pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk If "USE_INET6" is already defined (e.g. by NetBSD-c...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/86ce55cca15f
branches:  trunk
changeset: 465304:86ce55cca15f
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Dec 27 13:28:46 2003 +0000

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

 mk/bsd.prefs.mk |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 1431b7a26550 -r 86ce55cca15f mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sat Dec 27 09:12:49 2003 +0000
+++ b/mk/bsd.prefs.mk   Sat Dec 27 13:28:46 2003 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index