NOINET6 -> NO_INET6

2004-12-21 10:49:29 +00:00 · 2004-12-21 10:49:29 +00:00 · 731db6a428
commit 731db6a428
parent 39a855c2a1
25 changed files with 26 additions and 25 deletions
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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 */
--- 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

--- 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

--- 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

--- 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)
--- 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

--- 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
--- 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
--- 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.
--- 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 \
--- 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
--- 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
--- 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
--- 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=
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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