pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc BUILDLINK_DEPENDS.<pkg> lines should _always_ use += t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1976acef4240
branches:  trunk
changeset: 468039:1976acef4240
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 09 23:56:32 2004 +0000

description:
BUILDLINK_DEPENDS.<pkg> lines should _always_ use += to _append_ to the
existing value.  This is critical to set the correct list of dependencies
for a package.

diffstat:

 archivers/liblzo/buildlink3.mk      |   4 ++--
 audio/id3lib/buildlink3.mk          |   4 ++--
 audio/musicbrainz/buildlink3.mk     |  13 ++++++-------
 audio/taglib/buildlink3.mk          |   9 ++++-----
 databases/rrdtool/buildlink3.mk     |  17 ++++++++---------
 devel/glib2/buildlink3.mk           |  14 ++++++--------
 fonts/Xft2/buildlink3.mk            |  20 +++++++++-----------
 graphics/OpenRM/buildlink3.mk       |  20 +++++++-------------
 graphics/cairo/buildlink3.mk        |  22 ++++++++--------------
 graphics/libgdiplus/buildlink3.mk   |  16 +++++++---------
 graphics/libpixman/buildlink3.mk    |  12 +++++-------
 lang/mono/buildlink3.mk             |  18 ++++++------------
 print/pdflib/buildlink3.mk          |  18 ++++++------------
 security/libgpg-error/buildlink3.mk |   4 ++--
 textproc/icu/buildlink3.mk          |  10 ++++------
 textproc/libxml2/buildlink3.mk      |   6 +++---
 x11/render/buildlink3.mk            |  10 ++++------
 17 files changed, 89 insertions(+), 128 deletions(-)

diffs (truncated from 473 to 300 lines):

diff -r 51b6229a5544 -r 1976acef4240 archivers/liblzo/buildlink3.mk
--- a/archivers/liblzo/buildlink3.mk    Mon Feb 09 23:19:27 2004 +0000
+++ b/archivers/liblzo/buildlink3.mk    Mon Feb 09 23:56:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/09 20:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 LIBLZO_BUILDLINK3_MK:= ${LIBLZO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
 
 .if !empty(LIBLZO_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=           liblzo
-BUILDLINK_DEPENDS.liblzo?=     liblzo>=1.08
+BUILDLINK_DEPENDS.liblzo+=     liblzo>=1.08
 BUILDLINK_PKGSRCDIR.liblzo?=   ../../archivers/liblzo
 .endif # LIBLZO_BUILDLINK3_MK
 
diff -r 51b6229a5544 -r 1976acef4240 audio/id3lib/buildlink3.mk
--- a/audio/id3lib/buildlink3.mk        Mon Feb 09 23:19:27 2004 +0000
+++ b/audio/id3lib/buildlink3.mk        Mon Feb 09 23:56:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/08 17:08:13 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@
 
 .if !empty(ID3LIB_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=                   id3lib
-BUILDLINK_DEPENDS.id3lib?=             id3lib>=3.8.3
+BUILDLINK_DEPENDS.id3lib+=             id3lib>=3.8.3
 BUILDLINK_PKGSRCDIR.id3lib?=           ../../audio/id3lib
 
 .include "../../devel/zlib/buildlink3.mk"
diff -r 51b6229a5544 -r 1976acef4240 audio/musicbrainz/buildlink3.mk
--- a/audio/musicbrainz/buildlink3.mk   Mon Feb 09 23:19:27 2004 +0000
+++ b/audio/musicbrainz/buildlink3.mk   Mon Feb 09 23:56:32 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 01:23:43 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 MUSICBRAINZ_BUILDLINK3_MK:=    ${MUSICBRAINZ_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,12 +9,11 @@
 
 .if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=                   musicbrainz
-BUILDLINK_DEPENDS.musicbrainz?=                musicbrainz>=2.0.2
-BUILDLINK_PKGSRCDIR.musicbrainz?=              ../../audio/musicbrainz
+BUILDLINK_DEPENDS.musicbrainz+=                musicbrainz>=2.0.2
+BUILDLINK_PKGSRCDIR.musicbrainz?=      ../../audio/musicbrainz
 
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-
+.  include "../../devel/pkgconfig/buildlink3.mk"
+.  include "../../textproc/expat/buildlink3.mk"
 .endif # MUSICBRAINZ_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 audio/taglib/buildlink3.mk
--- a/audio/taglib/buildlink3.mk        Mon Feb 09 23:19:27 2004 +0000
+++ b/audio/taglib/buildlink3.mk        Mon Feb 09 23:56:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 00:42:45 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TAGLIB_BUILDLINK3_MK:= ${TAGLIB_BUILDLINK3_MK}+
@@ -8,10 +8,9 @@
 .endif
 
 .if !empty(TAGLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=                   taglib
-BUILDLINK_DEPENDS.taglib?=             taglib>=1.0
-BUILDLINK_PKGSRCDIR.taglib?=           ../../audio/taglib
-
+BUILDLINK_PACKAGES+=           taglib
+BUILDLINK_DEPENDS.taglib+=     taglib>=1.0
+BUILDLINK_PKGSRCDIR.taglib?=   ../../audio/taglib
 .endif # TAGLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 databases/rrdtool/buildlink3.mk
--- a/databases/rrdtool/buildlink3.mk   Mon Feb 09 23:19:27 2004 +0000
+++ b/databases/rrdtool/buildlink3.mk   Mon Feb 09 23:56:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/07 17:44:10 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=        ${RRDTOOL_BUILDLINK3_MK}+
@@ -8,15 +8,14 @@
 .endif
 
 .if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=                   rrdtool
-BUILDLINK_DEPENDS.rrdtool?=            rrdtool>=1.0.40nb2
-BUILDLINK_PKGSRCDIR.rrdtool?=          ../../databases/rrdtool
+BUILDLINK_PACKAGES+=           rrdtool
+BUILDLINK_DEPENDS.rrdtool+=    rrdtool>=1.0.40nb2
+BUILDLINK_PKGSRCDIR.rrdtool?=  ../../databases/rrdtool
 
-.include "../../graphics/freetype-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../www/cgilib/buildlink3.mk"
-
+.  include "../../graphics/freetype-lib/buildlink3.mk"
+.  include "../../graphics/gd/buildlink3.mk"
+.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../www/cgilib/buildlink3.mk"
 .endif # RRDTOOL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 devel/glib2/buildlink3.mk
--- a/devel/glib2/buildlink3.mk Mon Feb 09 23:19:27 2004 +0000
+++ b/devel/glib2/buildlink3.mk Mon Feb 09 23:56:32 2004 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 10:49:53 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GLIB2_BUILDLINK3_MK:=  ${GLIB2_BUILDLINK3_MK}+
@@ -9,13 +8,12 @@
 .endif
 
 .if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=                   glib2
-BUILDLINK_DEPENDS.glib2?=              glib2>=2.2.3nb1
-BUILDLINK_PKGSRCDIR.glib2?=            ../../devel/glib2
+BUILDLINK_PACKAGES+=           glib2
+BUILDLINK_DEPENDS.glib2+=      glib2>=2.2.3nb1
+BUILDLINK_PKGSRCDIR.glib2?=    ../../devel/glib2
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
+.  include "../../converters/libiconv/buildlink3.mk"
+.  include "../../devel/gettext-lib/buildlink3.mk"
 .endif # GLIB2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 fonts/Xft2/buildlink3.mk
--- a/fonts/Xft2/buildlink3.mk  Mon Feb 09 23:19:27 2004 +0000
+++ b/fonts/Xft2/buildlink3.mk  Mon Feb 09 23:56:32 2004 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 14:29:29 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 XFT2_BUILDLINK3_MK:=   ${XFT2_BUILDLINK3_MK}+
@@ -9,17 +8,16 @@
 .endif
 
 .if !empty(XFT2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=                   Xft2
-BUILDLINK_DEPENDS.Xft2?=               Xft2>=2.1.2nb1
-BUILDLINK_PKGSRCDIR.Xft2?=             ../../fonts/Xft2
-
-BUILDLINK_DEPENDS.freetype2=  freetype2>=2.0.9
+BUILDLINK_PACKAGES+=           Xft2
+BUILDLINK_DEPENDS.Xft2+=       Xft2>=2.1.2nb1
+BUILDLINK_PKGSRCDIR.Xft2?=     ../../fonts/Xft2
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.0.9
 
+.  include "../../devel/zlib/buildlink3.mk"
+.  include "../../fonts/fontconfig/buildlink3.mk"
+.  include "../../graphics/freetype2/buildlink3.mk"
+.  include "../../x11/Xrender/buildlink3.mk"
 .endif # XFT2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 graphics/OpenRM/buildlink3.mk
--- a/graphics/OpenRM/buildlink3.mk     Mon Feb 09 23:19:27 2004 +0000
+++ b/graphics/OpenRM/buildlink3.mk     Mon Feb 09 23:56:32 2004 +0000
@@ -1,11 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/05 20:34:17 garbled Exp $
-#
-# This Makefile fragment is included by packages that use openrm-devel.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 OPENRM_DEVEL_BUILDLINK3_MK:=   ${OPENRM_DEVEL_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -14,13 +9,12 @@
 
 .if !empty(OPENRM_DEVEL_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=                   openrm-devel
-BUILDLINK_DEPENDS.openrm-devel?=               openrm-devel>=1.5.1
-BUILDLINK_PKGSRCDIR.openrm-devel?=             ../../graphics/OpenRM
+BUILDLINK_DEPENDS.openrm-devel+=       openrm-devel>=1.5.1
+BUILDLINK_PKGSRCDIR.openrm-devel?=     ../../graphics/OpenRM
 
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
+.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../graphics/Mesa/buildlink3.mk"
+.  include "../../mk/pthread.buildlink3.mk"
 .endif # OPENRM_DEVEL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 graphics/cairo/buildlink3.mk
--- a/graphics/cairo/buildlink3.mk      Mon Feb 09 23:19:27 2004 +0000
+++ b/graphics/cairo/buildlink3.mk      Mon Feb 09 23:56:32 2004 +0000
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/03 12:16:43 recht Exp $
-#
-# This Makefile fragment is included by packages that use cairo.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=  ${CAIRO_BUILDLINK3_MK}+
@@ -13,16 +8,15 @@
 .endif
 
 .if !empty(CAIRO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=                   cairo
-BUILDLINK_DEPENDS.cairo?=              cairo>=0.1.17
-BUILDLINK_PKGSRCDIR.cairo?=            ../../graphics/cairo
+BUILDLINK_PACKAGES+=           cairo
+BUILDLINK_DEPENDS.cairo+=      cairo>=0.1.17
+BUILDLINK_PKGSRCDIR.cairo?=    ../../graphics/cairo
 
-BUILDLINK_DEPENDS.freetype2=  freetype2>=2.1.5
+BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.1.5
 
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libpixman/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
-
+.  include "../../fonts/Xft2/buildlink3.mk"
+.  include "../../graphics/freetype2/buildlink3.mk"
+.  include "../../graphics/libpixman/buildlink3.mk"
 .endif # CAIRO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 graphics/libgdiplus/buildlink3.mk
--- a/graphics/libgdiplus/buildlink3.mk Mon Feb 09 23:19:27 2004 +0000
+++ b/graphics/libgdiplus/buildlink3.mk Mon Feb 09 23:56:32 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/03 12:31:35 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=     ${LIBGDIPLUS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -10,13 +9,12 @@
 
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=                   libgdiplus
-BUILDLINK_DEPENDS.libgdiplus?=         libgdiplus>=0.1
-BUILDLINK_PKGSRCDIR.libgdiplus?=               ../../graphics/libgdiplus
+BUILDLINK_DEPENDS.libgdiplus+=         libgdiplus>=0.1
+BUILDLINK_PKGSRCDIR.libgdiplus?=       ../../graphics/libgdiplus
 
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../lang/mono/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
-
+.  include "../../graphics/cairo/buildlink3.mk"
+.  include "../../lang/mono/buildlink3.mk"
+.  include "../../x11/Xrender/buildlink3.mk"
 .endif # LIBGDIPLUS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 51b6229a5544 -r 1976acef4240 graphics/libpixman/buildlink3.mk
--- a/graphics/libpixman/buildlink3.mk  Mon Feb 09 23:19:27 2004 +0000
+++ b/graphics/libpixman/buildlink3.mk  Mon Feb 09 23:56:32 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/03 12:07:57 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+



Home | Main Index | Thread Index | Old Index