diff --git a/contrib/bind9/FREEBSD-Upgrade b/contrib/bind9/FREEBSD-Upgrade index c0ea0f5a20a9..721404620ab8 100644 --- a/contrib/bind9/FREEBSD-Upgrade +++ b/contrib/bind9/FREEBSD-Upgrade @@ -51,7 +51,7 @@ Note that we intentionally disable IPv6 support on the configure command line; src/lib/bind/config.mk will re-enable it at compile - time if NOINET6 is not defined. + time if NO_INET6 is not defined. 8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and commit it. Do not commit any other file that was modified or diff --git a/lib/bind/config.mk b/lib/bind/config.mk index 70e60a6f70a5..1aecc04c7954 100644 --- a/lib/bind/config.mk +++ b/lib/bind/config.mk @@ -29,7 +29,7 @@ INTERNALLIB= #.endif # Enable IPv6 support if available -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+= -DWANT_IPV6 .endif diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile index d197caa2fdc6..8aaa6c0a250f 100644 --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -32,7 +32,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 1 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DINET6 .endif diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile index 3e89e332454c..41db4180d712 100644 --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -7,7 +7,7 @@ CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNOT_SENDMAIL -Dsm_snprintf=snprintf CFLAGS+=-D_THREAD_SAFE -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DNETINET6 .endif diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 57651c324f42..28fe7b884dd7 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -15,7 +15,7 @@ LFLAGS+=-Ppcapyy CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcapyylval -I${.CURDIR} -I. CFLAGS+=-D_U_="__attribute__((unused))" CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DINET6 .endif diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h index 39a80b417119..4a1544834d32 100644 --- a/lib/libpcap/config.h +++ b/lib/libpcap/config.h @@ -67,7 +67,7 @@ /* #undef NO_PROTOCHAIN */ /* IPv6 */ -/* XXX Handled by Makefile, to handle NOINET6 */ +/* XXX Handled by Makefile, to handle NO_INET6 */ /* #define INET6 1 */ /* Enable optimizer debugging */ diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index a248736950e3..62981aae7981 100644 --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -6,7 +6,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DNETINET6 .endif diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile index c780768df4d2..8748b5cab078 100644 --- a/lib/libwrap/Makefile +++ b/lib/libwrap/Makefile @@ -20,7 +20,7 @@ CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \ .if defined(NO_NIS) CFLAGS+= -DUSE_GETDOMAIN .endif -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DINET6 .endif diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile index 9e0e7ef4819d..e9ae81a3d191 100644 --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -7,7 +7,7 @@ CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ -DFACILITY=LOG_DAEMON -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DINET6 .endif diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf index f681057ad34e..7da433aa86cc 100644 --- a/release/picobsd/bridge/crunch.conf +++ b/release/picobsd/bridge/crunch.conf @@ -18,7 +18,7 @@ # Default build options. Basically tell the Makefiles which understand # that to use the most compact possible version of the code. # -buildopts -DNOPAM -DRELEASE_CRUNCH -DNONETGRAPH -DNOIPSEC -DNOINET6 +buildopts -DNOPAM -DRELEASE_CRUNCH -DNONETGRAPH -DNOIPSEC -DNO_INET6 # directories where to look for sources of various binaries. # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 362512749ee5..ba942a7ceed1 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -119,7 +119,7 @@ CRUNCH_PROGS_sbin+= atm atmconfig fore_dnld ilmid CRUNCH_LIBS+= -latm .endif -.if !defined(NOINET6) +.if !defined(NO_INET6) CRUNCH_PROGS_sbin+= ping6 .endif diff --git a/sbin/Makefile b/sbin/Makefile index 536dafcf1368..c59058b8757b 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -115,7 +115,7 @@ _pfctl= pfctl _pflogd= pflogd .endif -.if !defined(NOINET6) +.if !defined(NO_INET6) _ip6fw= ip6fw _ping6= ping6 .endif diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 298e45a2b597..f0f5a3997ca1 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -118,7 +118,7 @@ #NO_GAMES= # do not build games (games/ subdir) #NO_GDB= # do not build GDB #NO_I4B= # do not build isdn4bsd package -#NOINET6= # do not build IPv6 related programs and libraries +#NO_INET6= # do not build IPv6 related programs and libraries #NO_INFO= # do not make or install info files #NO_IPFILTER= # do not build IP Filter package #NOIPSEC= # do not build traceroute(8) with IPSEC support diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index f890524c63e8..302fe2b3b1d0 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -454,7 +454,7 @@ Set to not build Set to not build programs used for program development, compilers, debuggers etc. -.It Va NOINET6 +.It Va NO_INET6 .Pq Vt bool Set to not build programs and libraries related to IPv6 networking. diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index fc1726ffa9ce..92365b76b104 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -8,6 +8,7 @@ NOEXTRADEPEND:NO_EXTRADEPEND \ NOFSCHG:NO_FSCHG \ NOGAMES:NO_GAMES \ + NOINET6:NO_INET6 \ NOINFO:NO_INFO \ NOINFOCOMPRESS:NO_INFOCOMPRESS \ NOINSTALLLIB:NO_INSTALLLIB \ diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile index e934f5b4acbf..df04cba7ba0c 100644 --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -5,14 +5,14 @@ KMOD= if_gif SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mac.h \ opt_mrouting.h -.if !defined(NOINET6) +.if !defined(NO_INET6) SRCS+= in6_gif.c .endif opt_inet.h: echo "#define INET 1" > ${.TARGET} -.if !defined(NOINET6) +.if !defined(NO_INET6) opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .endif diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile index 7297cd238447..4b7aca713cd1 100644 --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -6,7 +6,7 @@ KMOD= ipl SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \ ip_log.c ip_fil.c fil.c -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+= -DUSE_INET6 .endif CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index f68e7493ebcb..79798c858eb1 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -20,7 +20,7 @@ opt_inet.h: echo "#define INET 1" > opt_inet.h opt_inet6.h: -.if defined(NOINET6) +.if defined(NO_INET6) echo > opt_inet6.h .else echo "#define INET6 1" > opt_inet6.h diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf index 6e29d398b49a..96f4ff98ac7d 100644 --- a/tools/tools/nanobsd/make.conf +++ b/tools/tools/nanobsd/make.conf @@ -20,7 +20,7 @@ NO_GDB= NO_HESIOD_LIBC= NOHTML= NO_I4B= -NOINET6= +NO_INET6= NO_INFO= NO_IPFILTER= NO_KERBEROS= diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 162fb975f1e7..d8f78dc04265 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -215,7 +215,7 @@ _bluetooth= bluetooth _keyserv= keyserv .endif -.if !defined(NOINET6) +.if !defined(NO_INET6) _mld6query= mld6query _rip6query= rip6query _route6d= route6d diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 370d057600ff..c2bbb4c9ca7d 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -48,7 +48,7 @@ CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\" CFLAGS+=-DNOKLDLOAD .endif -.if defined(NOINET6) +.if defined(NO_INET6) CFLAGS+=-DNOINET6 .endif diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 4b2dc7250513..7db47d05695f 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -36,7 +36,7 @@ CSTD?= c89 CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I. CFLAGS+= ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS} -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+= -DNETINET6 .endif diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile index 57938e14c9d7..a9436514b4e8 100644 --- a/usr.sbin/tcpdchk/Makefile +++ b/usr.sbin/tcpdchk/Makefile @@ -9,7 +9,7 @@ SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DINET6 .endif diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile index bea68aa6aa3f..2370e9c1081e 100644 --- a/usr.sbin/tcpdmatch/Makefile +++ b/usr.sbin/tcpdmatch/Makefile @@ -8,7 +8,7 @@ SRCS= tcpdmatch.c fakelog.c inetcf.c scaffold.c CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -.if !defined(NOINET6) +.if !defined(NO_INET6) CFLAGS+=-DINET6 .endif diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 95d743132b48..0526cedeee5f 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -31,7 +31,7 @@ CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR} CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -D_U_="__attribute__((unused))" -.if !defined(NOINET6) +.if !defined(NO_INET6) SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \ print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-mobility.c CFLAGS+= -DINET6