9 files changed, 47 insertions, 13 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 965fef03d7e..82ef0c96559 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2002/08/01 00:58:33 mycroft Exp $
+# $NetBSD: Makefile,v 1.104 2002/08/25 18:40:16 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -36,7 +36,7 @@ COMMENT=		Apache HTTP (Web) server
 CONFLICTS=		apache-*ssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
 CONFIGURE_ARGS+=	--enable-module=most				\
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--without-confadjust
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
-CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_DIR}"
+CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_PREFIX.libmm}"
 CONFIGURE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP}
 
 .include "../../mk/bsd.prefs.mk"
@@ -113,7 +113,7 @@ MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 
 .if (${OPSYS} == "SunOS")
 LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib
-CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_DIR}/include/db2"
+CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_PREFIX.db2}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
 BUILDLINK_DEPENDS.db=	db>=2.7.7
 .include "../../databases/db/buildlink.mk"
@@ -187,7 +187,8 @@ post-install:
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
-.include "../../devel/libmm/buildlink.mk"
-.include "../../textproc/expat/buildlink.mk"
+.include "../../devel/libmm/buildlink2.mk"
+.include "../../textproc/expat/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/PLIST b/www/apache/PLIST
index b7c37dcfef4..fab804af501 100644
--- a/www/apache/PLIST
+++ b/www/apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/20 17:12:37 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:40:17 jlam Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
diff --git a/www/apache/PLIST.shared b/www/apache/PLIST.shared
index afcaaa7fe70..d8f6ea7d8fd 100644
--- a/www/apache/PLIST.shared
+++ b/www/apache/PLIST.shared
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.shared,v 1.3 2002/07/30 18:40:14 wiz Exp $
+@comment $NetBSD: PLIST.shared,v 1.4 2002/08/25 18:40:17 jlam Exp $
 lib/httpd/httpd.exp
 lib/httpd/mod_define.so
 lib/httpd/mod_proxy.so
diff --git a/www/apache/buildlink2.mk b/www/apache/buildlink2.mk
new file mode 100644
index 00000000000..f370d53398b
--- /dev/null
+++ b/www/apache/buildlink2.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:17 jlam Exp $
+
+.if !defined(APACHE_BUILDLINK2_MK)
+APACHE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		apache
+BUILDLINK_DEPENDS.apache?=	apache{,6}-1.3.*
+BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
+
+# For "apxs":
+BUILD_DEPENDS+=			perl>=${PERL5_REQD}:../../lang/perl5
+.if defined(APACHE_MODULE)
+BUILDLINK_DEPMETHOD.apache?=	full
+.else
+BUILDLINK_DEPMETHOD.apache?=	build
+.endif
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.apache=apache
+BUILDLINK_PREFIX.apache_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.apache=		include/httpd/*/*.[ch]
+BUILDLINK_FILES.apache+=	include/httpd/*.[ch]
+
+BUILDLINK_TARGETS+=	apache-buildlink
+
+APXS?=			${BUILDLINK_PREFIX.apache}/sbin/apxs
+.if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=	--with-apxs="${APXS}"
+.endif
+
+apache-buildlink: _BUILDLINK_USE
+
+.endif	# APACHE_BUILDLINK2_MK
diff --git a/www/apache/distinfo b/www/apache/distinfo
index d07d4a48d57..fb0883bf773 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2002/06/24 16:26:19 taca Exp $
+$NetBSD: distinfo,v 1.22 2002/08/25 18:40:18 jlam Exp $
 
 SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f
 Size (apache_1.3.26.tar.gz) = 2303147 bytes
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index afe01833999..67879c0f02f 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.20 2002/07/07 00:45:18 tv Exp $
+# $NetBSD: apache.sh,v 1.21 2002/08/25 18:40:18 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout
index 78cd648c07a..0c17293071d 100644
--- a/www/apache/files/config.layout
+++ b/www/apache/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.5 2002/07/30 18:40:14 wiz Exp $
+# $NetBSD: config.layout,v 1.6 2002/08/25 18:40:19 jlam Exp $
 
 <Layout pkgsrc>
 prefix: @PREFIX@
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 7b5809cd53e..ea099ea49b5 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.19 2002/06/20 17:12:37 taca Exp $
+$NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
 
 --- Makefile.tmpl.orig	Fri Jun 21 02:02:43 2002
 +++ Makefile.tmpl
diff --git a/www/apache/patches/patch-ao b/www/apache/patches/patch-ao
index f2ca851a12c..40a221d0ad9 100644
--- a/www/apache/patches/patch-ao
+++ b/www/apache/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1 2002/06/20 17:12:37 taca Exp $
+$NetBSD: patch-ao,v 1.2 2002/08/25 18:40:19 jlam Exp $
 
 --- configure.orig	Thu Jun 20 20:56:07 2002
 +++ configure