Convert to buildlink3.

6 files changed, 46 insertions, 54 deletions

diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index 4f1016df639..31702093924 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/08 07:37:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=		gimp-1.2.5
@@ -18,7 +18,7 @@ BUILD_USES_MSGFMT=	YES
 
 CONFLICTS+=		gimp<=1.2.3 gimp>=2.0.0
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
@@ -70,18 +70,18 @@ post-install:
 		${LN} -fs ${PREFIX}/share/aclocal/gimp.m4		\
 			${LOCALBASE}/share/aclocal/gimp.m4
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/mpeg-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/mpeg-lib/buildlink3.mk"
 .if defined(GIMP_WITH_HELPBROWSER) && ${GIMP_WITH_HELPBROWSER} != "no"
 PLIST_SUBST+=	HELPBROWSER=""
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 .else
 PLIST_SUBST+=	HELPBROWSER="@comment "
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp1-base/buildlink2.mk b/graphics/gimp1-base/buildlink2.mk
deleted file mode 100644
index 1d32d820bd0..00000000000
--- a/graphics/gimp1-base/buildlink2.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 22:24:20 xtraeme Exp $
-#
-# This Makefile fragment is included by packages that use gimp-base.
-#
-# This file was created automatically using createbuildlink 2.6.
-#
-
-.if !defined(GIMP_BASE_BUILDLINK2_MK)
-GIMP_BASE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			gimp-base
-BUILDLINK_DEPENDS.gimp-base?=		gimp-base>=1.2.5nb2
-BUILDLINK_PKGSRCDIR.gimp-base?=		../../graphics/gimp1-base
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.gimp-base=gimp-base
-BUILDLINK_PREFIX.gimp-base_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.gimp-base+=	include/gck/*
-BUILDLINK_FILES.gimp-base+=	include/libgimp/*
-BUILDLINK_FILES.gimp-base+=	lib/libgck*
-BUILDLINK_FILES.gimp-base+=	lib/libgimp*
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/mpeg-lib/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	gimp-base-buildlink
-
-gimp-base-buildlink: _BUILDLINK_USE
-
-.endif	# GIMP_BASE_BUILDLINK2_MK
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
new file mode 100644
index 00000000000..111874d5cb4
--- /dev/null
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 02:26:41 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GIMP_BASE_BUILDLINK3_MK:=	${GIMP_BASE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gimp-base
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp-base}
+BUILDLINK_PACKAGES+=	gimp-base
+
+.if !empty(GIMP_BASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gimp-base+=	gimp-base>=1.2.5nb2
+BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp1-base
+.endif	# GIMP_BASE_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/mpeg-lib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gimp1-data/Makefile b/graphics/gimp1-data/Makefile
index 7cf77b6ca99..f0a02d7b75b 100644
--- a/graphics/gimp1-data/Makefile
+++ b/graphics/gimp1-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/08 07:37:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	gimp-data-extras-1.2.0
@@ -16,9 +16,9 @@ COMMENT=	GNU Image Manipulation Program (extra brushes and patterns)
 
 CONFLICTS+=	gimp<=1.2.3 gimp>=2.0.0
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp1-wideangle/Makefile b/graphics/gimp1-wideangle/Makefile
index 6c2d5db0e3c..8df30f8eab7 100644
--- a/graphics/gimp1-wideangle/Makefile
+++ b/graphics/gimp1-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/29 22:22:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	wideangleFeb03
@@ -13,11 +13,11 @@ HOMEPAGE=	http://www.ozemail.com.au/~hodsond/
 COMMENT=	GIMP plugin for wideangle lens distortions
 
 WRKSRC=		${WRKDIR}/wideangle
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 
 ALL_TARGET=	wideangle
 
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 9609da3d8af..8d7460ab15f 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/29 22:31:13 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	pygimp-1.2
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
 
 PYTHON_PATCH_SCRIPTS= plug-ins/clothify.py plug-ins/foggify.py
 PYTHON_PATCH_SCRIPTS+= plug-ins/gimpcons.py plug-ins/gtkcons.py
@@ -30,6 +30,6 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../graphics/gimp1-base/buildlink2.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
+.include "../../x11/pygtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"