Convert to buildlink3.

5 files changed, 33 insertions, 14 deletions

diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index ffb6b9471d9..f7b539dde5d 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/25 21:26:13 snj Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGREVISION=	3
@@ -14,7 +14,7 @@ CONFLICTS+=	ja-dvipdfm-[0-9]*
 CONFLICTS+=	teTeX-bin>=2.0
 
 WRKSRC=			${WRKDIR}/dvipdfm
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 # needed to get the stdarg.h version of kpathsea/c-varargs.h instead of the
@@ -33,7 +33,7 @@ post-patch:
 post-install:
 	mktexlsr
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../print/teTeX1-bin/kpathsea.buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../print/teTeX1-bin/kpathsea.buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile
index 625e32ccd41..e3773ee0511 100644
--- a/print/ja-dvipdfm/Makefile
+++ b/print/ja-dvipdfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/25 21:28:30 snj Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGNAME=	ja-${DISTNAME}
@@ -19,7 +19,7 @@ CONFLICTS+=	dvipdfmx-[0-9]*
 CONFLICTS+=	teTeX-bin>=2.0
 
 WRKSRC=		${WRKDIR}/dvipdfm
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share
 
@@ -35,7 +35,7 @@ post-patch:
 post-install:
 	${PREFIX}/bin/mktexlsr
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../print/teTeX1-bin/kpathsea.buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../print/teTeX1-bin/kpathsea.buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 70164a5a572..ebd7cd7620d 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/25 21:23:34 snj Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
@@ -22,7 +22,7 @@ DIST_SUBDIR=		teTeX
 ALL_TARGET=		all
 INSTALL_TARGET=		install strip
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_GCC_SHLIB=		yes
 USE_GNU_TOOLS+=		make
@@ -92,7 +92,7 @@ post-install:
 	${LOCALBASE}/bin/texconfig font vardir /var/spool/texfonts
 	${LOCALBASE}/bin/texconfig font options appendonlydir varfonts
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../www/libwww/buildlink2.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../www/libwww/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX1-bin/kpathsea.buildlink3.mk b/print/teTeX1-bin/kpathsea.buildlink3.mk
new file mode 100644
index 00000000000..321bf054ffa
--- /dev/null
+++ b/print/teTeX1-bin/kpathsea.buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: kpathsea.buildlink3.mk,v 1.1 2004/04/25 21:23:34 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	teTeX-bin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NteTeX-bin}
+BUILDLINK_PACKAGES+=	teTeX-bin
+
+.if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin>=1.0.7nb2
+BUILDLINK_DEPMETHOD.teTeX-bin?=	build
+BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX1-bin
+.endif	# TETEX_BIN_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/teTeX1-share/Makefile b/print/teTeX1-share/Makefile
index 1deb434958c..80ce2bd3a9a 100644
--- a/print/teTeX1-share/Makefile
+++ b/print/teTeX1-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/29 09:44:48 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/25 21:23:53 snj Exp $
 #
 
 DISTNAME=	teTeX-texmf-1.0.2
@@ -15,7 +15,7 @@ CONFLICTS+=	teTeX2-share-[2-9]*
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	teTeX
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes