bl3ify

18 files changed, 210 insertions, 41 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 2e830f3cffd..4ae68b7e9aa 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2004/02/01 01:43:29 jlam Exp $
+# $NetBSD: Makefile,v 1.109 2004/02/11 09:10:15 xtraeme Exp $
 
 .include "Makefile.common"
 
@@ -14,7 +14,7 @@ DEPENDS+=		mpeg2codec-1.2:../../graphics/mpeg2codec
 
 CONFLICTS=		geomview<1.8.1nb2  # used to have a program named 'animate'
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -41,10 +41,10 @@ CFLAGS=			-O
 # Some configure_args come from Makefile.common
 CONFIGURE_ARGS+=	--without-perl
 
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../graphics/jasper/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
new file mode 100644
index 00000000000..abbf6882383
--- /dev/null
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 09:10:15 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use ImageMagick.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ImageMagick
+.endif
+
+.if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			ImageMagick
+BUILDLINK_DEPENDS.ImageMagick+=		ImageMagick>=5.5.7.11nb1
+BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
+.endif # IMAGEMAGICK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index 11fd8a07cf5..b82f5d19333 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/11 08:55:58 xtraeme Exp $
 
 DISTNAME=		Hermes-1.3.3
 CATEGORIES=		graphics
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.clanlib.org/hermes/
 COMMENT=		Library for conversion of pixel graphics
 
 WRKSRC=			${WRKDIR}/Hermes-1.3.3
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk
new file mode 100644
index 00000000000..3e5f50cb131
--- /dev/null
+++ b/graphics/hermes/buildlink3.mk
@@ -0,0 +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 Hermes.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+HERMES_BUILDLINK3_MK:=	${HERMES_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+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
+
+.endif # HERMES_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index a38eac2cd69..7fed618e7ac 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/05 20:14:05 skrll Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 09:10:15 xtraeme Exp $
 #
 
 DISTNAME=		jasper-1.600.0
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.ece.uvic.ca/~mdadams/jasper/
 COMMENT=		Software-based reference implementation of the JPEG-2000 codec
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS+=	--enable-shared --without-x --disable-opengl
@@ -25,5 +25,5 @@ post-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
new file mode 100644
index 00000000000..e66823bb737
--- /dev/null
+++ b/graphics/jasper/buildlink3.mk
@@ -0,0 +1,24 @@
+# $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.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+JASPER_BUILDLINK3_MK:=	${JASPER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	jasper
+.endif
+
+.if !empty(JASPER_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			jasper
+BUILDLINK_DEPENDS.jasper+=		jasper>=1.600.0
+BUILDLINK_PKGSRCDIR.jasper?=		../../graphics/jasper
+
+.include "../../graphics/jpeg/buildlink3.mk"
+
+.endif # JASPER_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 99560476ddf..98194916048 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/11 09:10:15 xtraeme Exp $
 
 DISTNAME=	mpeg2vidcodec_v12
 PKGNAME=	mpeg2codec-1.2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.mpeg.org/MSSG/
 COMMENT=	MPEG Software Simulation Group's MPEG-2 Encoder and Decoder
 
 WRKSRC=		${WRKDIR}/mpeg2
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 USE_X11BASE=		# defined
 
 do-install:
diff --git a/graphics/openquicktime/Makefile b/graphics/openquicktime/Makefile
index 8586e7a3adc..5c1aaad4c75 100644
--- a/graphics/openquicktime/Makefile
+++ b/graphics/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 15:46:44 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/11 08:55:58 xtraeme Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}-src
@@ -12,7 +12,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.openquicktime.org/
 COMMENT=		Portable library for handling QuickTime(TM) media files
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
@@ -25,7 +25,7 @@ pre-configure:
 		>> ${BUILDLINK_DIR}/bin/glib-config-2.0
 	${CHMOD} +x ${BUILDLINK_DIR}/bin/glib-config-2.0
 
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openquicktime/buildlink3.mk b/graphics/openquicktime/buildlink3.mk
new file mode 100644
index 00000000000..f937569ba96
--- /dev/null
+++ b/graphics/openquicktime/buildlink3.mk
@@ -0,0 +1,25 @@
+# $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.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+OPENQUICKTIME_BUILDLINK3_MK:=	${OPENQUICKTIME_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	openquicktime
+.endif
+
+.if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			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
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index a35d64d3bc8..1048f27eb23 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/22 12:48:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 08:55:58 xtraeme Exp $
 #
 
 .include "Makefile.common"
@@ -7,7 +7,7 @@ PKGREVISION=		7
 
 CONFIGURE_ARGS+=	--disable-pixbuf-loader
 
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../graphics/libart2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/swfdec/Makefile.common b/graphics/swfdec/Makefile.common
index 463a99d65a2..8c7e2dd96c0 100644
--- a/graphics/swfdec/Makefile.common
+++ b/graphics/swfdec/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2004/01/22 12:48:32 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/02/11 08:55:58 xtraeme Exp $
 #
 
 DISTNAME=		swfdec-0.2.1
@@ -13,7 +13,7 @@ DISTINFO_FILE=		${.CURDIR}/../../graphics/swfdec/distinfo
 PATCHDIR=		${.CURDIR}/../../graphics/swfdec/patches
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/graphics/swfdec/buildlink3.mk b/graphics/swfdec/buildlink3.mk
new file mode 100644
index 00000000000..b2b555dbe69
--- /dev/null
+++ b/graphics/swfdec/buildlink3.mk
@@ -0,0 +1,26 @@
+# $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.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	swfdec
+.endif
+
+.if !empty(SWFDEC_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			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
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile
index 44fe58a91b7..8d050a8d541 100644
--- a/misc/gnome2-user-docs/Makefile
+++ b/misc/gnome2-user-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/24 14:11:10 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/11 09:59:23 xtraeme Exp $
 #
 
 DISTNAME=	gnome2-user-docs-2.4.1
@@ -12,7 +12,7 @@ COMMENT=	The GNOME 2 users guide
 
 DEPENDS=	gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -22,5 +22,5 @@ GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 48599ac963d..3f97b4525b9 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/11 09:59:23 xtraeme Exp $
 #
 
 DISTNAME=		gnome-utils-2.4.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 
 USE_PERL5=		build
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
@@ -28,12 +28,12 @@ GCONF2_SCHEMAS+=	gnome-search-tool.schemas
 GCONF2_SCHEMAS+=	logview.schemas
 
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/GConf2-ui/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libgnome/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../lang/guile/buildlink2.mk"
+.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../lang/guile/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gnome-panel/buildlink2.mk"
+.include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 87185a36b8b..3991ae0a1a3 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/28 14:29:01 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/11 08:59:40 xtraeme Exp $
 
 DISTNAME=	libdvdread-0.9.4
 CATEGORIES=	multimedia
@@ -11,7 +11,7 @@ COMMENT=	DVD access library, primarily used in Ogle
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
new file mode 100644
index 00000000000..d48cbe3b488
--- /dev/null
+++ b/multimedia/libdvdread/buildlink3.mk
@@ -0,0 +1,22 @@
+# $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.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBDVDREAD_BUILDLINK3_MK:=	${LIBDVDREAD_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libdvdread
+.endif
+
+.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
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index d1c595a12be..33be5d06ae8 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:55:39 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 09:53:02 xtraeme Exp $
 
 DISTNAME=		libghttp-1.0.9
 CATEGORIES=		www gnome
@@ -11,6 +11,6 @@ COMMENT=		GNOME http client library
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk
new file mode 100644
index 00000000000..1ce1b84894c
--- /dev/null
+++ b/www/libghttp/buildlink3.mk
@@ -0,0 +1,22 @@
+# $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.
+#
+
+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
+
+.endif # LIBGHTTP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}