pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Append to BUILDLINK_DEPENDS.<pkg> instead of setting a...
details: https://anonhg.NetBSD.org/pkgsrc/rev/839fec2a4e30
branches: trunk
changeset: 466878:839fec2a4e30
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Jan 24 03:26:45 2004 +0000
description:
Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files. In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
diffstat:
audio/SDL_mixer/buildlink3.mk | 4 ++--
audio/arts/buildlink3.mk | 4 ++--
audio/esound/buildlink3.mk | 4 ++--
audio/flac/buildlink3.mk | 18 ++++++++++++++++++
audio/libao/buildlink3.mk | 4 ++--
audio/libaudiofile/buildlink3.mk | 4 ++--
audio/libcddb/buildlink3.mk | 9 ++++-----
audio/libogg/buildlink3.mk | 4 ++--
audio/libvorbis/buildlink3.mk | 4 ++--
audio/nas/buildlink3.mk | 4 ++--
audio/oss/buildlink3.mk | 4 ++--
databases/db3/buildlink3.mk | 4 ++--
databases/db4/buildlink3.mk | 4 ++--
databases/mysql-client/buildlink3.mk | 4 ++--
databases/openldap/buildlink3.mk | 8 ++++----
databases/p5-DBI/buildlink3.mk | 4 ++--
databases/postgresql-lib/buildlink3.mk | 4 ++--
devel/SDL/buildlink3.mk | 4 ++--
devel/boehm-gc/buildlink3.mk | 4 ++--
devel/dlcompat/buildlink3.mk | 4 ++--
devel/glib/buildlink3.mk | 4 ++--
devel/gmp/buildlink3.mk | 4 ++--
devel/libmm/buildlink3.mk | 4 ++--
devel/libslang/buildlink3.mk | 8 ++++----
devel/pcre/buildlink3.mk | 4 ++--
devel/pkgconfig/buildlink3.mk | 4 ++--
devel/popt/buildlink3.mk | 4 ++--
devel/pth/buildlink3.mk | 4 ++--
devel/pthread-sem/buildlink3.mk | 4 ++--
devel/smpeg/buildlink3.mk | 4 ++--
fonts/fontconfig/buildlink3.mk | 4 ++--
graphics/SDL_image/buildlink3.mk | 4 ++--
graphics/aalib-x11/buildlink3.mk | 4 ++--
graphics/freetype-lib/buildlink3.mk | 4 ++--
graphics/gd/buildlink3.mk | 4 ++--
graphics/glut/buildlink3.mk | 4 ++--
graphics/imlib/buildlink3.mk | 4 ++--
graphics/jpeg/buildlink3.mk | 4 ++--
graphics/lcms/buildlink3.mk | 4 ++--
graphics/libungif/buildlink3.mk | 4 ++--
graphics/mng/buildlink3.mk | 4 ++--
graphics/netpbm/buildlink3.mk | 4 ++--
graphics/png/buildlink3.mk | 4 ++--
graphics/tiff/buildlink3.mk | 4 ++--
lang/libperl/buildlink3.mk | 4 ++--
lang/ocaml/buildlink3.mk | 4 ++--
lang/perl5/buildlink3.mk | 4 ++--
lang/tcl/buildlink3.mk | 4 ++--
misc/libcdio/buildlink3.mk | 4 ++--
net/ORBit/buildlink3.mk | 4 ++--
net/openslp/buildlink3.mk | 4 ++--
net/socks4/buildlink3.mk | 4 ++--
net/socks5/buildlink3.mk | 4 ++--
pkgtools/libnbcompat/buildlink3.mk | 4 ++--
print/cups/buildlink3.mk | 4 ++--
security/cyrus-sasl2/buildlink3.mk | 4 ++--
security/libcrack/buildlink3.mk | 4 ++--
security/rsaref/buildlink3.mk | 4 ++--
textproc/expat/buildlink3.mk | 4 ++--
www/apache/buildlink3.mk | 4 ++--
www/cgilib/buildlink3.mk | 4 ++--
x11/Xrandr-mixedcase/buildlink3.mk | 4 ++--
x11/gnome-libs/buildlink3.mk | 4 ++--
x11/gtk/buildlink3.mk | 4 ++--
x11/tk/buildlink3.mk | 4 ++--
x11/xcursor/buildlink3.mk | 4 ++--
66 files changed, 154 insertions(+), 137 deletions(-)
diffs (truncated from 1211 to 300 lines):
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/SDL_mixer/buildlink3.mk
--- a/audio/SDL_mixer/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/SDL_mixer/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:45 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= SDL_mixer
-BUILDLINK_DEPENDS.SDL_mixer?= SDL_mixer>=1.2.5nb1
+BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb1
BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer
BUILDLINK_INCDIRS.SDL_mixer?= include/SDL
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/arts/buildlink3.mk
--- a/audio/arts/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/arts/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/15 09:11:02 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(ARTS_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= arts
-BUILDLINK_DEPENDS.arts?= arts>=1.1.4nb1
+BUILDLINK_DEPENDS.arts+= arts>=1.1.4nb1
BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
. include "../../audio/libaudiofile/buildlink3.mk"
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/esound/buildlink3.mk
--- a/audio/esound/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/esound/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(ESOUND_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= esound
-BUILDLINK_DEPENDS.esound?= esound>=0.2.18
+BUILDLINK_DEPENDS.esound+= esound>=0.2.18
BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
. include "../../audio/libaudiofile/buildlink3.mk"
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/flac/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/flac/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/01/24 03:26:46 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= flac
+.endif
+
+.if !empty(FLAC_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= flac
+BUILDLINK_DEPENDS.flac+= flac>=1.1.0nb1
+BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac
+
+. include "../../audio/libogg/buildlink3.mk"
+.endif # FLAC_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/libao/buildlink3.mk
--- a/audio/libao/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/libao/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/11 18:47:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAO_BUILDLINK3_MK:= ${LIBAO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(LIBAO_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= libao
-BUILDLINK_DEPENDS.libao?= libao>=0.8.4
+BUILDLINK_DEPENDS.libao+= libao>=0.8.4
BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao
. include "../../devel/pkgconfig/buildlink3.mk"
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/libaudiofile/buildlink3.mk
--- a/audio/libaudiofile/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/libaudiofile/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/10 17:47:38 cjep Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= audiofile
-BUILDLINK_DEPENDS.audiofile?= libaudiofile>=0.2.1
+BUILDLINK_DEPENDS.audiofile+= libaudiofile>=0.2.1
BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile
.endif # AUDIOFILE_BUILDLINK3_MK
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/libcddb/buildlink3.mk
--- a/audio/libcddb/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/libcddb/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/17 15:32:33 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+
@@ -9,9 +8,9 @@
.endif
.if !empty(LIBCDDB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libcddb
-BUILDLINK_DEPENDS.libcddb?= libcddb>=0.9.4
-BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb
+BUILDLINK_PACKAGES+= libcddb
+BUILDLINK_DEPENDS.libcddb+= libcddb>=0.9.4
+BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb
.include "../../misc/libcdio/buildlink3.mk"
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/libogg/buildlink3.mk
--- a/audio/libogg/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/libogg/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOGG_BUILDLINK3_MK:= ${LIBOGG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(LIBOGG_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= libogg
-BUILDLINK_DEPENDS.libogg?= libogg>=1.0.0.8
+BUILDLINK_DEPENDS.libogg+= libogg>=1.0.0.8
BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg
.endif # LIBOGG_BUILDLINK3_MK
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/libvorbis/buildlink3.mk
--- a/audio/libvorbis/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/libvorbis/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/17 15:46:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= libvorbis
-BUILDLINK_DEPENDS.libvorbis?= libvorbis>=1.0.1
+BUILDLINK_DEPENDS.libvorbis+= libvorbis>=1.0.1
BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis
. include "../../audio/libogg/buildlink3.mk"
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/nas/buildlink3.mk
--- a/audio/nas/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/nas/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/21 18:22:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NAS_BUILDLINK3_MK:= ${NAS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(NAS_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= nas
-BUILDLINK_DEPENDS.nas?= nas>=1.4.2
+BUILDLINK_DEPENDS.nas+= nas>=1.4.2
BUILDLINK_PKGSRCDIR.nas?= ../../audio/nas
.endif # NAS_BUILDLINK3_MK
diff -r 1e6d8775a31d -r 839fec2a4e30 audio/oss/buildlink3.mk
--- a/audio/oss/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/audio/oss/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/07 01:14:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OSS_BUILDLINK3_MK:= ${OSS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(OSS_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= oss
-BUILDLINK_DEPENDS.oss?= oss-[0-9]*
+BUILDLINK_DEPENDS.oss+= oss-[0-9]*
BUILDLINK_PKGSRCDIR.oss?= ../../audio/oss
BUILDLINK_INCDIRS.oss= include lib/oss/include
diff -r 1e6d8775a31d -r 839fec2a4e30 databases/db3/buildlink3.mk
--- a/databases/db3/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/databases/db3/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(DB3_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= db3
-BUILDLINK_DEPENDS.db3?= db3>=2.9.2
+BUILDLINK_DEPENDS.db3+= db3>=2.9.2
BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3
.endif # DB3_BUILDLINK3_MK
diff -r 1e6d8775a31d -r 839fec2a4e30 databases/db4/buildlink3.mk
--- a/databases/db4/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/databases/db4/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(DB4_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= db4
-BUILDLINK_DEPENDS.db4?= db4>=4.1.25
+BUILDLINK_DEPENDS.db4+= db4>=4.1.25
BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4
BUILDLINK_INCDIRS.db4?= include/db4
.endif # DB4_BUILDLINK3_MK
diff -r 1e6d8775a31d -r 839fec2a4e30 databases/mysql-client/buildlink3.mk
--- a/databases/mysql-client/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/databases/mysql-client/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= mysql-client
-BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.23.58
+BUILDLINK_DEPENDS.mysql-client+= mysql-client>=3.23.58
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client
BUILDLINK_LIBDIRS.mysql-client?= lib/mysql
diff -r 1e6d8775a31d -r 839fec2a4e30 databases/openldap/buildlink3.mk
--- a/databases/openldap/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/databases/openldap/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/21 14:08:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
+.include "../../mk/bsd.prefs.mk"
+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= openldap
.endif
.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-. include "../../mk/bsd.prefs.mk"
-
BUILDLINK_PACKAGES+= openldap
-BUILDLINK_DEPENDS.openldap?= openldap>=2.1.22
+BUILDLINK_DEPENDS.openldap+= openldap>=2.1.22
BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
. if defined(USE_SASL2) && (${USE_SASL2} == "YES")
diff -r 1e6d8775a31d -r 839fec2a4e30 databases/p5-DBI/buildlink3.mk
--- a/databases/p5-DBI/buildlink3.mk Sat Jan 24 03:12:31 2004 +0000
+++ b/databases/p5-DBI/buildlink3.mk Sat Jan 24 03:26:45 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
.if !empty(P5_DBI_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= p5-DBI
-BUILDLINK_DEPENDS.p5-DBI?= p5-DBI>=1.30
Home |
Main Index |
Thread Index |
Old Index