Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

5 files changed, 10 insertions, 9 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 22d4ec13618..40687be9ab9 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2002/08/01 00:58:33 mycroft Exp $
+# $NetBSD: Makefile,v 1.56 2002/08/25 21:51:58 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -30,7 +30,7 @@ COMMENT=		Apache HTTP (Web) server with IPv6 support
 CONFLICTS=		apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif:N*.diff.gz}
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-layout="${WRKDIR}/config.layout:pkgsrc"
 CONFIGURE_ARGS+=	--enable-module=most \
@@ -110,10 +110,10 @@ 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.db}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
 BUILDLINK_DEPENDS.db=	db>=2.7.7
-.include "../../databases/db/buildlink.mk"
+.include "../../databases/db/buildlink2.mk"
 .endif
 
 BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
@@ -166,6 +166,7 @@ post-install:
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
-.include "../../textproc/expat/buildlink.mk"
+.include "../../textproc/expat/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache6/PLIST b/www/apache6/PLIST
index 8dc35c896d9..117a2a3a31b 100644
--- a/www/apache6/PLIST
+++ b/www/apache6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/30 18:40:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:58 jlam Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
diff --git a/www/apache6/distinfo b/www/apache6/distinfo
index cbc6354bf8e..13a09c62da5 100644
--- a/www/apache6/distinfo
+++ b/www/apache6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/06/20 07:24:18 itojun Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 21:51:59 jlam Exp $
 
 SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f
 Size (apache_1.3.26.tar.gz) = 2303147 bytes
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index ecd1538c740..3d98771f53d 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.14 2002/07/07 00:45:19 tv Exp $
+# $NetBSD: apache.sh,v 1.15 2002/08/25 21:51:59 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout
index 7f6ab362761..a425fdf3a53 100644
--- a/www/apache6/files/config.layout
+++ b/www/apache6/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.4 2002/07/30 18:40:15 wiz Exp $
+# $NetBSD: config.layout,v 1.5 2002/08/25 21:52:00 jlam Exp $
 
 <Layout pkgsrc>
 prefix: @PREFIX@