summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2003-12-27 13:28:46 +0000
committertron <tron@pkgsrc.org>2003-12-27 13:28:46 +0000
commit569a11b533447470ccff2e665f999ba7c0f250b7 (patch)
tree26407a401e1d4f8f3222ba880fbdc0050f51c9e6 /mk
parentff1f7d3b9fcfa24d8998214991df1bbf7f9e0088 (diff)
downloadpkgsrc-569a11b533447470ccff2e665f999ba7c0f250b7.tar.gz
If "USE_INET6" is already defined (e.g. by NetBSD-current's "bsd.own.mk")
convert it to uppercase to make checks in packages like "bind9" work.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 7aad714480f..65ba2adee8d 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.135 2003/12/11 22:35:50 reed Exp $
+# $NetBSD: bsd.prefs.mk,v 1.136 2003/12/27 13:28:46 tron Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -239,10 +239,16 @@ SHAREMODE?= ${DOCMODE}
.endif
# if the system is IPv6-ready, compile with IPv6 support turned on.
-.if empty(_OPSYS_HAS_INET6:M[nN][oO]) && !defined(USE_SOCKS)
-USE_INET6?= YES
+.if defined(USE_INET6)
+.if empty(USE_INET6:M[Yy][Ee][Ss])
+USE_INET6= NO
.else
-USE_INET6?= NO
+USE_INET6= YES
+.elif empty(_OPSYS_HAS_INET6:M[nN][oO]) && !defined(USE_SOCKS)
+USE_INET6= YES
+.else
+USE_INET6= NO
+.endif
.endif
LOCALBASE?= ${DESTDIR}/usr/pkg