Convert to buildlink3.

9 files changed, 35 insertions, 33 deletions

diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
index b0187813fcf..178fc9409ad 100644
--- a/www/ap-Embperl/Makefile
+++ b/www/ap-Embperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/22 04:14:18 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/08 19:48:27 snj Exp $
 #
 
 DISTNAME=       HTML-Embperl-1.2.0
@@ -12,7 +12,7 @@ COMMENT=	Perl5 library for embedding perl in HTML documents
 
 DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/HTML/Embperl/.packlist
 
 MAKE_ENV+=	APACHE_SRC=${PREFIX}/include/httpd
@@ -20,5 +20,5 @@ MAKE_ENV+=	APACHE_MODULES=${PREFIX}/lib/httpd
 MAKE_ENV+=	APACHE=${PREFIX}/sbin/httpd
 
 .include "../../lang/perl5/module.mk"
-.include "../../www/ap-perl/buildlink2.mk"
+.include "../../www/ap-perl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-aolserver/Makefile b/www/ap-aolserver/Makefile
index f62c5151740..3f1d0e6744f 100644
--- a/www/ap-aolserver/Makefile
+++ b/www/ap-aolserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/08 19:48:27 snj Exp $
 #
 
 DISTNAME=		mod_aolserver-1.1
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.arsdigita.com/acs-repository/one-version?version_id=601
 COMMENT=		Module that emulates AOLServer in Apache
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 CONFIGURE_ARGS+=	--with-database=postgres
 CONFIGURE_ARGS+=	--with-mm=${BUILDLINK_PREFIX.libmm}
@@ -28,8 +28,8 @@ post-install:
 		${WRKSRC}/tcl_modules/nsd.ini.sample \
 		${PREFIX}/share/examples/mod_aolserver
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../devel/libmm/buildlink2.mk"
-.include "../../lang/tcl83/buildlink2.mk"
-.include "../../www/apache/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../devel/libmm/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
+.include "../../www/apache/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 19564baa226..f80666fcfb7 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/01/20 12:27:58 agc Exp $
+# $NetBSD: Makefile,v 1.32 2004/05/08 19:48:27 snj Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -15,7 +15,7 @@ HOMEPAGE=	ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt
 COMMENT=	Cookie-based authentication for Apache
 
 WRKSRC=		${WRKDIR}
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 EXTRACT_CMD=	${DO_NADA}
 
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 2dde9ea673e..eb59c11d600 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/08 19:48:27 snj Exp $
 
 DISTNAME=	auth_ldap-1.6.0
 PKGREVISION=	2
@@ -11,7 +11,7 @@ MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://www.rudedog.org/auth_ldap/
 COMMENT=	Module to allow apache authentication against an LDAP directory
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	yes
 
 APACHE_MODULE_NAME=	auth_ldap.so
 CPPFLAGS+=		-DWITH_OPENLDAP
@@ -26,9 +26,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/future-directions.html		\
 		${PREFIX}/share/doc/mod_auth_ldap
 
-BUILDLINK_DEPMETHOD.apache=	full
-
-.include "../../databases/openldap/buildlink2.mk"
 .include "../../www/apache/module.mk"
 
+.include "../../databases/openldap/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile
index 63d3814bcbe..0a56c4b6302 100644
--- a/www/ap-auth-pam/Makefile
+++ b/www/ap-auth-pam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/24 22:46:12 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/08 19:48:27 snj Exp $
 
 DISTNAME=	mod_auth_pam-1.0a
 PKGNAME=	ap-auth-pam-1.0a
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://pam.sourceforge.net/mod_auth_pam/
 COMMENT=	Module to allow Apache authentication using PAM
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 APACHE_MODULE_NAME=	mod_auth_pam.so
 LDFLAGS+=		-lpam
@@ -23,6 +23,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${HTMLDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${HTMLDIR}
 
-.include "../../security/PAM/buildlink2.mk"
+.include "../../security/PAM/buildlink3.mk"
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-pgsql/Makefile b/www/ap-auth-pgsql/Makefile
index 2307519dfb6..78bd28b29d5 100644
--- a/www/ap-auth-pgsql/Makefile
+++ b/www/ap-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/08 19:48:27 snj Exp $
 
 DISTNAME=	mod_auth_pgsql-0.9.12
 PKGNAME=	ap-auth-pgsql-0.9.12
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.giuseppetanzilli.it/mod_auth_pgsql/
 COMMENT=	Apache module for user authentication/logging against a PostgreSQL DB
 
 CONFLICTS=	ap-auth-postgresql-[0-9]*
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 APACHE_MODULE_NAME=	mod_auth_pgsql.so
 
@@ -24,6 +24,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mod_auth_pgsql
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/mod_auth_pgsql
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../www/apache/module.mk"
+
+.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index ad2390f9116..14d1dfd580a 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2004/05/08 19:48:27 snj Exp $
 
 DISTNAME=	AuthPG-1.4
 PKGNAME=	ap-auth-postgresql-1.4
@@ -12,7 +12,7 @@ COMMENT=	Module to allow apache authentication against a Postgresql database
 
 CONFLICTS=	ap-auth-pgsql-[0-9]*
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 APACHE_MODULE_NAME=	mod_auth_pg.so
 
@@ -32,6 +32,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample.htaccess ${EGDIR}/mod_auth_pg.htaccess
 	${INSTALL_DATA} ${WRKSRC}/sample.sql ${EGDIR}/mod_auth_pg.sql
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../www/apache/module.mk"
+
+.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index bba1e7a1cc7..fb98dcd999e 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/21 07:44:09 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/08 19:48:27 snj Exp $
 #
 
 DISTNAME=		mod_python-2.7.8
@@ -13,7 +13,7 @@ COMMENT=		Python interpreter embedded into Apache
 
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON_BIN=${PYTHONBIN}
 MAKE_ENV+=		PYTHONBIN=${PYTHONBIN}
@@ -32,5 +32,5 @@ post-install:
 		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../lang/python/extension.mk"
-.include "../../www/apache/buildlink2.mk"
+.include "../../www/apache/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 9f2cd71b935..989e77efa4c 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2004/05/08 19:48:27 snj Exp $
 
 DISTNAME=	modxslt-1.1
 PKGNAME=	ap-xslt-1.1
@@ -11,13 +11,14 @@ HOMEPAGE=	http://modxslt.sourceforge.net/
 COMMENT=	Simple, fast XSLT transformations for apache
 
 WRKSRC=		${WRKDIR}/modxslt
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 APACHE_MODULE_NAME=	mod_xslt.so
 LDFLAGS+=	        -lsablot
 
-.include "../../textproc/sablotron/buildlink2.mk"
-.include "../../www/libwww/buildlink2.mk"
-
 .include "../../www/apache/module.mk"
+
+.include "../../textproc/sablotron/buildlink3.mk"
+.include "../../www/libwww/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"