summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-05 19:25:06 +0000
committerjlam <jlam@pkgsrc.org>2004-03-05 19:25:06 +0000
commit9ff0e10340db36b9d69d9c894831dee901dd82e7 (patch)
treea3daf9a5fb572d8089372ce24f3f353d4bac8d47
parent07634a03fa5b47f44a90b982d8294e55a2d3dd01 (diff)
downloadpkgsrc-9ff0e10340db36b9d69d9c894831dee901dd82e7.tar.gz
Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
-rw-r--r--archivers/libcomprex/buildlink3.mk17
-rw-r--r--archivers/liblzo/buildlink3.mk8
-rw-r--r--audio/SDL_mixer/buildlink3.mk9
-rw-r--r--audio/arts/buildlink3.mk21
-rw-r--r--audio/cdparanoia/buildlink3.mk20
-rw-r--r--audio/esound/buildlink3.mk9
-rw-r--r--audio/faad2/buildlink3.mk16
-rw-r--r--audio/flac/buildlink3.mk11
-rw-r--r--audio/gnome-speech/buildlink3.mk19
-rw-r--r--audio/gsm/buildlink3.mk14
-rw-r--r--audio/id3lib/buildlink3.mk12
-rw-r--r--audio/lame/buildlink3.mk8
-rw-r--r--audio/liba52/buildlink3.mk18
-rw-r--r--audio/libao/buildlink3.mk7
-rw-r--r--audio/libaudiofile/buildlink3.mk6
-rw-r--r--audio/libcddb/buildlink3.mk8
-rw-r--r--audio/libid3tag/buildlink3.mk19
-rw-r--r--audio/libmad/buildlink3.mk6
-rw-r--r--audio/libmikmod/buildlink3.mk15
-rw-r--r--audio/libogg/buildlink3.mk6
-rw-r--r--audio/libsamplerate/buildlink3.mk19
-rw-r--r--audio/libshout/buildlink3.mk13
-rw-r--r--audio/libsidplay/buildlink3.mk18
-rw-r--r--audio/libsndfile/buildlink3.mk16
-rw-r--r--audio/libvorbis/buildlink3.mk9
-rw-r--r--audio/musicbrainz/buildlink3.mk11
-rw-r--r--audio/nas/buildlink3.mk6
-rw-r--r--audio/oss/buildlink3.mk6
-rw-r--r--audio/py-ogg/buildlink3.mk15
-rw-r--r--audio/rplay/buildlink3.mk15
-rw-r--r--audio/speex/buildlink3.mk17
-rw-r--r--audio/sweep/buildlink3.mk21
-rw-r--r--audio/taglib/buildlink3.mk8
-rw-r--r--audio/tremor/buildlink3.mk18
-rw-r--r--audio/xmms/buildlink3.mk16
-rw-r--r--cad/libgeda/buildlink3.mk17
-rw-r--r--chat/ekg/buildlink3.mk13
-rw-r--r--chat/jabberd/buildlink3.mk17
-rw-r--r--chat/libtlen/buildlink3.mk18
-rw-r--r--chat/loudmouth/buildlink3.mk30
-rw-r--r--comms/jpilot/buildlink3.mk17
-rw-r--r--comms/openobex/buildlink3.mk20
-rw-r--r--comms/pilot-link-libs/buildlink3.mk19
-rw-r--r--converters/fribidi/buildlink3.mk18
-rw-r--r--converters/wv/buildlink3.mk17
-rw-r--r--databases/db3/buildlink3.mk6
-rw-r--r--databases/db4/buildlink3.mk6
-rw-r--r--databases/dbxml/buildlink3.mk15
-rw-r--r--databases/gdbm/buildlink3.mk8
-rw-r--r--databases/gnome-mime-data/buildlink3.mk15
-rw-r--r--databases/libgda/buildlink3.mk23
-rw-r--r--databases/libgnomedb/buildlink3.mk17
-rw-r--r--databases/mysql-client/buildlink3.mk9
-rw-r--r--databases/openldap/buildlink3.mk19
-rw-r--r--databases/p5-DBI/buildlink3.mk9
-rw-r--r--databases/postgresql-lib/buildlink3.mk9
-rw-r--r--databases/py-ZODB/buildlink3.mk16
-rw-r--r--databases/rrdtool/buildlink3.mk17
-rw-r--r--databases/tdb/buildlink3.mk14
-rw-r--r--devel/GConf/buildlink3.mk19
-rw-r--r--devel/GConf2-ui/buildlink3.mk19
-rw-r--r--devel/GConf2/buildlink3.mk19
-rw-r--r--devel/SDL/buildlink3.mk18
-rw-r--r--devel/at-spi/buildlink3.mk17
-rw-r--r--devel/atk/buildlink3.mk15
-rw-r--r--devel/boehm-gc/buildlink3.mk6
-rw-r--r--devel/devIL/buildlink3.mk17
-rw-r--r--devel/dlcompat/buildlink3.mk6
-rw-r--r--devel/eel2/buildlink3.mk17
-rw-r--r--devel/gail/buildlink3.mk17
-rw-r--r--devel/gal2/buildlink3.mk17
-rw-r--r--devel/giblib/buildlink3.mk17
-rw-r--r--devel/glib/buildlink3.mk9
-rw-r--r--devel/glib2/buildlink3.mk16
-rw-r--r--devel/gmp/buildlink3.mk9
-rw-r--r--devel/gperf/buildlink3.mk21
-rw-r--r--devel/libast/buildlink3.mk17
-rw-r--r--devel/libbonobo/buildlink3.mk25
-rw-r--r--devel/libbonoboui/buildlink3.mk17
-rw-r--r--devel/libglade/buildlink3.mk13
-rw-r--r--devel/libglade2/buildlink3.mk25
-rw-r--r--devel/libgnome/buildlink3.mk19
-rw-r--r--devel/libgnomeui/buildlink3.mk19
-rw-r--r--devel/libgphoto2/buildlink3.mk14
-rw-r--r--devel/libgsf/buildlink3.mk17
-rw-r--r--devel/libgtop2/buildlink3.mk21
-rw-r--r--devel/libidn/buildlink3.mk13
-rw-r--r--devel/libmm/buildlink3.mk6
-rw-r--r--devel/libntlm/buildlink3.mk8
-rw-r--r--devel/libproplist/buildlink3.mk16
-rw-r--r--devel/libslang/buildlink3.mk13
-rw-r--r--devel/libstroke/buildlink3.mk19
-rw-r--r--devel/libtar/buildlink3.mk13
-rw-r--r--devel/libtool/buildlink3.mk18
-rw-r--r--devel/libusb/buildlink3.mk13
-rw-r--r--devel/libwnck/buildlink3.mk19
-rw-r--r--devel/oaf/buildlink3.mk13
-rw-r--r--devel/ode/buildlink3.mk14
-rw-r--r--devel/ogre/buildlink3.mk19
-rw-r--r--devel/pango/buildlink3.mk15
-rw-r--r--devel/pcre/buildlink3.mk6
-rw-r--r--devel/pkgconfig/buildlink3.mk7
-rw-r--r--devel/popt/buildlink3.mk9
-rw-r--r--devel/pth/buildlink3.mk6
-rw-r--r--devel/pthread-sem/buildlink3.mk12
-rw-r--r--devel/rx/buildlink3.mk12
-rw-r--r--devel/smpeg/buildlink3.mk11
-rw-r--r--emulators/libspectrum/buildlink3.mk15
-rw-r--r--fonts/gucharmap/buildlink3.mk19
-rw-r--r--fonts/t1lib/buildlink3.mk16
-rw-r--r--games/gnome2-games/buildlink3.mk15
-rw-r--r--graphics/ImageMagick/buildlink3.mk15
-rw-r--r--graphics/Mesa/buildlink3.mk6
-rw-r--r--graphics/OpenRM/buildlink3.mk28
-rw-r--r--graphics/SDL_image/buildlink3.mk17
-rw-r--r--graphics/aalib-x11/buildlink3.mk9
-rw-r--r--graphics/aalib/buildlink3.mk18
-rw-r--r--graphics/cairo/buildlink3.mk8
-rw-r--r--graphics/cal3d/buildlink3.mk17
-rw-r--r--graphics/compface/buildlink3.mk18
-rw-r--r--graphics/freetype-lib/buildlink3.mk9
-rw-r--r--graphics/gd/buildlink3.mk20
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink3.mk13
-rw-r--r--graphics/gdk-pixbuf/buildlink3.mk17
-rw-r--r--graphics/gle/buildlink3.mk11
-rw-r--r--graphics/glut/buildlink3.mk9
-rw-r--r--graphics/gnome2-pixmaps/buildlink3.mk16
-rw-r--r--graphics/gtkglext/buildlink3.mk19
-rw-r--r--graphics/hermes/buildlink3.mk18
-rw-r--r--graphics/imlib/buildlink3.mk23
-rw-r--r--graphics/imlib2/buildlink3.mk17
-rw-r--r--graphics/jasper/buildlink3.mk17
-rw-r--r--graphics/jpeg/buildlink3.mk6
-rw-r--r--graphics/lcms/buildlink3.mk12
-rw-r--r--graphics/libart2/buildlink3.mk18
-rw-r--r--graphics/libexif/buildlink3.mk17
-rw-r--r--graphics/libgdgeda/buildlink3.mk19
-rw-r--r--graphics/libgdiplus/buildlink3.mk15
-rw-r--r--graphics/libgnomecanvas/buildlink3.mk15
-rw-r--r--graphics/libpixman/buildlink3.mk8
-rw-r--r--graphics/librsvg2/buildlink3.mk25
-rw-r--r--graphics/libungif/buildlink3.mk6
-rw-r--r--graphics/libwmf/buildlink3.mk17
-rw-r--r--graphics/mng/buildlink3.mk15
-rw-r--r--graphics/netpbm/buildlink3.mk11
-rw-r--r--graphics/openquicktime/buildlink3.mk19
-rw-r--r--graphics/plotutils/buildlink3.mk17
-rw-r--r--graphics/png/buildlink3.mk9
-rw-r--r--graphics/swfdec/buildlink3.mk17
-rw-r--r--graphics/tiff/buildlink3.mk11
-rw-r--r--lang/gcc/buildlink3.mk13
-rw-r--r--lang/gcc3-c++/buildlink3.mk15
-rw-r--r--lang/gcc3-c/buildlink3.mk15
-rw-r--r--lang/gcc3-f77/buildlink3.mk15
-rw-r--r--lang/gcc3-java/buildlink3.mk15
-rw-r--r--lang/gcc3-objc/buildlink3.mk16
-rw-r--r--lang/guile/buildlink3.mk17
-rw-r--r--lang/libperl/buildlink3.mk9
-rw-r--r--lang/librep/buildlink3.mk13
-rw-r--r--lang/lua/buildlink3.mk12
-rw-r--r--lang/mono/buildlink3.mk13
-rw-r--r--lang/ocaml/buildlink3.mk6
-rw-r--r--lang/perl5/buildlink3.mk38
-rw-r--r--lang/pnet/buildlink3.mk18
-rw-r--r--lang/pnetC/buildlink3.mk17
-rw-r--r--lang/pnetlib/buildlink3.mk17
-rw-r--r--lang/python15/buildlink3.mk16
-rw-r--r--lang/python20/buildlink3.mk12
-rw-r--r--lang/python21-pth/buildlink3.mk12
-rw-r--r--lang/python21/buildlink3.mk12
-rw-r--r--lang/python22-pth/buildlink3.mk8
-rw-r--r--lang/python22/buildlink3.mk12
-rw-r--r--lang/python23-pth/buildlink3.mk12
-rw-r--r--lang/python23/buildlink3.mk12
-rw-r--r--lang/tcl/buildlink3.mk7
-rw-r--r--mail/faces/buildlink3.mk16
-rw-r--r--mail/libesmtp/buildlink3.mk21
-rw-r--r--math/blas/buildlink3.mk18
-rw-r--r--math/fftw2/buildlink3.mk18
-rw-r--r--math/lapack/buildlink3.mk18
-rw-r--r--math/libffm/buildlink3.mk18
-rw-r--r--math/py-Numeric/buildlink3.mk18
-rw-r--r--misc/libcdio/buildlink3.mk14
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk45
-rw-r--r--multimedia/gst-plugins/buildlink3.mk16
-rw-r--r--multimedia/gstreamer/buildlink3.mk19
-rw-r--r--multimedia/libdvdread/buildlink3.mk16
-rw-r--r--multimedia/mjpegtools/buildlink3.mk17
-rw-r--r--multimedia/xine-lib/buildlink3.mk25
-rw-r--r--multimedia/xvidcore/buildlink3.mk20
-rw-r--r--net/GeoIP/buildlink3.mk18
-rw-r--r--net/ORBit/buildlink3.mk15
-rw-r--r--net/ORBit2/buildlink3.mk17
-rw-r--r--net/gnet/buildlink3.mk15
-rw-r--r--net/gnet1/buildlink3.mk15
-rw-r--r--net/libIDL/buildlink3.mk17
-rw-r--r--net/libsoup/buildlink3.mk17
-rw-r--r--net/netatalk/buildlink3.mk17
-rw-r--r--net/openslp/buildlink3.mk6
-rw-r--r--net/py-ORBit/buildlink3.mk17
-rw-r--r--net/socks4/buildlink3.mk7
-rw-r--r--net/socks5/buildlink3.mk6
-rw-r--r--net/spread/buildlink3.mk9
-rw-r--r--parallel/mpi-ch/buildlink3.mk14
-rw-r--r--parallel/pvm3/buildlink3.mk16
-rw-r--r--pkgtools/libnbcompat/buildlink3.mk11
-rw-r--r--print/cups/buildlink3.mk11
-rw-r--r--print/libgnomeprint/buildlink3.mk27
-rw-r--r--print/libgnomeprintui/buildlink3.mk17
-rw-r--r--print/pdflib/buildlink3.mk13
-rw-r--r--security/cyrus-sasl2/buildlink3.mk6
-rw-r--r--security/gnutls/buildlink3.mk21
-rw-r--r--security/gpgme/buildlink3.mk17
-rw-r--r--security/gpgme03/buildlink3.mk16
-rw-r--r--security/gsasl/buildlink3.mk19
-rw-r--r--security/gss/buildlink3.mk8
-rw-r--r--security/libcrack/buildlink3.mk6
-rw-r--r--security/libgcrypt/buildlink3.mk11
-rw-r--r--security/libgpg-error/buildlink3.mk11
-rw-r--r--security/libksba/buildlink3.mk13
-rw-r--r--security/libtasn1/buildlink3.mk8
-rw-r--r--security/libtcpa/buildlink3.mk19
-rw-r--r--security/opencdk/buildlink3.mk13
-rw-r--r--security/rsaref/buildlink3.mk6
-rw-r--r--sysutils/fam/buildlink3.mk14
-rw-r--r--sysutils/gkrellm/buildlink3.mk15
-rw-r--r--sysutils/gnome-vfs/buildlink3.mk23
-rw-r--r--sysutils/gnome-vfs2/buildlink3.mk17
-rw-r--r--sysutils/nautilus/buildlink3.mk19
-rw-r--r--textproc/aspell/buildlink3.mk18
-rw-r--r--textproc/enchant/buildlink3.mk17
-rw-r--r--textproc/gnome-spell/buildlink3.mk19
-rw-r--r--textproc/gtkspell/buildlink3.mk17
-rw-r--r--textproc/icu/buildlink3.mk8
-rw-r--r--textproc/intltool/buildlink3.mk24
-rw-r--r--textproc/libcroco/buildlink3.mk19
-rw-r--r--textproc/libpathan/buildlink3.mk17
-rw-r--r--textproc/libunicode/buildlink3.mk16
-rw-r--r--textproc/libxml/buildlink3.mk11
-rw-r--r--textproc/libxml2/buildlink3.mk13
-rw-r--r--textproc/libxslt/buildlink3.mk19
-rw-r--r--textproc/opensp/buildlink3.mk17
-rw-r--r--textproc/py-xml/buildlink3.mk13
-rw-r--r--textproc/scrollkeeper/buildlink3.mk17
-rw-r--r--textproc/xalan-c/buildlink3.mk17
-rw-r--r--textproc/xerces-c/buildlink3.mk19
-rw-r--r--textproc/xmlcatmgr/buildlink3.mk17
-rw-r--r--wm/metacity/buildlink3.mk19
-rw-r--r--wm/openbox/buildlink3.mk12
-rw-r--r--wm/windowmaker/buildlink3.mk17
-rw-r--r--www/ap-perl/buildlink3.mk17
-rw-r--r--www/apache/buildlink3.mk18
-rw-r--r--www/cgilib/buildlink3.mk8
-rw-r--r--www/curl/buildlink3.mk17
-rw-r--r--www/gtkhtml3/buildlink3.mk19
-rw-r--r--www/libghttp/buildlink3.mk20
-rw-r--r--www/libgtkhtml/buildlink3.mk15
-rw-r--r--www/libwww/buildlink3.mk15
-rw-r--r--www/mozilla-gtk2/buildlink3.mk15
-rw-r--r--www/mozilla-stable/buildlink3.mk15
-rw-r--r--www/mozilla/buildlink3.mk17
-rw-r--r--www/tidy/buildlink3.mk18
-rw-r--r--x11/Xfixes/buildlink3.mk13
-rw-r--r--x11/controlcenter/buildlink3.mk21
-rw-r--r--x11/fixesext/buildlink3.mk17
-rw-r--r--x11/fltk/buildlink3.mk13
-rw-r--r--x11/gnome-desktop/buildlink3.mk19
-rw-r--r--x11/gnome-libs/buildlink3.mk27
-rw-r--r--x11/gnome-mag/buildlink3.mk19
-rw-r--r--x11/gnome-panel/buildlink3.mk19
-rw-r--r--x11/gnome2-control-center/buildlink3.mk19
-rw-r--r--x11/gtk/buildlink3.mk13
-rw-r--r--x11/gtk2-engines/buildlink3.mk15
-rw-r--r--x11/gtk2/buildlink3.mk23
-rw-r--r--x11/gtkglarea2/buildlink3.mk17
-rw-r--r--x11/gtksourceview/buildlink3.mk19
-rw-r--r--x11/libxklavier/buildlink3.mk15
-rw-r--r--x11/libzvt/buildlink3.mk17
-rw-r--r--x11/py-gnome2/buildlink3.mk19
-rw-r--r--x11/py-gtk2/buildlink3.mk15
-rw-r--r--x11/startup-notification/buildlink3.mk16
-rw-r--r--x11/tk/buildlink3.mk11
-rw-r--r--x11/vte/buildlink3.mk13
-rw-r--r--x11/wxGTK/buildlink3.mk29
-rw-r--r--x11/xosd/buildlink3.mk18
-rw-r--r--x11/xscreensaver/buildlink3.mk19
286 files changed, 2105 insertions, 2240 deletions
diff --git a/archivers/libcomprex/buildlink3.mk b/archivers/libcomprex/buildlink3.mk
index d15b0adf349..28e35cdeb99 100644
--- a/archivers/libcomprex/buildlink3.mk
+++ b/archivers/libcomprex/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 10:59:28 wiz Exp $
-#
-# This Makefile fragment is included by packages that use libcomprex.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:06 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCOMPREX_BUILDLINK3_MK:= ${LIBCOMPREX_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libcomprex
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcomprex}
+BUILDLINK_PACKAGES+= libcomprex
+
.if !empty(LIBCOMPREX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libcomprex
BUILDLINK_DEPENDS.libcomprex+= libcomprex>=0.3.2
-BUILDLINK_PKGSRCDIR.libcomprex?= ../../archivers/libcomprex
+BUILDLINK_PKGSRCDIR.libcomprex?= ../../archivers/libcomprex
.include "../../www/curl/buildlink3.mk"
-.endif # LIBCOMPREX_BUILDLINK3_MK
+.endif # LIBCOMPREX_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/archivers/liblzo/buildlink3.mk b/archivers/liblzo/buildlink3.mk
index 8f7184faca0..2e6399b2dec 100644
--- a/archivers/liblzo/buildlink3.mk
+++ b/archivers/liblzo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:06 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBLZO_BUILDLINK3_MK:= ${LIBLZO_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LIBLZO_BUILDLINK3_MK:= ${LIBLZO_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= liblzo
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblzo}
+BUILDLINK_PACKAGES+= liblzo
+
.if !empty(LIBLZO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= liblzo
BUILDLINK_DEPENDS.liblzo+= liblzo>=1.08
BUILDLINK_PKGSRCDIR.liblzo?= ../../archivers/liblzo
-.endif # LIBLZO_BUILDLINK3_MK
+.endif # LIBLZO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index ed8f7203cfa..b18af6d5313 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:06 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ SDL_MIXER_BUILDLINK3_MK:= ${SDL_MIXER_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= SDL_mixer
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_mixer}
+BUILDLINK_PACKAGES+= SDL_mixer
+
.if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= SDL_mixer
BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2
BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer
BUILDLINK_INCDIRS.SDL_mixer?= include/SDL
-. include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+
.endif # SDL_MIXER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 82128a4de98..3f059f61836 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/08 16:22:37 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:06 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
@@ -7,18 +7,21 @@ ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= arts
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Narts}
+BUILDLINK_PACKAGES+= arts
+
.if !empty(ARTS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= arts
BUILDLINK_DEPENDS.arts+= arts>=1.1.4nb1
BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
-. include "../../audio/esound/buildlink3.mk"
-. include "../../audio/libaudiofile/buildlink3.mk"
-. include "../../audio/libmad/buildlink3.mk"
-. include "../../audio/libogg/buildlink3.mk"
-. include "../../audio/libvorbis/buildlink3.mk"
-. include "../../devel/glib2/buildlink3.mk"
-. include "../../mk/ossaudio.buildlink3.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../audio/libaudiofile/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libogg/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+
.endif # ARTS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk
index cc64008cfa2..668613c9182 100644
--- a/audio/cdparanoia/buildlink3.mk
+++ b/audio/cdparanoia/buildlink3.mk
@@ -1,26 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:47:04 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use cdparanoia.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:06 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CDPARANOIA_BUILDLINK3_MK:= ${CDPARANOIA_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= cdparanoia
.endif
-.include "../../mk/bsd.prefs.mk"
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdparanoia}
+BUILDLINK_PACKAGES+= cdparanoia
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-. if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= cdparanoia
+.if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.cdparanoia+= cdparanoia>=3.0
BUILDLINK_PKGSRCDIR.cdparanoia?= ../../audio/cdparanoia
-
-. endif # CDPARANOIA_BUILDLINK3_MK
-.endif #
+.endif # CDPARANOIA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index c63a79a48e4..98e87b91a9d 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:06 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ ESOUND_BUILDLINK3_MK:= ${ESOUND_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= esound
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nesound}
+BUILDLINK_PACKAGES+= esound
+
.if !empty(ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= esound
BUILDLINK_DEPENDS.esound+= esound>=0.2.18
BUILDLINK_PKGSRCDIR.esound?= ../../audio/esound
-. include "../../audio/libaudiofile/buildlink3.mk"
+.include "../../audio/libaudiofile/buildlink3.mk"
+
.endif # ESOUND_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
index 9532ad82821..30f4df3a4d2 100644
--- a/audio/faad2/buildlink3.mk
+++ b/audio/faad2/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 20:21:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use faad2.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:06 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FAAD2_BUILDLINK3_MK:= ${FAAD2_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ FAAD2_BUILDLINK3_MK:= ${FAAD2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= faad2
.endif
-.if !empty(FAAD2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= faad2
-BUILDLINK_DEPENDS.faad2+= faad2>=1.1
-BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaad2}
+BUILDLINK_PACKAGES+= faad2
-.endif # FAAD2_BUILDLINK3_MK
+.if !empty(FAAD2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.faad2+= faad2>=1.1
+BUILDLINK_PKGSRCDIR.faad2?= ../../audio/faad2
+.endif # FAAD2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
index 8b644b6766e..fefacf24551 100644
--- a/audio/flac/buildlink3.mk
+++ b/audio/flac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= flac
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflac}
+BUILDLINK_PACKAGES+= flac
+
.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
+.include "../../audio/libogg/buildlink3.mk"
+
+.endif # FLAC_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
index 81dcb52611d..125b95fe0d8 100644
--- a/audio/gnome-speech/buildlink3.mk
+++ b/audio/gnome-speech/buildlink3.mk
@@ -1,26 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/17 23:50:33 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome-speech.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPEECH_BUILDLINK3_MK:= ${GNOME_SPEECH_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-speech
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-speech}
+BUILDLINK_PACKAGES+= gnome-speech
+
.if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-speech
-BUILDLINK_DEPENDS.gnome-speech+= gnome-speech>=0.2.7
-BUILDLINK_PKGSRCDIR.gnome-speech?= ../../audio/gnome-speech
+BUILDLINK_DEPENDS.gnome-speech+= gnome-speech>=0.2.7
+BUILDLINK_PKGSRCDIR.gnome-speech?= ../../audio/gnome-speech
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
-.endif # GNOME_SPEECH_BUILDLINK3_MK
+.endif # GNOME_SPEECH_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk
index d800f2484e7..f6447761512 100644
--- a/audio/gsm/buildlink3.mk
+++ b/audio/gsm/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:37:35 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gsm.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSM_BUILDLINK3_MK:= ${GSM_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ GSM_BUILDLINK3_MK:= ${GSM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gsm
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsm}
+BUILDLINK_PACKAGES+= gsm
+
.if !empty(GSM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gsm
BUILDLINK_DEPENDS.gsm+= gsm>=1.0.10
BUILDLINK_PKGSRCDIR.gsm?= ../../audio/gsm
-
-.endif # GSM_BUILDLINK3_MK
+.endif # GSM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
index 57a6d511d08..9de98ef63d1 100644
--- a/audio/id3lib/buildlink3.mk
+++ b/audio/id3lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+
@@ -7,13 +7,15 @@ ID3LIB_BUILDLINK3_MK:= ${ID3LIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= id3lib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nid3lib}
+BUILDLINK_PACKAGES+= id3lib
+
.if !empty(ID3LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= id3lib
-BUILDLINK_DEPENDS.id3lib+= id3lib>=3.8.3
-BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib
+BUILDLINK_DEPENDS.id3lib+= id3lib>=3.8.3
+BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib
.include "../../devel/zlib/buildlink3.mk"
-.endif # ID3LIB_BUILDLINK3_MK
+.endif # ID3LIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk
index 1f677ef422c..cc1fdfaa01f 100644
--- a/audio/lame/buildlink3.mk
+++ b/audio/lame/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/20 11:13:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LAME_BUILDLINK3_MK:= ${LAME_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LAME_BUILDLINK3_MK:= ${LAME_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= lame
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlame}
+BUILDLINK_PACKAGES+= lame
+
.if !empty(LAME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= lame
BUILDLINK_DEPENDS.lame+= lame>=3.93.1nb2
BUILDLINK_PKGSRCDIR.lame?= ../../audio/lame
-.endif # LAME_BUILDLINK3_MK
+.endif # LAME_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/liba52/buildlink3.mk b/audio/liba52/buildlink3.mk
index 2f280152105..9e0b5520fae 100644
--- a/audio/liba52/buildlink3.mk
+++ b/audio/liba52/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:37:35 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use liba52.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBA52_BUILDLINK3_MK:= ${LIBA52_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LIBA52_BUILDLINK3_MK:= ${LIBA52_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= liba52
.endif
-.if !empty(LIBA52_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= liba52
-BUILDLINK_DEPENDS.liba52+= liba52>=0.7.4
-BUILDLINK_PKGSRCDIR.liba52?= ../../audio/liba52
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliba52}
+BUILDLINK_PACKAGES+= liba52
-.endif # LIBA52_BUILDLINK3_MK
+.if !empty(LIBA52_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.liba52+= liba52>=0.7.4
+BUILDLINK_PKGSRCDIR.liba52?= ../../audio/liba52
+.endif # LIBA52_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index 31fad85bf3d..e7e86ad77b5 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/19 17:54:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAO_BUILDLINK3_MK:= ${LIBAO_BUILDLINK3_MK}+
@@ -7,11 +7,12 @@ LIBAO_BUILDLINK3_MK:= ${LIBAO_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libao
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibao}
+BUILDLINK_PACKAGES+= libao
+
.if !empty(LIBAO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libao
BUILDLINK_DEPENDS.libao+= libao>=0.8.4
BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao
-
.endif # LIBAO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index ac25ea15552..17d1fb6eacb 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ AUDIOFILE_BUILDLINK3_MK:= ${AUDIOFILE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= audiofile
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naudiofile}
+BUILDLINK_PACKAGES+= audiofile
+
.if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= audiofile
BUILDLINK_DEPENDS.audiofile+= libaudiofile>=0.2.1
BUILDLINK_PKGSRCDIR.audiofile?= ../../audio/libaudiofile
.endif # AUDIOFILE_BUILDLINK3_MK
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
index 7a05d4b1040..4f63722908c 100644
--- a/audio/libcddb/buildlink3.mk
+++ b/audio/libcddb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+
@@ -7,13 +7,15 @@ LIBCDDB_BUILDLINK3_MK:= ${LIBCDDB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libcddb
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcddb}
+BUILDLINK_PACKAGES+= libcddb
+
.if !empty(LIBCDDB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libcddb
BUILDLINK_DEPENDS.libcddb+= libcddb>=0.9.4
BUILDLINK_PKGSRCDIR.libcddb?= ../../audio/libcddb
.include "../../misc/libcdio/buildlink3.mk"
-.endif # LIBCDDB_BUILDLINK3_MK
+.endif # LIBCDDB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk
index ccfc8577ebc..ac0d30632d5 100644
--- a/audio/libid3tag/buildlink3.mk
+++ b/audio/libid3tag/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:37:35 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libid3tag.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBID3TAG_BUILDLINK3_MK:= ${LIBID3TAG_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libid3tag
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibid3tag}
+BUILDLINK_PACKAGES+= libid3tag
+
.if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libid3tag
-BUILDLINK_DEPENDS.libid3tag+= libid3tag>=0.15.0b
-BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag
+BUILDLINK_DEPENDS.libid3tag+= libid3tag>=0.15.0b
+BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag
.include "../../devel/zlib/buildlink3.mk"
-.endif # LIBID3TAG_BUILDLINK3_MK
+.endif # LIBID3TAG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libmad/buildlink3.mk b/audio/libmad/buildlink3.mk
index afb6eae226c..15fab9949f9 100644
--- a/audio/libmad/buildlink3.mk
+++ b/audio/libmad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMAD_BUILDLINK3_MK:= ${LIBMAD_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ LIBMAD_BUILDLINK3_MK:= ${LIBMAD_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libmad
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmad}
+BUILDLINK_PACKAGES+= libmad
+
.if !empty(LIBMAD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libmad
BUILDLINK_DEPENDS.libmad+= libmad>=0.15.0b
BUILDLINK_PKGSRCDIR.libmad?= ../../audio/libmad
.endif # LIBMAD_BUILDLINK3_MK
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index 2c423e4edee..68fd31fb511 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/19 06:41:21 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
@@ -9,14 +9,17 @@ LIBMIKMOD_BUILDLINK3_MK:= ${LIBMIKMOD_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libmikmod
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmikmod}
+BUILDLINK_PACKAGES+= libmikmod
+
.if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libmikmod
BUILDLINK_DEPENDS.libmikmod+= libmikmod>=3.1.9
BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
-. if defined(USE_ESOUND) && !empty(USE_ESOUND:M[Yy][Ee][Ss])
-. include "../../audio/esound/buildlink3.mk"
-. endif
-.endif # LIBMIKMOD_BUILDLINK3_MK
+.if defined(USE_ESOUND) && !empty(USE_ESOUND:M[Yy][Ee][Ss])
+. include "../../audio/esound/buildlink3.mk"
+.endif
+
+.endif # LIBMIKMOD_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libogg/buildlink3.mk b/audio/libogg/buildlink3.mk
index 0090e92ba62..53ea51a6994 100644
--- a/audio/libogg/buildlink3.mk
+++ b/audio/libogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOGG_BUILDLINK3_MK:= ${LIBOGG_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ LIBOGG_BUILDLINK3_MK:= ${LIBOGG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libogg
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibogg}
+BUILDLINK_PACKAGES+= libogg
+
.if !empty(LIBOGG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libogg
BUILDLINK_DEPENDS.libogg+= libogg>=1.1
BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg
.endif # LIBOGG_BUILDLINK3_MK
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
index 1584b9c251e..cede6cf55e4 100644
--- a/audio/libsamplerate/buildlink3.mk
+++ b/audio/libsamplerate/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 11:22:53 wiz Exp $
-#
-# This Makefile fragment is included by packages that use libsamplerate.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:07 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSAMPLERATE_BUILDLINK3_MK:= ${LIBSAMPLERATE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libsamplerate
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsamplerate}
+BUILDLINK_PACKAGES+= libsamplerate
+
.if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libsamplerate
-BUILDLINK_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1
-BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate
+BUILDLINK_DEPENDS.libsamplerate+= libsamplerate>=0.0.13nb1
+BUILDLINK_PKGSRCDIR.libsamplerate?= ../../audio/libsamplerate
.include "../../audio/libsndfile/buildlink3.mk"
-.endif # LIBSAMPLERATE_BUILDLINK3_MK
+.endif # LIBSAMPLERATE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk
index 3fd065ca9c1..bb0e7293c3e 100644
--- a/audio/libshout/buildlink3.mk
+++ b/audio/libshout/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:56:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBSHOUT_BUILDLINK3_MK:= ${LIBSHOUT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libshout
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibshout}
+BUILDLINK_PACKAGES+= libshout
+
.if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libshout
BUILDLINK_DEPENDS.libshout+= libshout>=2.0
BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout
-. include "../../audio/libvorbis/buildlink3.mk"
-. include "../../mk/pthread.buildlink3.mk"
-.endif # LIBSHOUT_BUILDLINK3_MK
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+.endif # LIBSHOUT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk
index 19521b15e04..ce6b89d84eb 100644
--- a/audio/libsidplay/buildlink3.mk
+++ b/audio/libsidplay/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 23:52:45 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libsidplay.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIDPLAY_BUILDLINK3_MK:= ${LIBSIDPLAY_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libsidplay
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsidplay}
+BUILDLINK_PACKAGES+= libsidplay
+
.if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libsidplay
BUILDLINK_DEPENDS.libsidplay+= libsidplay>=1.36.38
-BUILDLINK_PKGSRCDIR.libsidplay?= ../../audio/libsidplay
-
-.endif # LIBSIDPLAY_BUILDLINK3_MK
+BUILDLINK_PKGSRCDIR.libsidplay?= ../../audio/libsidplay
+.endif # LIBSIDPLAY_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
index 688e7f50225..62f4cde9bff 100644
--- a/audio/libsndfile/buildlink3.mk
+++ b/audio/libsndfile/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 19:13:28 wiz Exp $
-#
-# This Makefile fragment is included by packages that use libsndfile.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSNDFILE_BUILDLINK3_MK:= ${LIBSNDFILE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libsndfile
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsndfile}
+BUILDLINK_PACKAGES+= libsndfile
+
.if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libsndfile
BUILDLINK_DEPENDS.libsndfile+= libsndfile>=1.0.0
BUILDLINK_PKGSRCDIR.libsndfile?= ../../audio/libsndfile
-
-.endif # LIBSNDFILE_BUILDLINK3_MK
+.endif # LIBSNDFILE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
index 1d35e8a1b7f..ae8f1f0110a 100644
--- a/audio/libvorbis/buildlink3.mk
+++ b/audio/libvorbis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ LIBVORBIS_BUILDLINK3_MK:= ${LIBVORBIS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libvorbis
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvorbis}
+BUILDLINK_PACKAGES+= libvorbis
+
.if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libvorbis
BUILDLINK_DEPENDS.libvorbis+= libvorbis>=1.0.1
BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis
-. include "../../audio/libogg/buildlink3.mk"
+.include "../../audio/libogg/buildlink3.mk"
+
.endif # LIBVORBIS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index 3600ff6940f..32960ab1666 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/19 17:54:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MUSICBRAINZ_BUILDLINK3_MK:= ${MUSICBRAINZ_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ MUSICBRAINZ_BUILDLINK3_MK:= ${MUSICBRAINZ_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= musicbrainz
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmusicbrainz}
+BUILDLINK_PACKAGES+= musicbrainz
+
.if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= musicbrainz
BUILDLINK_DEPENDS.musicbrainz+= musicbrainz>=2.0.2
BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz
-. include "../../textproc/expat/buildlink3.mk"
-.endif # MUSICBRAINZ_BUILDLINK3_MK
+.include "../../textproc/expat/buildlink3.mk"
+
+.endif # MUSICBRAINZ_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
index 8a1455c4e19..ca60c6efd9f 100644
--- a/audio/nas/buildlink3.mk
+++ b/audio/nas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NAS_BUILDLINK3_MK:= ${NAS_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ NAS_BUILDLINK3_MK:= ${NAS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= nas
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnas}
+BUILDLINK_PACKAGES+= nas
+
.if !empty(NAS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= nas
BUILDLINK_DEPENDS.nas+= nas>=1.4.2
BUILDLINK_PKGSRCDIR.nas?= ../../audio/nas
.endif # NAS_BUILDLINK3_MK
diff --git a/audio/oss/buildlink3.mk b/audio/oss/buildlink3.mk
index 64a4f1c87da..a7965e784f6 100644
--- a/audio/oss/buildlink3.mk
+++ b/audio/oss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OSS_BUILDLINK3_MK:= ${OSS_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ OSS_BUILDLINK3_MK:= ${OSS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= oss
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noss}
+BUILDLINK_PACKAGES+= oss
+
.if !empty(OSS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= oss
BUILDLINK_DEPENDS.oss+= oss-[0-9]*
BUILDLINK_PKGSRCDIR.oss?= ../../audio/oss
BUILDLINK_INCDIRS.oss= include lib/oss/include
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index b07c9ffab58..f8a162bc5b1 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-ogg.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+
@@ -12,13 +9,15 @@ PY_OGG_BUILDLINK3_MK:= ${PY_OGG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pyogg
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyogg}
+BUILDLINK_PACKAGES+= pyogg
+
.if !empty(PY_OGG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pyogg
-BUILDLINK_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3
-BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg
+BUILDLINK_DEPENDS.pyogg+= ${PYPKGPREFIX}-ogg>=1.3
+BUILDLINK_PKGSRCDIR.pyogg?= ../../audio/py-ogg
.include "../../audio/libogg/buildlink3.mk"
-.endif # PY_OGG_BUILDLINK3_MK
+.endif # PY_OGG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
index 2cd8b61aace..7266eda4026 100644
--- a/audio/rplay/buildlink3.mk
+++ b/audio/rplay/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:51:07 minskim Exp $
-#
-# This Makefile fragment is included by packages that use rplay.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RPLAY_BUILDLINK3_MK:= ${RPLAY_BUILDLINK3_MK}+
@@ -10,15 +7,17 @@ RPLAY_BUILDLINK3_MK:= ${RPLAY_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= rplay
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrplay}
+BUILDLINK_PACKAGES+= rplay
+
.if !empty(RPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= rplay
-BUILDLINK_DEPENDS.rplay+= rplay>=3.3.2nb1
-BUILDLINK_PKGSRCDIR.rplay?= ../../audio/rplay
+BUILDLINK_DEPENDS.rplay+= rplay>=3.3.2nb1
+BUILDLINK_PKGSRCDIR.rplay?= ../../audio/rplay
.include "../../audio/gsm/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/rx/buildlink3.mk"
-.endif # RPLAY_BUILDLINK3_MK
+.endif # RPLAY_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index c22e98bce56..06af32cd1bf 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 01:49:18 wiz Exp $
-#
-# This Makefile fragment is included by packages that use speex.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= speex
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspeex}
+BUILDLINK_PACKAGES+= speex
+
.if !empty(SPEEX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= speex
-BUILDLINK_DEPENDS.speex+= speex>=1.0.2nb1
-BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
+BUILDLINK_DEPENDS.speex+= speex>=1.0.2nb1
+BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
.include "../../audio/libogg/buildlink3.mk"
-.endif # SPEEX_BUILDLINK3_MK
+.endif # SPEEX_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
index 89ef4727cb0..00c65f54464 100644
--- a/audio/sweep/buildlink3.mk
+++ b/audio/sweep/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 11:39:24 wiz Exp $
-#
-# This Makefile fragment is included by packages that use sweep.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+
@@ -12,21 +7,23 @@ SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= sweep
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsweep}
+BUILDLINK_PACKAGES+= sweep
+
.if !empty(SWEEP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= sweep
-BUILDLINK_DEPENDS.sweep+= sweep>=0.8.2nb6
-BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep
+BUILDLINK_DEPENDS.sweep+= sweep>=0.8.2nb6
+BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep
-.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/speex/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/tdb/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.endif # SWEEP_BUILDLINK3_MK
+.endif # SWEEP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk
index 3ef19a4f63b..7090ef8b91a 100644
--- a/audio/taglib/buildlink3.mk
+++ b/audio/taglib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TAGLIB_BUILDLINK3_MK:= ${TAGLIB_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ TAGLIB_BUILDLINK3_MK:= ${TAGLIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= taglib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntaglib}
+BUILDLINK_PACKAGES+= taglib
+
.if !empty(TAGLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= taglib
BUILDLINK_DEPENDS.taglib+= taglib>=1.0
BUILDLINK_PKGSRCDIR.taglib?= ../../audio/taglib
-.endif # TAGLIB_BUILDLINK3_MK
+.endif # TAGLIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk
index 51e56604fd7..dc2171ea5bd 100644
--- a/audio/tremor/buildlink3.mk
+++ b/audio/tremor/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 01:06:43 wiz Exp $
-#
-# This Makefile fragment is included by packages that use tremor.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TREMOR_BUILDLINK3_MK:= ${TREMOR_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ TREMOR_BUILDLINK3_MK:= ${TREMOR_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= tremor
.endif
-.if !empty(TREMOR_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= tremor
-BUILDLINK_DEPENDS.tremor+= tremor>=1.0.2
-BUILDLINK_PKGSRCDIR.tremor?= ../../audio/tremor
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntremor}
+BUILDLINK_PACKAGES+= tremor
-.endif # TREMOR_BUILDLINK3_MK
+.if !empty(TREMOR_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tremor+= tremor>=1.0.2
+BUILDLINK_PKGSRCDIR.tremor?= ../../audio/tremor
+.endif # TREMOR_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
index b3e4c03f02e..d966c7626a4 100644
--- a/audio/xmms/buildlink3.mk
+++ b/audio/xmms/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 16:23:53 minskim Exp $
-#
-# This Makefile fragment is included by packages that use xmms.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+
@@ -10,10 +7,12 @@ XMMS_BUILDLINK3_MK:= ${XMMS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= xmms
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmms}
+BUILDLINK_PACKAGES+= xmms
+
.if !empty(XMMS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xmms
-BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb10
-BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms
+BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb10
+BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms
PTHREAD_OPTS+= require
@@ -23,8 +22,9 @@ PTHREAD_OPTS+= require
.include "../../graphics/Mesa/buildlink3.mk"
.include "../../textproc/libxml/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
+
.include "../../mk/pthread.buildlink3.mk"
-.endif # XMMS_BUILDLINK3_MK
+.endif # XMMS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index db4921b2eeb..243b8bfc34d 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 13:03:48 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use libgeda.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGEDA_BUILDLINK3_MK:= ${LIBGEDA_BUILDLINK3_MK}+
@@ -12,16 +7,18 @@ LIBGEDA_BUILDLINK3_MK:= ${LIBGEDA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libgeda
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgeda}
+BUILDLINK_PACKAGES+= libgeda
+
.if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgeda
-BUILDLINK_DEPENDS.libgeda+= libgeda-20040111{,nb[0-9]*}
-BUILDLINK_PKGSRCDIR.libgeda?= ../../cad/libgeda
+BUILDLINK_DEPENDS.libgeda+= libgeda-20040111{,nb[0-9]*}
+BUILDLINK_PKGSRCDIR.libgeda?= ../../cad/libgeda
.include "../../devel/libstroke/buildlink3.mk"
.include "../../graphics/libgdgeda/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBGEDA_BUILDLINK3_MK
+.endif # LIBGEDA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk
index 47e9621f1c6..f83769314da 100644
--- a/chat/ekg/buildlink3.mk
+++ b/chat/ekg/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 17:44:17 wiz Exp $
-#
-# This Makefile fragment is included by packages that use ekg.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EKG_BUILDLINK3_MK:= ${EKG_BUILDLINK3_MK}+
@@ -12,8 +7,10 @@ EKG_BUILDLINK3_MK:= ${EKG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ekg
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nekg}
+BUILDLINK_PACKAGES+= ekg
+
.if !empty(EKG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ekg
BUILDLINK_DEPENDS.ekg+= ekg>=1.1
BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg
@@ -22,6 +19,6 @@ BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.endif # EKG_BUILDLINK3_MK
+.endif # EKG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk
index 5402d51791c..e2f4567b73a 100644
--- a/chat/jabberd/buildlink3.mk
+++ b/chat/jabberd/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use jabberd.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JABBERD_BUILDLINK3_MK:= ${JABBERD_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ JABBERD_BUILDLINK3_MK:= ${JABBERD_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= jabberd
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njabberd}
+BUILDLINK_PACKAGES+= jabberd
+
.if !empty(JABBERD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= jabberd
-BUILDLINK_DEPENDS.jabberd+= jabberd>=1.4.2
-BUILDLINK_PKGSRCDIR.jabberd?= ../../chat/jabberd
+BUILDLINK_DEPENDS.jabberd+= jabberd>=1.4.2
+BUILDLINK_PKGSRCDIR.jabberd?= ../../chat/jabberd
.include "../../security/openssl/buildlink3.mk"
-.endif # JABBERD_BUILDLINK3_MK
+.endif # JABBERD_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/libtlen/buildlink3.mk b/chat/libtlen/buildlink3.mk
index 549e14420cd..e48fe020a35 100644
--- a/chat/libtlen/buildlink3.mk
+++ b/chat/libtlen/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/26 09:24:01 adam Exp $
-#
-# This Makefile fragment is included by packages that use libtlen.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:08 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTLEN_BUILDLINK3_MK:= ${LIBTLEN_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LIBTLEN_BUILDLINK3_MK:= ${LIBTLEN_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libtlen
.endif
-.if !empty(LIBTLEN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libtlen
-BUILDLINK_DEPENDS.libtlen+= libtlen>=20040212
-BUILDLINK_PKGSRCDIR.libtlen?= ../../chat/libtlen
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtlen}
+BUILDLINK_PACKAGES+= libtlen
-.endif # LIBTLEN_BUILDLINK3_MK
+.if !empty(LIBTLEN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libtlen+= libtlen>=20040212
+BUILDLINK_PKGSRCDIR.libtlen?= ../../chat/libtlen
+.endif # LIBTLEN_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk
index de61ecde0bd..3b6b3837238 100644
--- a/chat/loudmouth/buildlink3.mk
+++ b/chat/loudmouth/buildlink3.mk
@@ -1,31 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/20 14:16:19 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use loudmouth.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:08 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LOUDMOUTH_BUILDLINK3_MK:= ${LOUDMOUTH_BUILDLINK3_MK}+
+.include "../../mk/bsd.prefs.mk"
+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= loudmouth
.endif
-.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= loudmouth
-BUILDLINK_DEPENDS.loudmouth+= loudmouth>=0.10.1
-BUILDLINK_PKGSRCDIR.loudmouth?= ../../chat/loudmouth
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nloudmouth}
+BUILDLINK_PACKAGES+= loudmouth
-.include "../../mk/bsd.prefs.mk"
+.if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.loudmouth+= loudmouth>=0.10.1
+BUILDLINK_PKGSRCDIR.loudmouth?= ../../chat/loudmouth
.include "../../devel/glib2/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
+
.if defined(LOUDMOUTH_USE_SSL) && !empty(LOUDMOUTH_USE_SSL:M[Yy][Ee][Ss])
-BUILDLINK_DEPENDS.gnutls= gnutls>=1.0.0
-.include "../../security/gnutls/buildlink3.mk"
+BUILDLINK_DEPENDS.gnutls+= gnutls>=1.0.0
+. include "../../security/gnutls/buildlink3.mk"
.endif
-.endif # LOUDMOUTH_BUILDLINK3_MK
+.endif # LOUDMOUTH_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk
index c12ca23287e..cacde221d46 100644
--- a/comms/jpilot/buildlink3.mk
+++ b/comms/jpilot/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:43:43 minskim Exp $
-#
-# This Makefile fragment is included by packages that use jpilot.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JPILOT_BUILDLINK3_MK:= ${JPILOT_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ JPILOT_BUILDLINK3_MK:= ${JPILOT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= jpilot
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njpilot}
+BUILDLINK_PACKAGES+= jpilot
+
.if !empty(JPILOT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= jpilot
-BUILDLINK_DEPENDS.jpilot+= jpilot>=0.99.5nb4
-BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
+BUILDLINK_DEPENDS.jpilot+= jpilot>=0.99.5nb4
+BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # JPILOT_BUILDLINK3_MK
+.endif # JPILOT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk
index 875f981a541..53376f40aff 100644
--- a/comms/openobex/buildlink3.mk
+++ b/comms/openobex/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/26 12:49:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use openobex.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENOBEX_BUILDLINK3_MK:= ${OPENOBEX_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= openobex
.endif
-.if !empty(OPENOBEX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= openobex
-BUILDLINK_DEPENDS.openobex+= openobex>=1.0.1
-BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenobex}
+BUILDLINK_PACKAGES+= openobex
-.endif # OPENOBEX_BUILDLINK3_MK
+.if !empty(OPENOBEX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.openobex+= openobex>=1.0.1
+BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex
+.endif # OPENOBEX_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/comms/pilot-link-libs/buildlink3.mk b/comms/pilot-link-libs/buildlink3.mk
index 7d20f46cf9e..74119fed909 100644
--- a/comms/pilot-link-libs/buildlink3.mk
+++ b/comms/pilot-link-libs/buildlink3.mk
@@ -1,24 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:31:23 minskim Exp $
-#
-# This Makefile fragment is included by packages that use pilot-link-libs.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PILOT_LINK_LIBS_BUILDLINK3_MK:= ${PILOT_LINK_LIBS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= pilot-link-libs
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npilot-link-libs}
+BUILDLINK_PACKAGES+= pilot-link-libs
+
.if !empty(PILOT_LINK_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pilot-link-libs
-BUILDLINK_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.11.7nb1
-BUILDLINK_PKGSRCDIR.pilot-link-libs?= ../../comms/pilot-link-libs
+BUILDLINK_DEPENDS.pilot-link-libs+= pilot-link-libs>=0.11.7nb1
+BUILDLINK_PKGSRCDIR.pilot-link-libs?= ../../comms/pilot-link-libs
-.include "../../devel/ncurses/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
-.endif # PILOT_LINK_LIBS_BUILDLINK3_MK
+.endif # PILOT_LINK_LIBS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/converters/fribidi/buildlink3.mk b/converters/fribidi/buildlink3.mk
index 1ba055e8a70..2b88e1a3b61 100644
--- a/converters/fribidi/buildlink3.mk
+++ b/converters/fribidi/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:01:11 wiz Exp $
-#
-# This Makefile fragment is included by packages that use fribidi.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FRIBIDI_BUILDLINK3_MK:= ${FRIBIDI_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ FRIBIDI_BUILDLINK3_MK:= ${FRIBIDI_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= fribidi
.endif
-.if !empty(FRIBIDI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= fribidi
-BUILDLINK_DEPENDS.fribidi+= fribidi>=0.10.4
-BUILDLINK_PKGSRCDIR.fribidi?= ../../converters/fribidi
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfribidi}
+BUILDLINK_PACKAGES+= fribidi
-.endif # FRIBIDI_BUILDLINK3_MK
+.if !empty(FRIBIDI_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.fribidi+= fribidi>=0.10.4
+BUILDLINK_PKGSRCDIR.fribidi?= ../../converters/fribidi
+.endif # FRIBIDI_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk
index c56965afc64..fac1628f6f0 100644
--- a/converters/wv/buildlink3.mk
+++ b/converters/wv/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:19:00 wiz Exp $
-#
-# This Makefile fragment is included by packages that use wv.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ WV_BUILDLINK3_MK:= ${WV_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= wv
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwv}
+BUILDLINK_PACKAGES+= wv
+
.if !empty(WV_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= wv
-BUILDLINK_DEPENDS.wv+= wv>=1.0.0
-BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv
+BUILDLINK_DEPENDS.wv+= wv>=1.0.0
+BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -25,6 +22,6 @@ BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv
.include "../../graphics/png/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # WV_BUILDLINK3_MK
+.endif # WV_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index 010d2af1f85..ace68444e77 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= db3
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb3}
+BUILDLINK_PACKAGES+= db3
+
.if !empty(DB3_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= db3
BUILDLINK_DEPENDS.db3+= db3>=2.9.2
BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3
.endif # DB3_BUILDLINK3_MK
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index a8bdf4e1b85..1e75e0f936f 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= db4
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb4}
+BUILDLINK_PACKAGES+= db4
+
.if !empty(DB4_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= db4
BUILDLINK_DEPENDS.db4+= db4>=4.2.52
BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4
BUILDLINK_INCDIRS.db4?= include/db4
diff --git a/databases/dbxml/buildlink3.mk b/databases/dbxml/buildlink3.mk
index 98ebd4c3ca1..760c19d01c8 100644
--- a/databases/dbxml/buildlink3.mk
+++ b/databases/dbxml/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/13 19:39:37 minskim Exp $
-#
-# This Makefile fragment is included by packages that use dbxml.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DBXML_BUILDLINK3_MK:= ${DBXML_BUILDLINK3_MK}+
@@ -10,15 +7,17 @@ DBXML_BUILDLINK3_MK:= ${DBXML_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= dbxml
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbxml}
+BUILDLINK_PACKAGES+= dbxml
+
.if !empty(DBXML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= dbxml
-BUILDLINK_DEPENDS.dbxml+= dbxml>=1.2.0
-BUILDLINK_PKGSRCDIR.dbxml?= ../../databases/dbxml
+BUILDLINK_DEPENDS.dbxml+= dbxml>=1.2.0
+BUILDLINK_PKGSRCDIR.dbxml?= ../../databases/dbxml
.include "../../databases/db4/buildlink3.mk"
.include "../../textproc/libpathan/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
-.endif # DBXML_BUILDLINK3_MK
+.endif # DBXML_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/gdbm/buildlink3.mk b/databases/gdbm/buildlink3.mk
index 9fd18737d0e..f356c6a71b5 100644
--- a/databases/gdbm/buildlink3.mk
+++ b/databases/gdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 08:40:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDBM_BUILDLINK3_MK:= ${GDBM_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ GDBM_BUILDLINK3_MK:= ${GDBM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gdbm
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdbm}
+BUILDLINK_PACKAGES+= gdbm
+
.if !empty(GDBM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gdbm
BUILDLINK_DEPENDS.gdbm+= gdbm>=1.8.3
BUILDLINK_PKGSRCDIR.gdbm?= ../../databases/gdbm
-.endif # GDBM_BUILDLINK3_MK
+.endif # GDBM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk
index 060d0f55713..de2c610a1c5 100644
--- a/databases/gnome-mime-data/buildlink3.mk
+++ b/databases/gnome-mime-data/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:48:07 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome-mime-data.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MIME_DATA_BUILDLINK3_MK:= ${GNOME_MIME_DATA_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-mime-data
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-mime-data}
+BUILDLINK_PACKAGES+= gnome-mime-data
+
.if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-mime-data
BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0
BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
-.endif # GNOME_MIME_DATA_BUILDLINK3_MK
+.endif # GNOME_MIME_DATA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index 96caaabedf2..2f9289d9c42 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:28:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgda.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDA_BUILDLINK3_MK:= ${LIBGDA_BUILDLINK3_MK}+
@@ -12,17 +7,19 @@ LIBGDA_BUILDLINK3_MK:= ${LIBGDA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libgda
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgda}
+BUILDLINK_PACKAGES+= libgda
+
.if !empty(LIBGDA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgda
-BUILDLINK_DEPENDS.libgda+= libgda>=0.99.0nb1
-BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda
+BUILDLINK_DEPENDS.libgda+= libgda>=0.99.0nb1
+BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
-.endif # LIBGDA_BUILDLINK3_MK
+.endif # LIBGDA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index b275c01ee7f..d0b1c03510f 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,29 +1,26 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:28:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomedb.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEDB_BUILDLINK3_MK:= ${LIBGNOMEDB_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgnomedb
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomedb}
+BUILDLINK_PACKAGES+= libgnomedb
+
.if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgnomedb
BUILDLINK_DEPENDS.libgnomedb+= libgnomedb>=1.0.0nb5
BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb
.include "../../databases/libgda/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBGNOMEDB_BUILDLINK3_MK
+.endif # LIBGNOMEDB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index 2427141b0b7..69fa5cd982c 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= mysql-client
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmysql-client}
+BUILDLINK_PACKAGES+= mysql-client
+
.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mysql-client
BUILDLINK_DEPENDS.mysql-client+= mysql-client>=3.23.58
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client
BUILDLINK_LIBDIRS.mysql-client?= lib/mysql
-. include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
.endif # MYSQL_CLIENT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index 91fa545bf78..cb66ceb0733 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/21 01:56:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -9,17 +9,20 @@ OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= openldap
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenldap}
+BUILDLINK_PACKAGES+= openldap
+
.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= openldap
BUILDLINK_DEPENDS.openldap+= openldap>=2.1.22
BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
-. if defined(USE_SASL2) && (${USE_SASL2} == "YES")
-. include "../../security/cyrus-sasl2/buildlink3.mk"
-. elif defined(USE_SASL) && (${USE_SASL} == "YES")
-. include "../../security/cyrus-sasl/buildlink3.mk"
-. endif
-. include "../../security/openssl/buildlink3.mk"
+.if defined(USE_SASL2) && (${USE_SASL2} == "YES")
+. include "../../security/cyrus-sasl2/buildlink3.mk"
+.elif defined(USE_SASL) && (${USE_SASL} == "YES")
+. include "../../security/cyrus-sasl/buildlink3.mk"
+.endif
+.include "../../security/openssl/buildlink3.mk"
+
.endif # OPENLDAP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index e1df41e7c52..909e4b7a790 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/27 12:24:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ P5_DBI_BUILDLINK3_MK:= ${P5_DBI_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= p5-DBI
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-DBI}
+BUILDLINK_PACKAGES+= p5-DBI
+
.if !empty(P5_DBI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= p5-DBI
BUILDLINK_DEPENDS.p5-DBI+= p5-DBI>=1.30
BUILDLINK_PKGSRCDIR.p5-DBI?= ../../databases/p5-DBI
BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
@@ -16,7 +18,8 @@ BUILDLINK_INCDIRS.p5-DBI?= ${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
# We want all of the arch-dependent DBI files.
BUILDLINK_CONTENTS_FILTER.p5-DBI?= ${GREP} '/auto/DBI/'
-. include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+
.endif # P5_DBI_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk
index 01dbf164097..d2d293ccff5 100644
--- a/databases/postgresql-lib/buildlink3.mk
+++ b/databases/postgresql-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POSTGRESQL_LIB_BUILDLINK3_MK:= ${POSTGRESQL_LIB_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ POSTGRESQL_LIB_BUILDLINK3_MK:= ${POSTGRESQL_LIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= postgresql-lib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql-lib}
+BUILDLINK_PACKAGES+= postgresql-lib
+
.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= postgresql-lib
BUILDLINK_DEPENDS.postgresql-lib+= postgresql-lib>=7.3.1
BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql-lib
BUILDLINK_INCDIRS.postgresql-lib?= include/postgresql
-. include "../../security/openssl/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
.endif # POSTGRESQL_LIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/py-ZODB/buildlink3.mk b/databases/py-ZODB/buildlink3.mk
index 146e6d340de..76c96c34d76 100644
--- a/databases/py-ZODB/buildlink3.mk
+++ b/databases/py-ZODB/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 23:07:51 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-ZODB.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ZODB_BUILDLINK3_MK:= ${PY_ZODB_BUILDLINK3_MK}+
@@ -12,11 +9,12 @@ PY_ZODB_BUILDLINK3_MK:= ${PY_ZODB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pyZODB
.endif
-.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pyZODB
-BUILDLINK_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2nb1
-BUILDLINK_PKGSRCDIR.pyZODB?= ../../databases/py-ZODB
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NpyZODB}
+BUILDLINK_PACKAGES+= pyZODB
-.endif # PY_ZODB_BUILDLINK3_MK
+.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2nb1
+BUILDLINK_PKGSRCDIR.pyZODB?= ../../databases/py-ZODB
+.endif # PY_ZODB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index ce178b13af1..46fbad0209f 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+
@@ -7,15 +7,18 @@ RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= rrdtool
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrrdtool}
+BUILDLINK_PACKAGES+= rrdtool
+
.if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= rrdtool
BUILDLINK_DEPENDS.rrdtool+= rrdtool>=1.0.40
BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool
-. 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
+.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 --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk
index 05ee66cf07a..476765d7824 100644
--- a/databases/tdb/buildlink3.mk
+++ b/databases/tdb/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 11:28:21 wiz Exp $
-#
-# This Makefile fragment is included by packages that use tdb.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TDB_BUILDLINK3_MK:= ${TDB_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ TDB_BUILDLINK3_MK:= ${TDB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= tdb
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntdb}
+BUILDLINK_PACKAGES+= tdb
+
.if !empty(TDB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= tdb
BUILDLINK_DEPENDS.tdb+= tdb>=1.0.6
BUILDLINK_PKGSRCDIR.tdb?= ../../databases/tdb
-
-.endif # TDB_BUILDLINK3_MK
+.endif # TDB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index 2c4fc0f3de8..d867a02d491 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:29:24 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use GConf.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+
@@ -12,16 +7,18 @@ GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= GConf
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf}
+BUILDLINK_PACKAGES+= GConf
+
.if !empty(GCONF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= GConf
-BUILDLINK_DEPENDS.GConf+= GConf>=1.0.9nb5
-BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf
+BUILDLINK_DEPENDS.GConf+= GConf>=1.0.9nb5
+BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../databases/db3/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/oaf/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
-.endif # GCONF_BUILDLINK3_MK
+.endif # GCONF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
index 42e535ffd9b..c3645562716 100644
--- a/devel/GConf2-ui/buildlink3.mk
+++ b/devel/GConf2-ui/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:53:57 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use GConf2-ui.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_UI_BUILDLINK3_MK:= ${GCONF2_UI_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= GConf2-ui
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf2-ui}
+BUILDLINK_PACKAGES+= GConf2-ui
+
.if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= GConf2-ui
-BUILDLINK_DEPENDS.GConf2-ui+= GConf2-ui>=2.4.0.1nb1
-BUILDLINK_PKGSRCDIR.GConf2-ui?= ../../devel/GConf2-ui
+BUILDLINK_DEPENDS.GConf2-ui+= GConf2-ui>=2.4.0.1nb1
+BUILDLINK_PKGSRCDIR.GConf2-ui?= ../../devel/GConf2-ui
.include "../../devel/GConf2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GCONF2_UI_BUILDLINK3_MK
+.endif # GCONF2_UI_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
index 67542361e26..89f475bb5a4 100644
--- a/devel/GConf2/buildlink3.mk
+++ b/devel/GConf2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:53:57 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use GConf2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_BUILDLINK3_MK:= ${GCONF2_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ GCONF2_BUILDLINK3_MK:= ${GCONF2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= GConf2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf2}
+BUILDLINK_PACKAGES+= GConf2
+
.if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= GConf2
-BUILDLINK_DEPENDS.GConf2+= GConf2>=2.4.0.1
-BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2
+BUILDLINK_DEPENDS.GConf2+= GConf2>=2.4.0.1
+BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -30,13 +27,13 @@ _GCONF2_FAKE= ${BUILDLINK_DIR}/bin/gconftool-2
GConf2-buildlink-fake:
${_PKG_SILENT}${_PKG_DEBUG} \
- if [ ! -f ${_GCONF2_FAKE} ]; then \
+ if [ ! -f ${_GCONF2_FAKE} ]; then \
${ECHO_BUILDLINK_MSG} "Creating ${_GCONF2_FAKE}"; \
${MKDIR} ${_GCONF2_FAKE:H}; \
${ECHO} "#!${SH}" > ${_GCONF2_FAKE}; \
${CHMOD} +x ${_GCONF2_FAKE}; \
fi
-.endif # GCONF2_BUILDLINK3_MK
+.endif # GCONF2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 672633f1591..58c42834eef 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:09 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
@@ -7,18 +7,22 @@ SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= SDL
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL}
+BUILDLINK_PACKAGES+= SDL
+
.if !empty(SDL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= SDL
BUILDLINK_DEPENDS.SDL+= SDL>=1.2.5nb5
BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
-USE_X11= YES
+USE_X11= yes
PTHREAD_OPTS+= require
-. include "../../graphics/MesaLib/buildlink3.mk"
-. include "../../graphics/glut/buildlink3.mk"
-. include "../../graphics/aalib-x11/buildlink3.mk"
-. include "../../mk/pthread.buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/aalib-x11/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
.endif # SDL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index 9ccf1027dd3..9da1d0e28c1 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/13 17:02:09 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use at-spi.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= at-spi
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nat-spi}
+BUILDLINK_PACKAGES+= at-spi
+
.if !empty(AT_SPI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= at-spi
-BUILDLINK_DEPENDS.at-spi?= at-spi>=1.3.8nb1
-BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi
+BUILDLINK_DEPENDS.at-spi?= at-spi>=1.3.8nb1
+BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gail/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi
.include "../../devel/popt/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # AT_SPI_BUILDLINK3_MK
+.endif # AT_SPI_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk
index fa3ed35ece9..e2c0307f8b4 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 01:56:42 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use atk.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ATK_BUILDLINK3_MK:= ${ATK_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ ATK_BUILDLINK3_MK:= ${ATK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= atk
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Natk}
+BUILDLINK_PACKAGES+= atk
+
.if !empty(ATK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= atk
BUILDLINK_DEPENDS.atk?= atk>=1.4.1
-BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk
+BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.endif # ATK_BUILDLINK3_MK
+.endif # ATK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index ce74026c3f0..d210d78efbd 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOEHM_GC_BUILDLINK3_MK:= ${BOEHM_GC_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ BOEHM_GC_BUILDLINK3_MK:= ${BOEHM_GC_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= boehm-gc
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboehm-gc}
+BUILDLINK_PACKAGES+= boehm-gc
+
.if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= boehm-gc
BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.2nb1
BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc
.endif # BOEHM_GC_BUILDLINK3_MK
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index d76e1ac3d4b..562dc4084b1 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:56:33 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use devIL.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DEVIL_BUILDLINK3_MK:= ${DEVIL_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ DEVIL_BUILDLINK3_MK:= ${DEVIL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= devIL
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NdevIL}
+BUILDLINK_PACKAGES+= devIL
+
.if !empty(DEVIL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= devIL
-BUILDLINK_DEPENDS.devIL+= devIL>=1.6.6nb1
-BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL
+BUILDLINK_DEPENDS.devIL+= devIL>=1.6.6nb1
+BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
@@ -25,6 +22,6 @@ BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL
.include "../../graphics/tiff/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
-.endif # DEVIL_BUILDLINK3_MK
+.endif # DEVIL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index d6cc356a51a..c6a7e02fd4f 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DLCOMPAT_BUILDLINK3_MK:= ${DLCOMPAT_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ DLCOMPAT_BUILDLINK3_MK:= ${DLCOMPAT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= dlcompat
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndlcompat}
+BUILDLINK_PACKAGES+= dlcompat
+
.if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= dlcompat
BUILDLINK_DEPENDS.dlcompat+= dlcompat>=20020606
BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
.endif # DLCOMPAT_BUILDLINK3_MK
diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk
index 0fff6fef546..79a65e307f5 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/13 23:29:17 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use eel2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EEL2_BUILDLINK3_MK:= ${EEL2_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ EEL2_BUILDLINK3_MK:= ${EEL2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= eel2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neel2}
+BUILDLINK_PACKAGES+= eel2
+
.if !empty(EEL2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= eel2
-BUILDLINK_DEPENDS.eel2+= eel2>=2.4.1nb2
-BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2
+BUILDLINK_DEPENDS.eel2+= eel2>=2.4.1nb2
+BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gail/buildlink3.mk"
@@ -30,6 +27,6 @@ BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # EEL2_BUILDLINK3_MK
+.endif # EEL2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index 917d26da2dd..ec9d520122a 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:04:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gail.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAIL_BUILDLINK3_MK:= ${GAIL_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ GAIL_BUILDLINK3_MK:= ${GAIL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gail
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngail}
+BUILDLINK_PACKAGES+= gail
+
.if !empty(GAIL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gail
-BUILDLINK_DEPENDS.gail+= gail>=1.4.1nb1
-BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail
+BUILDLINK_DEPENDS.gail+= gail>=1.4.1nb1
+BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GAIL_BUILDLINK3_MK
+.endif # GAIL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gal2/buildlink3.mk b/devel/gal2/buildlink3.mk
index cc71ab8ac3c..9589a298a2d 100644
--- a/devel/gal2/buildlink3.mk
+++ b/devel/gal2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:04:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gal2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAL2_BUILDLINK3_MK:= ${GAL2_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ GAL2_BUILDLINK3_MK:= ${GAL2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gal2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngal2}
+BUILDLINK_PACKAGES+= gal2
+
.if !empty(GAL2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gal2
-BUILDLINK_DEPENDS.gal2+= gal2>=1.99.10nb3
-BUILDLINK_PKGSRCDIR.gal2?= ../../devel/gal2
+BUILDLINK_DEPENDS.gal2+= gal2>=1.99.10nb3
+BUILDLINK_PKGSRCDIR.gal2?= ../../devel/gal2
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
-.endif # GAL2_BUILDLINK3_MK
+.endif # GAL2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index 9784174cddc..8837b3df8de 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:02:52 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use giblib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIBLIB_BUILDLINK3_MK:= ${GIBLIB_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ GIBLIB_BUILDLINK3_MK:= ${GIBLIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= giblib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngiblib}
+BUILDLINK_PACKAGES+= giblib
+
.if !empty(GIBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= giblib
-BUILDLINK_DEPENDS.giblib+= giblib>=1.2.3nb3
-BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib
+BUILDLINK_DEPENDS.giblib+= giblib>=1.2.3nb3
+BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib
.include "../../graphics/imlib2/buildlink3.mk"
-.endif # GIBLIB_BUILDLINK3_MK
+.endif # GIBLIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 244cc256fec..65dc4ce3aeb 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= glib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib}
+BUILDLINK_PACKAGES+= glib
+
.if !empty(GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= glib
BUILDLINK_DEPENDS.glib+= glib>=1.2.10nb5
BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib
PTHREAD_OPTS+= require
-. include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
.endif # GLIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 65871029d46..7f1e83f5bd2 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/11 12:27:22 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+
@@ -7,14 +7,18 @@ GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= glib2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib2}
+BUILDLINK_PACKAGES+= glib2
+
.if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= glib2
BUILDLINK_DEPENDS.glib2+= glib2>=2.2.2nb1
BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
-. include "../../converters/libiconv/buildlink3.mk"
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../mk/pthread.buildlink3.mk"
-.endif # GLIB2_BUILDLINK3_MK
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.endif # GLIB2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index d900d94807c..8844639c81b 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GMP_BUILDLINK3_MK:= ${GMP_BUILDLINK3_MK}+
@@ -7,11 +7,12 @@ GMP_BUILDLINK3_MK:= ${GMP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gmp
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmp}
+BUILDLINK_PACKAGES+= gmp
+
.if !empty(GMP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gmp
BUILDLINK_DEPENDS.gmp+= gmp>=4.1.2
BUILDLINK_PKGSRCDIR.gmp?= ../../devel/gmp
-
-.endif # GMP_BUILDLINK3_MK
+.endif # GMP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gperf/buildlink3.mk b/devel/gperf/buildlink3.mk
index cf13ee18692..e4fc203276b 100644
--- a/devel/gperf/buildlink3.mk
+++ b/devel/gperf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 13:15:54 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use gperf.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPERF_BUILDLINK3_MK:= ${GPERF_BUILDLINK3_MK}+
@@ -12,13 +7,13 @@ GPERF_BUILDLINK3_MK:= ${GPERF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gperf
.endif
-.if !empty(GPERF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gperf
-BUILDLINK_DEPENDS.gperf+= gperf>=3.0.1
-BUILDLINK_PKGSRCDIR.gperf?= ../../devel/gperf
-
-BUILDLINK_DEPMETHOD.gperf= build
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngperf}
+BUILDLINK_PACKAGES+= gperf
-.endif # GPERF_BUILDLINK3_MK
+.if !empty(GPERF_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gperf+= gperf>=3.0.1
+BUILDLINK_PKGSRCDIR.gperf?= ../../devel/gperf
+BUILDLINK_DEPMETHOD.gperf?= build
+.endif # GPERF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index efb8bd47d2f..da6053f6a0e 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:02:52 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libast.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAST_BUILDLINK3_MK:= ${LIBAST_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBAST_BUILDLINK3_MK:= ${LIBAST_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libast
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibast}
+BUILDLINK_PACKAGES+= libast
+
.if !empty(LIBAST_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libast
-BUILDLINK_DEPENDS.libast+= libast>=0.5nb5
-BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast
+BUILDLINK_DEPENDS.libast+= libast>=0.5nb5
+BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
-.endif # LIBAST_BUILDLINK3_MK
+.endif # LIBAST_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index 616ec5e0a63..f0287f6cb5d 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 03:52:22 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libbonobo.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:10 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBONOBO_BUILDLINK3_MK:= ${LIBBONOBO_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libbonobo
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonobo}
+BUILDLINK_PACKAGES+= libbonobo
+
.if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libbonobo
-BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.4.2
-BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo
+BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.4.2
+BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo
-BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/*
-BUILDLINK_FILES.libbonobo+= share/idl/bonobo-activation-2.0/*
+BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/*
+BUILDLINK_FILES.libbonobo+= share/idl/bonobo-activation-2.0/*
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -26,6 +23,6 @@ BUILDLINK_FILES.libbonobo+= share/idl/bonobo-activation-2.0/*
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBBONOBO_BUILDLINK3_MK
+.endif # LIBBONOBO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index b3c1f291be2..6287e3189bb 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:12:36 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libbonoboui.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBONOBOUI_BUILDLINK3_MK:= ${LIBBONOBOUI_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libbonoboui
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonoboui}
+BUILDLINK_PACKAGES+= libbonoboui
+
.if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libbonoboui
BUILDLINK_DEPENDS.libbonoboui+= libbonoboui>=2.4.1nb2
BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
@@ -27,6 +24,6 @@ BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBBONOBOUI_BUILDLINK3_MK
+.endif # LIBBONOBOUI_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 2791f4c9dc8..c1fb649dcfc 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:35:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADE_BUILDLINK3_MK:= ${LIBGLADE_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBGLADE_BUILDLINK3_MK:= ${LIBGLADE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libglade
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglade}
+BUILDLINK_PACKAGES+= libglade
+
.if !empty(LIBGLADE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libglade
BUILDLINK_DEPENDS.libglade+= libglade>=0.17nb5
BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
-. include "../../textproc/libxml/buildlink3.mk"
-. include "../../x11/gnome-libs/buildlink3.mk"
-.endif # LIBGLADE_BUILDLINK3_MK
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+.endif # LIBGLADE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk
index a8b86d3126e..9b7d29937b4 100644
--- a/devel/libglade2/buildlink3.mk
+++ b/devel/libglade2/buildlink3.mk
@@ -1,30 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:23:36 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libglade2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADE2_BUILDLINK3_MK:= ${LIBGLADE2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libglade2
.endif
-.if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libglade2
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.0.1nb13
-BUILDLINK_PKGSRCDIR.libglade2?= ../../devel/libglade2
-
-BUILDLINK_CPPFLAGS.libglade2= \
- -I${BUILDLINK_PREFIX.libglade2}/include/libglade-2.0
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglade2}
+BUILDLINK_PACKAGES+= libglade2
-CPPFLAGS+= ${BUILDLINK_CPPFLAGS.libglade2}
+.if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libglade2+= libglade2>=2.0.1nb13
+BUILDLINK_PKGSRCDIR.libglade2?= ../../devel/libglade2
+BUILDLINK_INCDIRS.libglade2?= include/libglade-2.0
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBGLADE2_BUILDLINK3_MK
+.endif # LIBGLADE2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index c2e3ae7e8d4..620173c9627 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:04:37 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnome.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOME_BUILDLINK3_MK:= ${LIBGNOME_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgnome
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnome}
+BUILDLINK_PACKAGES+= libgnome
+
.if !empty(LIBGNOME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgnome
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.4.0
-BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
+BUILDLINK_DEPENDS.libgnome+= libgnome>=2.4.0
+BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
.include "../../audio/esound/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -27,6 +24,6 @@ BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.endif # LIBGNOME_BUILDLINK3_MK
+.endif # LIBGNOME_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 9e14acc0ee1..9f35e843281 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,31 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:12:36 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomeui.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEUI_BUILDLINK3_MK:= ${LIBGNOMEUI_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgnomeui
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeui}
+BUILDLINK_PACKAGES+= libgnomeui
+
.if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgnomeui
BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.4.0.1nb2
BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.endif # LIBGNOMEUI_BUILDLINK3_MK
+.endif # LIBGNOMEUI_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index 9c751262ae2..d609b592c8b 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,20 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 22:58:08 cube Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGPHOTO2_BUILDLINK3_MK:= ${LIBGPHOTO2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgphoto2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgphoto2}
+BUILDLINK_PACKAGES+= libgphoto2
+
.if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgphoto2
BUILDLINK_DEPENDS.libgphoto2+= libgphoto2>=2.1.2
-BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2
+BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
-.endif # LIBGPHOTO2_BUILDLINK3_MK
+.endif # LIBGPHOTO2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index cc025bb220a..4e0b969909a 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:43:54 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgsf.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGSF_BUILDLINK3_MK:= ${LIBGSF_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ LIBGSF_BUILDLINK3_MK:= ${LIBGSF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libgsf
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgsf}
+BUILDLINK_PACKAGES+= libgsf
+
.if !empty(LIBGSF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgsf
-BUILDLINK_DEPENDS.libgsf+= libgsf>=1.8.2nb3
-BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf
+BUILDLINK_DEPENDS.libgsf+= libgsf>=1.8.2nb3
+BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBGSF_BUILDLINK3_MK
+.endif # LIBGSF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgtop2/buildlink3.mk b/devel/libgtop2/buildlink3.mk
index 08e369f7075..ddb5a293889 100644
--- a/devel/libgtop2/buildlink3.mk
+++ b/devel/libgtop2/buildlink3.mk
@@ -1,26 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/26 11:23:41 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libgtop2.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:11 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGTOP2_BUILDLINK3_MK:= ${LIBGTOP2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgtop2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtop2}
+BUILDLINK_PACKAGES+= libgtop2
+
.if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgtop2
-BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.0.0nb4
-BUILDLINK_PKGSRCDIR.libgtop2?= ../../devel/libgtop2
+BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.0.0nb4
+BUILDLINK_PKGSRCDIR.libgtop2?= ../../devel/libgtop2
-.include "../../devel/popt/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
-.endif # LIBGTOP2_BUILDLINK3_MK
+.endif # LIBGTOP2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index f29da0599e1..eaa56f60459 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 10:22:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIDN_BUILDLINK3_MK:= ${LIBIDN_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBIDN_BUILDLINK3_MK:= ${LIBIDN_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libidn
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibidn}
+BUILDLINK_PACKAGES+= libidn
+
.if !empty(LIBIDN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libidn
BUILDLINK_DEPENDS.libidn+= libidn>=0.3.3
BUILDLINK_PKGSRCDIR.libidn?= ../../devel/libidn
-. include "../../converters/libiconv/buildlink3.mk"
-. include "../../devel/libgetopt/buildlink3.mk"
-.endif # LIBIDN_BUILDLINK3_MK
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+
+.endif # LIBIDN_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index e9559b91cce..3efc3f3887c 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMM_BUILDLINK3_MK:= ${LIBMM_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ LIBMM_BUILDLINK3_MK:= ${LIBMM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libmm
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmm}
+BUILDLINK_PACKAGES+= libmm
+
.if !empty(LIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libmm
BUILDLINK_DEPENDS.libmm+= libmm>=1.2.1
BUILDLINK_PKGSRCDIR.libmm?= ../../devel/libmm
.endif # LIBMM_BUILDLINK3_MK
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
index 6eabd46caca..85963a50dd9 100644
--- a/devel/libntlm/buildlink3.mk
+++ b/devel/libntlm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:20:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNTLM_BUILDLINK3_MK:= ${LIBNTLM_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LIBNTLM_BUILDLINK3_MK:= ${LIBNTLM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libntlm
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibntlm}
+BUILDLINK_PACKAGES+= libntlm
+
.if !empty(LIBNTLM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libntlm
BUILDLINK_DEPENDS.libntlm+= libntlm>=0.3.2
BUILDLINK_PKGSRCDIR.libntlm?= ../../devel/libntlm
-.endif # LIBNTLM_BUILDLINK3_MK
+.endif # LIBNTLM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk
index e7b363f6104..0d46895df61 100644
--- a/devel/libproplist/buildlink3.mk
+++ b/devel/libproplist/buildlink3.mk
@@ -1,20 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 23:23:00 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libproplist.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPROPLIST_BUILDLINK3_MK:= ${LIBPROPLIST_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libproplist
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibproplist}
+BUILDLINK_PACKAGES+= libproplist
+
.if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libproplist
BUILDLINK_DEPENDS.libproplist+= libproplist>=0.10.1
-BUILDLINK_PKGSRCDIR.libproplist?= ../../devel/libproplist
-
-.endif # LIBPROPLIST_BUILDLINK3_MK
+BUILDLINK_PKGSRCDIR.libproplist?= ../../devel/libproplist
+.endif # LIBPROPLIST_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index d049cda198a..f40ecae1e17 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
@@ -9,15 +9,18 @@ LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libslang
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang}
+BUILDLINK_PACKAGES+= libslang
+
.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libslang
BUILDLINK_DEPENDS.libslang+= libslang>=1.4.9nb1
BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
# Debian adds a dependency on ncurses.
-. if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
-. include "../../devel/ncurses/buildlink3.mk"
-. endif
+.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
+. include "../../devel/ncurses/buildlink3.mk"
+.endif
+
.endif # LIBSLANG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index 19a7c80e4ef..b7b1e9a4f19 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 05:08:50 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use libstroke.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSTROKE_BUILDLINK3_MK:= ${LIBSTROKE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libstroke
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibstroke}
+BUILDLINK_PACKAGES+= libstroke
+
.if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libstroke
-BUILDLINK_DEPENDS.libstroke+= libstroke>=0.3nb1
-BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke
+BUILDLINK_DEPENDS.libstroke+= libstroke>=0.3nb1
+BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke
.include "../../lang/tcl/buildlink3.mk"
-.endif # LIBSTROKE_BUILDLINK3_MK
+.endif # LIBSTROKE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk
index ce6238d6fe4..f5375c009a4 100644
--- a/devel/libtar/buildlink3.mk
+++ b/devel/libtar/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 23:53:09 seb Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTAR_BUILDLINK3_MK:= ${LIBTAR_BUILDLINK3_MK}+
@@ -8,13 +7,15 @@ LIBTAR_BUILDLINK3_MK:= ${LIBTAR_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libtar
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtar}
+BUILDLINK_PACKAGES+= libtar
+
.if !empty(LIBTAR_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libtar
-BUILDLINK_DEPENDS.libtar+= libtar>=1.2.11
-BUILDLINK_PKGSRCDIR.libtar?= ../../devel/libtar
+BUILDLINK_DEPENDS.libtar+= libtar>=1.2.11
+BUILDLINK_PKGSRCDIR.libtar?= ../../devel/libtar
.include "../../devel/zlib/buildlink3.mk"
-.endif # LIBTAR_BUILDLINK3_MK
+.endif # LIBTAR_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libtool/buildlink3.mk b/devel/libtool/buildlink3.mk
index 3e6bd6a15d7..8a5377c727a 100644
--- a/devel/libtool/buildlink3.mk
+++ b/devel/libtool/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 04:23:35 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libtool.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LTDL_BUILDLINK3_MK:= ${LTDL_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LTDL_BUILDLINK3_MK:= ${LTDL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ltdl
.endif
-.if !empty(LTDL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ltdl
-BUILDLINK_DEPENDS.ltdl+= libtool-base>=1.5.2
-BUILDLINK_PKGSRCDIR.ltdl?= ../../devel/libtool-base
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nltdl}
+BUILDLINK_PACKAGES+= ltdl
-.endif # LTDL_BUILDLINK3_MK
+.if !empty(LTDL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ltdl+= libtool-base>=1.5.2
+BUILDLINK_PKGSRCDIR.ltdl?= ../../devel/libtool-base
+.endif # LTDL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk
index e2165c977cc..fb189637be4 100644
--- a/devel/libusb/buildlink3.mk
+++ b/devel/libusb/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 22:54:04 cube Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUSB_BUILDLINK3_MK:= ${LIBUSB_BUILDLINK3_MK}+
@@ -8,10 +7,12 @@ LIBUSB_BUILDLINK3_MK:= ${LIBUSB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libusb
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibusb}
+BUILDLINK_PACKAGES+= libusb
+
.if !empty(LIBUSB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libusb
-BUILDLINK_DEPENDS.libusb+= libusb>=0.1.7
-BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb
-.endif # LIBUSB_BUILDLINK3_MK
+BUILDLINK_DEPENDS.libusb+= libusb>=0.1.7
+BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb
+.endif # LIBUSB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 937cea395cb..414ae3a71f3 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:38:35 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libwnck.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWNCK_BUILDLINK3_MK:= ${LIBWNCK_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ LIBWNCK_BUILDLINK3_MK:= ${LIBWNCK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libwnck
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwnck}
+BUILDLINK_PACKAGES+= libwnck
+
.if !empty(LIBWNCK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libwnck
-BUILDLINK_DEPENDS.libwnck+= libwnck>=2.4.0.1nb1
-BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck
+BUILDLINK_DEPENDS.libwnck+= libwnck>=2.4.0.1nb1
+BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
-.endif # LIBWNCK_BUILDLINK3_MK
+.endif # LIBWNCK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk
index 788b563fb95..455c5898258 100644
--- a/devel/oaf/buildlink3.mk
+++ b/devel/oaf/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 19:17:33 minskim Exp $
-#
-# This Makefile fragment is included by packages that use oaf.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OAF_BUILDLINK3_MK:= ${OAF_BUILDLINK3_MK}+
@@ -10,15 +7,17 @@ OAF_BUILDLINK3_MK:= ${OAF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= oaf
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noaf}
+BUILDLINK_PACKAGES+= oaf
+
.if !empty(OAF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= oaf
BUILDLINK_DEPENDS.oaf+= oaf>=0.6.10nb4
-BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf
+BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf
.include "../../devel/popt/buildlink3.mk"
.include "../../textproc/libxml/buildlink3.mk"
.include "../../x11/gnome-libs/buildlink3.mk"
-.endif # OAF_BUILDLINK3_MK
+.endif # OAF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ode/buildlink3.mk b/devel/ode/buildlink3.mk
index d61f11a7acb..06c076fc183 100644
--- a/devel/ode/buildlink3.mk
+++ b/devel/ode/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:56:33 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ode.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ODE_BUILDLINK3_MK:= ${ODE_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ ODE_BUILDLINK3_MK:= ${ODE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ode
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Node}
+BUILDLINK_PACKAGES+= ode
+
.if !empty(ODE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ode
BUILDLINK_DEPENDS.ode+= ode>=0.039
BUILDLINK_PKGSRCDIR.ode?= ../../devel/ode
-
-.endif # ODE_BUILDLINK3_MK
+.endif # ODE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index 2e1e08908ba..e07306add7f 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 09:02:51 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ogre.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OGRE_BUILDLINK3_MK:= ${OGRE_BUILDLINK3_MK}+
@@ -12,16 +7,18 @@ OGRE_BUILDLINK3_MK:= ${OGRE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ogre
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nogre}
+BUILDLINK_PACKAGES+= ogre
+
.if !empty(OGRE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ogre
-BUILDLINK_DEPENDS.ogre+= ogre>=0.12.1nb1
-BUILDLINK_PKGSRCDIR.ogre?= ../../devel/ogre
+BUILDLINK_DEPENDS.ogre+= ogre>=0.12.1nb1
+BUILDLINK_PKGSRCDIR.ogre?= ../../devel/ogre
-.include "../../devel/devIL/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/devIL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.endif # OGRE_BUILDLINK3_MK
+.endif # OGRE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index b9413a1a08c..1f5e24a82da 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/17 14:48:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pango
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npango}
+BUILDLINK_PACKAGES+= pango
+
.if !empty(PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pango
-BUILDLINK_DEPENDS.pango?= pango>=1.2.5nb1
+BUILDLINK_DEPENDS.pango+= pango>=1.2.5nb1
BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
-. include "../../devel/glib2/buildlink3.mk"
-. include "../../fonts/Xft2/buildlink3.mk"
-.endif # PANGO_BUILDLINK3_MK
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+
+.endif # PANGO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 3337cb02ed2..8511768e680 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCRE_BUILDLINK3_MK:= ${PCRE_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PCRE_BUILDLINK3_MK:= ${PCRE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pcre
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcre}
+BUILDLINK_PACKAGES+= pcre
+
.if !empty(PCRE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pcre
BUILDLINK_DEPENDS.pcre+= pcre>=3.4nb1
BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre
.endif # PCRE_BUILDLINK3_MK
diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk
index f56a61281ee..47cb1c3f00e 100644
--- a/devel/pkgconfig/buildlink3.mk
+++ b/devel/pkgconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/02/16 21:01:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PKGCONFIG_BUILDLINK3_MK:= ${PKGCONFIG_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PKGCONFIG_BUILDLINK3_MK:= ${PKGCONFIG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pkgconfig
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npkgconfig}
+BUILDLINK_PACKAGES+= pkgconfig
+
.if !empty(PKGCONFIG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pkgconfig
BUILDLINK_DEPENDS.pkgconfig+= pkgconfig>=0.15.0
BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig
BUILDLINK_DEPMETHOD.pkgconfig?= build
@@ -18,6 +20,7 @@ CONFIGURE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
MAKE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkgconfig}/bin/pkg-config
MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
+
.endif # PKGCONFIG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index db0126022d1..dd0243c92dc 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:11 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POPT_BUILDLINK3_MK:= ${POPT_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ POPT_BUILDLINK3_MK:= ${POPT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= popt
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npopt}
+BUILDLINK_PACKAGES+= popt
+
.if !empty(POPT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= popt
BUILDLINK_DEPENDS.popt+= popt>=1.7nb3
BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt
-. include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
.endif # POPT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index 29d9ec708e1..6d7bed7edea 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PTH_BUILDLINK3_MK:= ${PTH_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PTH_BUILDLINK3_MK:= ${PTH_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pth
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npth}
+BUILDLINK_PACKAGES+= pth
+
.if !empty(PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pth
BUILDLINK_DEPENDS.pth+= pth>=2.0.0
BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth
.endif # PTH_BUILDLINK3_MK
diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk
index 20aa33634e0..acaf80fe272 100644
--- a/devel/pthread-sem/buildlink3.mk
+++ b/devel/pthread-sem/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
-#
-# This Makefile fragment is included by packages that use pthread-sem.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PTHREAD_SEM_BUILDLINK3_MK:= ${PTHREAD_SEM_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ PTHREAD_SEM_BUILDLINK3_MK:= ${PTHREAD_SEM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pthread-sem
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread-sem}
+BUILDLINK_PACKAGES+= pthread-sem
+
.if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pthread-sem
BUILDLINK_DEPENDS.pthread-sem+= pthread-sem>=1.0
BUILDLINK_PKGSRCDIR.pthread-sem?= ../../devel/pthread-sem
-
-.endif # PTHREAD_SEM_BUILDLINK3_MK
+.endif # PTHREAD_SEM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk
index b7da5268914..d4215c389ef 100644
--- a/devel/rx/buildlink3.mk
+++ b/devel/rx/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:48:11 minskim Exp $
-#
-# This Makefile fragment is included by packages that use rx.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RX_BUILDLINK3_MK:= ${RX_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ RX_BUILDLINK3_MK:= ${RX_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= rx
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrx}
+BUILDLINK_PACKAGES+= rx
+
.if !empty(RX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= rx
BUILDLINK_DEPENDS.rx+= rx>=1.5
BUILDLINK_PKGSRCDIR.rx?= ../../devel/rx
-
-.endif # RX_BUILDLINK3_MK
+.endif # RX_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/smpeg/buildlink3.mk b/devel/smpeg/buildlink3.mk
index 47f7528bf59..7b2f5315f05 100644
--- a/devel/smpeg/buildlink3.mk
+++ b/devel/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPMEG_BUILDLINK3_MK:= ${SPMEG_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ SPMEG_BUILDLINK3_MK:= ${SPMEG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= smpeg
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsmpeg}
+BUILDLINK_PACKAGES+= smpeg
+
.if !empty(SPMEG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= smpeg
BUILDLINK_DEPENDS.smpeg+= smpeg>=0.4.4nb3
BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/smpeg
-. include "../../devel/SDL/buildlink3.mk"
-. include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
.endif # SMPEG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/emulators/libspectrum/buildlink3.mk b/emulators/libspectrum/buildlink3.mk
index 7b7f678f606..8c61d33c1f0 100644
--- a/emulators/libspectrum/buildlink3.mk
+++ b/emulators/libspectrum/buildlink3.mk
@@ -1,24 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 18:49:36 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libspectrum.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSPECTRUM_BUILDLINK3_MK:= ${LIBSPECTRUM_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libspectrum
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspectrum}
+BUILDLINK_PACKAGES+= libspectrum
+
.if !empty(LIBSPECTRUM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libspectrum
BUILDLINK_DEPENDS.libspectrum+= libspectrum>=0.2.1
-BUILDLINK_PKGSRCDIR.libspectrum?= ../../emulators/libspectrum
+BUILDLINK_PKGSRCDIR.libspectrum?= ../../emulators/libspectrum
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
-.endif # LIBSPECTRUM_BUILDLINK3_MK
+.endif # LIBSPECTRUM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk
index 76a14f00f4b..6d0f96933cd 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/16 00:11:32 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gucharmap.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUCHARMAP_BUILDLINK3_MK:= ${GUCHARMAP_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gucharmap
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngucharmap}
+BUILDLINK_PACKAGES+= gucharmap
+
.if !empty(GUCHARMAP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gucharmap
-BUILDLINK_DEPENDS.gucharmap+= gucharmap>=1.2.0nb2
-BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
+BUILDLINK_DEPENDS.gucharmap+= gucharmap>=1.2.0nb2
+BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
.include "../../devel/popt/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GUCHARMAP_BUILDLINK3_MK
+.endif # GUCHARMAP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/fonts/t1lib/buildlink3.mk b/fonts/t1lib/buildlink3.mk
index 43d85013454..7d8ec97da57 100644
--- a/fonts/t1lib/buildlink3.mk
+++ b/fonts/t1lib/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/03 11:28:11 adam Exp $
-#
-# This Makefile fragment is included by packages that use t1lib.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
T1LIB_BUILDLINK3_MK:= ${T1LIB_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ T1LIB_BUILDLINK3_MK:= ${T1LIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= t1lib
.endif
-.if !empty(T1LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= t1lib
-BUILDLINK_DEPENDS.t1lib+= t1lib>=5.0.1
-BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nt1lib}
+BUILDLINK_PACKAGES+= t1lib
-.endif # T1LIB_BUILDLINK3_MK
+.if !empty(T1LIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.t1lib+= t1lib>=5.0.1
+BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib
+.endif # T1LIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/games/gnome2-games/buildlink3.mk b/games/gnome2-games/buildlink3.mk
index 005ef55e150..158d3890950 100644
--- a/games/gnome2-games/buildlink3.mk
+++ b/games/gnome2-games/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:06:32 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome-games.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_GAMES_BUILDLINK3_MK:= ${GNOME_GAMES_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-games
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-games}
+BUILDLINK_PACKAGES+= gnome-games
+
.if !empty(GNOME_GAMES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-games
BUILDLINK_DEPENDS.gnome-games+= gnome-games>=2.4.1nb1
BUILDLINK_PKGSRCDIR.gnome-games?= ../../games/gnome2-games
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.gnome-games?= ../../games/gnome2-games
.include "../../lang/guile/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.endif # GNOME_GAMES_BUILDLINK3_MK
+.endif # GNOME_GAMES_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index a1f9e21b87f..c2ea1c3b63f 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/02 10:31:48 adam Exp $
-#
-# This Makefile fragment is included by packages that use ImageMagick.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMAGEMAGICK_BUILDLINK3_MK:= ${IMAGEMAGICK_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= ImageMagick
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NImageMagick}
+BUILDLINK_PACKAGES+= ImageMagick
+
.if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ImageMagick
BUILDLINK_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
.include "../../graphics/libwmf/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.endif # IMAGEMAGICK_BUILDLINK3_MK
+.endif # IMAGEMAGICK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/Mesa/buildlink3.mk b/graphics/Mesa/buildlink3.mk
index e3275b94128..214d7fb8721 100644
--- a/graphics/Mesa/buildlink3.mk
+++ b/graphics/Mesa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 02:03:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
.if !defined(MESA_BUILDLINK3_MK)
MESA_BUILDLINK3_MK= defined
@@ -8,8 +8,8 @@ BUILDLINK_PREFIX.Mesa= ${BUILDLINK_PREFIX.MesaLib}
# The ordering is important here as glut/buildlink3.mk sets the version
# of Mesa required.
#
-.include "../../graphics/glut/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
.endif # MESA_BUILDLINK3_MK
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 564109a9b29..d3bd6d2279c 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,20 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 10:07:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-OPENRM_BUILDLINK3_MK:= ${OPENRM_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+OPENRM_BUILDLINK3_MK:= ${OPENRM_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= OpenRM
+BUILDLINK_DEPENDS+= OpenRM
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NOpenRM}
+BUILDLINK_PACKAGES+= OpenRM
+
.if !empty(OPENRM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= OpenRM
-BUILDLINK_DEPENDS.OpenRM+= OpenRM>=1.5.1
-BUILDLINK_PKGSRCDIR.OpenRM?= ../../graphics/OpenRM
-
-. include "../../graphics/jpeg/buildlink3.mk"
-. include "../../graphics/Mesa/buildlink3.mk"
-. include "../../mk/pthread.buildlink3.mk"
-.endif # OPENRM_BUILDLINK3_MK
+BUILDLINK_DEPENDS.OpenRM+= OpenRM>=1.5.1
+BUILDLINK_PKGSRCDIR.OpenRM?= ../../graphics/OpenRM
+
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.endif # OPENRM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 2a62e50060d..c45aa30c163 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_IMAGE_BUILDLINK3_MK:= ${SDL_IMAGE_BUILDLINK3_MK}+
@@ -7,16 +7,19 @@ SDL_IMAGE_BUILDLINK3_MK:= ${SDL_IMAGE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= SDL_image
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_image}
+BUILDLINK_PACKAGES+= SDL_image
+
.if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= SDL_image
BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1
BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image
BUILDLINK_INCDIRS.SDL_image?= include/SDL
-. include "../../graphics/jpeg/buildlink3.mk"
-. include "../../graphics/png/buildlink3.mk"
-. include "../../graphics/tiff/buildlink3.mk"
-. include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
.endif # SDL_IMAGE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
index 89950604460..0cdc02e5e2f 100644
--- a/graphics/aalib-x11/buildlink3.mk
+++ b/graphics/aalib-x11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AALIB_X11_BUILDLINK3_MK:= ${AALIB_X11_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ AALIB_X11_BUILDLINK3_MK:= ${AALIB_X11_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= aalib-x11
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naalib-x11}
+BUILDLINK_PACKAGES+= aalib-x11
+
.if !empty(AALIB_X11_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= aalib-x11
BUILDLINK_DEPENDS.aalib-x11+= aalib-x11>=1.4.0.4nb1
BUILDLINK_PKGSRCDIR.aalib-x11?= ../../graphics/aalib-x11
@@ -19,6 +21,7 @@ BUILDLINK_TRANSFORM+= l:aa:aa-x11
AALIB_CONFIG= ${BUILDLINK_PREFIX.aalib-x11}/bin/aalib-x11-config
CONFIGURE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}"
MAKE_ENV+= AALIB_CONFIG="${AALIB_CONFIG}"
-.endif # AALIB_X11_BUILDLINK3_MK
+
+.endif # AALIB_X11_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 77f515c14f1..901926c6f38 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:44:23 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use aalib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= aalib
.endif
-.if !empty(AALIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= aalib
-BUILDLINK_DEPENDS.aalib+= aalib>=1.4.0.4
-BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naalib}
+BUILDLINK_PACKAGES+= aalib
-.endif # AALIB_BUILDLINK3_MK
+.if !empty(AALIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.aalib+= aalib>=1.4.0.4
+BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib
+.endif # AALIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 6fe3795c09f..988b633c49b 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/29 00:06:14 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= cairo
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo}
+BUILDLINK_PACKAGES+= cairo
+
.if !empty(CAIRO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= cairo
BUILDLINK_DEPENDS.cairo+= cairo>=0.1.17nb1
BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
@@ -21,6 +23,6 @@ BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
.include "../../graphics/libpixman/buildlink3.mk"
.include "../../x11/Xrender/buildlink3.mk"
-.endif # CAIRO_BUILDLINK3_MK
+.endif # CAIRO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk
index 321a3f32a3b..cf5b9275dcf 100644
--- a/graphics/cal3d/buildlink3.mk
+++ b/graphics/cal3d/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $
-#
-# This Makefile fragment is included by packages that use cal3d.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAL3D_BUILDLINK3_MK:= ${CAL3D_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ CAL3D_BUILDLINK3_MK:= ${CAL3D_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= cal3d
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncal3d}
+BUILDLINK_PACKAGES+= cal3d
+
.if !empty(CAL3D_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= cal3d
-BUILDLINK_DEPENDS.cal3d?= cal3d>=0.9.1
-BUILDLINK_PKGSRCDIR.cal3d?= ../../graphics/cal3d
+BUILDLINK_DEPENDS.cal3d?= cal3d>=0.9.1
+BUILDLINK_PKGSRCDIR.cal3d?= ../../graphics/cal3d
.include "../../graphics/Mesa/buildlink3.mk"
-.endif # CAL3D_BUILDLINK3_MK
+.endif # CAL3D_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk
index 8a80a1067c4..ffa721caed4 100644
--- a/graphics/compface/buildlink3.mk
+++ b/graphics/compface/buildlink3.mk
@@ -1,20 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:08:44 minskim Exp $
-#
-# This Makefile fragment is included by packages that use compface.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
COMPFACE_BUILDLINK3_MK:= ${COMPFACE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= compface
.endif
-.if !empty(COMPFACE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= compface
-BUILDLINK_DEPENDS.compface+= compface>=1.4
-BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompface}
+BUILDLINK_PACKAGES+= compface
-.endif # COMPFACE_BUILDLINK3_MK
+.if !empty(COMPFACE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.compface+= compface>=1.4
+BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface
+.endif # COMPFACE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 6ad85f44019..91fae0db87c 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:12 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= freetype
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetype}
+BUILDLINK_PACKAGES+= freetype
+
.if !empty(FREETYPE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= freetype
BUILDLINK_DEPENDS.freetype+= freetype-lib>=1.3.1nb1
BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib
-. include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
.endif # FREETYPE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index f28349c2360..e450d18b5bb 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:13 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+
@@ -7,19 +7,23 @@ GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gd
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngd}
+BUILDLINK_PACKAGES+= gd
+
.if !empty(GD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gd
BUILDLINK_DEPENDS.gd+= gd>=2.0.15
BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd
USE_X11= yes
-. include "../../mk/pthread.buildlink3.mk"
-. include "../../devel/zlib/buildlink3.mk"
-. include "../../graphics/freetype2/buildlink3.mk"
-. include "../../graphics/jpeg/buildlink3.mk"
-. include "../../graphics/png/buildlink3.mk"
-. include "../../graphics/xpm/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+
.endif # GD_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gdk-pixbuf-gnome/buildlink3.mk b/graphics/gdk-pixbuf-gnome/buildlink3.mk
index 02bba99d066..cac0869a856 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink3.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:48:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDK_PIXBUF_GNOME_BUILDLINK3_MK:= ${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ GDK_PIXBUF_GNOME_BUILDLINK3_MK:= ${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gdk-pixbuf-gnome
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdk-pixbuf-gnome}
+BUILDLINK_PACKAGES+= gdk-pixbuf-gnome
+
.if !empty(GDK_PIXBUF_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gdk-pixbuf-gnome
BUILDLINK_DEPENDS.gdk-pixbuf-gnome+= gdk-pixbuf-gnome>=0.22.0nb2
BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?= ../../graphics/gdk-pixbuf-gnome
-. include "../../graphics/gdk-pixbuf/buildlink3.mk"
-. include "../../x11/gnome-libs/buildlink3.mk"
-.endif # GDK_PIXBUF_GNOME_BUILDLINK3_MK
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+.endif # GDK_PIXBUF_GNOME_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index 93412e3cb61..19a42bfb724 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:47:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDK_PIXBUF_BUILDLINK3_MK:= ${GDK_PIXBUF_BUILDLINK3_MK}+
@@ -7,15 +7,18 @@ GDK_PIXBUF_BUILDLINK3_MK:= ${GDK_PIXBUF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gdk-pixbuf
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdk-pixbuf}
+BUILDLINK_PACKAGES+= gdk-pixbuf
+
.if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gdk-pixbuf
BUILDLINK_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2
BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf
-. include "../../graphics/jpeg/buildlink3.mk"
-. include "../../graphics/png/buildlink3.mk"
-. include "../../graphics/tiff/buildlink3.mk"
-. include "../../x11/gtk/buildlink3.mk"
-.endif # GDK_PIXBUF_BUILDLINK3_MK
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif # GDK_PIXBUF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk
index 669d966c03f..40e050ffaf9 100644
--- a/graphics/gle/buildlink3.mk
+++ b/graphics/gle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/01 10:09:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:13 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLE_BUILDLINK3_MK:= ${GLE_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ GLE_BUILDLINK3_MK:= ${GLE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gle
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngle}
+BUILDLINK_PACKAGES+= gle
+
.if !empty(GLE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gle
BUILDLINK_DEPENDS.gle+= gle>=3.0.3
BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle
-. include "../../graphics/Mesa/buildlink3.mk"
-.endif # GLE_BUILDLINK3_MK
+.include "../../graphics/Mesa/buildlink3.mk"
+
+.endif # GLE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index d52ca6af6f7..c2985a3331a 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/11 02:03:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:13 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= glut
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglut}
+BUILDLINK_PACKAGES+= glut
+
.if !empty(GLUT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= glut
BUILDLINK_DEPENDS.glut+= glut>=${_MESA_REQD}
BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut
MESA_REQD+= 6.0
-. include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+
.endif # GLUT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gnome2-pixmaps/buildlink3.mk b/graphics/gnome2-pixmaps/buildlink3.mk
index c7e2f8c6444..0083dc2acb0 100644
--- a/graphics/gnome2-pixmaps/buildlink3.mk
+++ b/graphics/gnome2-pixmaps/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:40:49 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome2-pixmaps.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:13 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME2_PIXMAPS_BUILDLINK3_MK:= ${GNOME2_PIXMAPS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome2-pixmaps
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome2-pixmaps}
+BUILDLINK_PACKAGES+= gnome2-pixmaps
+
.if !empty(GNOME2_PIXMAPS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome2-pixmaps
BUILDLINK_DEPENDS.gnome2-pixmaps+= gnome2-pixmaps>=2.4.1.1
BUILDLINK_PKGSRCDIR.gnome2-pixmaps?= ../../graphics/gnome2-pixmaps
-
-.endif # GNOME2_PIXMAPS_BUILDLINK3_MK
+.endif # GNOME2_PIXMAPS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index df80cc2403b..497e05d072a 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,26 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 20:58:04 garbled Exp $
-#
-# This Makefile fragment is included by packages that use gtkglext.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:34 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKGLEXT_BUILDLINK3_MK:= ${GTKGLEXT_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtkglext
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglext}
+BUILDLINK_PACKAGES+= gtkglext
+
.if !empty(GTKGLEXT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtkglext
-BUILDLINK_DEPENDS.gtkglext?= gtkglext>=0.7.1nb4
-BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext
+BUILDLINK_DEPENDS.gtkglext?= gtkglext>=0.7.1nb4
+BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GTKGLEXT_BUILDLINK3_MK
+.endif # GTKGLEXT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk
index 3e5f50cb131..588b42cae0c 100644
--- a/graphics/hermes/buildlink3.mk
+++ b/graphics/hermes/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:55:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use Hermes.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:34 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HERMES_BUILDLINK3_MK:= ${HERMES_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ HERMES_BUILDLINK3_MK:= ${HERMES_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= Hermes
.endif
-.if !empty(HERMES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= Hermes
-BUILDLINK_DEPENDS.Hermes+= Hermes>=1.3.2
-BUILDLINK_PKGSRCDIR.Hermes?= ../../graphics/hermes
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NHermes}
+BUILDLINK_PACKAGES+= Hermes
-.endif # HERMES_BUILDLINK3_MK
+.if !empty(HERMES_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.Hermes+= Hermes>=1.3.2
+BUILDLINK_PKGSRCDIR.Hermes?= ../../graphics/hermes
+.endif # HERMES_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index f4aef70ad00..81cce4d3140 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMLIB_BUILDLINK3_MK:= ${IMLIB_BUILDLINK3_MK}+
@@ -7,18 +7,21 @@ IMLIB_BUILDLINK3_MK:= ${IMLIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= imlib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib}
+BUILDLINK_PACKAGES+= imlib
+
.if !empty(IMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= imlib
BUILDLINK_DEPENDS.imlib+= imlib>=1.9.14nb5
BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../graphics/jpeg/buildlink3.mk"
-. include "../../graphics/libungif/buildlink3.mk"
-. include "../../graphics/netpbm/buildlink3.mk"
-. include "../../graphics/png/buildlink3.mk"
-. include "../../graphics/tiff/buildlink3.mk"
-. include "../../x11/gtk/buildlink3.mk"
-.endif # IMLIB_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/netpbm/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif # IMLIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 7e7b2d08a15..fa4e230e678 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 22:57:16 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use imlib2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:34 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMLIB2_BUILDLINK3_MK:= ${IMLIB2_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ IMLIB2_BUILDLINK3_MK:= ${IMLIB2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= imlib2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib2}
+BUILDLINK_PACKAGES+= imlib2
+
.if !empty(IMLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= imlib2
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.1.0nb2
-BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
+BUILDLINK_DEPENDS.imlib2+= imlib2>=1.1.0nb2
+BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.endif # IMLIB2_BUILDLINK3_MK
+.endif # IMLIB2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index e66823bb737..a1f94e0ae98 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 09:10:15 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use jasper.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JASPER_BUILDLINK3_MK:= ${JASPER_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ JASPER_BUILDLINK3_MK:= ${JASPER_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= jasper
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njasper}
+BUILDLINK_PACKAGES+= jasper
+
.if !empty(JASPER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= jasper
-BUILDLINK_DEPENDS.jasper+= jasper>=1.600.0
-BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper
+BUILDLINK_DEPENDS.jasper+= jasper>=1.600.0
+BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper
.include "../../graphics/jpeg/buildlink3.mk"
-.endif # JASPER_BUILDLINK3_MK
+.endif # JASPER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index 4f114a2f1c3..01c1713c396 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JPEG_BUILDLINK3_MK:= ${JPEG_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ JPEG_BUILDLINK3_MK:= ${JPEG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= jpeg
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njpeg}
+BUILDLINK_PACKAGES+= jpeg
+
.if !empty(JPEG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= jpeg
BUILDLINK_DEPENDS.jpeg+= jpeg>=6b
BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg
.endif # JPEG_BUILDLINK3_MK
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 4a64dc69688..69e39f2f3bf 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/11 19:11:32 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LCMS_BUILDLINK3_MK:= ${LCMS_BUILDLINK3_MK}+
@@ -7,15 +7,17 @@ LCMS_BUILDLINK3_MK:= ${LCMS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= lcms
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlcms}
+BUILDLINK_PACKAGES+= lcms
+
.if !empty(LCMS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= lcms
BUILDLINK_DEPENDS.lcms+= lcms>=1.06
BUILDLINK_PKGSRCDIR.lcms?= ../../graphics/lcms
-.endif # LCMS_BUILDLINK3_MK
BUILDLINK_TARGETS+= buildlink-include-lcms
-buildlink-include-lcms: .PHONY
+.PHONY: buildlink-include-lcms
+buildlink-include-lcms:
.for _h_ in lcms.h icc34.h
${_PKG_SILENT}${_PKG_DEBUG} \
if [ ! -f ${BUILDLINK_DIR}/include/lcms/${_h_} ]; then \
@@ -25,4 +27,6 @@ buildlink-include-lcms: .PHONY
fi
.endfor
+.endif # LCMS_BUILDLINK3_MK
+
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libart2/buildlink3.mk b/graphics/libart2/buildlink3.mk
index 8883f88cd5d..c881792f250 100644
--- a/graphics/libart2/buildlink3.mk
+++ b/graphics/libart2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:25:25 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libart2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBART2_BUILDLINK3_MK:= ${LIBART2_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LIBART2_BUILDLINK3_MK:= ${LIBART2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libart2
.endif
-.if !empty(LIBART2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libart2
-BUILDLINK_DEPENDS.libart2+= libart2>=2.3.10nb1
-BUILDLINK_PKGSRCDIR.libart2?= ../../graphics/libart2
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibart2}
+BUILDLINK_PACKAGES+= libart2
-.endif # LIBART2_BUILDLINK3_MK
+.if !empty(LIBART2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libart2+= libart2>=2.3.10nb1
+BUILDLINK_PKGSRCDIR.libart2?= ../../graphics/libart2
+.endif # LIBART2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
index 3e00fb2b0bc..9ad454c8cba 100644
--- a/graphics/libexif/buildlink3.mk
+++ b/graphics/libexif/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:58:15 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libexif.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEXIF_BUILDLINK3_MK:= ${LIBEXIF_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ LIBEXIF_BUILDLINK3_MK:= ${LIBEXIF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libexif
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibexif}
+BUILDLINK_PACKAGES+= libexif
+
.if !empty(LIBEXIF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libexif
-BUILDLINK_DEPENDS.libexif+= libexif>=0.5.12
-BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif
+BUILDLINK_DEPENDS.libexif+= libexif>=0.5.12
+BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif
.include "../../devel/gettext-lib/buildlink3.mk"
-.endif # LIBEXIF_BUILDLINK3_MK
+.endif # LIBEXIF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgdgeda/buildlink3.mk b/graphics/libgdgeda/buildlink3.mk
index 5c2e69cb993..e154042f751 100644
--- a/graphics/libgdgeda/buildlink3.mk
+++ b/graphics/libgdgeda/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 04:43:48 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use libgdgeda.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDGEDA_BUILDLINK3_MK:= ${LIBGDGEDA_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgdgeda
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdgeda}
+BUILDLINK_PACKAGES+= libgdgeda
+
.if !empty(LIBGDGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgdgeda
-BUILDLINK_DEPENDS.libgdgeda+= libgdgeda>=2.0.15
-BUILDLINK_PKGSRCDIR.libgdgeda?= ../../graphics/libgdgeda
+BUILDLINK_DEPENDS.libgdgeda+= libgdgeda>=2.0.15
+BUILDLINK_PKGSRCDIR.libgdgeda?= ../../graphics/libgdgeda
.include "../../graphics/png/buildlink3.mk"
-.endif # LIBGDGEDA_BUILDLINK3_MK
+.endif # LIBGDGEDA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 932ba23a190..4c25847fd5a 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libgdiplus
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdiplus}
+BUILDLINK_PACKAGES+= libgdiplus
+
.if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= 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"
-.endif # LIBGDIPLUS_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 --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index a2d73bf750b..e9e2a6b9d15 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 01:25:25 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomecanvas.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMECANVAS_BUILDLINK3_MK:= ${LIBGNOMECANVAS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgnomecanvas
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecanvas}
+BUILDLINK_PACKAGES+= libgnomecanvas
+
.if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgnomecanvas
BUILDLINK_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.4.0nb1
BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas
@@ -22,6 +19,6 @@ BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas
.include "../../graphics/libart2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBGNOMECANVAS_BUILDLINK3_MK
+.endif # LIBGNOMECANVAS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libpixman/buildlink3.mk b/graphics/libpixman/buildlink3.mk
index 2aae0310ab6..1efa250facb 100644
--- a/graphics/libpixman/buildlink3.mk
+++ b/graphics/libpixman/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPIXMAN_BUILDLINK3_MK:= ${LIBPIXMAN_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LIBPIXMAN_BUILDLINK3_MK:= ${LIBPIXMAN_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libpixman
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpixman}
+BUILDLINK_PACKAGES+= libpixman
+
.if !empty(LIBPIXMAN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libpixman
BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.0
BUILDLINK_PKGSRCDIR.libpixman?= ../../graphics/libpixman
-.endif # LIBPIXMAN_BUILDLINK3_MK
+.endif # LIBPIXMAN_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 40534bcd5e6..126ec454ba7 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,32 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:22:08 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use librsvg2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSVG2_BUILDLINK3_MK:= ${LIBRSVG2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= librsvg2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsvg2}
+BUILDLINK_PACKAGES+= librsvg2
+
.if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= librsvg2
-BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.5.0nb4
-BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2
+BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.5.0nb4
+BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
.include "../../textproc/libcroco/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBRSVG2_BUILDLINK3_MK
+.endif # LIBRSVG2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index 7447352a96e..ccdb27d4168 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUNGIF_BUILDLINK3_MK:= ${LIBUNGIF_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ LIBUNGIF_BUILDLINK3_MK:= ${LIBUNGIF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libungif
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibungif}
+BUILDLINK_PACKAGES+= libungif
+
.if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libungif
BUILDLINK_DEPENDS.libungif+= libungif>=4.1.0
BUILDLINK_PKGSRCDIR.libungif?= ../../graphics/libungif
.endif # LIBUNGIF_BUILDLINK3_MK
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index 03ed1148dde..f67958ac362 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:07:25 wiz Exp $
-#
-# This Makefile fragment is included by packages that use libwmf.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWMF_BUILDLINK3_MK:= ${LIBWMF_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ LIBWMF_BUILDLINK3_MK:= ${LIBWMF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libwmf
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwmf}
+BUILDLINK_PACKAGES+= libwmf
+
.if !empty(LIBWMF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libwmf
-BUILDLINK_DEPENDS.libwmf+= libwmf>=0.2.8nb2
-BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
+BUILDLINK_DEPENDS.libwmf+= libwmf>=0.2.8nb2
+BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
.include "../../graphics/xpm/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBWMF_BUILDLINK3_MK
+.endif # LIBWMF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index 1de48ec02ed..c1e1307803e 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MNG_BUILDLINK3_MK:= ${MNG_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ MNG_BUILDLINK3_MK:= ${MNG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= mng
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmng}
+BUILDLINK_PACKAGES+= mng
+
.if !empty(MNG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mng
BUILDLINK_DEPENDS.mng+= mng>=1.0.0
BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng
-. include "../../devel/zlib/buildlink3.mk"
-. include "../../graphics/jpeg/buildlink3.mk"
-. include "../../graphics/lcms/buildlink3.mk"
-.endif # MNG_BUILDLINK3_MK
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
+
+.endif # MNG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 17e5bbed837..ef3ad4b8f0f 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETPBM_BUILDLINK3_MK:= ${NETPBM_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ NETPBM_BUILDLINK3_MK:= ${NETPBM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= netpbm
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetpbm}
+BUILDLINK_PACKAGES+= netpbm
+
.if !empty(NETPBM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= netpbm
BUILDLINK_DEPENDS.netpbm+= netpbm>=10.11.6
BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm
-. include "../../graphics/png/buildlink3.mk"
-. include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
.endif # NETPBM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/openquicktime/buildlink3.mk b/graphics/openquicktime/buildlink3.mk
index f937569ba96..d251e116dff 100644
--- a/graphics/openquicktime/buildlink3.mk
+++ b/graphics/openquicktime/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:55:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use openquicktime.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENQUICKTIME_BUILDLINK3_MK:= ${OPENQUICKTIME_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= openquicktime
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenquicktime}
+BUILDLINK_PACKAGES+= openquicktime
+
.if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= openquicktime
-BUILDLINK_DEPENDS.openquicktime+= openquicktime>=1.0nb2
-BUILDLINK_PKGSRCDIR.openquicktime?= ../../graphics/openquicktime
+BUILDLINK_DEPENDS.openquicktime+= openquicktime>=1.0nb2
+BUILDLINK_PKGSRCDIR.openquicktime?= ../../graphics/openquicktime
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.endif # OPENQUICKTIME_BUILDLINK3_MK
+.endif # OPENQUICKTIME_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index bb9f5b628bf..92b53fbed8b 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,22 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 14:46:50 minskim Exp $
-#
-# This Makefile fragment is included by packages that use plotutils.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PLOTUTILS_BUILDLINK3_MK:= ${PLOTUTILS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= plotutils
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplotutils}
+BUILDLINK_PACKAGES+= plotutils
+
.if !empty(PLOTUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= plotutils
-BUILDLINK_DEPENDS.plotutils+= plotutils>=2.4.1nb2
-BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils
+BUILDLINK_DEPENDS.plotutils+= plotutils>=2.4.1nb2
+BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils
.include "../../graphics/png/buildlink3.mk"
-.endif # PLOTUTILS_BUILDLINK3_MK
+.endif # PLOTUTILS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 9589b3d6aaf..07ba0db974d 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= png
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npng}
+BUILDLINK_PACKAGES+= png
+
.if !empty(PNG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= png
BUILDLINK_DEPENDS.png+= png>=1.2.4
BUILDLINK_PKGSRCDIR.png?= ../../graphics/png
-. include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
.endif # PNG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/swfdec/buildlink3.mk b/graphics/swfdec/buildlink3.mk
index b2b555dbe69..2f3c2b2d7df 100644
--- a/graphics/swfdec/buildlink3.mk
+++ b/graphics/swfdec/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:55:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use swfdec.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWFDEC_BUILDLINK3_MK:= ${SWFDEC_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ SWFDEC_BUILDLINK3_MK:= ${SWFDEC_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= swfdec
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswfdec}
+BUILDLINK_PACKAGES+= swfdec
+
.if !empty(SWFDEC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= swfdec
-BUILDLINK_DEPENDS.swfdec+= swfdec>=0.2.1nb7
-BUILDLINK_PKGSRCDIR.swfdec?= ../../graphics/swfdec
+BUILDLINK_DEPENDS.swfdec+= swfdec>=0.2.1nb7
+BUILDLINK_PKGSRCDIR.swfdec?= ../../graphics/swfdec
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # SWFDEC_BUILDLINK3_MK
+.endif # SWFDEC_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index 450c07db9d7..9e121d4e21e 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= tiff
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntiff}
+BUILDLINK_PACKAGES+= tiff
+
.if !empty(TIFF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= tiff
BUILDLINK_DEPENDS.tiff+= tiff>=3.6.1
BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff
-. include "../../devel/zlib/buildlink3.mk"
-. include "../../graphics/jpeg/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+
.endif # TIFF_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index 795bb8de46c..24a032b0b80 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC_BUILDLINK3_MK:= ${GCC_BUILDLINK3_MK}+
@@ -9,19 +9,22 @@ GCC_BUILDLINK3_MK:= ${GCC_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gcc
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc}
+BUILDLINK_PACKAGES+= gcc
+
.if !empty(GCC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gcc
BUILDLINK_DEPENDS.gcc+= gcc>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc
BUILDLINK_LIBDIRS.gcc?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
# Packages that link against shared libraries need a full dependency.
-. if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc+= full
-. else
+.else
BUILDLINK_DEPMETHOD.gcc?= build
-. endif
+.endif
+
.endif # GCC_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index cf84ea105eb..cdfbf09d26d 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+
@@ -9,24 +9,27 @@ GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gcc3cxx
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3cxx}
+BUILDLINK_PACKAGES+= gcc3cxx
+
.if !empty(GCC3CXX_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX)
. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PACKAGES+= gcc3cxx
BUILDLINK_DEPENDS.gcc3cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3cxx?= ../../lang/gcc3-c++
BUILDLINK_LIBDIRS.gcc3cxx?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3cxx}\///}
# Packages that link against shared libraries need a full dependency.
-. if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc3cxx+= full
-. else
+.else
BUILDLINK_DEPMETHOD.gcc3cxx?= build
-. endif
+.endif
+
.endif # GCC3CXX_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 49b600bfd27..ac946757f5b 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/05 20:58:41 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3C_BUILDLINK3_MK:= ${GCC3C_BUILDLINK3_MK}+
@@ -9,6 +9,9 @@ GCC3C_BUILDLINK3_MK:= ${GCC3C_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gcc3c
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3c}
+BUILDLINK_PACKAGES+= gcc3c
+
.if !empty(GCC3C_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX)
#
@@ -16,21 +19,21 @@ BUILDLINK_DEPENDS+= gcc3c
# as GCC3_DEFAULT_SUBPREFIX.
#
. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PACKAGES+= gcc3c
BUILDLINK_DEPENDS.gcc3c+= gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3c?= ../../lang/gcc3-c
BUILDLINK_LIBDIRS.gcc3c?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3c}\///}
# Packages that link against shared libraries need a full dependency.
-. if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc3c+= full
-. else
+.else
BUILDLINK_DEPMETHOD.gcc3c?= build
-. endif
+.endif
+
.endif # GCC3C_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index d8f0e28b8f7..dce33460154 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+
@@ -9,24 +9,27 @@ GCC3F77_BUILDLINK3_MK:= ${GCC3F77_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gcc3f77
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3f77}
+BUILDLINK_PACKAGES+= gcc3f77
+
.if !empty(GCC3F77_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX)
. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PACKAGES+= gcc3f77
BUILDLINK_DEPENDS.gcc3f77+= gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3f77?= ../../lang/gcc3-f77
BUILDLINK_LIBDIRS.gcc3f77?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3f77}\///}
# Packages that link against shared libraries need a full dependency.
-. if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc3f77+= full
-. else
+.else
BUILDLINK_DEPMETHOD.gcc3f77?= build
-. endif
+.endif
+
.endif # GCC3F77_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index d09fdcf927b..43fa2995708 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+
@@ -9,24 +9,27 @@ GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gcc3java
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3java}
+BUILDLINK_PACKAGES+= gcc3java
+
.if !empty(GCC3JAVA_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX)
. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PACKAGES+= gcc3java
BUILDLINK_DEPENDS.gcc3java+= gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3java?= ../../lang/gcc3-java
BUILDLINK_LIBDIRS.gcc3java?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3java}\///}
# Packages that link against shared libraries need a full dependency.
-. if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc3java+= full
-. else
+.else
BUILDLINK_DEPMETHOD.gcc3java?= build
-. endif
+.endif
+
.endif # GCC3JAVA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index 5b0c6c7e9e3..ffa88c74cde 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+
@@ -9,25 +9,27 @@ GCC3OBJC_BUILDLINK3_MK:= ${GCC3OBJC_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gcc3objc
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3objc}
+BUILDLINK_PACKAGES+= gcc3objc
+
.if !empty(GCC3OBJC_BUILDLINK3_MK:M+)
. if defined(GCC3_INSTALLTO_SUBPREFIX)
. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
-GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
+GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
. endif
. endif
-BUILDLINK_PACKAGES+= gcc3objc
-BUILDLINK_DEPENDS+= gcc3objc
BUILDLINK_DEPENDS.gcc3objc+= gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3objc?= ../../lang/gcc3-objc
BUILDLINK_LIBDIRS.gcc3objc?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3objc}\///}
# Packages that link against shared libraries need a full dependency.
-. if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc3objc+= full
-. else
+.else
BUILDLINK_DEPMETHOD.gcc3objc?= build
-. endif
+.endif
+
.endif # GCC3OBJC_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk
index 8003677a4a7..0774a312cee 100644
--- a/lang/guile/buildlink3.mk
+++ b/lang/guile/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:16:47 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use guile.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILE_BUILDLINK3_MK:= ${GUILE_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ GUILE_BUILDLINK3_MK:= ${GUILE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= guile
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile}
+BUILDLINK_PACKAGES+= guile
+
.if !empty(GUILE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= guile
-BUILDLINK_DEPENDS.guile+= guile>=1.6.3nb1
-BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile
+BUILDLINK_DEPENDS.guile+= guile>=1.6.3nb1
+BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile
.include "../../devel/libtool/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
-.endif # GUILE_BUILDLINK3_MK
+.endif # GUILE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index c06ec5a6f70..d941a7de213 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 02:18:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPERL_BUILDLINK3_MK:= ${LIBPERL_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ LIBPERL_BUILDLINK3_MK:= ${LIBPERL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libperl
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibperl}
+BUILDLINK_PACKAGES+= libperl
+
.if !empty(LIBPERL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libperl
BUILDLINK_DEPENDS.libperl+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}
BUILDLINK_PKGSRCDIR.libperl?= ../../lang/libperl
LIBPERL5_REQD?= ${_PERL5_REQD}
-. include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+
.endif # LIBPERL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index 4ba8a012088..36263ed67e4 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/15 15:02:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBREP_BUILDLINK3_MK:= ${LIBREP_BUILDLINK3_MK}+
@@ -7,15 +7,18 @@ LIBREP_BUILDLINK3_MK:= ${LIBREP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= librep
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrep}
+BUILDLINK_PACKAGES+= librep
+
.if !empty(LIBREP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= librep
BUILDLINK_DEPENDS.librep+= librep>=0.16.1nb1
BUILDLINK_PKGSRCDIR.librep?= ../../lang/librep
MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL}
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../devel/gmp/buildlink3.mk"
-.endif # LIBREP_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+
+.endif # LIBREP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index 69cbe64f24f..6bdfac44205 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/24 00:05:26 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LUA_BUILDLINK3_MK:= ${LUA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= lua
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlua}
+BUILDLINK_PACKAGES+= lua
+
.if !empty(LUA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= lua
-BUILDLINK_DEPENDS.lua+= lua>=5.0
-BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua
-.endif # LUA_BUILDLINK3_MK
+BUILDLINK_DEPENDS.lua+= lua>=5.0
+BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua
+.endif # LUA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 83aca3c06ef..d799856b414 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/14 20:39:38 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+
@@ -8,14 +7,16 @@ MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= mono
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmono}
+BUILDLINK_PACKAGES+= mono
+
.if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mono
-BUILDLINK_DEPENDS.mono+= mono>=0.30
-BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
+BUILDLINK_DEPENDS.mono+= mono>=0.30
+BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
-.endif # MONO_BUILDLINK3_MK
+.endif # MONO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index af71a8ded04..cff602c181c 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ocaml
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml}
+BUILDLINK_PACKAGES+= ocaml
+
.if !empty(OCAML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ocaml
BUILDLINK_DEPENDS.ocaml+= ocaml>=3.06
BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml
BUILDLINK_DEPMETHOD.ocaml?= build
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index a2849b4d4c7..8db263b5db4 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,29 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/02/10 02:18:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
-.if !empty(PERL5_BUILDLINK3_MK:M+)
-. include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= perl
+.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nperl}
+BUILDLINK_PACKAGES+= perl
+
+.if !empty(PERL5_BUILDLINK3_MK:M+)
USE_PERL5?= run
PERL5_REQD+= 5.0
BUILDLINK_DEPENDS.perl+= perl>=${_PERL5_REQD}
BUILDLINK_PKGSRCDIR.perl?= ${PERL5_PKGSRCDIR}
-. if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
+.if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
BUILDLINK_DEPMETHOD.perl?= build
-. endif
-.endif # PERL5_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= perl
.endif
-.if !empty(PERL5_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= perl
-
_PERL5_SITEVARS= \
INSTALLSITEBIN INSTALLSITELIB INSTALLSITEARCH \
INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR \
@@ -37,8 +36,8 @@ _PERL5_SITEVAR.INSTALLSITEMAN3DIR= installsiteman3dir
_PERL5_SITEVAR.SITELIBEXP= sitelibexp
_PERL5_SITEVAR.SITEARCHEXP= sitearchexp
-. if exists(${PERL5})
-. if !defined(_PERL5_SITEPREFIX)
+.if exists(${PERL5})
+. if !defined(_PERL5_SITEPREFIX)
_PERL5_PREFIX!= \
eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
_PERL5_SITEPREFIX!= \
@@ -46,13 +45,13 @@ _PERL5_SITEPREFIX!= \
MAKEFLAGS+= _PERL5_PREFIX=${_PERL5_PREFIX:Q}
MAKEFLAGS+= _PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q}
-. for _var_ in ${_PERL5_SITEVARS}
+. for _var_ in ${_PERL5_SITEVARS}
PERL5_SUB_${_var_}!= \
eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`; \
${ECHO} $${${_PERL5_SITEVAR.${_var_}}} | \
${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
MAKEFLAGS+= PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q}
-. endfor
+. endfor
PERL5_SUB_INSTALLARCHLIB!= \
eval `${PERL5} -V:installarchlib 2>/dev/null`; \
${ECHO} $$installarchlib | \
@@ -63,8 +62,8 @@ PERL5_SUB_INSTALLSCRIPT!= \
${ECHO} $$installscript | \
${SED} -e "s,^${_PERL5_PREFIX}/,,"
MAKEFLAGS+= PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
-. endif
-. if ${PKG_INSTALLATION_TYPE} == "overwrite"
+. endif
+. if ${PKG_INSTALLATION_TYPE} == "overwrite"
#
# Perl keeps headers and odd libraries in an odd path not caught by the
# default BUILDLINK_FILES_CMD, so name them to be symlinked into
@@ -73,8 +72,9 @@ MAKEFLAGS+= PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
BUILDLINK_FILES.perl= \
${PERL5_SUB_INSTALLARCHLIB}/CORE/* \
${PERL5_SUB_INSTALLARCHLIB}/auto/DynaLoader/DynaLoader.a
-. endif
. endif
+.endif
+
.endif # PERL5_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk
index 39e8d5bc5ec..3429f06c0a5 100644
--- a/lang/pnet/buildlink3.mk
+++ b/lang/pnet/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:37:04 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use pnet.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNET_BUILDLINK3_MK:= ${PNET_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ PNET_BUILDLINK3_MK:= ${PNET_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pnet
.endif
-.if !empty(PNET_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pnet
-BUILDLINK_DEPENDS.pnet+= pnet>=0.6.2
-BUILDLINK_PKGSRCDIR.pnet?= ../../lang/pnet
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npnet}
+BUILDLINK_PACKAGES+= pnet
-.endif # PNET_BUILDLINK3_MK
+.if !empty(PNET_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pnet+= pnet>=0.6.2
+BUILDLINK_PKGSRCDIR.pnet?= ../../lang/pnet
+.endif # PNET_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk
index 3d90817fd2c..1c82f6ae4c1 100644
--- a/lang/pnetC/buildlink3.mk
+++ b/lang/pnetC/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:37:04 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use pnetC.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNETC_BUILDLINK3_MK:= ${PNETC_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ PNETC_BUILDLINK3_MK:= ${PNETC_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pnetC
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NpnetC}
+BUILDLINK_PACKAGES+= pnetC
+
.if !empty(PNETC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pnetC
-BUILDLINK_DEPENDS.pnetC+= pnetC>=0.6.0
-BUILDLINK_PKGSRCDIR.pnetC?= ../../lang/pnetC
+BUILDLINK_DEPENDS.pnetC+= pnetC>=0.6.0
+BUILDLINK_PKGSRCDIR.pnetC?= ../../lang/pnetC
.include "../../lang/pnet/buildlink3.mk"
-.endif # PNETC_BUILDLINK3_MK
+.endif # PNETC_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index 5e5ffc0b607..e455f8e5728 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:37:04 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use pnetlib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNETLIB_BUILDLINK3_MK:= ${PNETLIB_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ PNETLIB_BUILDLINK3_MK:= ${PNETLIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pnetlib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npnetlib}
+BUILDLINK_PACKAGES+= pnetlib
+
.if !empty(PNETLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pnetlib
-BUILDLINK_DEPENDS.pnetlib+= pnetlib>=0.6.2
-BUILDLINK_PKGSRCDIR.pnetlib?= ../../lang/pnetlib
+BUILDLINK_DEPENDS.pnetlib+= pnetlib>=0.6.2
+BUILDLINK_PKGSRCDIR.pnetlib?= ../../lang/pnetlib
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../lang/pnet/buildlink3.mk"
-.endif # PNETLIB_BUILDLINK3_MK
+.endif # PNETLIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python15/buildlink3.mk b/lang/python15/buildlink3.mk
index 1d79949cbba..c7b49fddf79 100644
--- a/lang/python15/buildlink3.mk
+++ b/lang/python15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON15_BUILDLINK3_MK:= ${PYTHON15_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON15_BUILDLINK3_MK:= ${PYTHON15_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python15
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython15}
+BUILDLINK_PACKAGES+= python15
+
.if !empty(PYTHON15_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python15
BUILDLINK_DEPENDS.python15+= python15>=1.5
BUILDLINK_PKGSRCDIR.python15?= ../../lang/python15
-. if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python15?= ${BUILDLINK_DEPMETHOD.python}
-. endif
+.endif
-BUILDLINK_INCDIRS.python15= include/python1.5
-BUILDLINK_LIBDIRS.python15= lib/python1.5/config
+BUILDLINK_INCDIRS.python15+= include/python1.5
+BUILDLINK_LIBDIRS.python15+= lib/python1.5/config
BUILDLINK_TRANSFORM+= l:python:python1.5
-.endif # PYTHON15_BUILDLINK3_MK
+.endif # PYTHON15_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python20/buildlink3.mk b/lang/python20/buildlink3.mk
index 809ea4a7b0f..ee74b722068 100644
--- a/lang/python20/buildlink3.mk
+++ b/lang/python20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON20_BUILDLINK3_MK:= ${PYTHON20_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON20_BUILDLINK3_MK:= ${PYTHON20_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python20
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython20}
+BUILDLINK_PACKAGES+= python20
+
.if !empty(PYTHON20_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python20
BUILDLINK_DEPENDS.python20+= python20>=2.0
BUILDLINK_PKGSRCDIR.python20?= ../../lang/python20
-. if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python20?= ${BUILDLINK_DEPMETHOD.python}
-. endif
+.endif
BUILDLINK_INCDIRS.python20+= include/python2.0
BUILDLINK_LIBDIRS.python20+= lib/python2.0/config
BUILDLINK_TRANSFORM+= l:python:python2.0
-.endif # PYTHON20_BUILDLINK3_MK
+.endif # PYTHON20_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python21-pth/buildlink3.mk b/lang/python21-pth/buildlink3.mk
index f3802fbab31..0daeadc96e9 100644
--- a/lang/python21-pth/buildlink3.mk
+++ b/lang/python21-pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON21_PTH_BUILDLINK3_MK:= ${PYTHON21_PTH_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON21_PTH_BUILDLINK3_MK:= ${PYTHON21_PTH_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python21-pth
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython21-pth}
+BUILDLINK_PACKAGES+= python21-pth
+
.if !empty(PYTHON21_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python21-pth
BUILDLINK_DEPENDS.python21-pth+= python21-pth>=2.1.3nb2
BUILDLINK_PKGSRCDIR.python21-pth?= ../../lang/python21-pth
-. if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python21pth?= ${BUILDLINK_DEPMETHOD.python}
-. endif
+.endif
BUILDLINK_INCDIRS.python21-pth+= include/python2p1
BUILDLINK_LIBDIRS.python21-pth+= lib/python2p1/config
BUILDLINK_TRANSFORM+= l:python:python2p1
-.endif # PYTHON21_PTH_BUILDLINK3_MK
+.endif # PYTHON21_PTH_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python21/buildlink3.mk b/lang/python21/buildlink3.mk
index b617c2177cb..683bcbcc4d9 100644
--- a/lang/python21/buildlink3.mk
+++ b/lang/python21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON21_BUILDLINK3_MK:= ${PYTHON21_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON21_BUILDLINK3_MK:= ${PYTHON21_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python21
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython21}
+BUILDLINK_PACKAGES+= python21
+
.if !empty(PYTHON21_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python21
BUILDLINK_DEPENDS.python21+= python21>=2.1
BUILDLINK_PKGSRCDIR.python21?= ../../lang/python21
-. if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python21?= ${BUILDLINK_DEPMETHOD.python}
-. endif
+.endif
BUILDLINK_INCDIRS.python21+= include/python2.1
BUILDLINK_LIBDIRS.python21+= lib/python2.1/config
BUILDLINK_TRANSFORM+= l:python:python2.1
-.endif # PYTHON21_BUILDLINK3_MK
+.endif # PYTHON21_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python22-pth/buildlink3.mk b/lang/python22-pth/buildlink3.mk
index a87e3a03185..26fa57ccba5 100644
--- a/lang/python22-pth/buildlink3.mk
+++ b/lang/python22-pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON22_PTH_BUILDLINK3_MK:= ${PYTHON22_PTH_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ PYTHON22_PTH_BUILDLINK3_MK:= ${PYTHON22_PTH_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python22-pth
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython22-pth}
+BUILDLINK_PACKAGES+= python22-pth
+
.if !empty(PYTHON22_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python22-pth
BUILDLINK_DEPENDS.python22-pth+= python22-pth>=2.2.2nb1
BUILDLINK_PKGSRCDIR.python22-pth?= ../../lang/python22-pth
@@ -20,6 +22,6 @@ BUILDLINK_INCDIRS.python22-pth+= include/python2p2
BUILDLINK_LIBDIRS.python22-pth+= lib/python2p2/config
BUILDLINK_TRANSFORM+= l:python:python2p2
-.endif # PYTHON22_PTH_BUILDLINK3_MK
+.endif # PYTHON22_PTH_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python22/buildlink3.mk b/lang/python22/buildlink3.mk
index f8ecda95e89..a8064b8d6ea 100644
--- a/lang/python22/buildlink3.mk
+++ b/lang/python22/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON22_BUILDLINK3_MK:= ${PYTHON22_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON22_BUILDLINK3_MK:= ${PYTHON22_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python22
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython22}
+BUILDLINK_PACKAGES+= python22
+
.if !empty(PYTHON22_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python22
BUILDLINK_DEPENDS.python22+= python22>=2.2
BUILDLINK_PKGSRCDIR.python22?= ../../lang/python22
-. if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python22?= ${BUILDLINK_DEPMETHOD.python}
-. endif
+.endif
BUILDLINK_INCDIRS.python22+= include/python2.2
BUILDLINK_LIBDIRS.python22+= lib/python2.2/config
BUILDLINK_TRANSFORM+= l:python:python2.2
-.endif # PYTHON22_BUILDLINK3_MK
+.endif # PYTHON22_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python23-pth/buildlink3.mk b/lang/python23-pth/buildlink3.mk
index 94bda11e581..2d780e343c5 100644
--- a/lang/python23-pth/buildlink3.mk
+++ b/lang/python23-pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON23_PTH_BUILDLINK3_MK:= ${PYTHON23_PTH_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON23_PTH_BUILDLINK3_MK:= ${PYTHON23_PTH_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python23-pth
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython23-pth}
+BUILDLINK_PACKAGES+= python23-pth
+
.if !empty(PYTHON23_PTH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python23-pth
BUILDLINK_DEPENDS.python23-pth+= python23-pth>=2.3
BUILDLINK_PKGSRCDIR.python23-pth?= ../../lang/python23-pth
-. if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python23pth?= ${BUILDLINK_DEPMETHOD.python}
-. endif
+.endif
BUILDLINK_INCDIRS.python23-pth+= include/python2p3
BUILDLINK_LIBDIRS.python23-pth+= lib/python2p3/config
BUILDLINK_TRANSFORM+= l:python:python2p3
-.endif # PYTHON23_PTH_BUILDLINK3_MK
+.endif # PYTHON23_PTH_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index 9b6be27d6d5..300358e43da 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYTHON23_BUILDLINK3_MK:= ${PYTHON23_BUILDLINK3_MK}+
@@ -7,19 +7,21 @@ PYTHON23_BUILDLINK3_MK:= ${PYTHON23_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= python23
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npython23}
+BUILDLINK_PACKAGES+= python23
+
.if !empty(PYTHON23_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= python23
BUILDLINK_DEPENDS.python23+= python23>=2.3
BUILDLINK_PKGSRCDIR.python23?= ../../lang/python23
-. if defined(BUILDLINK_DEPMETHOD.python)
+.if defined(BUILDLINK_DEPMETHOD.python)
BUILDLINK_DEPMETHOD.python23?= ${BUILDLINK_DEPMETHOD.python}
-. endif
+.endif
BUILDLINK_INCDIRS.python23+= include/python2.3
BUILDLINK_LIBDIRS.python23+= lib/python2.3/config
BUILDLINK_TRANSFORM+= l:python:python2.3
-.endif # PYTHON23_BUILDLINK3_MK
+.endif # PYTHON23_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 71884a9bc43..b54abac7031 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= tcl
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl}
+BUILDLINK_PACKAGES+= tcl
+
.if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= tcl
BUILDLINK_DEPENDS.tcl+= tcl>=8.3.4
BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
@@ -20,6 +22,7 @@ BUILDLINK_FILES.tcl= bin/tclsh*
BUILDLINK_TRANSFORM+= l:tcl:tcl83
TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
+
.endif # TCL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/faces/buildlink3.mk b/mail/faces/buildlink3.mk
index b450f1be640..127ae9144e2 100644
--- a/mail/faces/buildlink3.mk
+++ b/mail/faces/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:22:56 minskim Exp $
-#
-# This Makefile fragment is included by packages that use faces.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FACES_BUILDLINK3_MK:= ${FACES_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ FACES_BUILDLINK3_MK:= ${FACES_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= faces
.endif
-.if !empty(FACES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= faces
-BUILDLINK_DEPENDS.faces+= faces>=1.6.1nb1
-BUILDLINK_PKGSRCDIR.faces?= ../../mail/faces
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfaces}
+BUILDLINK_PACKAGES+= faces
-.endif # FACES_BUILDLINK3_MK
+.if !empty(FACES_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.faces+= faces>=1.6.1nb1
+BUILDLINK_PKGSRCDIR.faces?= ../../mail/faces
+.endif # FACES_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
index e6b85c01d3a..3a34b9a03a7 100644
--- a/mail/libesmtp/buildlink3.mk
+++ b/mail/libesmtp/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:54:41 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libesmtp.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:37 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBESMTP_BUILDLINK3_MK:= ${LIBESMTP_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libesmtp
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibesmtp}
+BUILDLINK_PACKAGES+= libesmtp
+
.if !empty(LIBESMTP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libesmtp
-BUILDLINK_DEPENDS.libesmtp+= libesmtp>=1.0rc1nb1
-BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
+BUILDLINK_DEPENDS.libesmtp+= libesmtp>=1.0rc1nb1
+BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
LIBESMTP= -lesmtp
@@ -24,6 +21,6 @@ MAKE_ENV+= LIBESMTP="${LIBESMTP}"
.include "../../security/openssl/buildlink3.mk"
-.endif # LIBESMTP_BUILDLINK3_MK
+.endif # LIBESMTP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/blas/buildlink3.mk b/math/blas/buildlink3.mk
index ba4ad4b5da2..0e31f76c239 100644
--- a/math/blas/buildlink3.mk
+++ b/math/blas/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 15:26:05 adam Exp $
-#
-# This Makefile fragment is included by packages that use blas.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLAS_BUILDLINK3_MK:= ${BLAS_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ BLAS_BUILDLINK3_MK:= ${BLAS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= blas
.endif
-.if !empty(BLAS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= blas
-BUILDLINK_DEPENDS.blas+= blas>=1.0nb2
-BUILDLINK_PKGSRCDIR.blas?= ../../math/blas
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblas}
+BUILDLINK_PACKAGES+= blas
-.endif # BLAS_BUILDLINK3_MK
+.if !empty(BLAS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.blas+= blas>=1.0nb2
+BUILDLINK_PKGSRCDIR.blas?= ../../math/blas
+.endif # BLAS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/fftw2/buildlink3.mk b/math/fftw2/buildlink3.mk
index 8dc2f9660c2..da10fc369c6 100644
--- a/math/fftw2/buildlink3.mk
+++ b/math/fftw2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 11:11:31 wiz Exp $
-#
-# This Makefile fragment is included by packages that use fftw2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFTW2_BUILDLINK3_MK:= ${FFTW2_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ FFTW2_BUILDLINK3_MK:= ${FFTW2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= fftw2
.endif
-.if !empty(FFTW2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= fftw2
-BUILDLINK_DEPENDS.fftw2+= fftw2>=2.1.3
-BUILDLINK_PKGSRCDIR.fftw2?= ../../math/fftw2
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfftw2}
+BUILDLINK_PACKAGES+= fftw2
-.endif # FFTW2_BUILDLINK3_MK
+.if !empty(FFTW2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.fftw2+= fftw2>=2.1.3
+BUILDLINK_PKGSRCDIR.fftw2?= ../../math/fftw2
+.endif # FFTW2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/lapack/buildlink3.mk b/math/lapack/buildlink3.mk
index dd46365f1bd..0624f52aa33 100644
--- a/math/lapack/buildlink3.mk
+++ b/math/lapack/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 15:26:29 adam Exp $
-#
-# This Makefile fragment is included by packages that use lapack.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LAPACK_BUILDLINK3_MK:= ${LAPACK_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LAPACK_BUILDLINK3_MK:= ${LAPACK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= lapack
.endif
-.if !empty(LAPACK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= lapack
-BUILDLINK_DEPENDS.lapack+= lapack>=20010201nb1
-BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlapack}
+BUILDLINK_PACKAGES+= lapack
-.endif # LAPACK_BUILDLINK3_MK
+.if !empty(LAPACK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.lapack+= lapack>=20010201nb1
+BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack
+.endif # LAPACK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/libffm/buildlink3.mk b/math/libffm/buildlink3.mk
index de53ac2afd8..5ee18a880dc 100644
--- a/math/libffm/buildlink3.mk
+++ b/math/libffm/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:32:14 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libffm.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFFM_BUILDLINK3_MK:= ${LIBFFM_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ LIBFFM_BUILDLINK3_MK:= ${LIBFFM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libffm
.endif
-.if !empty(LIBFFM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libffm
-BUILDLINK_DEPENDS.libffm+= libffm>=0.28
-BUILDLINK_PKGSRCDIR.libffm?= ../../math/libffm
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffm}
+BUILDLINK_PACKAGES+= libffm
-.endif # LIBFFM_BUILDLINK3_MK
+.if !empty(LIBFFM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libffm+= libffm>=0.28
+BUILDLINK_PKGSRCDIR.libffm?= ../../math/libffm
+.endif # LIBFFM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk
index d17c7fbc5b9..8c78cedd116 100644
--- a/math/py-Numeric/buildlink3.mk
+++ b/math/py-Numeric/buildlink3.mk
@@ -1,9 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-Numeric.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_NUMERIC_BUILDLINK3_MK:= ${PY_NUMERIC_BUILDLINK3_MK}+
.include "../../lang/python/pyversion.mk"
@@ -12,11 +9,12 @@ PY_NUMERIC_BUILDLINK3_MK:= ${PY_NUMERIC_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pynumeric
.endif
-.if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pynumeric
-BUILDLINK_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric-*
-BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npynumeric}
+BUILDLINK_PACKAGES+= pynumeric
-.endif # PY_NUMERIC_BUILDLINK3_MK
+.if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric-*
+BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric
+.endif # PY_NUMERIC_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/misc/libcdio/buildlink3.mk b/misc/libcdio/buildlink3.mk
index a6a7d3916f3..99dc3acfbc7 100644
--- a/misc/libcdio/buildlink3.mk
+++ b/misc/libcdio/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:47 jlam Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:37 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDIO_BUILDLINK3_MK:= ${LIBCDIO_BUILDLINK3_MK}+
@@ -8,11 +7,12 @@ LIBCDIO_BUILDLINK3_MK:= ${LIBCDIO_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libcdio
.endif
-.if !empty(LIBCDIO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libcdio
-BUILDLINK_DEPENDS.libcdio+= libcdio>=0.65
-BUILDLINK_PKGSRCDIR.libcdio?= ../../misc/libcdio
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcdio}
+BUILDLINK_PACKAGES+= libcdio
-.endif # LIBCDIO_BUILDLINK3_MK
+.if !empty(LIBCDIO_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libcdio+= libcdio>=0.65
+BUILDLINK_PKGSRCDIR.libcdio?= ../../misc/libcdio
+.endif # LIBCDIO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 4a93802ec75..685c72d3eba 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.101 2004/03/05 19:09:56 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.102 2004/03/05 19:25:37 jlam Exp $
#
# An example package buildlink3.mk file:
#
@@ -81,15 +81,35 @@ _BLNK_X11_LINKS_DIR= ${BUILDLINK_PREFIX.x11-links}/${X11_LINKS_SUBDIR}
_BLNK_X11_LINKS_PACKAGE= # empty
.endif
-# _BLNK_DEPENDS contains all of the unique elements of BUILDLINK_DEPENDS.
-# _BLNK_PACKAGES contains all of the unique elements of BUILDLINK_PACKAGES.
+# For each package we use, check whether we are using the built-in
+# version of the package or if we are using the pkgsrc version. The
+# necessary logic is encapsulated in a package's builtin.mk file, which
+# is required to define USE_BUILTIN.<pkg> to be either "yes" or "no".
#
-_BLNK_DEPENDS= # empty
-.for _pkg_ in ${BUILDLINK_DEPENDS}
-. if empty(_BLNK_DEPENDS:M${_pkg_})
-_BLNK_DEPENDS+= ${_pkg_}
+.for _pkg_ in ${BUILDLINK_PACKAGES}
+USE_BUILTIN.${_pkg_}?= no
+. if !empty(PREFER_NATIVE:M[yY][eE][sS])
+USE_BUILTIN.${_pkg_}= yes
+. endif
+. if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+USE_BUILTIN.${_pkg_}= no
+. endif
+. if !empty(PREFER_NATIVE:M${_pkg_})
+USE_BUILTIN.${_pkg_}= yes
+. endif
+. if !empty(PREFER_PKGSRC:M${_pkg_})
+USE_BUILTIN.${_pkg_}= no
+. endif
+. if exists(${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk)
+. include "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
+. endif
+. if !defined(IS_BUILTIN.${_pkg_})
+USE_BUILTIN.${_pkg_}= no
. endif
.endfor
+
+# _BLNK_PACKAGES contains all of the unique elements of BUILDLINK_PACKAGES.
+#
_BLNK_PACKAGES= # empty
.for _pkg_ in ${BUILDLINK_PACKAGES}
. if empty(_BLNK_PACKAGES:M${_pkg_})
@@ -97,6 +117,17 @@ _BLNK_PACKAGES+= ${_pkg_}
. endif
.endfor
+# _BLNK_DEPENDS contains all of the elements of BUILDLINK_DEPENDS that
+# name packages for which we aren't using the built-in software and hence
+# need to add a dependency.
+#
+_BLNK_DEPENDS= # empty
+.for _pkg_ in ${BUILDLINK_DEPENDS}
+. if empty(_BLNK_DEPENDS:M${_pkg_}) && !empty(USE_BUILTIN.${_pkg_}:M[nN][oO])
+_BLNK_DEPENDS+= ${_pkg_}
+. endif
+.endfor
+
# Add the proper dependency on each package pulled in by buildlink3.mk
# files. BUILDLINK_DEPMETHOD.<pkg> contains a list of either "full" or
# "build", and if any of that list is "full" then we use a full dependency
diff --git a/multimedia/gst-plugins/buildlink3.mk b/multimedia/gst-plugins/buildlink3.mk
index 2c28565aabe..33775b0556b 100644
--- a/multimedia/gst-plugins/buildlink3.mk
+++ b/multimedia/gst-plugins/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/20 11:33:21 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gst-plugins.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS_BUILDLINK3_MK:= ${GST_PLUGINS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gst-plugins
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngst-plugins}
+BUILDLINK_PACKAGES+= gst-plugins
+
.if !empty(GST_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gst-plugins
BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.6.4
BUILDLINK_PKGSRCDIR.gst-plugins?= ../../multimedia/gst-plugins
-
-.endif # GST_PLUGINS_BUILDLINK3_MK
+.endif # GST_PLUGINS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gstreamer/buildlink3.mk b/multimedia/gstreamer/buildlink3.mk
index ef4b1540f04..409c0224e9f 100644
--- a/multimedia/gstreamer/buildlink3.mk
+++ b/multimedia/gstreamer/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:16:09 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gstreamer.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSTREAMER_BUILDLINK3_MK:= ${GSTREAMER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gstreamer
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngstreamer}
+BUILDLINK_PACKAGES+= gstreamer
+
.if !empty(GSTREAMER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gstreamer
-BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.6.4
-BUILDLINK_PKGSRCDIR.gstreamer?= ../../multimedia/gstreamer
+BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.6.4
+BUILDLINK_PKGSRCDIR.gstreamer?= ../../multimedia/gstreamer
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.gstreamer?= ../../multimedia/gstreamer
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.endif # GSTREAMER_BUILDLINK3_MK
+.endif # GSTREAMER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
index d48cbe3b488..b68f0047b4b 100644
--- a/multimedia/libdvdread/buildlink3.mk
+++ b/multimedia/libdvdread/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 08:59:40 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libdvdread.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDVDREAD_BUILDLINK3_MK:= ${LIBDVDREAD_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libdvdread
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdvdread}
+BUILDLINK_PACKAGES+= libdvdread
+
.if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libdvdread
BUILDLINK_DEPENDS.libdvdread+= libdvdread>=0.9.4
BUILDLINK_PKGSRCDIR.libdvdread?= ../../multimedia/libdvdread
-
-.endif # LIBDVDREAD_BUILDLINK3_MK
+.endif # LIBDVDREAD_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index d9e7e0234af..905dc54d744 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,27 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 00:13:28 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mjpegtools.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MJPEGTOOLS_BUILDLINK3_MK:= ${MJPEGTOOLS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= mjpegtools
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmjpegtools}
+BUILDLINK_PACKAGES+= mjpegtools
+
.if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mjpegtools
BUILDLINK_DEPENDS.mjpegtools+= mjpegtools>=1.6.1.90nb3
-BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools
+BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools
.include "../../audio/lame/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.endif # MJPEGTOOLS_BUILDLINK3_MK
+.endif # MJPEGTOOLS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index 5348ea56482..e9b413a6197 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,34 +1,31 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 18:02:08 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use xine-lib.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XINE_LIB_BUILDLINK3_MK:= ${XINE_LIB_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= xine-lib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxine-lib}
+BUILDLINK_PACKAGES+= xine-lib
+
.if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xine-lib
-BUILDLINK_DEPENDS.xine-lib+= xine-lib>=1rc0anb2
-BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib
+BUILDLINK_DEPENDS.xine-lib+= xine-lib>=1rc0anb2
+BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/Mesa/buildlink3.mk"
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../multimedia/xvidcore/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.endif # XINE_LIB_BUILDLINK3_MK
+.endif # XINE_LIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk
index 4db98a95b3b..2720ec9bab5 100644
--- a/multimedia/xvidcore/buildlink3.mk
+++ b/multimedia/xvidcore/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/20 17:23:44 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use xvidcore.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XVIDCORE_BUILDLINK3_MK:= ${XVIDCORE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= xvidcore
.endif
-.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xvidcore
-BUILDLINK_DEPENDS.xvidcore+= xvidcore>=0.9.1
-BUILDLINK_PKGSRCDIR.xvidcore?= ../../multimedia/xvidcore
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxvidcore}
+BUILDLINK_PACKAGES+= xvidcore
-.endif # XVIDCORE_BUILDLINK3_MK
+.if !empty(XVIDCORE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xvidcore+= xvidcore>=0.9.1
+BUILDLINK_PKGSRCDIR.xvidcore?= ../../multimedia/xvidcore
+.endif # XVIDCORE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk
index 4c5f87ff7a1..e9e9ade1d27 100644
--- a/net/GeoIP/buildlink3.mk
+++ b/net/GeoIP/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 03:34:07 minskim Exp $
-#
-# This Makefile fragment is included by packages that use GeoIP.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GEOIP_BUILDLINK3_MK:= ${GEOIP_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ GEOIP_BUILDLINK3_MK:= ${GEOIP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= GeoIP
.endif
-.if !empty(GEOIP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= GeoIP
-BUILDLINK_DEPENDS.GeoIP+= GeoIP>=1.3.1
-BUILDLINK_PKGSRCDIR.GeoIP?= ../../net/GeoIP
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeoIP}
+BUILDLINK_PACKAGES+= GeoIP
-.endif # GEOIP_BUILDLINK3_MK
+.if !empty(GEOIP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GeoIP+= GeoIP>=1.3.1
+BUILDLINK_PKGSRCDIR.GeoIP?= ../../net/GeoIP
+.endif # GEOIP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index fe7d0b0ccae..b92e3d33512 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ORBIT_BUILDLINK3_MK:= ${ORBIT_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ ORBIT_BUILDLINK3_MK:= ${ORBIT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ORBit
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NORBit}
+BUILDLINK_PACKAGES+= ORBit
+
.if !empty(ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ORBit
BUILDLINK_DEPENDS.ORBit+= ORBit>=0.5.15nb5
BUILDLINK_PKGSRCDIR.ORBit?= ../../net/ORBit
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../devel/glib/buildlink3.mk"
-. include "../../security/tcp_wrappers/buildlink3.mk"
-.endif # ORBIT_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+
+.endif # ORBIT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
index f8117c0e6e1..fb964e39e3b 100644
--- a/net/ORBit2/buildlink3.mk
+++ b/net/ORBit2/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/11 00:21:09 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ORBit2.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ORBIT2_BUILDLINK3_MK:= ${ORBIT2_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ ORBIT2_BUILDLINK3_MK:= ${ORBIT2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ORBit2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NORBit2}
+BUILDLINK_PACKAGES+= ORBit2
+
.if !empty(ORBIT2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ORBit2
-BUILDLINK_DEPENDS.ORBit2+= ORBit2>=2.8.2
-BUILDLINK_PKGSRCDIR.ORBit2?= ../../net/ORBit2
+BUILDLINK_DEPENDS.ORBit2+= ORBit2>=2.8.2
+BUILDLINK_PKGSRCDIR.ORBit2?= ../../net/ORBit2
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
-.endif # ORBIT2_BUILDLINK3_MK
+.endif # ORBIT2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk
index 4bafcaacc16..86d0e16da8b 100644
--- a/net/gnet/buildlink3.mk
+++ b/net/gnet/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 17:56:42 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gnet.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNET_BUILDLINK3_MK:= ${GNET_BUILDLINK3_MK}+
@@ -10,13 +7,15 @@ GNET_BUILDLINK3_MK:= ${GNET_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gnet
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnet}
+BUILDLINK_PACKAGES+= gnet
+
.if !empty(GNET_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnet
-BUILDLINK_DEPENDS.gnet+= gnet>=2.0.3nb1
-BUILDLINK_PKGSRCDIR.gnet?= ../../net/gnet
+BUILDLINK_DEPENDS.gnet+= gnet>=2.0.3nb1
+BUILDLINK_PKGSRCDIR.gnet?= ../../net/gnet
.include "../../devel/glib2/buildlink3.mk"
-.endif # GNET_BUILDLINK3_MK
+.endif # GNET_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk
index c089d491d6e..503519f7731 100644
--- a/net/gnet1/buildlink3.mk
+++ b/net/gnet1/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 03:29:46 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gnet1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNET1_BUILDLINK3_MK:= ${GNET1_BUILDLINK3_MK}+
@@ -10,13 +7,15 @@ GNET1_BUILDLINK3_MK:= ${GNET1_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gnet1
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnet1}
+BUILDLINK_PACKAGES+= gnet1
+
.if !empty(GNET1_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnet1
-BUILDLINK_DEPENDS.gnet1+= gnet1>=1.1.8nb2
-BUILDLINK_PKGSRCDIR.gnet1?= ../../net/gnet1
+BUILDLINK_DEPENDS.gnet1+= gnet1>=1.1.8nb2
+BUILDLINK_PKGSRCDIR.gnet1?= ../../net/gnet1
.include "../../devel/glib2/buildlink3.mk"
-.endif # GNET1_BUILDLINK3_MK
+.endif # GNET1_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk
index de9cc2300e8..69ce8b1a0f2 100644
--- a/net/libIDL/buildlink3.mk
+++ b/net/libIDL/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/11 00:21:09 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libIDL.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIDL_BUILDLINK3_MK:= ${LIBIDL_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBIDL_BUILDLINK3_MK:= ${LIBIDL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libIDL
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibIDL}
+BUILDLINK_PACKAGES+= libIDL
+
.if !empty(LIBIDL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libIDL
-BUILDLINK_DEPENDS.libIDL+= libIDL>=0.8.2
-BUILDLINK_PKGSRCDIR.libIDL?= ../../net/libIDL
+BUILDLINK_DEPENDS.libIDL+= libIDL>=0.8.2
+BUILDLINK_PKGSRCDIR.libIDL?= ../../net/libIDL
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.endif # LIBIDL_BUILDLINK3_MK
+.endif # LIBIDL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index b81a58d1b3b..c45e3c0b482 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:06:30 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libsoup.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSOUP_BUILDLINK3_MK:= ${LIBSOUP_BUILDLINK3_MK}+
@@ -12,15 +7,17 @@ LIBSOUP_BUILDLINK3_MK:= ${LIBSOUP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libsoup
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsoup}
+BUILDLINK_PACKAGES+= libsoup
+
.if !empty(LIBSOUP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libsoup
-BUILDLINK_DEPENDS.libsoup+= libsoup>=1.99.26
-BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup
+BUILDLINK_DEPENDS.libsoup+= libsoup>=1.99.26
+BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.endif # LIBSOUP_BUILDLINK3_MK
+.endif # LIBSOUP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index ad2b8f21d15..97bb87568ca 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,22 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:51:23 minskim Exp $
-#
-# This Makefile fragment is included by packages that use netatalk.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETATALK_BUILDLINK3_MK:= ${NETATALK_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= netatalk
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGESNnetatalk}
+BUILDLINK_PACKAGES+= netatalk
+
.if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= netatalk
-BUILDLINK_DEPENDS.netatalk+= netatalk>=1.6.2
-BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk
+BUILDLINK_DEPENDS.netatalk+= netatalk>=1.6.2
+BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk
.include "../../devel/rx/buildlink3.mk"
-.endif # NETATALK_BUILDLINK3_MK
+.endif # NETATALK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index 04f67eea011..d0409cb0f40 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSLP_BUILDLINK3_MK:= ${OPENSLP_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ OPENSLP_BUILDLINK3_MK:= ${OPENSLP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= openslp
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenslp}
+BUILDLINK_PACKAGES+= openslp
+
.if !empty(OPENSLP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= openslp
BUILDLINK_DEPENDS.openslp+= openslp>=1.0.1
BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp
.endif # OPENSLP_BUILDLINK3_MK
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index 7348c30c356..3837a8d39b7 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,9 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-ORBit.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:38 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ORBIT_BUILDLINK3_MK:= ${PY_ORBIT_BUILDLINK3_MK}+
.include "../../lang/python/pyversion.mk"
@@ -12,13 +9,15 @@ PY_ORBIT_BUILDLINK3_MK:= ${PY_ORBIT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pyorbit
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyorbit}
+BUILDLINK_PACKAGES+= pyorbit
+
.if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pyorbit
-BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.0nb1
-BUILDLINK_PKGSRCDIR.pyorbit?= ../../net/py-ORBit
+BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.0nb1
+BUILDLINK_PKGSRCDIR.pyorbit?= ../../net/py-ORBit
.include "../../net/ORBit2/buildlink3.mk"
-.endif # PY_ORBIT_BUILDLINK3_MK
+.endif # PY_ORBIT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index 5122784290d..e83b6e5c4d9 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:38 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOCKS4_BUILDLINK3_MK:= ${SOCKS4_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ SOCKS4_BUILDLINK3_MK:= ${SOCKS4_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= socks4
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsocks4}
+BUILDLINK_PACKAGES+= socks4
+
.if !empty(SOCKS4_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= socks4
BUILDLINK_DEPENDS.socks4+= socks4>=2.2
BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4
BUILDLINK_TRANSFORM+= l:socks:socks4
+
.endif # SOCKS4_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index 48e23cb6881..8a9980928c1 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOCKS5_BUILDLINK3_MK:= ${SOCKS5_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ SOCKS5_BUILDLINK3_MK:= ${SOCKS5_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= socks5
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsocks5}
+BUILDLINK_PACKAGES+= socks5
+
.if !empty(SOCKS5_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= socks5
BUILDLINK_DEPENDS.socks5+= socks5>=1.0.2
BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5
.endif # SOCKS5_BUILDLINK3_MK
diff --git a/net/spread/buildlink3.mk b/net/spread/buildlink3.mk
index 8813ff7315c..135749cf18b 100644
--- a/net/spread/buildlink3.mk
+++ b/net/spread/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/25 17:18:13 jlam Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPREAD_BUILDLINK3_MK:= ${SPREAD_BUILDLINK3_MK}+
@@ -8,10 +7,12 @@ SPREAD_BUILDLINK3_MK:= ${SPREAD_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= spread
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspread}
+BUILDLINK_PACKAGES+= spread
+
.if !empty(SPREAD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= spread
BUILDLINK_DEPENDS.spread+= spread>=3.17.1
BUILDLINK_PKGSRCDIR.spread?= ../../net/spread
-.endif # SPREAD_BUILDLINK3_MK
+.endif # SPREAD_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index cadbd58c905..aff86eaddd5 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 16:50:53 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MPICH_BUILDLINK3_MK:= ${MPICH_BUILDLINK3_MK}+
@@ -8,11 +7,12 @@ MPICH_BUILDLINK3_MK:= ${MPICH_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= mpich
.endif
-.if !empty(MPICH_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mpich
-BUILDLINK_DEPENDS.mpich+= mpich>=1.2.5.2
-BUILDLINK_PKGSRCDIR.mpich?= ../../parallel/mpi-ch
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpich}
+BUILDLINK_PACKAGES+= mpich
-.endif # MPICH_BUILDLINK3_MK
+.if !empty(MPICH_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.mpich+= mpich>=1.2.5.2
+BUILDLINK_PKGSRCDIR.mpich?= ../../parallel/mpi-ch
+.endif # MPICH_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/parallel/pvm3/buildlink3.mk b/parallel/pvm3/buildlink3.mk
index e54560af970..0331500c268 100644
--- a/parallel/pvm3/buildlink3.mk
+++ b/parallel/pvm3/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 03:47:50 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use pvm.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pvm
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npvm}
+BUILDLINK_PACKAGES+= pvm
+
.if !empty(PVM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pvm
BUILDLINK_DEPENDS.pvm+= pvm>=3.4.3
-BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3
-
-.endif # PVM_BUILDLINK3_MK
+BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3
+.endif # PVM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/pkgtools/libnbcompat/buildlink3.mk b/pkgtools/libnbcompat/buildlink3.mk
index 9555169807a..1bb96ac041d 100644
--- a/pkgtools/libnbcompat/buildlink3.mk
+++ b/pkgtools/libnbcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNBCOMPAT_BUILDLINK3_MK:= ${LIBNBCOMPAT_BUILDLINK3_MK}+
@@ -7,16 +7,19 @@ LIBNBCOMPAT_BUILDLINK3_MK:= ${LIBNBCOMPAT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libnbcompat
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnbcompat}
+BUILDLINK_PACKAGES+= libnbcompat
+
.if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libnbcompat
BUILDLINK_DEPENDS.libnbcompat+= libnbcompat>=20030916
BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
BUILDLINK_DEPMETHOD.libnbcompat?= build
BUILDLINK_LDADD.libnbcompat= -lnbcompat
-. if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE)
LIBS+= ${BUILDLINK_LDADD.libnbcompat}
-. endif
+.endif
+
.endif # LIBNBCOMPAT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index e743702cefc..68458847098 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CUPS_BUILDLINK3_MK:= ${CUPS_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ CUPS_BUILDLINK3_MK:= ${CUPS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= cups
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncups}
+BUILDLINK_PACKAGES+= cups
+
.if !empty(CUPS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= cups
BUILDLINK_DEPENDS.cups+= cups>=1.1.19nb3
BUILDLINK_PKGSRCDIR.cups?= ../../print/cups
-. include "../../graphics/png/buildlink3.mk"
-. include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
.endif # CUPS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 8c2318a03b9..41fdcc30d13 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,19 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:34:55 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomeprint.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+
+.include "../../mk/bsd.prefs.mk"
+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgnomeprint
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprint}
+BUILDLINK_PACKAGES+= libgnomeprint
+
.if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgnomeprint
BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.4.2nb1
BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
@@ -24,12 +23,10 @@ BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
-.include "../../mk/bsd.prefs.mk"
-
-. if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
-. include "../../print/cups/buildlink3.mk"
-. endif
+.if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
+. include "../../print/cups/buildlink3.mk"
+.endif
-.endif # LIBGNOMEPRINT_BUILDLINK3_MK
+.endif # LIBGNOMEPRINT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 8ea2a5c9c3d..676643f7948 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:34:55 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libgnomeprintui.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINTUI_BUILDLINK3_MK:= ${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgnomeprintui
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprintui}
+BUILDLINK_PACKAGES+= libgnomeprintui
+
.if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgnomeprintui
BUILDLINK_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.4.2nb1
BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
@@ -27,6 +24,6 @@ BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
+.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk
index 5815ac97e02..5ff869df492 100644
--- a/print/pdflib/buildlink3.mk
+++ b/print/pdflib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PDFLIB_BUILDLINK3_MK:= ${PDFLIB_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ PDFLIB_BUILDLINK3_MK:= ${PDFLIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pdflib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npdflib}
+BUILDLINK_PACKAGES+= pdflib
+
.if !empty(PDFLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pdflib
BUILDLINK_DEPENDS.pdflib+= pdflib>=4.0.3nb2
BUILDLINK_PKGSRCDIR.pdflib?= ../../print/pdflib
-. include "../../graphics/png/buildlink3.mk"
-. include "../../graphics/tiff/buildlink3.mk"
-.endif # PDFLIB_BUILDLINK3_MK
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
+.endif # PDFLIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/cyrus-sasl2/buildlink3.mk b/security/cyrus-sasl2/buildlink3.mk
index dc69722feb1..07b961cc5ae 100644
--- a/security/cyrus-sasl2/buildlink3.mk
+++ b/security/cyrus-sasl2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ CYRUS_SASL_BUILDLINK3_MK:= ${CYRUS_SASL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= cyrus-sasl
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncyrus-sasl}
+BUILDLINK_PACKAGES+= cyrus-sasl
+
.if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= cyrus-sasl
BUILDLINK_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.12
BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl2
.endif # CYRUS_SASL_BUILDLINK3_MK
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index a3bc8194abd..fdbb708c6f3 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/01 15:14:45 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUTLS_BUILDLINK3_MK:= ${GNUTLS_BUILDLINK3_MK}+
@@ -7,17 +7,20 @@ GNUTLS_BUILDLINK3_MK:= ${GNUTLS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gnutls
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnutls}
+BUILDLINK_PACKAGES+= gnutls
+
.if !empty(GNUTLS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnutls
BUILDLINK_DEPENDS.gnutls?= gnutls>=1.0.8
BUILDLINK_PKGSRCDIR.gnutls?= ../../security/gnutls
-. include "../../archivers/liblzo/buildlink3.mk"
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../devel/zlib/buildlink3.mk"
-. include "../../security/libgcrypt/buildlink3.mk"
-. include "../../security/libtasn1/buildlink3.mk"
-. include "../../security/opencdk/buildlink3.mk"
-.endif # GNUTLS_BUILDLINK3_MK
+.include "../../archivers/liblzo/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libtasn1/buildlink3.mk"
+.include "../../security/opencdk/buildlink3.mk"
+
+.endif # GNUTLS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index 6baad1f160d..c5b0d2a2d40 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:30:49 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gpgme.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPGME_BUILDLINK3_MK:= ${GPGME_BUILDLINK3_MK}+
@@ -12,13 +7,15 @@ GPGME_BUILDLINK3_MK:= ${GPGME_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gpgme
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpgme}
+BUILDLINK_PACKAGES+= gpgme
+
.if !empty(GPGME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gpgme
-BUILDLINK_DEPENDS.gpgme+= gpgme>=0.4.3
-BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme
+BUILDLINK_DEPENDS.gpgme+= gpgme>=0.4.3
+BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme
.include "../../security/libgpg-error/buildlink3.mk"
-.endif # GPGME_BUILDLINK3_MK
+.endif # GPGME_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gpgme03/buildlink3.mk b/security/gpgme03/buildlink3.mk
index 807fda2bd16..063f5246531 100644
--- a/security/gpgme03/buildlink3.mk
+++ b/security/gpgme03/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:45:25 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gpgme.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPGME_BUILDLINK3_MK:= ${GPGME_BUILDLINK3_MK}+
@@ -10,11 +7,12 @@ GPGME_BUILDLINK3_MK:= ${GPGME_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gpgme
.endif
-.if !empty(GPGME_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gpgme
-BUILDLINK_DEPENDS.gpgme+= gpgme-0.3.[0-9]*
-BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme03
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngpgme}
+BUILDLINK_PACKAGES+= gpgme
-.endif # GPGME_BUILDLINK3_MK
+.if !empty(GPGME_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gpgme+= gpgme-0.3.[0-9]*
+BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme03
+.endif # GPGME_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk
index ff2088fdf59..484aa12af0c 100644
--- a/security/gsasl/buildlink3.mk
+++ b/security/gsasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:17:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSASL_BUILDLINK3_MK:= ${GSASL_BUILDLINK3_MK}+
@@ -7,16 +7,19 @@ GSASL_BUILDLINK3_MK:= ${GSASL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gsasl
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngsasl}
+BUILDLINK_PACKAGES+= gsasl
+
.if !empty(GSASL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gsasl
BUILDLINK_DEPENDS.gsasl+= gsasl>=0.0.8
BUILDLINK_PKGSRCDIR.gsasl?= ../../security/gsasl
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../devel/libidn/buildlink3.mk"
-. include "../../devel/libntlm/buildlink3.mk"
-. include "../../security/gss/buildlink3.mk"
-. include "../../security/libgcrypt/buildlink3.mk"
-.endif # GSASL_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libntlm/buildlink3.mk"
+.include "../../security/gss/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+
+.endif # GSASL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gss/buildlink3.mk b/security/gss/buildlink3.mk
index 6945e66205a..a4b09e37e82 100644
--- a/security/gss/buildlink3.mk
+++ b/security/gss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/10 00:17:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GSS_BUILDLINK3_MK:= ${GSS_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ GSS_BUILDLINK3_MK:= ${GSS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gss
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngss}
+BUILDLINK_PACKAGES+= gss
+
.if !empty(GSS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gss
BUILDLINK_DEPENDS.gss+= gss>=0.0.6nb1
BUILDLINK_PKGSRCDIR.gss?= ../../security/gss
-.endif # GSS_BUILDLINK3_MK
+.endif # GSS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk
index f453f23ac8a..f9ba2b25f00 100644
--- a/security/libcrack/buildlink3.mk
+++ b/security/libcrack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCRACK_BUILDLINK3_MK:= ${LIBCRACK_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ LIBCRACK_BUILDLINK3_MK:= ${LIBCRACK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libcrack
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcrack}
+BUILDLINK_PACKAGES+= libcrack
+
.if !empty(LIBCRACK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libcrack
BUILDLINK_DEPENDS.libcrack+= libcrack>=2.7
BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack
.endif # LIBCRACK_BUILDLINK3_MK
diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk
index 06dd27472a9..9bdbd56efcc 100644
--- a/security/libgcrypt/buildlink3.mk
+++ b/security/libgcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/25 18:10:49 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGCRYPT_BUILDLINK3_MK:= ${LIBGCRYPT_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ LIBGCRYPT_BUILDLINK3_MK:= ${LIBGCRYPT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libgcrypt
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgcrypt}
+BUILDLINK_PACKAGES+= libgcrypt
+
.if !empty(LIBGCRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgcrypt
BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.1.92
BUILDLINK_PKGSRCDIR.libgcrypt?= ../../security/libgcrypt
-. include "../../security/libgpg-error/buildlink3.mk"
-.endif # LIBGCRYPT_BUILDLINK3_MK
+.include "../../security/libgpg-error/buildlink3.mk"
+
+.endif # LIBGCRYPT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk
index fd76de8f135..c46f2bf2c6d 100644
--- a/security/libgpg-error/buildlink3.mk
+++ b/security/libgpg-error/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGPG_ERROR_BUILDLINK3_MK:= ${LIBGPG_ERROR_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ LIBGPG_ERROR_BUILDLINK3_MK:= ${LIBGPG_ERROR_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libgpg-error
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgpg-error}
+BUILDLINK_PACKAGES+= libgpg-error
+
.if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgpg-error
BUILDLINK_DEPENDS.libgpg-error+= libgpg-error>=0.6
BUILDLINK_PKGSRCDIR.libgpg-error?= ../../security/libgpg-error
-. include "../../devel/gettext-lib/buildlink3.mk"
-.endif # LIBGPG_ERROR_BUILDLINK3_MK
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+.endif # LIBGPG_ERROR_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libksba/buildlink3.mk b/security/libksba/buildlink3.mk
index 5ded75633f9..a8bbf83d17d 100644
--- a/security/libksba/buildlink3.mk
+++ b/security/libksba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/25 18:11:06 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBKSBA_BUILDLINK3_MK:= ${LIBKSBA_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBKSBA_BUILDLINK3_MK:= ${LIBKSBA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libksba
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibksba}
+BUILDLINK_PACKAGES+= libksba
+
.if !empty(LIBKSBA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libksba
BUILDLINK_DEPENDS.libksba+= libksba>=0.9.4
BUILDLINK_PKGSRCDIR.libksba?= ../../security/libksba
-. include "../../security/libgcrypt/buildlink3.mk"
-. include "../../security/libgpg-error/buildlink3.mk"
-.endif # LIBKSBA_BUILDLINK3_MK
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libgpg-error/buildlink3.mk"
+
+.endif # LIBKSBA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libtasn1/buildlink3.mk b/security/libtasn1/buildlink3.mk
index 9ac27f69819..a68c2b9db37 100644
--- a/security/libtasn1/buildlink3.mk
+++ b/security/libtasn1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/01 15:12:10 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTASN1_BUILDLINK3_MK:= ${LIBTASN1_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ LIBTASN1_BUILDLINK3_MK:= ${LIBTASN1_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libtasn1
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtasn1}
+BUILDLINK_PACKAGES+= libtasn1
+
.if !empty(LIBTASN1_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libtasn1
BUILDLINK_DEPENDS.libtasn1+= libtasn1>=0.2.7
BUILDLINK_PKGSRCDIR.libtasn1?= ../../security/libtasn1
-.endif # LIBTASN1_BUILDLINK3_MK
+.endif # LIBTASN1_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk
index 4a7f74a2afa..286b4b1564a 100644
--- a/security/libtcpa/buildlink3.mk
+++ b/security/libtcpa/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/22 04:01:57 schmonz Exp $
-#
-# This Makefile fragment is included by packages that use libtcpa.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTCPA_BUILDLINK3_MK:= ${LIBTCPA_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBTCPA_BUILDLINK3_MK:= ${LIBTCPA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libtcpa
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtcpa}
+BUILDLINK_PACKAGES+= libtcpa
+
.if !empty(LIBTCPA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libtcpa
-BUILDLINK_DEPENDS.libtcpa+= libtcpa>=1.1b
-BUILDLINK_PKGSRCDIR.libtcpa?= ../../security/libtcpa
-BUILDLINK_DEPMETHOD.libtcpa?= build
+BUILDLINK_DEPENDS.libtcpa+= libtcpa>=1.1b
+BUILDLINK_PKGSRCDIR.libtcpa?= ../../security/libtcpa
+BUILDLINK_DEPMETHOD.libtcpa?= build
.include "../../security/openssl/buildlink3.mk"
-.endif # LIBTCPA_BUILDLINK3_MK
+.endif # LIBTCPA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk
index 4c0db1555e3..2c3f836e1b6 100644
--- a/security/opencdk/buildlink3.mk
+++ b/security/opencdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:20:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENCDK_BUILDLINK3_MK:= ${OPENCDK_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ OPENCDK_BUILDLINK3_MK:= ${OPENCDK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= opencdk
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopencdk}
+BUILDLINK_PACKAGES+= opencdk
+
.if !empty(OPENCDK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= opencdk
BUILDLINK_DEPENDS.opencdk+= opencdk>=0.5.3
BUILDLINK_PKGSRCDIR.opencdk?= ../../security/opencdk
-. include "../../devel/zlib/buildlink3.mk"
-. include "../../security/libgcrypt/buildlink3.mk"
-.endif # OPENCDK_BUILDLINK3_MK
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+
+.endif # OPENCDK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk
index 0e1c04c2699..d6659f3d9c8 100644
--- a/security/rsaref/buildlink3.mk
+++ b/security/rsaref/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RSAREF_BUILDLINK3_MK:= ${RSAREF_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ RSAREF_BUILDLINK3_MK:= ${RSAREF_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= rsaref
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrsaref}
+BUILDLINK_PACKAGES+= rsaref
+
.if !empty(RSAREF_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= rsaref
BUILDLINK_DEPENDS.rsaref+= rsaref-2.0p3
BUILDLINK_PKGSRCDIR.rsaref?= ../../security/rsaref
.endif # RSAREF_BUILDLINK3_MK
diff --git a/sysutils/fam/buildlink3.mk b/sysutils/fam/buildlink3.mk
index b23c477b8f1..89a35df373c 100644
--- a/sysutils/fam/buildlink3.mk
+++ b/sysutils/fam/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:39:29 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use fam.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FAM_BUILDLINK3_MK:= ${FAM_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ FAM_BUILDLINK3_MK:= ${FAM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= fam
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfam}
+BUILDLINK_PACKAGES+= fam
+
.if !empty(FAM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= fam
BUILDLINK_DEPENDS.fam+= fam>=2.6.10
BUILDLINK_PKGSRCDIR.fam?= ../../sysutils/fam
-
-.endif # FAM_BUILDLINK3_MK
+.endif # FAM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index 7d401a55463..f93f7db3398 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/24 22:11:28 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+
@@ -7,14 +7,17 @@ GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gkrellm
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngkrellm}
+BUILDLINK_PACKAGES+= gkrellm
+
.if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gkrellm
-BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.1.22
-BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
-.include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.1.22
+BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
+
.include "../../devel/glib2/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
-.endif # GKRELLM_BUILDLINK3_MK
+.endif # GKRELLM_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index fc5cb1064a3..efe9a4dde7e 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,28 +1,25 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:29:24 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome-vfs.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_VFS_BUILDLINK3_MK:= ${GNOME_VFS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-vfs
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs}
+BUILDLINK_PACKAGES+= gnome-vfs
+
.if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-vfs
-BUILDLINK_DEPENDS.gnome-vfs+= gnome-vfs>=1.0.5nb5
-BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs
+BUILDLINK_DEPENDS.gnome-vfs+= gnome-vfs>=1.0.5nb5
+BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs
-.include "../../converters/libiconv/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/gnome-mime-data/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
-.endif # GNOME_VFS_BUILDLINK3_MK
+.endif # GNOME_VFS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk
index 0a9eaae95a8..6159b546ecf 100644
--- a/sysutils/gnome-vfs2/buildlink3.mk
+++ b/sysutils/gnome-vfs2/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/11 13:05:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use gnome-vfs2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-vfs2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs2}
+BUILDLINK_PACKAGES+= gnome-vfs2
+
.if !empty(GNOME_VFS2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-vfs2
BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.4.2nb2
BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2
@@ -26,10 +23,10 @@ BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../sysutils/fam/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
-.endif # GNOME_VFS2_BUILDLINK3_MK
+.endif # GNOME_VFS2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 3a491988f92..f5c1e816aa8 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/14 00:23:34 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use nautilus.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= nautilus
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus}
+BUILDLINK_PACKAGES+= nautilus
+
.if !empty(NAUTILUS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= nautilus
-BUILDLINK_DEPENDS.nautilus+= nautilus>=2.4.2nb4
-BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus
+BUILDLINK_DEPENDS.nautilus+= nautilus>=2.4.2nb4
+BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus
.include "../../audio/esound/buildlink3.mk"
.include "../../devel/GConf2/schemas.mk"
@@ -36,6 +33,6 @@ BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
-.endif # NAUTILUS_BUILDLINK3_MK
+.endif # NAUTILUS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk
index 608b9786149..89f5e098626 100644
--- a/textproc/aspell/buildlink3.mk
+++ b/textproc/aspell/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/15 14:55:09 wiz Exp $
-#
-# This Makefile fragment is included by packages that use aspell.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= aspell
.endif
-.if !empty(ASPELL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= aspell
-BUILDLINK_DEPENDS.aspell+= aspell>=0.50.3nb2
-BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naspell}
+BUILDLINK_PACKAGES+= aspell
-.endif # ASPELL_BUILDLINK3_MK
+.if !empty(ASPELL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.aspell+= aspell>=0.50.3nb2
+BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell
+.endif # ASPELL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk
index 916738ff8a1..0b50abb2414 100644
--- a/textproc/enchant/buildlink3.mk
+++ b/textproc/enchant/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 23:25:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use enchant.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= enchant
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nenchant}
+BUILDLINK_PACKAGES+= enchant
+
.if !empty(ENCHANT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= enchant
-BUILDLINK_DEPENDS.enchant+= enchant>=1.1.3
-BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant
+BUILDLINK_DEPENDS.enchant+= enchant>=1.1.3
+BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
-.endif # ENCHANT_BUILDLINK3_MK
+.endif # ENCHANT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index 12369f2d02b..0e911007a04 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,30 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/14 22:46:55 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gnome-spell.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPELL_BUILDLINK3_MK:= ${GNOME_SPELL_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-spell
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-spell}
+BUILDLINK_PACKAGES+= gnome-spell
+
.if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-spell
BUILDLINK_DEPENDS.gnome-spell+= gnome-spell>=1.0.5
-BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
+BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
-.include "../../net/ORBit2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GNOME_SPELL_BUILDLINK3_MK
+.endif # GNOME_SPELL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index 35266fd4a19..28f0244ef12 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,23 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/14 18:04:39 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gtkspell.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKSPELL_BUILDLINK3_MK:= ${GTKSPELL_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtkspell
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkspell}
+BUILDLINK_PACKAGES+= gtkspell
+
.if !empty(GTKSPELL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtkspell
-BUILDLINK_DEPENDS.gtkspell+= gtkspell>=2.0.2nb6
-BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
+BUILDLINK_DEPENDS.gtkspell+= gtkspell>=2.0.2nb6
+BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
.include "../../textproc/aspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GTKSPELL_BUILDLINK3_MK
+.endif # GTKSPELL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 2cb7b27f153..26ed0c997af 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/10 20:45:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= icu
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nicu}
+BUILDLINK_PACKAGES+= icu
+
.if !empty(ICU_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= icu
BUILDLINK_DEPENDS.icu+= icu>=2.6
BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu
-.endif # ICU_BUILDLINK3_MK
+.endif # ICU_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
index 62d3c7289e9..ae5b435a2b0 100644
--- a/textproc/intltool/buildlink3.mk
+++ b/textproc/intltool/buildlink3.mk
@@ -1,22 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:48:58 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use intltool.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= intltool
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nintltool}
+BUILDLINK_PACKAGES+= intltool
+
.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= intltool
-BUILDLINK_DEPENDS.intltool+= intltool>=0.30
-BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool
-BUILDLINK_DEPMETHOD.intltool?= build
+BUILDLINK_DEPENDS.intltool+= intltool>=0.30
+BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool
+BUILDLINK_DEPMETHOD.intltool?= build
USE_PERL5?= build
@@ -27,11 +24,12 @@ INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize
_CONFIGURE_PREREQ+= intltoolize
+.PHONY: intltoolize
intltoolize:
${_PKG_SILENT}${_PKG_DEBUG} \
${ECHO} "=> Overriding intltool."
@cd ${WRKSRC} && ${INTLTOOLIZE} --force >/dev/null 2>&1
-.endif # INTLTOOL_BUILDLINK3_MK
+.endif # INTLTOOL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index 7d81a95668d..2981bbc2814 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/buildlink3.mk
@@ -1,27 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:18:33 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libcroco.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libcroco
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcroco}
+BUILDLINK_PACKAGES+= libcroco
+
.if !empty(LIBCROCO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libcroco
-BUILDLINK_DEPENDS.libcroco+= libcroco>=0.4.0
-BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco
+BUILDLINK_DEPENDS.libcroco+= libcroco>=0.4.0
+BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBCROCO_BUILDLINK3_MK
+.endif # LIBCROCO_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk
index e681f70ae18..58de2f30f91 100644
--- a/textproc/libpathan/buildlink3.mk
+++ b/textproc/libpathan/buildlink3.mk
@@ -1,22 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/13 06:58:31 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libpathan.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPATHAN_BUILDLINK3_MK:= ${LIBPATHAN_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libpathan
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpathan}
+BUILDLINK_PACKAGES+= libpathan
+
.if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libpathan
-BUILDLINK_DEPENDS.libpathan+= libpathan>=1.2.2
-BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan
+BUILDLINK_DEPENDS.libpathan+= libpathan>=1.2.2
+BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan
.include "../../textproc/xerces-c/buildlink3.mk"
-.endif # LIBPATHAN_BUILDLINK3_MK
+.endif # LIBPATHAN_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk
index f903cd7b275..e89577abedd 100644
--- a/textproc/libunicode/buildlink3.mk
+++ b/textproc/libunicode/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/20 12:48:07 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libunicode.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUNICODE_BUILDLINK3_MK:= ${LIBUNICODE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libunicode
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibunicode}
+BUILDLINK_PACKAGES+= libunicode
+
.if !empty(LIBUNICODE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libunicode
BUILDLINK_DEPENDS.libunicode+= libunicode>=0.4
BUILDLINK_PKGSRCDIR.libunicode?= ../../textproc/libunicode
-
-.endif # LIBUNICODE_BUILDLINK3_MK
+.endif # LIBUNICODE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk
index 89c5dc0ea65..628e7296a92 100644
--- a/textproc/libxml/buildlink3.mk
+++ b/textproc/libxml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:27:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+
@@ -7,12 +7,15 @@ LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libxml
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml}
+BUILDLINK_PACKAGES+= libxml
+
.if !empty(LIBXML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libxml
BUILDLINK_DEPENDS.libxml+= libxml>=1.8.11
BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml
-. include "../../devel/zlib/buildlink3.mk"
-.endif # LIBXML_BUILDLINK3_MK
+.include "../../devel/zlib/buildlink3.mk"
+
+.endif # LIBXML_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index 4c1251d1701..0eb1270b840 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libxml2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml2}
+BUILDLINK_PACKAGES+= libxml2
+
.if !empty(LIBXML2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libxml2
BUILDLINK_DEPENDS.libxml2+= libxml2>=2.6.2
BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
-. include "../../converters/libiconv/buildlink3.mk"
-. include "../../devel/zlib/buildlink3.mk"
-.endif # LIBXML2_BUILDLINK3_MK
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+.endif # LIBXML2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index 3aba17c6dbe..927f025ecba 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/10 20:45:02 jlam Exp $
-#
-# This Makefile fragment is included by packages that use libxslt.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libxslt
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxslt}
+BUILDLINK_PACKAGES+= libxslt
+
.if !empty(LIBXSLT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libxslt
-BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.0
-BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
+BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.0
+BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBXSLT_BUILDLINK3_MK
+.endif # LIBXSLT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index 282ce9caa01..29456094231 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 21:59:22 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use opensp.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:40 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= opensp
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopensp}
+BUILDLINK_PACKAGES+= opensp
+
.if !empty(OPENSP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= opensp
-BUILDLINK_DEPENDS.opensp+= opensp>=1.5nb1
-BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp
+BUILDLINK_DEPENDS.opensp+= opensp>=1.5nb1
+BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp
PTHREAD_OPTS+= native
@@ -26,6 +23,6 @@ PTHREAD_OPTS+= native
. include "../../devel/unproven-pthreads/buildlink3.mk"
.endif
-.endif # OPENSP_BUILDLINK3_MK
+.endif # OPENSP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 6df8abb7324..820d6b655e5 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/23 12:36:25 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+
@@ -10,13 +9,15 @@ PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pyxml
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyxml}
+BUILDLINK_PACKAGES+= pyxml
+
.if !empty(PYXML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pyxml
-BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1
-BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml
+BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1
+BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml
.include "../../textproc/expat/buildlink3.mk"
-.endif # PYXML_BUILDLINK3_MK
+.endif # PYXML_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/scrollkeeper/buildlink3.mk b/textproc/scrollkeeper/buildlink3.mk
index 310478f8f26..77a65f2c6d0 100644
--- a/textproc/scrollkeeper/buildlink3.mk
+++ b/textproc/scrollkeeper/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/15 21:39:14 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use scrollkeeper.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SCROLLKEEPER_BUILDLINK3_MK:= ${SCROLLKEEPER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= scrollkeeper
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nscrollkeeper}
+BUILDLINK_PACKAGES+= scrollkeeper
+
.if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= scrollkeeper
BUILDLINK_DEPENDS.scrollkeeper+= scrollkeeper>=0.3.12nb2
BUILDLINK_PKGSRCDIR.scrollkeeper?= ../../textproc/scrollkeeper
@@ -45,6 +42,6 @@ scrollkeeper-buildlink-fake:
${CHMOD} +x ${_SK_FAKE_REBUILDDB}; \
fi
-.endif # SCROLLKEEPER_BUILDLINK3_MK
+.endif # SCROLLKEEPER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk
index 9068992f4ee..0a2ac62a402 100644
--- a/textproc/xalan-c/buildlink3.mk
+++ b/textproc/xalan-c/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:20:16 minskim Exp $
-#
-# This Makefile fragment is included by packages that use xalan-c.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= xalan-c
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxalan-c}
+BUILDLINK_PACKAGES+= xalan-c
+
.if !empty(XALAN_C_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xalan-c
-BUILDLINK_DEPENDS.xalan-c+= xalan-c>=1.6
-BUILDLINK_PKGSRCDIR.xalan-c?= ../../textproc/xalan-c
+BUILDLINK_DEPENDS.xalan-c+= xalan-c>=1.6
+BUILDLINK_PKGSRCDIR.xalan-c?= ../../textproc/xalan-c
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
-.endif # XALAN_C_BUILDLINK3_MK
+.endif # XALAN_C_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index 909c266b455..3fe141e76f2 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:06:04 minskim Exp $
-#
-# This Makefile fragment is included by packages that use xerces-c.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XERCES_C_BUILDLINK3_MK:= ${XERCES_C_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= xerces-c
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxerces-c}
+BUILDLINK_PACKAGES+= xerces-c
+
.if !empty(XERCES_C_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xerces-c
-BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0
-BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c
+BUILDLINK_DEPENDS.xerces-c+= xerces-c>=2.3.0
+BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c
.include "../../converters/libiconv/buildlink3.mk"
-.endif # XERCES_C_BUILDLINK3_MK
+.endif # XERCES_C_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 22af994fea4..1f6894d9a2e 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 10:11:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
#
# This Makefile fragment is included by packages that use xmlcatmgr.
#
@@ -12,15 +12,17 @@
# type of tool they are.
#
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XMLCATMGR_BUILDLINK3_MK:= ${XMLCATMGR_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= xmlcatmgr
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlcatmgr}
+BUILDLINK_PACKAGES+= xmlcatmgr
+
.if !empty(XMLCATMGR_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xmlcatmgr
BUILDLINK_DEPENDS.xmlcatmgr+= xmlcatmgr>=0.2
BUILDLINK_RECOMMENDED.xmlcatmgr+= xmlcatmgr>=2.0beta1
BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr
@@ -29,13 +31,14 @@ BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr
XMLCATMGR= ${BUILDLINK_PREFIX.xmlcatmgr}/bin/xmlcatmgr
# System-wide configurable catalogs.
-. if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
+.if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
SGML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/sgml/catalog
XML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/xml/catalog
-. else
+.else
SGML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/sgml/catalog
XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog
-. endif
-.endif # XMLCATMGR_BUILDLINK3_MK
+.endif
+
+.endif # XMLCATMGR_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index aa6af2716ad..1d9949882d6 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/04 19:17:04 minskim Exp $
-#
-# This Makefile fragment is included by packages that use metacity.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
METACITY_BUILDLINK3_MK:= ${METACITY_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= metacity
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmetacity}
+BUILDLINK_PACKAGES+= metacity
+
.if !empty(METACITY_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= metacity
-BUILDLINK_DEPENDS.metacity+= metacity>=2.6.3nb1
-BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
+BUILDLINK_DEPENDS.metacity+= metacity>=2.6.3nb1
+BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
-.endif # METACITY_BUILDLINK3_MK
+.endif # METACITY_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index 615f8964fb3..1e753b5cce8 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/16 23:00:47 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENBOX_BUILDLINK3_MK:= ${OPENBOX_BUILDLINK3_MK}+
@@ -7,16 +7,18 @@ OPENBOX_BUILDLINK3_MK:= ${OPENBOX_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= openbox
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenbox}
+BUILDLINK_PACKAGES+= openbox
+
.if !empty(OPENBOX_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= openbox
-BUILDLINK_DEPENDS.openbox+= openbox>=3.1
-BUILDLINK_PKGSRCDIR.openbox?= ../../wm/openbox
+BUILDLINK_DEPENDS.openbox+= openbox>=3.1
+BUILDLINK_PKGSRCDIR.openbox?= ../../wm/openbox
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # OPENBOX_BUILDLINK3_MK
+.endif # OPENBOX_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index 8042ffeadd2..8a29f2e33a9 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,28 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 19:02:39 minskim Exp $
-#
-# This Makefile fragment is included by packages that use windowmaker.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= windowmaker
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwindowmaker}
+BUILDLINK_PACKAGES+= windowmaker
+
.if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= windowmaker
BUILDLINK_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3
-BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker
+BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/hermes/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
-.endif # WINDOWMAKER_BUILDLINK3_MK
+.endif # WINDOWMAKER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index b22548f6ade..36ed0058231 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:59:54 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use ap-perl.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AP_PERL_BUILDLINK3_MK:= ${AP_PERL_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ AP_PERL_BUILDLINK3_MK:= ${AP_PERL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= ap-perl
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nap-perl}
+BUILDLINK_PACKAGES+= ap-perl
+
.if !empty(AP_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= ap-perl
-BUILDLINK_DEPENDS.ap-perl+= ap-perl>=1.25nb1
-BUILDLINK_PKGSRCDIR.ap-perl?= ../../www/ap-perl
+BUILDLINK_DEPENDS.ap-perl+= ap-perl>=1.25nb1
+BUILDLINK_PKGSRCDIR.ap-perl?= ../../www/ap-perl
BUILDLINK_FILES.ap-perl+= lib/httpd/mod_perl.*
BUILDLINK_FILES.ap-perl+= \
@@ -25,6 +22,6 @@ BUILDLINK_FILES.ap-perl+= \
.include "../../www/apache/buildlink3.mk"
-.endif # AP_PERL_BUILDLINK3_MK
+.endif # AP_PERL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 82c539c440b..22b3368dd22 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/02/11 18:35:43 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
@@ -7,22 +7,26 @@ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= apache
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache}
+BUILDLINK_PACKAGES+= apache
+
.if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= apache
BUILDLINK_DEPENDS.apache+= apache{,6}-1.3.*
BUILDLINK_PKGSRCDIR.apache?= ../../www/apache
-. if defined(APACHE_MODULE)
+
+.if defined(APACHE_MODULE)
BUILDLINK_DEPMETHOD.apache+= full
-. else
+.else
BUILDLINK_DEPMETHOD.apache?= build
-. endif
+.endif
USE_PERL5?= build # for "apxs"
APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs
-. if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+= --with-apxs="${APXS}"
-. endif
+.endif
+
.endif # APACHE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk
index a9876805d81..0bd1eb72dce 100644
--- a/www/cgilib/buildlink3.mk
+++ b/www/cgilib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CGILIB_BUILDLINK3_MK:= ${CGILIB_BUILDLINK3_MK}+
@@ -7,10 +7,12 @@ CGILIB_BUILDLINK3_MK:= ${CGILIB_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= cgilib
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncgilib}
+BUILDLINK_PACKAGES+= cgilib
+
.if !empty(CGILIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= cgilib
BUILDLINK_DEPENDS.cgilib+= cgilib>=0.5nb1
BUILDLINK_PKGSRCDIR.cgilib?= ../../www/cgilib
-.endif # CGILIB_BUILDLINK3_MK
+.endif # CGILIB_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 924cf88f1c5..d2daffb4b68 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 01:24:01 wiz Exp $
-#
-# This Makefile fragment is included by packages that use curl.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CURL_BUILDLINK3_MK:= ${CURL_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ CURL_BUILDLINK3_MK:= ${CURL_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= curl
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncurl}
+BUILDLINK_PACKAGES+= curl
+
.if !empty(CURL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= curl
-BUILDLINK_DEPENDS.curl+= curl>=7.9.1
-BUILDLINK_PKGSRCDIR.curl?= ../../www/curl
+BUILDLINK_DEPENDS.curl+= curl>=7.9.1
+BUILDLINK_PKGSRCDIR.curl?= ../../www/curl
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.endif # CURL_BUILDLINK3_MK
+.endif # CURL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/gtkhtml3/buildlink3.mk b/www/gtkhtml3/buildlink3.mk
index 601021af722..496ba52ddde 100644
--- a/www/gtkhtml3/buildlink3.mk
+++ b/www/gtkhtml3/buildlink3.mk
@@ -1,27 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 03:59:51 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gtkhtml3.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKHTML3_BUILDLINK3_MK:= ${GTKHTML3_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtkhtml3
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkhtml3}
+BUILDLINK_PACKAGES+= gtkhtml3
+
.if !empty(GTKHTML3_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtkhtml3
-BUILDLINK_DEPENDS.gtkhtml3+= gtkhtml3>=3.0.9nb5
-BUILDLINK_PKGSRCDIR.gtkhtml3?= ../../www/gtkhtml3
+BUILDLINK_DEPENDS.gtkhtml3+= gtkhtml3>=3.0.9nb5
+BUILDLINK_PKGSRCDIR.gtkhtml3?= ../../www/gtkhtml3
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/gal2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../net/libsoup/buildlink3.mk"
-.endif # GTKHTML3_BUILDLINK3_MK
+.endif # GTKHTML3_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk
index 1ce1b84894c..fdb8635a16a 100644
--- a/www/libghttp/buildlink3.mk
+++ b/www/libghttp/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 09:53:02 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libghttp.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGHTTP_BUILDLINK3_MK:= ${LIBGHTTP_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libghttp
.endif
-.if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libghttp
-BUILDLINK_DEPENDS.libghttp+= libghttp>=1.0.9
-BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibghttp}
+BUILDLINK_PACKAGES+= libghttp
-.endif # LIBGHTTP_BUILDLINK3_MK
+.if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libghttp+= libghttp>=1.0.9
+BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp
+.endif # LIBGHTTP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index 80168aa90e2..fb56ae59e10 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/13 19:36:38 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libgtkhtml.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGTKHTML_BUILDLINK3_MK:= ${LIBGTKHTML_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libgtkhtml
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtkhtml}
+BUILDLINK_PACKAGES+= libgtkhtml
+
.if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libgtkhtml
BUILDLINK_DEPENDS.libgtkhtml+= libgtkhtml>=2.4.1nb5
BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml
@@ -22,6 +19,6 @@ BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBGTKHTML_BUILDLINK3_MK
+.endif # LIBGTKHTML_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index d87398b2260..8aaaee452f1 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/12 21:39:32 minskim Exp $
-#
-# This Makefile fragment is included by packages that use libwww.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWWW_BUILDLINK3_MK:= ${LIBWWW_BUILDLINK3_MK}+
@@ -10,14 +7,16 @@ LIBWWW_BUILDLINK3_MK:= ${LIBWWW_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libwww
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwww}
+BUILDLINK_PACKAGES+= libwww
+
.if !empty(LIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libwww
-BUILDLINK_DEPENDS.libwww+= libwww>=5.3.2nb2
-BUILDLINK_PKGSRCDIR.libwww?= ../../www/libwww
+BUILDLINK_DEPENDS.libwww+= libwww>=5.3.2nb2
+BUILDLINK_PKGSRCDIR.libwww?= ../../www/libwww
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.endif # LIBWWW_BUILDLINK3_MK
+.endif # LIBWWW_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk
index 620b6942e7b..aac132d836c 100644
--- a/www/mozilla-gtk2/buildlink3.mk
+++ b/www/mozilla-gtk2/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mozilla-gtk2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOZILLA_GTK2_BUILDLINK3_MK:= ${MOZILLA_GTK2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= mozilla-gtk2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla-gtk2}
+BUILDLINK_PACKAGES+= mozilla-gtk2
+
.if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mozilla-gtk2
BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.6nb1
BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2
.include "../../net/libIDL/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # MOZILLA_GTK2_BUILDLINK3_MK
+.endif # MOZILLA_GTK2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla-stable/buildlink3.mk b/www/mozilla-stable/buildlink3.mk
index 5b98b88fb7b..0e5d285d06e 100644
--- a/www/mozilla-stable/buildlink3.mk
+++ b/www/mozilla-stable/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mozilla-stable.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOZILLA_STABLE_BUILDLINK3_MK:= ${MOZILLA_STABLE_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= mozilla-stable
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla-stable}
+BUILDLINK_PACKAGES+= mozilla-stable
+
.if !empty(MOZILLA_STABLE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mozilla-stable
BUILDLINK_DEPENDS.mozilla-stable+= mozilla-stable>=1.4.1nb2
BUILDLINK_PKGSRCDIR.mozilla-stable?= ../../www/mozilla-stable
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.mozilla-stable?= ../../www/mozilla-stable
.include "../../net/ORBit/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.endif # MOZILLA_STABLE_BUILDLINK3_MK
+.endif # MOZILLA_STABLE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk
index 65c8bf7531d..bbbe8efdcd8 100644
--- a/www/mozilla/buildlink3.mk
+++ b/www/mozilla/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use mozilla.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+
@@ -12,10 +7,12 @@ MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= mozilla
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla}
+BUILDLINK_PACKAGES+= mozilla
+
.if !empty(MOZILLA_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= mozilla
-BUILDLINK_DEPENDS.mozilla+= mozilla>=1.6
-BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla
+BUILDLINK_DEPENDS.mozilla+= mozilla>=1.6
+BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
@@ -24,6 +21,6 @@ BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla
.include "../../net/ORBit/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.endif # MOZILLA_BUILDLINK3_MK
+.endif # MOZILLA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk
index 3e7270f84f9..bddccc2c862 100644
--- a/www/tidy/buildlink3.mk
+++ b/www/tidy/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 01:13:57 minskim Exp $
-#
-# This Makefile fragment is included by packages that use tidy.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= tidy
.endif
-.if !empty(TIDY_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= tidy
-BUILDLINK_DEPENDS.tidy+= tidy>=20031002
-BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntidy}
+BUILDLINK_PACKAGES+= tidy
-.endif # TIDY_BUILDLINK3_MK
+.if !empty(TIDY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tidy+= tidy>=20031002
+BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy
+.endif # TIDY_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 202c537d0d9..cb3f355407c 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 09:45:30 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+
@@ -8,13 +7,15 @@ XFIXES_BUILDLINK3_MK:= ${XFIXES_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= Xfixes
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXfixes}
+BUILDLINK_PACKAGES+= Xfixes
+
.if !empty(XFIXES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= Xfixes
-BUILDLINK_DEPENDS.Xfixes+= Xfixes>=2.0.0
-BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes
+BUILDLINK_DEPENDS.Xfixes+= Xfixes>=2.0.0
+BUILDLINK_PKGSRCDIR.Xfixes?= ../../x11/Xfixes
.include "../../x11/fixesext/buildlink3.mk"
-.endif # XFIXES_BUILDLINK3_MK
+.endif # XFIXES_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/controlcenter/buildlink3.mk b/x11/controlcenter/buildlink3.mk
index 8a4752d267e..df114cd0b15 100644
--- a/x11/controlcenter/buildlink3.mk
+++ b/x11/controlcenter/buildlink3.mk
@@ -1,28 +1,25 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:29:24 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use control-center.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CONTROL_CENTER_BUILDLINK3_MK:= ${CONTROL_CENTER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= control-center
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncontrol-center}
+BUILDLINK_PACKAGES+= control-center
+
.if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= control-center
-BUILDLINK_DEPENDS.control-center+= control-center>=1.4.0.4nb5
-BUILDLINK_PKGSRCDIR.control-center?= ../../x11/controlcenter
+BUILDLINK_DEPENDS.control-center+= control-center>=1.4.0.4nb5
+BUILDLINK_PKGSRCDIR.control-center?= ../../x11/controlcenter
-.include "../../devel/popt/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../x11/gnome-libs/buildlink3.mk"
-.endif # CONTROL_CENTER_BUILDLINK3_MK
+.endif # CONTROL_CENTER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fixesext/buildlink3.mk b/x11/fixesext/buildlink3.mk
index 6908f60f497..5ce848af9b6 100644
--- a/x11/fixesext/buildlink3.mk
+++ b/x11/fixesext/buildlink3.mk
@@ -1,19 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 09:45:30 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FIXESEXT_BUILDLINK3_MK:= ${FIXESEXT_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= fixesext
.endif
-.if !empty(FIXESEXT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= fixesext
-BUILDLINK_DEPENDS.fixesext+= fixesext>=2.0
-BUILDLINK_PKGSRCDIR.fixesext?= ../../x11/fixesext
-
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfixesext}
+BUILDLINK_PACKAGES+= fixesext
-.endif # FIXESEXT_BUILDLINK3_MK
+.if !empty(FIXESEXT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.fixesext+= fixesext>=2.0
+BUILDLINK_PKGSRCDIR.fixesext?= ../../x11/fixesext
+.endif # FIXESEXT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index 5b71b3cb04f..7c34c584034 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 10:21:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+
@@ -7,13 +7,16 @@ FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= fltk
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfltk}
+BUILDLINK_PACKAGES+= fltk
+
.if !empty(FLTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= fltk
BUILDLINK_DEPENDS.fltk+= fltk>=1.0.9
BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk
-. include "../../graphics/MesaLib/buildlink3.mk"
-. include "../../graphics/glu/buildlink3.mk"
-.endif # FLTK_BUILDLINK3_MK
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+
+.endif # FLTK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index d25a1dbf80f..1c77c364ec5 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,30 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:47:10 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome-desktop.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_DESKTOP_BUILDLINK3_MK:= ${GNOME_DESKTOP_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-desktop
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-desktop}
+BUILDLINK_PACKAGES+= gnome-desktop
+
.if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-desktop
BUILDLINK_DEPENDS.gnome-desktop+= gnome-desktop>=2.4.1.1nb2
BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop
-.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/gnome2-pixmaps/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
-.endif # GNOME_DESKTOP_BUILDLINK3_MK
+.endif # GNOME_DESKTOP_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk
index 72c3b345bb9..b3f08470eb6 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_LIBS_BUILDLINK3_MK:= ${GNOME_LIBS_BUILDLINK3_MK}+
@@ -9,20 +9,23 @@ GNOME_LIBS_BUILDLINK3_MK:= ${GNOME_LIBS_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gnome-libs
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-libs}
+BUILDLINK_PACKAGES+= gnome-libs
+
.if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-libs
BUILDLINK_DEPENDS.gnome-libs+= gnome-libs>=1.4.2nb1
BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs
-. include "../../audio/esound/buildlink3.mk"
-. if ${OPSYS} == "SunOS"
-. include "../../databases/db/buildlink2.mk"
-. endif
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../graphics/imlib/buildlink3.mk"
-. include "../../graphics/xpm/buildlink3.mk"
-. include "../../net/ORBit/buildlink3.mk"
-. include "../../x11/gtk/buildlink3.mk"
-.endif # GNOME_LIBS_BUILDLINK3_MK
+.include "../../audio/esound/buildlink3.mk"
+.if ${OPSYS} == "SunOS"
+. include "../../databases/db/buildlink2.mk"
+.endif
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../net/ORBit/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif # GNOME_LIBS_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index 5b9b96a85f3..b196e9efbf9 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,26 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/02/17 23:50:33 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome-mag.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MAG_BUILDLINK3_MK:= ${GNOME_MAG_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-mag
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-mag}
+BUILDLINK_PACKAGES+= gnome-mag
+
.if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-mag
-BUILDLINK_DEPENDS.gnome-mag+= gnome-mag>=0.10.4nb1
-BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag
+BUILDLINK_DEPENDS.gnome-mag+= gnome-mag>=0.10.4nb1
+BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GNOME_MAG_BUILDLINK3_MK
+.endif # GNOME_MAG_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index cd9b18cbc6e..b99ac58621c 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,32 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gnome-panel.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome-panel
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-panel}
+BUILDLINK_PACKAGES+= gnome-panel
+
.if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome-panel
BUILDLINK_DEPENDS.gnome-panel+= gnome-panel>=2.4.1nb3
BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libwnck/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libwnck/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/gnome2-control-center/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
-.endif # GNOME_PANEL_BUILDLINK3_MK
+.endif # GNOME_PANEL_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 915f3880b6b..091878d06df 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,31 +1,28 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/14 14:48:23 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use gnome2-control-center.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME2_CONTROL_CENTER_BUILDLINK3_MK:= ${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gnome2-control-center
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome2-control-center}
+BUILDLINK_PACKAGES+= gnome2-control-center
+
.if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gnome2-control-center
BUILDLINK_DEPENDS.gnome2-control-center+= gnome2-control-center>=2.4.0nb2
BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
@@ -34,6 +31,6 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
-.endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK
+.endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index f4fd8b408af..c02e4f4af46 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+
@@ -7,16 +7,19 @@ GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gtk
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk}
+BUILDLINK_PACKAGES+= gtk
+
.if !empty(GTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtk
BUILDLINK_DEPENDS.gtk+= gtk+>=1.2.10
BUILDLINK_RECOMMENDED.gtk?= gtk+>=1.2.10nb6
BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk
-USE_X11= YES
+USE_X11= yes
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
-. include "../../devel/gettext-lib/buildlink3.mk"
-. include "../../devel/glib/buildlink3.mk"
.endif # GTK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 38aac823847..d9270cd4c63 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gtk2-engines.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK2_ENGINES_BUILDLINK3_MK:= ${GTK2_ENGINES_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtk2-engines
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2-engines}
+BUILDLINK_PACKAGES+= gtk2-engines
+
.if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtk2-engines
BUILDLINK_DEPENDS.gtk2-engines+= gtk2-engines>=2.2.0nb4
BUILDLINK_PKGSRCDIR.gtk2-engines?= ../../x11/gtk2-engines
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GTK2_ENGINES_BUILDLINK3_MK
+.endif # GTK2_ENGINES_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 1abf1254351..14e3b791ce5 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,23 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/02/14 22:10:46 recht Exp $
-#
-# This Makefile fragment is included by packages that use gtk2+.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GTK2+_BUILDLINK3_MK:= ${GTK2+_BUILDLINK3_MK}+
+GTK2_BUILDLINK3_MK:= ${GTK2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtk2
.endif
-.if !empty(GTK2+_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtk2
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.2.4nb2
-BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2}
+BUILDLINK_PACKAGES+= gtk2
-USE_X11= yes
+.if !empty(GTK2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.2.4nb2
+BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
+
+USE_X11= yes
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -28,6 +25,6 @@ USE_X11= yes
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.endif # GTK2+_BUILDLINK3_MK
+.endif # GTK2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk
index c5c098e4235..61b241a425e 100644
--- a/x11/gtkglarea2/buildlink3.mk
+++ b/x11/gtkglarea2/buildlink3.mk
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 15:48:00 minskim Exp $
-#
-# This Makefile fragment is included by packages that use gtkglarea2.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKGLAREA2_BUILDLINK3_MK:= ${GTKGLAREA2_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtkglarea2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglarea2}
+BUILDLINK_PACKAGES+= gtkglarea2
+
.if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtkglarea2
BUILDLINK_DEPENDS.gtkglarea2+= gtkglarea2>=1.99.0nb3
-BUILDLINK_PKGSRCDIR.gtkglarea2?= ../../x11/gtkglarea2
+BUILDLINK_PKGSRCDIR.gtkglarea2?= ../../x11/gtkglarea2
.include "../../graphics/Mesa/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GTKGLAREA2_BUILDLINK3_MK
+.endif # GTKGLAREA2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 88d8fbe50e2..82f4ac41ee2 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:11:07 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gtksourceview.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKSOURCEVIEW_BUILDLINK3_MK:= ${GTKSOURCEVIEW_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtksourceview
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtksourceview}
+BUILDLINK_PACKAGES+= gtksourceview
+
.if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= gtksourceview
-BUILDLINK_DEPENDS.gtksourceview+= gtksourceview>=0.7.0nb8
-BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview
+BUILDLINK_DEPENDS.gtksourceview+= gtksourceview>=0.7.0nb8
+BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -23,6 +20,6 @@ BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # GTKSOURCEVIEW_BUILDLINK3_MK
+.endif # GTKSOURCEVIEW_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index b2c5624ef70..15b1f2a3858 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/14 17:34:25 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use libxklavier.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXKLAVIER_BUILDLINK3_MK:= ${LIBXKLAVIER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= libxklavier
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxklavier}
+BUILDLINK_PACKAGES+= libxklavier
+
.if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libxklavier
BUILDLINK_DEPENDS.libxklavier?= libxklavier>=0.97
BUILDLINK_PKGSRCDIR.libxklavier?= ../../x11/libxklavier
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # LIBXKLAVIER_BUILDLINK3_MK
+.endif # LIBXKLAVIER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index ba4dfca5441..f71916f54ab 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use libzvt.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBZVT_BUILDLINK3_MK:= ${LIBZVT_BUILDLINK3_MK}+
@@ -12,14 +7,16 @@ LIBZVT_BUILDLINK3_MK:= ${LIBZVT_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= libzvt
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibzvt}
+BUILDLINK_PACKAGES+= libzvt
+
.if !empty(LIBZVT_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= libzvt
-BUILDLINK_DEPENDS.libzvt+= libzvt>=2.0.1nb5
-BUILDLINK_PKGSRCDIR.libzvt?= ../../x11/libzvt
+BUILDLINK_DEPENDS.libzvt+= libzvt>=2.0.1nb5
+BUILDLINK_PKGSRCDIR.libzvt?= ../../x11/libzvt
.include "../../graphics/libart2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.endif # LIBZVT_BUILDLINK3_MK
+.endif # LIBZVT_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index d56d71cbcbb..87e345eae96 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,9 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-gnome2.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GNOME2_BUILDLINK3_MK:= ${PY_GNOME2_BUILDLINK3_MK}+
.include "../../lang/python/pyversion.mk"
@@ -12,19 +9,21 @@ PY_GNOME2_BUILDLINK3_MK:= ${PY_GNOME2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pygnome2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygnome2}
+BUILDLINK_PACKAGES+= pygnome2
+
.if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pygnome2
-BUILDLINK_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.0.0nb4
-BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2
+BUILDLINK_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.0.0nb4
+BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2
.include "../../net/py-ORBit/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../www/libgtkhtml/buildlink3.mk"
-.include "../../x11/libzvt/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
+.include "../../x11/libzvt/buildlink3.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
-.endif # PY_GNOME2_BUILDLINK3_MK
+.endif # PY_GNOME2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 5261eaccbe7..b39a3c6f604 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,7 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/20 03:12:22 minskim Exp $
-#
-# This Makefile fragment is included by packages that use py-gtk2.
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GTK2_BUILDLINK3_MK:= ${PY_GTK2_BUILDLINK3_MK}+
@@ -12,16 +9,18 @@ PY_GTK2_BUILDLINK3_MK:= ${PY_GTK2_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= pygtk2
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygtk2}
+BUILDLINK_PACKAGES+= pygtk2
+
.if !empty(PY_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= pygtk2
-BUILDLINK_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.0.0nb2
-BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2
+BUILDLINK_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.0.0nb2
+BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2
.include "../../devel/libglade2/buildlink3.mk"
.include "../../math/py-Numeric/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtkglarea2/buildlink3.mk"
-.endif # PY_GTK2_BUILDLINK3_MK
+.endif # PY_GTK2_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk
index df749c73bef..a4579584bd4 100644
--- a/x11/startup-notification/buildlink3.mk
+++ b/x11/startup-notification/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:43:38 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use startup-notification.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
STARTUP_NOTIFICATION_BUILDLINK3_MK:= ${STARTUP_NOTIFICATION_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= startup-notification
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nstartup-notification}
+BUILDLINK_PACKAGES+= startup-notification
+
.if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= startup-notification
BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.5
BUILDLINK_PKGSRCDIR.startup-notification?= ../../x11/startup-notification
-
-.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK
+.endif # STARTUP_NOTIFICATION_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index ab1d5f62763..083e749f96b 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+
@@ -7,8 +7,10 @@ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= tk
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk}
+BUILDLINK_PACKAGES+= tk
+
.if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= tk
BUILDLINK_DEPENDS.tk+= tk>=8.3.4
BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
@@ -19,10 +21,11 @@ BUILDLINK_FILES.tk= bin/wish*
#
BUILDLINK_TRANSFORM+= l:tk:tk83
-USE_X11= YES
+USE_X11= yes
TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
-. include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+
.endif # TK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 88a66bf6315..1fef385a58f 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use vte.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:42 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+
@@ -12,8 +7,10 @@ VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= vte
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvte}
+BUILDLINK_PACKAGES+= vte
+
.if !empty(VTE_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= vte
BUILDLINK_DEPENDS.vte+= vte>=0.11.10nb1
BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte
@@ -31,6 +28,6 @@ BUILDLINK_FILES.vte+= lib/vte/window
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libzvt/buildlink3.mk"
-.endif # VTE_BUILDLINK3_MK
+.endif # VTE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 45d24738cda..0ecb00f6fdc 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,25 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 20:38:37 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+
+.include "../../mk/bsd.prefs.mk"
+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= wxGTK
.endif
-.if !empty(WXGTK_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= wxGTK
-BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.4.2
-BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK}
+BUILDLINK_PACKAGES+= wxGTK
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
-.include "../../x11/gtk/buildlink3.mk"
-.else
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
+.if !empty(WXGTK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.4.2
+BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
@@ -27,6 +22,12 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.endif # WXGTK_BUILDLINK3_MK
+.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
+. include "../../x11/gtk/buildlink3.mk"
+.else
+. include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.endif # WXGTK_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk
index ea601c3f1f3..9f5cb5e94ae 100644
--- a/x11/xosd/buildlink3.mk
+++ b/x11/xosd/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 15:00:38 wiz Exp $
-#
-# This Makefile fragment is included by packages that use xosd.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XOSD_BUILDLINK3_MK:= ${XOSD_BUILDLINK3_MK}+
@@ -12,11 +7,12 @@ XOSD_BUILDLINK3_MK:= ${XOSD_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= xosd
.endif
-.if !empty(XOSD_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xosd
-BUILDLINK_DEPENDS.xosd+= xosd>=2.2.5
-BUILDLINK_PKGSRCDIR.xosd?= ../../x11/xosd
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxosd}
+BUILDLINK_PACKAGES+= xosd
-.endif # XOSD_BUILDLINK3_MK
+.if !empty(XOSD_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xosd+= xosd>=2.2.5
+BUILDLINK_PKGSRCDIR.xosd?= ../../x11/xosd
+.endif # XOSD_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk
index 359ceabbd6e..f55fb72f422 100644
--- a/x11/xscreensaver/buildlink3.mk
+++ b/x11/xscreensaver/buildlink3.mk
@@ -1,24 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:31:40 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use xscreensaver.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:43 jlam Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XSCREENSAVER_BUILDLINK3_MK:= ${XSCREENSAVER_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= xscreensaver
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxscreensaver}
+BUILDLINK_PACKAGES+= xscreensaver
+
.if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= xscreensaver
-BUILDLINK_DEPENDS.xscreensaver+= xscreensaver>=4.14
-BUILDLINK_PKGSRCDIR.xscreensaver?= ../../x11/xscreensaver
+BUILDLINK_DEPENDS.xscreensaver+= xscreensaver>=4.14
+BUILDLINK_PKGSRCDIR.xscreensaver?= ../../x11/xscreensaver
.include "../../textproc/libxml2/buildlink3.mk"
-.endif # XSCREENSAVER_BUILDLINK3_MK
+.endif # XSCREENSAVER_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}