bl3ify

5 files changed, 38 insertions, 14 deletions

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 67ecefb5ae2..96769b7e813 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/04/25 00:53:15 xtraeme Exp $
 
 DISTNAME=	freetds-0.61.2
 CATEGORIES=	databases
@@ -8,7 +8,7 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.freetds.org/
 COMMENT=	LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_GNU_TOOLS+=		make
@@ -24,11 +24,13 @@ CONF_FILES=	${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf
 CONF_FILES+=	${EGDIR}/locales.conf ${PKG_SYSCONFDIR}/locales.conf
 CONF_FILES+=	${EGDIR}/pool.conf ${PKG_SYSCONFDIR}/pool.conf
 
+BUILDLINK_PASSTHRU_DIRS+=   ${PREFIX}/freetds/lib
+
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/freetds.conf ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/locales.conf ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/pool/pool.conf ${EGDIR}
 
-.include "../../converters/libiconv/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk
new file mode 100644
index 00000000000..6411c5185a0
--- /dev/null
+++ b/databases/freetds/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 00:53:15 xtraeme Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+FREETDS_BUILDLINK3_MK:=	${FREETDS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	freetds
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreetds}
+BUILDLINK_PACKAGES+=	freetds
+
+.if !empty(FREETDS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.freetds+=	freetds>=0.61.2
+BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds
+BUILDLINK_INCDIRS.freetds+=	${BUILDLINK_PREFIX.freetds}/freetds/include
+BUILDLINK_LIBDIRS.freetds+=	${BUILDLINK_PREFIX.freetds}/freetds/lib
+.endif	# FREETDS_BUILDLINK3_MK
+
+.include "../../converters/libiconv/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index 74717c6f4ef..9cd7d013ed7 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/25 00:52:39 xtraeme Exp $
 
 MODNAME=		domxml
 CATEGORIES+=		textproc
 PKGREVISION=		3
 COMMENT=		PHP4 extension for DOM support
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 .include "../../www/php4/Makefile.module"
 
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--with-dom-xslt=${BUILDLINK_PREFIX.libxslt}
 CONFIGURE_ARGS+=	--with-dom-exslt=${BUILDLINK_PREFIX.libxslt}
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../textproc/libxslt/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php4-wddx/Makefile b/textproc/php4-wddx/Makefile
index 6c2497ebbe7..f5a9aa9ea64 100644
--- a/textproc/php4-wddx/Makefile
+++ b/textproc/php4-wddx/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2003/11/29 12:12:10 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/25 00:52:39 xtraeme Exp $
 
 MODNAME=		wddx
 CATEGORIES+=		textproc
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for WDDX support
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 .include "../../www/php4/Makefile.module"
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_PREFIX.expat}
 
-.include "../../textproc/expat/buildlink2.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index 15c7b178c12..c182e6cb129 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2003/08/31 19:56:04 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/25 00:52:39 xtraeme Exp $
 
 MODNAME=		xslt
 PKGREVISION=		# empty
 CATEGORIES+=		textproc
 COMMENT=		PHP4 extension for XSLT functions (Sablotron backend)
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 .include "../../www/php4/Makefile.module"
 
@@ -25,5 +25,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} README.XSLT-BACKENDS ${DOCDIR}
 
-.include "../../textproc/sablotron/buildlink2.mk"
+.include "../../textproc/sablotron/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"