summaryrefslogtreecommitdiff
path: root/mk/bsd.prefs.mk
diff options
context:
space:
mode:
authordillo <dillo>2005-08-16 19:55:38 +0000
committerdillo <dillo>2005-08-16 19:55:38 +0000
commit4200e05b6bcd8ac4262c0b5436b644dcb23719db (patch)
treece8fa3aae6a945bd45f0ff0672677e620993f001 /mk/bsd.prefs.mk
parent7bbef331ffeadfd97dfde9d6cef624ab040faac6 (diff)
downloadpkgsrc-4200e05b6bcd8ac4262c0b5436b644dcb23719db.tar.gz
Don't add inet6 to PKG_DEFAULT_OPTIONS, it is a user settable
variable. mk/defaults/obsolete.mk takes care of converting USE_INET6 to inet6 option. Bug noted by schmonz.
Diffstat (limited to 'mk/bsd.prefs.mk')
-rw-r--r--mk/bsd.prefs.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 92a2df2af2e..9debb772298 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.199 2005/07/28 13:07:17 wiz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.200 2005/08/16 19:55:38 dillo Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -355,11 +355,9 @@ PKG_INSTALLATION_TYPE?= none
. if empty(USE_INET6:M[Yy][Ee][Ss]) || defined(USE_SOCKS)
USE_INET6= NO
. else
-PKG_DEFAULT_OPTIONS+= inet6
USE_INET6= YES
. endif
.elif empty(_OPSYS_HAS_INET6:M[nN][oO]) && !defined(USE_SOCKS)
-PKG_DEFAULT_OPTIONS+= inet6
USE_INET6= YES
.else
USE_INET6= NO