[pkgsrc/trunk]: pkgsrc/www Convert to buildlink3.

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/206d679405a2
branches:  trunk
changeset: 474749:206d679405a2
user:      snj <snj%pkgsrc.org@localhost>
date:      Tue May 04 23:59:15 2004 +0000

description:
Convert to buildlink3.

diffstat:

 www/ap2-auth-mysql/Makefile |   8 ++++----
 www/ap2-perl/Makefile       |   6 +++---
 www/apache2/buildlink2.mk   |  34 ----------------------------------
 www/p5-libapreq2/Makefile   |   8 ++++----
 4 files changed, 11 insertions(+), 45 deletions(-)

diffs (119 lines):

diff -r 2db454e23ea1 -r 206d679405a2 www/ap2-auth-mysql/Makefile
--- a/www/ap2-auth-mysql/Makefile       Tue May 04 23:46:36 2004 +0000
+++ b/www/ap2-auth-mysql/Makefile       Tue May 04 23:59:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/30 18:32:33 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 23:59:15 snj Exp $
 #
 
 DISTNAME=              mod_auth_mysql.c
@@ -18,7 +18,7 @@
 EXTRACT_ONLY=          ${DISTNAME}.gz
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 NO_CONFIGURE=          yes
 
 APACHE_MODULE_NAME=    mod_auth_mysql
@@ -43,7 +43,7 @@
        ${INSTALL_DATA_DIR} ${DOC_DIR}
        ${INSTALL_DATA} ${WRKSRC}/mysql-group-auth.txt ${DOC_DIR}
 
-.include "../../www/apache2/buildlink2.mk"
-.include "../../databases/mysql-client/buildlink2.mk"
+.include "../../www/apache2/buildlink3.mk"
+.include "../../databases/mysql-client/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 2db454e23ea1 -r 206d679405a2 www/ap2-perl/Makefile
--- a/www/ap2-perl/Makefile     Tue May 04 23:46:36 2004 +0000
+++ b/www/ap2-perl/Makefile     Tue May 04 23:59:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/24 22:46:12 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/04 23:59:15 snj Exp $
 #
 # NOTE: This package is *BETA*.  If it doesn't work, then check the
 #      modperl-2.0 mailing lists for help.
@@ -15,7 +15,7 @@
 
 CONFLICTS=             ap-perl-[0-9]*
 
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                yes
 APACHE_MODULE=         # defined
 PERL5_REQD+=           5.6.0
 PERL5_PACKLIST=                ${PERL5_SITEARCH}/auto/mod_perl/.packlist
@@ -29,6 +29,6 @@
        ${CP} -R ${WRKSRC}/docs/* ${MODPERLDOCSDIR}
 
 .include "../../lang/perl5/module.mk"
-.include "../../www/apache2/buildlink2.mk"
+.include "../../www/apache2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 2db454e23ea1 -r 206d679405a2 www/apache2/buildlink2.mk
--- a/www/apache2/buildlink2.mk Tue May 04 23:46:36 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/26 02:27:56 wiz Exp $
-
-.if !defined(APACHE_BUILDLINK2_MK)
-APACHE_BUILDLINK2_MK=  # defined
-
-BUILDLINK_PACKAGES+=           apache
-BUILDLINK_DEPENDS.apache?=     apache>=2.0.49
-BUILDLINK_RECOMMENDED.apache?= apache>=2.0.49nb1
-BUILDLINK_PKGSRCDIR.apache?=   ../../www/apache2
-BUILDLINK_DEPMETHOD.apache?=   build
-
-USE_PERL5?=                    build   # for "apxs"
-
-.if defined(APACHE_MODULE)
-BUILDLINK_DEPMETHOD.apache+=   full
-.endif
-
-EVAL_PREFIX+=                          BUILDLINK_PREFIX.apache=apache
-BUILDLINK_PREFIX.apache_DEFAULT=       ${LOCALBASE}
-
-BUILDLINK_FILES.apache=                include/httpd/*
-
-.include "../../devel/apr/buildlink2.mk"
-
-BUILDLINK_TARGETS+=    apache-buildlink
-
-APXS?=                 ${BUILDLINK_PREFIX.apache}/sbin/apxs
-.if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=       --with-apxs2="${APXS}"
-.endif
-
-apache-buildlink: _BUILDLINK_USE
-
-.endif # APACHE_BUILDLINK2_MK
diff -r 2db454e23ea1 -r 206d679405a2 www/p5-libapreq2/Makefile
--- a/www/p5-libapreq2/Makefile Tue May 04 23:46:36 2004 +0000
+++ b/www/p5-libapreq2/Makefile Tue May 04 23:59:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/12 18:18:29 kim Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/04 23:59:15 snj Exp $
 
 DISTNAME=      libapreq2-2.02_02-dev
 PKGNAME=       p5-libapreq2-2.2.2
@@ -14,7 +14,7 @@
 DEPENDS+=      p5-ExtUtils-XSBuilder-[0-9]*:../../www/p5-ExtUtils-XSBuilder
 
 WRKSRC=                ${WRKDIR}/libapreq2-2.02-dev
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 USE_LIBTOOL=   YES
 PERL5_PACKLIST=        ${PERL5_SITEARCH}/auto/libapreq2/.packlist
@@ -25,6 +25,6 @@
 #      cd ${WRKSRC} && ./buildconf
 
 .include "../../lang/perl5/module.mk"
-#.include "../../www/ap2-perl/buildlink2.mk"
-.include "../../www/apache2/buildlink2.mk"
+#.include "../../www/ap2-perl/buildlink3.mk"
+.include "../../www/apache2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"