Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a

user settable variable.  Set PKG_SUGGESTED_OPTIONS instead.  Also,
make use of PKG_OPTIONS_LEGACY_VARS.

Reviewed by wiz.

7 files changed, 22 insertions, 43 deletions

diff --git a/net/arping/options.mk b/net/arping/options.mk
index 5fa613688a4..7ef4c0567d1 100644
--- a/net/arping/options.mk
+++ b/net/arping/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/02/01 18:24:34 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.arping
 PKG_SUPPORTED_OPTIONS=	arping1 arping2
-
-.if !defined(PKG_OPTIONS.arping)
-PKG_DEFAULT_OPTIONS+= 	arping1
-.endif
+PKG_SUGGESTED_OPTIONS= 	arping1
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
index 343c1175d09..b28381981c8 100644
--- a/net/djbdns/options.mk
+++ b/net/djbdns/options.mk
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.3 2005/03/30 10:00:36 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:38 dillo Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
+PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2 tinydns64
 
 .if ${MACHINE_ARCH} == "sparc64" || \
 	${MACHINE_ARCH} == "alpha" || \
 	${MACHINE_ARCH} == "amd64"
-PKG_DEFAULT_OPTIONS+=   tinydns64
+PKG_SUGGESTED_OPTIONS=   tinydns64
 .endif
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
-PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2 tinydns64
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index c42888ba06e..0e5b6ed64b4 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/31 10:01:38 dillo Exp $
 
 DISTNAME=	flow-tools-0.67
 PKGREVISION=	2
@@ -27,17 +27,11 @@ SUPPORT_FILES+=	${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_}
 .endfor
 MESSAGE_SUBST+=	EGDIR=${EGDIR}
 
-.if defined(FLOW_TOOLS_USE_MYSQL) && \
-    !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	mysql
-.endif
-.if defined(FLOW_TOOLS_USE_POSTGRESQL) && \
-    !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	postgresql
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.flow-tools
 PKG_SUPPORTED_OPTIONS=	mysql postgresql
+PKG_OPTIONS_LEGACY_VARS+=	FLOW_TOOLS_USE_MYSQL:mysql
+PKG_OPTIONS_LEGACY_VARS+=	FLOW_TOOLS_USE_POSTGRESQL:postgresql
+
 .include "../../mk/bsd.options.mk"
 
 # MySQL support.
diff --git a/net/libnids/options.mk b/net/libnids/options.mk
index b599f17fcb2..e645dd09548 100644
--- a/net/libnids/options.mk
+++ b/net/libnids/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/04/05 22:13:29 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libnids
 PKG_SUPPORTED_OPTIONS=	libnet10 libnet11
-
-.if !defined(PKG_OPTIONS.libnids)
-PKG_DEFAULT_OPTIONS+= 	libnet10
-.endif
+PKG_SUGGESTED_OPTIONS= 	libnet10
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/netbsd-tap/options.mk b/net/netbsd-tap/options.mk
index 9b14ab2c42f..021c7896cce 100644
--- a/net/netbsd-tap/options.mk
+++ b/net/netbsd-tap/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2005/02/20 21:50:57 cube Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netbsd-tap
 PKG_SUPPORTED_OPTIONS=	bpf
-PKG_DEFAULT_OPTIONS?=	bpf
+PKG_SUGGESTED_OPTIONS=	bpf
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/samba2/options.mk b/net/samba2/options.mk
index a23560c3c17..3d8ebcb8081 100644
--- a/net/samba2/options.mk
+++ b/net/samba2/options.mk
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2005/02/07 11:35:46 jlam Exp $
-
-# Global and legacy options
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ldap-compat
-.endif
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba2
 PKG_SUPPORTED_OPTIONS=	PAM cups ldap-compat
+PKG_OPTIONS_LEGACY_VARS+=	USE_OPENLDAP:ldap-compat
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/net/wget/options.mk b/net/wget/options.mk
index 7fa47622382..0594a9eaa3f 100644
--- a/net/wget/options.mk
+++ b/net/wget/options.mk
@@ -1,17 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/02/09 17:51:47 tv Exp $
-
-# Global and legacy options
-.if defined(WGET_USE_SSL)
-BUILD_DEFS+=		WGET_USE_SSL
-.  if !empty(WGET_USE_SSL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	ssl
-.  endif
-.else
-PKG_DEFAULT_OPTIONS+=	ssl # on by default
-.endif
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wget
 PKG_SUPPORTED_OPTIONS=	inet6 ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+PKG_OPTIONS_LEGACY_VARS+=	WGET_USE_SSL:ssl
+
 .include "../../mk/bsd.options.mk"
 
 ###