[pkgsrc/trunk]: pkgsrc/mk PKGBASE is defined too late to be used in PKG_OPTIO...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/673d2b151866
branches:  trunk
changeset: 502930:673d2b151866
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 11 07:10:06 2005 +0000

description:
PKGBASE is defined too late to be used in PKG_OPTIONS_VAR, so it cannot
be used here.

diffstat:

 lang/php5/Makefile.php               |  6 ++++--
 mail/courier-maildir/Makefile.common |  6 ++++--
 mk/djbware.mk                        |  6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r e9d2854e742c -r 673d2b151866 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Fri Nov 11 07:04:57 2005 +0000
+++ b/lang/php5/Makefile.php    Fri Nov 11 07:10:06 2005 +0000
@@ -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+=       --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 -r e9d2854e742c -r 673d2b151866 mail/courier-maildir/Makefile.common
--- a/mail/courier-maildir/Makefile.common      Fri Nov 11 07:04:57 2005 +0000
+++ b/mail/courier-maildir/Makefile.common      Fri Nov 11 07:10:06 2005 +0000
@@ -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_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 -r e9d2854e742c -r 673d2b151866 mk/djbware.mk
--- a/mk/djbware.mk     Fri Nov 11 07:04:57 2005 +0000
+++ b/mk/djbware.mk     Fri Nov 11 07:10:06 2005 +0000
@@ -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 @@
 .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