Convert to buildlink3.

9 files changed, 45 insertions, 67 deletions

diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 96f4ffff913..a803986cb68 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/02/01 01:43:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/05/05 02:26:41 snj Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 BASEGS_VERS=	7.07
@@ -23,7 +23,7 @@ CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
 DEPENDS+=	ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
@@ -88,11 +88,11 @@ post-install:
 		${PREFIX}/libexec/cups/filter
 	${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR}
 
-.include "../../security/openssl/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../print/cups/buildlink2.mk"
-.include "../../print/gimp-print-lib/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
 
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index a5c3ac90a44..042985763bd 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	gimp-print-4.2.6
@@ -20,8 +20,8 @@ CONFIGURE_ARGS+= --enable-escputil=no
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../print/cups/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index 4b881256f72..31b81b98756 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/03/02 14:56:07 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/05 02:26:42 snj Exp $
 
 DISTNAME=	gimp-print-4.2.6
 PKGNAME=	gimp-print-escputil-4.2.6
@@ -20,10 +20,10 @@ CONFIGURE_ARGS+= --without-cups --without-translated-ppds
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index e4ac8ca72fa..f920fee8287 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/05 02:26:42 snj Exp $
 
 DISTNAME=	gimp-print-4.2.6
 PKGNAME=	gimp-print-ijs-4.2.6
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gimp-print.sourceforge.net/
 COMMENT=	GIMP print IJS server
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		# defined
 USE_GNU_TOOLS+=		make
 
@@ -30,6 +30,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/ghost/README ${DOCDIR}
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../print/ijs/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../print/ijs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-lib/buildlink2.mk b/print/gimp-print-lib/buildlink2.mk
deleted file mode 100644
index 659a5a7b14d..00000000000
--- a/print/gimp-print-lib/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/02 14:56:07 drochner Exp $
-
-.if !defined(GIMP_PRINT_BUILDLINK2_MK)
-GIMP_PRINT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=	gimp-print-lib
-BUILDLINK_DEPENDS.gimp-print-lib?=	gimp-print-lib-4.2.6{,nb*}
-BUILDLINK_PKGSRCDIR.gimp-print-lib?=	../../print/gimp-print-lib
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.gimp-print-lib=gimp-print-lib
-BUILDLINK_PREFIX.gimp-print-lib_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.gimp-print-lib=		include/gimp-print/*
-BUILDLINK_FILES.gimp-print-lib+=	lib/libgimpprint.*
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	gimp-print-lib-buildlink
-
-gimp-print-lib-buildlink: _BUILDLINK_USE
-
-.endif	# GIMP_PRINT_BUILDLINK2_MK
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index bb6f5ab5554..ec8c3b1fedc 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/03/29 22:25:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/05 02:26:41 snj Exp $
 #
 
 DISTNAME=	gimp-print-4.2.6
@@ -18,9 +18,9 @@ CONFIGURE_ARGS+= --enable-escputil=no
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_X11=	yes
 
-.include "../../print/gimp-print-lib/buildlink2.mk"
-.include "../../graphics/gimp1-base/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
+.include "../../graphics/gimp1-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 0642a1e29d4..163313ab4ff 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/05 02:26:42 snj Exp $
 
 DISTNAME=	ijs-0.34
 CATEGORIES=	print
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.linuxprinting.org/ijs/
 COMMENT=	Protocol library for raster page transmission
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
diff --git a/print/ijs/buildlink2.mk b/print/ijs/buildlink2.mk
deleted file mode 100644
index 103499970a8..00000000000
--- a/print/ijs/buildlink2.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/09/11 18:40:12 jlam Exp $
-
-.if !defined(IJS_BUILDLINK2_MK)
-IJS_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		ijs
-BUILDLINK_DEPENDS.ijs?=		ijs>=0.34
-BUILDLINK_PKGSRCDIR.ijs?=	../../print/ijs
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.ijs=ijs
-BUILDLINK_PREFIX.ijs_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ijs=	include/ijs/*
-BUILDLINK_FILES.ijs+=	lib/libijs.*
-
-BUILDLINK_TARGETS+=	ijs-buildlink
-
-ijs-buildlink: _BUILDLINK_USE
-
-.endif	# IJS_BUILDLINK2_MK
diff --git a/print/ijs/buildlink3.mk b/print/ijs/buildlink3.mk
new file mode 100644
index 00000000000..c3f4db4395b
--- /dev/null
+++ b/print/ijs/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 02:26:42 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+IJS_BUILDLINK3_MK:=	${IJS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ijs
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nijs}
+BUILDLINK_PACKAGES+=	ijs
+
+.if !empty(IJS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ijs+=	ijs>=0.34
+BUILDLINK_PKGSRCDIR.ijs?=	../../print/ijs
+.endif	# IJS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}