diff options
| author | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
| commit | f81ae835adc78533f22ce227d12d3f56e6076f1a (patch) | |
| tree | 54f5cc64fe8b06d4695748b3d5b9967e8c030117 /lang | |
| parent | 79084c0d28dd7c904bebb1b7d09f66fa505cfc47 (diff) | |
| download | pkgsrc-f81ae835adc78533f22ce227d12d3f56e6076f1a.tar.gz | |
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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gauche/options.mk | 5 | ||||
| -rw-r--r-- | lang/gawk/Makefile | 7 | ||||
| -rw-r--r-- | lang/php5/Makefile.php | 20 |
3 files changed, 13 insertions, 19 deletions
diff --git a/lang/gauche/options.mk b/lang/gauche/options.mk index ab57f078a14..a9e185c40d8 100644 --- a/lang/gauche/options.mk +++ b/lang/gauche/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2005/03/07 03:16:46 uebayasi Exp $ +# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gauche PKG_SUPPORTED_OPTIONS= gdbm multibyte -PKG_DEFAULT_OPTIONS+= gdbm multibyte +PKG_SUGGESTED_OPTIONS= gdbm multibyte .include "../../mk/bsd.options.mk" + .include "../../mk/bsd.prefs.mk" ### diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index e34a7a6dd6d..1aadffe1146 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:13 tv Exp $ +# $NetBSD: Makefile,v 1.29 2005/05/31 10:01:37 dillo Exp $ # DISTNAME= gawk-3.1.4 @@ -26,12 +26,9 @@ MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" .include "../../mk/bsd.prefs.mk" -.if !empty(GAWK_ENABLE_PORTALS:M[Yy][Ee][Ss]) -PKG_DEFAULT_OPTIONS+= portals -.endif - PKG_OPTIONS_VAR= PKG_OPTIONS.gawk PKG_SUPPORTED_OPTIONS= portals +PKG_OPTIONS_LEGACY_VARS+= GAWK_ENABLE_PORTALS:portals .include "../../mk/bsd.options.mk" diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index f7d6f1f7a5f..5b067968f08 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.5 2005/04/08 20:58:49 jdolecek Exp $ +# $NetBSD: Makefile.php,v 1.6 2005/05/31 10:01:37 dillo Exp $ # .include "../../lang/php5/Makefile.common" @@ -32,25 +32,21 @@ CONFIGURE_ARGS+= --enable-track-vars CONFIGURE_ARGS+= --disable-posix CONFIGURE_ARGS+= --disable-dom -.if defined(USE_INET6) && ${USE_INET6} == "NO" -CONFIGURE_ARGS+= --disable-ipv6 -.else -CONFIGURE_ARGS+= --enable-ipv6 -.endif - CONFIGURE_ARGS+= --enable-xml CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} .include "../../textproc/libxml2/buildlink3.mk" -# 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:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif + .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-openssl |