pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc If the ${PKGBASE} of a package doesn't match the token...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5252051dedf2
branches: trunk
changeset: 471067:5252051dedf2
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Mar 16 18:23:26 2004 +0000
description:
If the ${PKGBASE} of a package doesn't match the token passed to
BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE.<pkg> explicitly so that
we can map from <pkg> to BUILDLINK_PKGBASE.<pkg>.
diffstat:
audio/libaudiofile/buildlink3.mk | 3 ++-
audio/py-ogg/buildlink3.mk | 3 ++-
converters/libiconv/buildlink3.mk | 3 ++-
databases/db/buildlink3.mk | 3 ++-
databases/py-ZODB/buildlink3.mk | 3 ++-
devel/gettext-lib/buildlink3.mk | 3 ++-
devel/libgetopt/buildlink3.mk | 3 ++-
devel/libsigc++/buildlink3.mk | 3 ++-
devel/libtool/buildlink3.mk | 3 ++-
graphics/freetype-lib/buildlink3.mk | 3 ++-
graphics/py-imaging/buildlink3.mk | 3 ++-
lang/gcc3-c++/buildlink3.mk | 3 ++-
lang/gcc3-c/buildlink3.mk | 3 ++-
lang/gcc3-f77/buildlink3.mk | 3 ++-
lang/gcc3-java/buildlink3.mk | 3 ++-
lang/gcc3-objc/buildlink3.mk | 3 ++-
math/py-Numeric/buildlink3.mk | 3 ++-
mk/buildlink3/bsd.buildlink3.mk | 3 ++-
net/py-ORBit/buildlink3.mk | 3 ++-
security/PAM/buildlink3.mk | 3 ++-
textproc/py-xml/buildlink3.mk | 3 ++-
time/py-mxDateTime/buildlink3.mk | 3 ++-
x11/gtk/buildlink3.mk | 3 ++-
x11/gtk2/buildlink3.mk | 3 ++-
x11/py-gnome2/buildlink3.mk | 3 ++-
x11/py-gtk2/buildlink3.mk | 3 ++-
26 files changed, 52 insertions(+), 26 deletions(-)
diffs (truncated from 442 to 300 lines):
diff -r 38b26cfa6619 -r 5252051dedf2 audio/libaudiofile/buildlink3.mk
--- a/audio/libaudiofile/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/audio/libaudiofile/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:26 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@
BUILDLINK_PACKAGES+= audiofile
.if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.audiofile?= libaudiofile
BUILDLINK_DEPENDS.audiofile+= libaudiofile>=0.2.1
BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile
.endif # AUDIOFILE_BUILDLINK3_MK
diff -r 38b26cfa6619 -r 5252051dedf2 audio/py-ogg/buildlink3.mk
--- a/audio/py-ogg/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/audio/py-ogg/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:26 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@
BUILDLINK_PACKAGES+= pyogg
.if !empty(PY_OGG_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyogg?= ${PYPKGPREFIX}-ogg
BUILDLINK_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3
BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg
diff -r 38b26cfa6619 -r 5252051dedf2 converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@
BUILDLINK_PACKAGES+= iconv
.if !empty(ICONV_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.iconv?= libiconv
BUILDLINK_DEPENDS.iconv+= libiconv>=1.9.1
BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv
.endif # ICONV_BUILDLINK3_MK
diff -r 38b26cfa6619 -r 5252051dedf2 databases/db/buildlink3.mk
--- a/databases/db/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/databases/db/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/03/10 18:06:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB_BUILDLINK3_MK:= ${DB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@
BUILDLINK_PACKAGES+= db2
.if !empty(DB_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.db2?= db
BUILDLINK_DEPENDS.db2+= db>=2.7.3
BUILDLINK_PKGSRCDIR.db2?= ../../databases/db
diff -r 38b26cfa6619 -r 5252051dedf2 databases/py-ZODB/buildlink3.mk
--- a/databases/py-ZODB/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/databases/py-ZODB/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ZODB_BUILDLINK3_MK:= ${PY_ZODB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@
BUILDLINK_PACKAGES+= pyZODB
.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyZODB?= ${PYPKGPREFIX}-ZODB
BUILDLINK_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2nb1
BUILDLINK_PKGSRCDIR.pyZODB?= ../../databases/py-ZODB
.endif # PY_ZODB_BUILDLINK3_MK
diff -r 38b26cfa6619 -r 5252051dedf2 devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@
BUILDLINK_PACKAGES+= gettext
.if !empty(GETTEXT_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.gettext?= gettext-lib
BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.10.35nb1
BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib
diff -r 38b26cfa6619 -r 5252051dedf2 devel/libgetopt/buildlink3.mk
--- a/devel/libgetopt/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/devel/libgetopt/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGETOPT_BUILDLINK3_MK:= ${LIBGETOPT_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@
BUILDLINK_PACKAGES+= getopt
.if !empty(LIBGETOPT_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.getopt?= libgetopt
BUILDLINK_DEPENDS.getopt+= libgetopt>=1.3
BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
.endif # LIBGETOPT_BUILDLINK3_MK
diff -r 38b26cfa6619 -r 5252051dedf2 devel/libsigc++/buildlink3.mk
--- a/devel/libsigc++/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/devel/libsigc++/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 23:22:33 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGC++_BUILDLINK3_MK:= ${LIBSIGC++_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@
BUILDLINK_PACKAGES+= libsigcxx
.if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.libsigcxx?= libsigc++
BUILDLINK_DEPENDS.libsigcxx+= libsigc++>=1.2.3nb1
BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++
.endif # LIBSIGC++_BUILDLINK3_MK
diff -r 38b26cfa6619 -r 5252051dedf2 devel/libtool/buildlink3.mk
--- a/devel/libtool/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/devel/libtool/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LTDL_BUILDLINK3_MK:= ${LTDL_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@
BUILDLINK_PACKAGES+= ltdl
.if !empty(LTDL_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.ltdl?= libtool-base
BUILDLINK_DEPENDS.ltdl+= libtool-base>=1.5.2
BUILDLINK_PKGSRCDIR.ltdl?= ../../devel/libtool-base
.endif # LTDL_BUILDLINK3_MK
diff -r 38b26cfa6619 -r 5252051dedf2 graphics/freetype-lib/buildlink3.mk
--- a/graphics/freetype-lib/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/graphics/freetype-lib/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+
@@ -11,6 +11,7 @@
BUILDLINK_PACKAGES+= freetype
.if !empty(FREETYPE_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.freetype?= freetype-lib
BUILDLINK_DEPENDS.freetype+= freetype-lib>=1.3.1nb1
BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib
diff -r 38b26cfa6619 -r 5252051dedf2 graphics/py-imaging/buildlink3.mk
--- a/graphics/py-imaging/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/graphics/py-imaging/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 02:06:42 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_IMAGING_BUILDLINK3_MK:= ${PY_IMAGING_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@
BUILDLINK_PACKAGES+= pyimaging
.if !empty(PY_IMAGING_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pyimaging?= ${PYPKGPREFIX}-imaging
BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4
BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging
diff -r 38b26cfa6619 -r 5252051dedf2 lang/gcc3-c++/buildlink3.mk
--- a/lang/gcc3-c++/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/lang/gcc3-c++/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
+BUILDLINK_PKGBASE.gcc3cxx?= gcc3${GCC3_PKGMODIF}-c++
BUILDLINK_DEPENDS.gcc3cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3cxx?= ../../lang/gcc3-c++
BUILDLINK_LIBDIRS.gcc3cxx?= \
diff -r 38b26cfa6619 -r 5252051dedf2 lang/gcc3-c/buildlink3.mk
--- a/lang/gcc3-c/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/lang/gcc3-c/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3C_BUILDLINK3_MK:= ${GCC3C_BUILDLINK3_MK}+
@@ -22,6 +22,7 @@
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
+BUILDLINK_PKGBASE.gcc3c?= gcc3${GCC3_PKGMODIF}-c
BUILDLINK_DEPENDS.gcc3c+= gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3c?= ../../lang/gcc3-c
BUILDLINK_LIBDIRS.gcc3c?= \
diff -r 38b26cfa6619 -r 5252051dedf2 lang/gcc3-f77/buildlink3.mk
--- a/lang/gcc3-f77/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/lang/gcc3-f77/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
+BUILDLINK_PKGBASE.gcc3f77?= gcc3${GCC3_PKGMODIF}-f77
BUILDLINK_DEPENDS.gcc3f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3f77?= ../../lang/gcc3-f77
BUILDLINK_LIBDIRS.gcc3f77?= \
diff -r 38b26cfa6619 -r 5252051dedf2 lang/gcc3-java/buildlink3.mk
--- a/lang/gcc3-java/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/lang/gcc3-java/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
+BUILDLINK_PKGBASE.gcc3java?= gcc3${GCC3_PKGMODIF}-java
BUILDLINK_DEPENDS.gcc3java+= gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3java?= ../../lang/gcc3-java
BUILDLINK_LIBDIRS.gcc3java?= \
diff -r 38b26cfa6619 -r 5252051dedf2 lang/gcc3-objc/buildlink3.mk
--- a/lang/gcc3-objc/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/lang/gcc3-objc/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+
@@ -18,6 +18,7 @@
GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
+BUILDLINK_PKGBASE.gcc3objc?= gcc3${GCC3_PKGMODIF}-objc
BUILDLINK_DEPENDS.gcc3objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3objc?= ../../lang/gcc3-objc
BUILDLINK_LIBDIRS.gcc3objc?= \
diff -r 38b26cfa6619 -r 5252051dedf2 math/py-Numeric/buildlink3.mk
--- a/math/py-Numeric/buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/math/py-Numeric/buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/16 18:23:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_NUMERIC_BUILDLINK3_MK:= ${PY_NUMERIC_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@
BUILDLINK_PACKAGES+= pynumeric
.if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
+BUILDLINK_PKGBASE.pynumeric?= ${PYPKGPREFIX}-Numeric
BUILDLINK_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric-*
BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric
.endif # PY_NUMERIC_BUILDLINK3_MK
diff -r 38b26cfa6619 -r 5252051dedf2 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk Tue Mar 16 17:58:01 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk Tue Mar 16 18:23:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.122 2004/03/16 16:19:37 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.123 2004/03/16 18:23:26 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -14,6 +14,7 @@
# BUILDLINK_PACKAGES+= foo
Home |
Main Index |
Thread Index |
Old Index