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.

6 files changed, 15 insertions, 24 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 5abc47c179c..25688a9459c 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2005/05/17 19:11:47 jlam Exp $
+# $NetBSD: Makefile,v 1.166 2005/05/31 10:01:40 dillo Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -64,15 +64,11 @@ BUILD_DEFS+=		APACHE_USER APACHE_GROUP
 CONFIGURE_ARGS+=	--server-uid=${APACHE_USER}
 CONFIGURE_ARGS+=	--server-gid=${APACHE_GROUP}
 
-.if defined(APACHE_PERF_TUNING) && !empty(APACHE_PERF_TUNING:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	perf-tuning
-.endif
-.if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	suexec
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS=	perf-tuning suexec
+PKG_OPTIONS_LEGACY_VARS+=	APACHE_PERF_TUNING:perf-tuning
+PKG_OPTIONS_LEGACY_VARS+=	APACHE_SUEXEC:suexec
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msuexec)
diff --git a/www/horde3/options.mk b/www/horde3/options.mk
index bd7264a1b2d..bce44429e29 100644
--- a/www/horde3/options.mk
+++ b/www/horde3/options.mk
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2005/03/04 22:35:22 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:40 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.horde
 PKG_SUPPORTED_OPTIONS=	ldap postgresql mysql
+PKG_SUGGESTED_OPTIONS=	mysql
 
-.if !defined(PKG_OPTIONS.horde)
-PKG_DEFAULT_OPTIONS+=	mysql
-.endif
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index c215bcdf769..fb2338f0813 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.5 2004/11/30 15:33:53 xtraeme Exp $
+# $NetBSD: options.mk,v 1.6 2005/05/31 10:01:40 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS=	curses inet6 ncurses slang socks4 socks5
-PKG_DEFAULT_OPTIONS+=	curses
+PKG_SUGGESTED_OPTIONS=	curses
+
 .include "../../mk/bsd.options.mk"
 
 ###
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 6f29bf45131..57a5fbbc02c 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:56 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/31 10:01:40 dillo Exp $
 
 DISTNAME=		HTML-Mason-1.28
 PKGNAME=		p5-${DISTNAME}
@@ -24,7 +24,7 @@ USE_PERL5=		run
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-HTML-Mason
 PKG_SUPPORTED_OPTIONS=	modperl
-PKG_DEFAULT_OPTIONS+=	modperl
+PKG_SUGGESTED_OPTIONS=	modperl
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 915112ce99c..bdb6fd53676 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.21 2004/12/17 00:36:09 tron Exp $
+# $NetBSD: Makefile.php,v 1.22 2005/05/31 10:01:40 dillo Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -40,13 +40,9 @@ CONFIGURE_ARGS+=	${PHP4_CONFIGURE_ARGS}
 CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
 CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
-# Global and legacy options
-.if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
 PKG_SUPPORTED_OPTIONS+=	ssl
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mssl)
diff --git a/www/screws/options.mk b/www/screws/options.mk
index faabe4dd065..1d005334939 100644
--- a/www/screws/options.mk
+++ b/www/screws/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1 2005/03/20 17:52:20 jmmv Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:40 dillo Exp $
 #
 
-PKG_DEFAULT_OPTIONS+=	inet6 lua ssl
 PKG_OPTIONS_VAR=	PKG_OPTIONS.screws
 PKG_SUPPORTED_OPTIONS=	inet6 lua ssl
+PKG_SUGGESTED_OPTIONS=	inet6 lua ssl
 
 .include "../../mk/bsd.options.mk"