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

have been converted to USE_BUILDLINK2.

11 files changed, 21 insertions, 23 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 48174c447a3..90916d9a928 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/07/30 18:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 21:51:53 jlam Exp $
 
 DISTNAME=		httpd-${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
@@ -19,10 +19,7 @@ CONFLICTS+=		ap-*-[0-9]*	# Apache-1.x DSOs
 
 BUILD_DEFS+=		USE_INET6
 
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	config_vars.mk
-REPLACE_BUILDLINK_SED=	-e "s|${BUILDLINK_DIR}|${LOCALBASE}|g"
-
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 
 USE_LIBTOOL=		YES
@@ -39,7 +36,7 @@ CONFIGURE_ARGS+=	--with-mpm=prefork --with-devrandom=/dev/urandom
 
 # Apache Portable Runtime Utility library configure options
 CONFIGURE_ARGS+=	--with-dbm=sdbm
-CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -94,15 +91,15 @@ OWN_DIRS_PERMS+=	/var/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
 
 # Add dependencies for the modules that will be built.  For each module
 # ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace
-# separated list of dependencies or buildlink.mk files needed to build
+# separated list of dependencies or buildlink2.mk files needed to build
 # ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of
 # configure script options for ap_mod.
 #
-_AP_DEPENDS.ssl=	../../security/openssl/buildlink.mk
-_AP_DEPENDS.deflate=	../../devel/zlib/buildlink.mk
+_AP_DEPENDS.ssl=	../../security/openssl/buildlink2.mk
+_AP_DEPENDS.deflate=	../../devel/zlib/buildlink2.mk
 
-_AP_CFG_ARGS.ssl=	--with-ssl=${BUILDLINK_DIR}
-_AP_CFG_ARGS.deflate=	--with-z=${BUILDLINK_DIR}
+_AP_CFG_ARGS.ssl=	--with-ssl=${BUILDLINK_PREFIX.openssl}
+_AP_CFG_ARGS.deflate=	--with-z=${BUILDLINK_PREFIX.zlib}
 
 .for _ap_mod in ${APACHE_MODULES}
 .  if defined(_AP_DEPENDS.${_ap_mod}) && !empty(_AP_DEPENDS.${_ap_mod})
@@ -158,7 +155,8 @@ post-install:
 	done
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 
-.include "../../lang/perl5/buildlink.mk"
-.include "../../textproc/expat/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../textproc/expat/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index a703fc38546..10492b1dc88 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/18 23:58:07 itojun Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 21:51:53 jlam Exp $
 bin/apr-config
 bin/apu-config
 etc/rc.d/apache
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index eb04878cd1d..275fd049f14 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 21:51:54 jlam Exp $
 
 SHA1 (httpd-2.0.39.tar.gz) = 3f04dbffc081a34dbfc9aeab6738f320285db292
 Size (httpd-2.0.39.tar.gz) = 4413542 bytes
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
index d0e23dfd460..22e29461d57 100644
--- a/www/apache2/files/apache.sh
+++ b/www/apache2/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.4 2002/07/07 00:45:19 tv Exp $
+# $NetBSD: apache.sh,v 1.5 2002/08/25 21:51:55 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index afb9d0159c6..f6dd727f42a 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:55 jlam Exp $
 
 --- Makefile.in.orig	Sat Jun 15 18:41:03 2002
 +++ Makefile.in	Wed Jun 19 07:39:04 2002
diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad
index 46c70bbfd95..19e255f87cb 100644
--- a/www/apache2/patches/patch-ad
+++ b/www/apache2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: patch-ad,v 1.5 2002/08/25 21:51:56 jlam Exp $
 
 --- config.layout.orig	Fri May 17 23:49:30 2002
 +++ config.layout	Wed Jun 19 07:39:33 2002
diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag
index 1daea42bd56..17311fc94cf 100644
--- a/www/apache2/patches/patch-ag
+++ b/www/apache2/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: patch-ag,v 1.6 2002/08/25 21:51:56 jlam Exp $
 
 --- support/Makefile.in.orig	Sat Jun 15 13:41:52 2002
 +++ support/Makefile.in	Wed Jun 19 07:39:51 2002
diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah
index 213e51de12c..7bd670cd6e4 100644
--- a/www/apache2/patches/patch-ah
+++ b/www/apache2/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.5 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: patch-ah,v 1.6 2002/08/25 21:51:57 jlam Exp $
 
 --- support/apachectl.in.orig	Mon May 27 20:46:01 2002
 +++ support/apachectl.in	Wed Jun 19 07:40:07 2002
diff --git a/www/apache2/patches/patch-ak b/www/apache2/patches/patch-ak
index b41d3aba122..f38289721b6 100644
--- a/www/apache2/patches/patch-ak
+++ b/www/apache2/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2002/06/01 13:18:02 itojun Exp $
+$NetBSD: patch-ak,v 1.3 2002/08/25 21:51:57 jlam Exp $
 
 --- docs/conf/httpd-std.conf.in.orig	Wed Apr 24 16:24:35 2002
 +++ docs/conf/httpd-std.conf.in
diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an
index a3556ccde6f..560177b1d27 100644
--- a/www/apache2/patches/patch-an
+++ b/www/apache2/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2002/06/18 23:58:07 itojun Exp $
+$NetBSD: patch-an,v 1.3 2002/08/25 21:51:57 jlam Exp $
 
 --with-randomdev=foo does not work.
 
diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao
index 1968e2f8621..51a179fba15 100644
--- a/www/apache2/patches/patch-ao
+++ b/www/apache2/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.2 2002/06/18 23:58:08 itojun Exp $
+$NetBSD: patch-ao,v 1.3 2002/08/25 21:51:57 jlam Exp $
 
 --with-randomdev=foo does not work.