Convert to buildlink3.

5 files changed, 38 insertions, 18 deletions

diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 5530763d07d..abd097b84f2 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/26 01:30:41 snj Exp $
 
 DISTNAME=	dvipdfmx-20031116
 PKGNAME=	${DISTNAME:S/-/-0.0.0./}
@@ -16,7 +16,7 @@ DEPENDS+=	teTeX-bin>=2.0.2:../../print/teTeX-bin
 CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
@@ -24,8 +24,8 @@ INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 GNU_CONFIGURE=		YES
 #CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../print/teTeX-bin/kpathsea.buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-vflib-lib/Makefile.common b/print/ja-vflib-lib/Makefile.common
index 6841d35249c..d86245ee956 100644
--- a/print/ja-vflib-lib/Makefile.common
+++ b/print/ja-vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/07/17 22:52:33 grant Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/04/26 01:30:41 snj Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -15,7 +15,7 @@ VFLIB_VERSION=		2.24.2
 PLIST_SUBST+=		VFLIB_VERSION=${VFLIB_VERSION}
 PLIST_SUBST+=		VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -34,4 +34,4 @@ PATCHDIR=		${.CURDIR}/../../print/ja-vflib-lib/patches
 
 EXTRACT_ONLY=		${VFLIB_SRC}
 
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink3.mk"
diff --git a/print/ja-vflib-lib/buildlink3.mk b/print/ja-vflib-lib/buildlink3.mk
new file mode 100644
index 00000000000..12c09498a2f
--- /dev/null
+++ b/print/ja-vflib-lib/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 01:30:41 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+JA_VFLIB_LIB_BUILDLINK3_MK:=	${JA_VFLIB_LIB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ja-vflib-lib
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nja-vflib-lib}
+BUILDLINK_PACKAGES+=	ja-vflib-lib
+
+.if !empty(JA_VFLIB_LIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ja-vflib-lib+=	ja-vflib-lib>=2.24.2
+BUILDLINK_PKGSRCDIR.ja-vflib-lib?=	../../print/ja-vflib-lib
+.endif	# JA_VFLIB_LIB_BUILDLINK3_MK
+
+.include "../../graphics/freetype-lib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index 803181bbaf2..05ddfb1b41b 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/11 08:54:47 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/26 01:30:42 snj Exp $
 
 .include "../../print/ja-vflib-lib/Makefile.common"
 
@@ -13,5 +13,5 @@ CONFIGURE_ARGS+=	--enable-tools --with-x
 ALL_TARGET=		build-tools
 INSTALL_TARGET=		install-tools
 
-.include "../../print/ja-vflib-lib/buildlink2.mk"
+.include "../../print/ja-vflib-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index e3fb0334c56..bf392b695b7 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/26 01:30:42 snj Exp $
 
 DISTNAME=	xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=	ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -25,7 +25,7 @@ DEPENDS+=	ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
 
 XDVI_DIR=	${WRKDIR}/${DISTNAME}/texk/xdvik
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
@@ -73,12 +73,12 @@ do-install:
 	cd ${XDVI_DIR} && ${MAKE_PROGRAM} install
 
 .if defined(USE_TEXFAMILY)
-.include "../../print/teTeX1-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX1-bin/kpathsea.buildlink3.mk"
 .else
-.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX-bin/kpathsea.buildlink3.mk"
 .endif
-.include "../../www/libwww/buildlink2.mk"
-.include "../../print/ja-vflib-lib/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../fonts/t1lib/buildlink2.mk"
+.include "../../www/libwww/buildlink3.mk"
+.include "../../print/ja-vflib-lib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../fonts/t1lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"