diff options
| -rw-r--r-- | lang/php5/Makefile.php | 6 | ||||
| -rw-r--r-- | mail/courier-maildir/Makefile.common | 6 | ||||
| -rw-r--r-- | mk/djbware.mk | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 5ef776ce426..5ad83dcf2c8 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.13 2005/11/05 17:18:28 rillig Exp $ +# $NetBSD: Makefile.php,v 1.14 2005/11/11 07:10:06 rillig Exp $ # .include "../../lang/php5/Makefile.common" @@ -40,7 +40,9 @@ CONFIGURE_ARGS+= --enable-xml CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} .include "../../textproc/libxml2/buildlink3.mk" -PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGBASE} +# Note: This expression is the same as ${PKGBASE}, but the latter is +# not defined yet, so we cannot use it here. +PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} PKG_SUPPORTED_OPTIONS+= inet6 ssl PKG_SUGGESTED_OPTIONS+= ssl diff --git a/mail/courier-maildir/Makefile.common b/mail/courier-maildir/Makefile.common index 2f7ea209e3e..c97833eb4e5 100644 --- a/mail/courier-maildir/Makefile.common +++ b/mail/courier-maildir/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/10/20 20:26:15 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/11/11 07:18:41 rillig Exp $ # # Package Makefiles should include this file after setting PKGBASE and # PKG_SUPPORTED_OPTIONS. @@ -23,7 +23,9 @@ CONFIGURE_ARGS+= --with-db=db CONFIGURE_ENV+= SYSCONFTOOL_PERL=${PERL5:Q} -PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGBASE} +# Note: This expression is the same as ${PKGBASE}, but the latter is +# not defined yet, so we cannot use it here. +PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} PKG_SUPPORTED_OPTIONS+= fam .include "../../mk/bsd.options.mk" diff --git a/mk/djbware.mk b/mk/djbware.mk index ed9ab4a228d..776d03daa7f 100644 --- a/mk/djbware.mk +++ b/mk/djbware.mk @@ -1,4 +1,4 @@ -# $NetBSD: djbware.mk,v 1.11 2005/10/05 05:46:54 schmonz Exp $ +# $NetBSD: djbware.mk,v 1.12 2005/11/11 07:19:40 rillig Exp $ # # Makefile fragment for packages with djb-style build machinery # @@ -76,7 +76,9 @@ PKG_SUGGESTED_OPTIONS+= djbware-errno-hack .if exists(${PKGDIR}/options.mk) . include "${PKGDIR}/options.mk" .else -PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGBASE} +# Note: This expression is the same as ${PKGBASE}, but the latter is +# not defined yet, so we cannot use it here. +PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} .include "../../mk/bsd.options.mk" .endif |