pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Don't assign to PKG_OPTIONS.<pkg> which has special me...
details: https://anonhg.NetBSD.org/pkgsrc/rev/873bfdd41d54
branches: trunk
changeset: 493538:873bfdd41d54
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon May 09 05:14:08 2005 +0000
description:
Don't assign to PKG_OPTIONS.<pkg> which has special meaning to the
options framework. Rename PKG_OPTIONS.* to PKG_BUILD_OPTIONS.*.
diffstat:
databases/openldap/buildlink3.mk | 14 +++++++-------
devel/apr/buildlink3.mk | 14 +++++++-------
misc/kdepim3/buildlink3.mk | 12 ++++++------
security/heimdal/buildlink3.mk | 12 ++++++------
security/openssl/buildlink3.mk | 12 ++++++------
x11/kdebase3/buildlink3.mk | 14 +++++++-------
x11/kdelibs3/buildlink3.mk | 12 ++++++------
7 files changed, 45 insertions(+), 45 deletions(-)
diffs (230 lines):
diff -r a9addfe0b96d -r 873bfdd41d54 databases/openldap/buildlink3.mk
--- a/databases/openldap/buildlink3.mk Mon May 09 05:06:55 2005 +0000
+++ b/databases/openldap/buildlink3.mk Mon May 09 05:14:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2005/05/09 05:06:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2005/05/09 05:14:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -18,16 +18,16 @@
BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
.endif # OPENLDAP_BUILDLINK3_MK
-.if !defined(PKG_OPTIONS.openldap)
-PKG_OPTIONS.openldap!= \
+.if !defined(PKG_BUILD_OPTIONS.openldap)
+PKG_BUILD_OPTIONS.openldap!= \
cd ${BUILDLINK_PKGSRCDIR.openldap} && \
${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
-MAKE_FLAGS+= PKG_OPTIONS.openldap=${PKG_OPTIONS.openldap:Q}
+MAKE_FLAGS+= PKG_BUILD_OPTIONS.openldap=${PKG_BUILD_OPTIONS.openldap:Q}
.endif
-MAKE_VARS+= PKG_OPTIONS.openldap
+MAKE_VARS+= PKG_BUILD_OPTIONS.openldap
-.if !empty(PKG_OPTIONS.openldap:Mkerberos) || \
- !empty(PKG_OPTIONS.openldap:Msasl)
+.if !empty(PKG_BUILD_OPTIONS.openldap:Mkerberos) || \
+ !empty(PKG_BUILD_OPTIONS.openldap:Msasl)
. include "../../security/cyrus-sasl2/buildlink3.mk"
.endif
.include "../../security/openssl/buildlink3.mk"
diff -r a9addfe0b96d -r 873bfdd41d54 devel/apr/buildlink3.mk
--- a/devel/apr/buildlink3.mk Mon May 09 05:06:55 2005 +0000
+++ b/devel/apr/buildlink3.mk Mon May 09 05:14:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2005/05/09 05:06:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2005/05/09 05:14:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
@@ -24,18 +24,18 @@
BUILDLINK_FILES.apr+= lib/*.exp
.endif # APR_BUILDLINK3_MK
-.if !defined(PKG_OPTIONS.apr)
-PKG_OPTIONS.apr!= cd ${BUILDLINK_PKGSRCDIR.apr} && \
+.if !defined(PKG_BUILD_OPTIONS.apr)
+PKG_BUILD_OPTIONS.apr!= cd ${BUILDLINK_PKGSRCDIR.apr} && \
${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
-MAKE_FLAGS+= PKG_OPTIONS.apr=${PKG_OPTIONS.apr:Q}
+MAKE_FLAGS+= PKG_BUILD_OPTIONS.apr=${PKG_BUILD_OPTIONS.apr:Q}
.endif
-MAKE_VARS+= PKG_OPTIONS.apr
+MAKE_VARS+= PKG_BUILD_OPTIONS.apr
-.if !empty(PKG_OPTIONS.apr:Mdb4)
+.if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
. include "../../databases/db4/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS.apr:Mldap)
+.if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
. include "../../databases/openldap/buildlink3.mk"
.endif
diff -r a9addfe0b96d -r 873bfdd41d54 misc/kdepim3/buildlink3.mk
--- a/misc/kdepim3/buildlink3.mk Mon May 09 05:06:55 2005 +0000
+++ b/misc/kdepim3/buildlink3.mk Mon May 09 05:14:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/05/09 05:06:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/05/09 05:14:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+
@@ -16,18 +16,18 @@
BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3
.endif # KDEPIM_BUILDLINK3_MK
-.if !defined(PKG_OPTIONS.kdepim)
-PKG_OPTIONS.kdepim!= \
+.if !defined(PKG_BUILD_OPTIONS.kdepim)
+PKG_BUILD_OPTIONS.kdepim!= \
cd ${BUILDLINK_PKGSRCDIR.kdepim} && \
${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
-MAKE_FLAGS+= PKG_OPTIONS.kdepim=${PKG_OPTIONS.kdepim:Q}
+MAKE_FLAGS+= PKG_BUILD_OPTIONS.kdepim=${PKG_BUILD_OPTIONS.kdepim:Q}
.endif
-MAKE_VARS+= PKG_OPTIONS.kdepim
+MAKE_VARS+= PKG_BUILD_OPTIONS.kdepim
.include "../../comms/libmal/buildlink3.mk"
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
-.if !empty(PKG_OPTIONS.kdepim:Msasl)
+.if !empty(PKG_BUILD_OPTIONS.kdepim:Msasl)
. include "../../security/cyrus-sasl2/buildlink3.mk"
.endif
.include "../../x11/kdebase3/buildlink3.mk"
diff -r a9addfe0b96d -r 873bfdd41d54 security/heimdal/buildlink3.mk
--- a/security/heimdal/buildlink3.mk Mon May 09 05:06:55 2005 +0000
+++ b/security/heimdal/buildlink3.mk Mon May 09 05:14:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2005/05/09 05:06:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2005/05/09 05:14:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+
@@ -19,16 +19,16 @@
BUILDLINK_INCDIRS.heimdal?= include/krb5
.endif # HEIMDAL_BUILDLINK3_MK
-.if !defined(PKG_OPTIONS.heimdal)
-PKG_OPTIONS.heimdal!= \
+.if !defined(PKG_BUILD_OPTIONS.heimdal)
+PKG_BUILD_OPTIONS.heimdal!= \
cd ${BUILDLINK_PKGSRCDIR.heimdal} && \
${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
-MAKE_FLAGS+= PKG_OPTIONS.heimdal=${PKG_OPTIONS.heimdal:Q}
+MAKE_FLAGS+= PKG_BUILD_OPTIONS.heimdal=${PKG_BUILD_OPTIONS.heimdal:Q}
.endif
-MAKE_VARS+= PKG_OPTIONS.heimdal
+MAKE_VARS+= PKG_BUILD_OPTIONS.heimdal
.include "../../security/openssl/buildlink3.mk"
-.if !empty(PKG_OPTIONS.heimdal:Mdb4)
+.if !empty(PKG_BUILD_OPTIONS.heimdal:Mdb4)
. include "../../databases/db4/buildlink3.mk"
.else
. include "../../mk/bdb.buildlink3.mk"
diff -r a9addfe0b96d -r 873bfdd41d54 security/openssl/buildlink3.mk
--- a/security/openssl/buildlink3.mk Mon May 09 05:06:55 2005 +0000
+++ b/security/openssl/buildlink3.mk Mon May 09 05:14:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2005/05/09 05:06:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2005/05/09 05:14:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+
@@ -26,15 +26,15 @@
BUILD_DEFS+= SSLBASE
.endif # OPENSSL_BUILDLINK3_MK
-.if !defined(PKG_OPTIONS.openssl)
-PKG_OPTIONS.openssl!= \
+.if !defined(PKG_BUILD_OPTIONS.openssl)
+PKG_BUILD_OPTIONS.openssl!= \
cd ${BUILDLINK_PKGSRCDIR.openssl} && \
${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
-MAKE_FLAGS+= PKG_OPTIONS.openssl=${PKG_OPTIONS.openssl:Q}
+MAKE_FLAGS+= PKG_BUILD_OPTIONS.openssl=${PKG_BUILD_OPTIONS.openssl:Q}
.endif
-MAKE_VARS+= PKG_OPTIONS.openssl
+MAKE_VARS+= PKG_BUILD_OPTIONS.openssl
-.if !empty(PKG_OPTIONS.openssl:Mrsaref)
+.if !empty(PKG_BUILD_OPTIONS.openssl:Mrsaref)
. include "../../security/rsaref/buildlink3.mk"
.endif
diff -r a9addfe0b96d -r 873bfdd41d54 x11/kdebase3/buildlink3.mk
--- a/x11/kdebase3/buildlink3.mk Mon May 09 05:06:55 2005 +0000
+++ b/x11/kdebase3/buildlink3.mk Mon May 09 05:14:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/05/09 05:06:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/05/09 05:14:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+
@@ -16,13 +16,13 @@
BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3
.endif # KDEBASE_BUILDLINK3_MK
-.if !defined(PKG_OPTIONS.kdebase)
-PKG_OPTIONS.kdebase!= \
+.if !defined(PKG_BUILD_OPTIONS.kdebase)
+PKG_BUILD_OPTIONS.kdebase!= \
cd ${BUILDLINK_PKGSRCDIR.kdebase} && \
${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
-MAKE_FLAGS+= PKG_OPTIONS.kdebase=${PKG_OPTIONS.kdebase:Q}
+MAKE_FLAGS+= PKG_BUILD_OPTIONS.kdebase=${PKG_BUILD_OPTIONS.kdebase:Q}
.endif
-MAKE_VARS+= PKG_OPTIONS.kdebase
+MAKE_VARS+= PKG_BUILD_OPTIONS.kdebase
BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0
@@ -30,10 +30,10 @@
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
-.if !empty(PKG_OPTIONS.kdebase:Msamba)
+.if !empty(PKG_BUILD_OPTIONS.kdebase:Msamba)
. include "../../net/samba/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS.kdebase:Msasl)
+.if !empty(PKG_BUILD_OPTIONS.kdebase:Msasl)
. include "../../security/cyrus-sasl2/buildlink3.mk"
.endif
.include "../../x11/Xrandr/buildlink3.mk"
diff -r a9addfe0b96d -r 873bfdd41d54 x11/kdelibs3/buildlink3.mk
--- a/x11/kdelibs3/buildlink3.mk Mon May 09 05:06:55 2005 +0000
+++ b/x11/kdelibs3/buildlink3.mk Mon May 09 05:14:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/05/09 05:06:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/05/09 05:14:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+
@@ -20,15 +20,15 @@
.include "../../x11/kdelibs3/dirs.mk"
.endif # KDELIBS_BUILDLINK3_MK
-.if !defined(PKG_OPTIONS.kdelibs)
-PKG_OPTIONS.kdelibs!= \
+.if !defined(PKG_BUILD_OPTIONS.kdelibs)
+PKG_BUILD_OPTIONS.kdelibs!= \
cd ${BUILDLINK_PKGSRCDIR.kdelibs} && \
${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
-MAKE_FLAGS+= PKG_OPTIONS.kdelibs=${PKG_OPTIONS.kdelibs:Q}
+MAKE_FLAGS+= PKG_BUILD_OPTIONS.kdelibs=${PKG_BUILD_OPTIONS.kdelibs:Q}
.endif
-MAKE_VARS+= PKG_OPTIONS.kdelibs
+MAKE_VARS+= PKG_BUILD_OPTIONS.kdelibs
-.if !empty(PKG_OPTIONS.kdelibs:Mcups)
+.if !empty(PKG_BUILD_OPTIONS.kdelibs:Mcups)
. include "../../print/cups/buildlink3.mk"
.endif
.include "../../archivers/bzip2/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index