diff options
| -rw-r--r-- | mail/fetchmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/qpopper/Makefile | 4 | ||||
| -rw-r--r-- | mk/mk.conf.example | 4 | ||||
| -rw-r--r-- | net/rsync/Makefile | 4 | ||||
| -rw-r--r-- | net/zebra/Makefile | 4 | ||||
| -rw-r--r-- | security/ssh/Makefile | 6 | ||||
| -rw-r--r-- | www/apache6/Makefile | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 5f59f06adbc..f87133a3e1e 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 1999/08/22 20:20:57 frueauf Exp $ +# $NetBSD: Makefile,v 1.52 1999/09/03 22:00:52 tron Exp $ # DISTNAME= fetchmail-5.0.7 @@ -23,7 +23,7 @@ BUILD_DEFS+= USE_KERBEROS4 USE_INET6 CONFIGURE_ARGS+=--with-kerberos=yes RESTRICTED= uses Kerberos encryption code .endif -.if defined(USE_INET6) +.if defined(USE_INET6) && ${USE_INET6} == YES CONFIGURE_ARGS+=--enable-inet6 .endif diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 4a0f0769fe4..5e163faa3c0 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/08/18 09:01:49 agc Exp $ +# $NetBSD: Makefile,v 1.18 1999/09/03 22:00:52 tron Exp $ # DISTNAME= qpopper2.53 @@ -24,7 +24,7 @@ BUILD_DEFS+= QPOPPER_SERVERMODE USE_INET6 .if defined(QPOPPER_SERVERMODE) CONFIGURE_ARGS+= --enable-servermode .endif -.if defined(USE_INET6) +.if defined(USE_INET6) && ${USE_INET6} == YES CONFIGURE_ENV+= O_DEFS="${O_DEFS}" CFLAGS="-DINET6" .endif diff --git a/mk/mk.conf.example b/mk/mk.conf.example index ecd7ce09b62..70cf0ebc7ae 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.71 1999/08/26 05:18:06 sakamoto Exp $ +# $NetBSD: mk.conf.example,v 1.72 1999/09/03 22:00:52 tron Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -390,7 +390,7 @@ PAPERSIZE= A4 # Default paper size for packages. #USE_INET6= # Enable IPv6 support on certain packages. # Use IPv6-ready kernel if you define this. - # Possible: defined, not defined + # Possible: not defined, YES # Default: not defined # diff --git a/net/rsync/Makefile b/net/rsync/Makefile index af486d58d78..25e5b6ddfa5 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 1999/08/18 09:24:08 agc Exp $ +# $NetBSD: Makefile,v 1.25 1999/09/03 22:00:52 tron Exp $ # DISTNAME= rsync-2.3.1 @@ -21,7 +21,7 @@ BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" GNU_CONFIGURE= yes -.if defined(USE_INET6) +.if defined(USE_INET6) && ${USE_INET6} == YES CONFIGURE_ARGS= --enable-ipv6 .else CONFIGURE_ARGS= --disable-ipv6 diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 9aa374a68d7..8d3564b3e95 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1999/08/30 02:57:35 itojun Exp $ +# $NetBSD: Makefile,v 1.15 1999/09/03 22:00:52 tron Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -18,7 +18,7 @@ BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" -.if defined(USE_INET6) +.if defined(USE_INET6) && ${USE_INET6} == YES PLIST_SRC= ${PKGDIR}/PLIST.v6 .else CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 1ff4ac48a01..fd9449eb520 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 1999/08/18 09:24:08 agc Exp $ +# $NetBSD: Makefile,v 1.57 1999/09/03 22:00:53 tron Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -88,7 +88,7 @@ CFLAGS+= -DLIBWRAP_FWD # IPv6 support # always fetch IPv6 related patch files. simplify files/md5 generation. -.if defined(USE_INET6) +.if defined(USE_INET6) && ${USE_INET6} == YES PATCH_SITES+= ftp://ftp.kyoto.wide.ad.jp/IPv6/ssh/ PATCHFILES+= ssh-1.2.27-IPv6-1.5-patch.gz PATCH_DIST_STRIP+= -p1 @@ -113,7 +113,7 @@ PLIST_SRC= ${WRKDIR}/PLIST pre-patch: @${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \ ${WRKSRC}/make-ssh-known-hosts.pl.in -.if defined(USE_INET6) +.if defined(USE_INET6) && ${USE_INET6} == YES ${MKDIR} ${WRKDIR}/.patches ${CP} ${.CURDIR}/patches/patch-* ${WRKDIR}/.patches ${CP} ${.CURDIR}/patches.v6/patch-* ${WRKDIR}/.patches diff --git a/www/apache6/Makefile b/www/apache6/Makefile index dec27bc52f1..8d81c4ccf5a 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/09/01 09:00:26 itojun Exp $ +# $NetBSD: Makefile,v 1.7 1999/09/03 22:00:53 tron Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl @@ -49,7 +49,7 @@ CONFIGURE_ENV+= OPTIM="${OPTIM}" .include "../../mk/bsd.prefs.mk" -.if !defined(USE_INET6) +.if !defined(USE_INET6) || ${USE_INET6} != YES BROKEN= "IPv6 only build" .endif |