Split some stuff out into a new Makefile.common so that the new

deve/apr package can use it.  Depend on the new apr package.

Approved by jlam@netbsd.org.

9 files changed, 35 insertions, 179 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 041f03433cf..32ed49e97a6 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,41 +1,31 @@
-# $NetBSD: Makefile,v 1.22 2003/05/22 09:44:42 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/05/25 08:58:10 epg Exp $
 
-DISTNAME=		httpd-${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
-APACHE_VERSION=		2.0.45
 CATEGORIES=		www
-MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
-			${MASTER_SITE_APACHE:=httpd/old/} \
-			http://www.netbsd.org/images/logos/
 
-MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://httpd.apache.org/
 COMMENT=		Apache HTTP (Web) server, version 2
 
 CONFLICTS=		apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
 CONFLICTS+=		ap-*-[0-9]*	# Apache-1.x DSOs
-CONFLICTS+=		apr-[0-9]*	# devel/apr-devel package
 
 BUILD_DEFS+=		USE_INET6
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/srclib/apr/libtool
+#USE_LIBTOOL=		YES
+#LIBTOOL_OVERRIDE=	${WRKSRC}/srclib/apr/libtool
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-layout=NetBSD
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-port=80
+CONFIGURE_ARGS+=	--with-mpm=prefork
 
 # Apache Portable Runtime library configure options
-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_PREFIX.expat}
+CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-apr-util=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -125,8 +115,7 @@ AP_CONF_FILE_SED+=	-e "s|^\(User[	 ]\).*|\1${APACHE_USER}|g"
 AP_CONF_FILE_SED+=	-e "s|^\(Group[	 ]\).*|\1${APACHE_GROUP}|g"
 
 post-install:
-	${RM} ${PREFIX}/share/httpd/build/libtool
-	${INSTALL_SCRIPT} ${LIBTOOL} ${PREFIX}/share/httpd/build/libtool
+	${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${PREFIX}/share/httpd/build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV}				\
 		${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"
 	@cd ${EGDIR};							\
@@ -153,6 +142,9 @@ post-install:
 		${MV} -f $${file}.new $${file};				\
 	done
 
+.include "Makefile.common"
+
+.include "../../devel/apr/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 
diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
new file mode 100644
index 00000000000..2d667d61e38
--- /dev/null
+++ b/www/apache2/Makefile.common
@@ -0,0 +1,7 @@
+DISTNAME=		httpd-${APACHE_VERSION}
+APACHE_VERSION=		2.0.45
+APR_VERSION=            0.9.1
+MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
+			${MASTER_SITE_APACHE:=httpd/old/} \
+			http://www.netbsd.org/images/logos/
+MAINTAINER=		jlam@netbsd.org
diff --git a/www/apache2/PLIST b/www/apache2/PLIST
index de897333851..6415f398f77 100644
--- a/www/apache2/PLIST
+++ b/www/apache2/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2003/05/22 09:42:33 wiz Exp $
-bin/apr-config
-bin/apu-config
+@comment $NetBSD: PLIST,v 1.14 2003/05/25 08:58:10 epg Exp $
 etc/rc.d/apache
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
@@ -12,67 +10,6 @@ include/httpd/ap_mpm.h
 include/httpd/ap_provider.h
 include/httpd/ap_regkey.h
 include/httpd/ap_release.h
-include/httpd/apr.h
-include/httpd/apr_allocator.h
-include/httpd/apr_anylock.h
-include/httpd/apr_atomic.h
-include/httpd/apr_base64.h
-include/httpd/apr_buckets.h
-include/httpd/apr_compat.h
-include/httpd/apr_date.h
-include/httpd/apr_dbm.h
-include/httpd/apr_dso.h
-include/httpd/apr_env.h
-include/httpd/apr_errno.h
-include/httpd/apr_file_info.h
-include/httpd/apr_file_io.h
-include/httpd/apr_fnmatch.h
-include/httpd/apr_general.h
-include/httpd/apr_getopt.h
-include/httpd/apr_global_mutex.h
-include/httpd/apr_hash.h
-include/httpd/apr_hooks.h
-include/httpd/apr_inherit.h
-include/httpd/apr_ldap.h
-include/httpd/apr_ldap_url.h
-include/httpd/apr_lib.h
-include/httpd/apr_md4.h
-include/httpd/apr_md5.h
-include/httpd/apr_mmap.h
-include/httpd/apr_network_io.h
-include/httpd/apr_optional.h
-include/httpd/apr_optional_hooks.h
-include/httpd/apr_poll.h
-include/httpd/apr_pools.h
-include/httpd/apr_portable.h
-include/httpd/apr_proc_mutex.h
-include/httpd/apr_queue.h
-include/httpd/apr_reslist.h
-include/httpd/apr_ring.h
-include/httpd/apr_rmm.h
-include/httpd/apr_sdbm.h
-include/httpd/apr_sha1.h
-include/httpd/apr_shm.h
-include/httpd/apr_signal.h
-include/httpd/apr_strings.h
-include/httpd/apr_strmatch.h
-include/httpd/apr_support.h
-include/httpd/apr_tables.h
-include/httpd/apr_thread_cond.h
-include/httpd/apr_thread_mutex.h
-include/httpd/apr_thread_proc.h
-include/httpd/apr_thread_rwlock.h
-include/httpd/apr_time.h
-include/httpd/apr_uri.h
-include/httpd/apr_user.h
-include/httpd/apr_uuid.h
-include/httpd/apr_version.h
-include/httpd/apr_want.h
-include/httpd/apr_xlate.h
-include/httpd/apr_xml.h
-include/httpd/apu.h
-include/httpd/apu_compat.h
-include/httpd/apu_version.h
 include/httpd/http_config.h
 include/httpd/http_connection.h
 include/httpd/http_core.h
@@ -112,19 +49,7 @@ include/httpd/util_md5.h
 include/httpd/util_script.h
 include/httpd/util_time.h
 include/httpd/util_xml.h
-lib/apr.exp
-lib/aprutil.exp
 lib/httpd/httpd.exp
-lib/libapr.a
-lib/libapr.la
-lib/libapr.so
-lib/libapr.so.9
-lib/libapr.so.9.3
-lib/libaprutil.a
-lib/libaprutil.la
-lib/libaprutil.so
-lib/libaprutil.so.9
-lib/libaprutil.so.9.3
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
 man/man1/dbmmanage.1
@@ -153,7 +78,6 @@ share/examples/httpd/httpd-std.conf
 share/examples/httpd/magic
 share/examples/httpd/mime.types
 share/examples/httpd/ssl-std.conf
-share/httpd/build/apr_rules.mk
 share/httpd/build/config_vars.mk
 share/httpd/build/instdso.sh
 share/httpd/build/library.mk
diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 002c7dafc00..fd1b14804cf 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.17 2003/04/15 11:49:38 martin Exp $
+$NetBSD: distinfo,v 1.18 2003/05/25 08:58:10 epg Exp $
 
 SHA1 (httpd-2.0.45.tar.gz) = f722399b0e1986e699bc807518e396b7f0286cca
 Size (httpd-2.0.45.tar.gz) = 5549120 bytes
-SHA1 (patch-aa) = 368740503e36e158f88bee8df8463f9fd76ae620
+SHA1 (patch-aa) = b0632ed8e7fba4b5b36407b67bfe2faf3234e575
 SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74
 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
 SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc
 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
-SHA1 (patch-an) = 6b8aff418e1c3af3be7e280cc373c9555c6f8005
-SHA1 (patch-ao) = 30fa298dc4ae6c6f48276034d07667b909829abf
-SHA1 (patch-ap) = bac08a78f97cdbd3cecb3cbfbae254e217940f61
-SHA1 (patch-aq) = 388019fe029ddf108e0fd3f99d718563bcc2c51b
-SHA1 (patch-ar) = 5e4010b2b48c9a19c1cbade9baab639a9e31704d
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index 3882913addf..afb217301a4 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2003/02/02 09:59:09 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2003/05/25 08:58:10 epg Exp $
 
---- Makefile.in.orig	Mon Sep 30 08:34:40 2002
+--- Makefile.in.orig	Mon Sep 30 10:34:40 2002
 +++ Makefile.in
 @@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
  PROGRAMS        = $(PROGRAM_NAME)
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.8 2003/02/02 09:59:09 jlam Exp $
  	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
  	    	file=`echo $$i|sed s/-std//`; \
  	    	if [ "$$file" = "httpd.conf" ]; then \
-@@ -79,13 +80,16 @@ install-conf:
+@@ -79,21 +80,22 @@ install-conf:
  	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
  	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
@@ -36,7 +36,15 @@ $NetBSD: patch-aa,v 1.8 2003/02/02 09:59:09 jlam Exp $
  	fi
  
  install-build:
-@@ -106,7 +110,7 @@ dox::
+ 	@echo Installing build system files 
+ 	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
+ 	@cp build/*.mk $(DESTDIR)$(installbuilddir); \
+-	sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
+-	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
+ 	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir);
+ 
+ htdocs-srcdir = $(top_srcdir)/docs/docroot
+@@ -106,7 +108,7 @@ dox::
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -45,7 +53,7 @@ $NetBSD: patch-aa,v 1.8 2003/02/02 09:59:09 jlam Exp $
             echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
          else \
  	    echo Installing HTML documents ; \
-@@ -116,7 +120,7 @@ install-htdocs:
+@@ -116,7 +118,7 @@ install-htdocs:
  	fi
  
  install-error:
@@ -54,7 +62,7 @@ $NetBSD: patch-aa,v 1.8 2003/02/02 09:59:09 jlam Exp $
             echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
          else \
  	    echo Installing error documents ; \
-@@ -126,7 +130,7 @@ install-error:
+@@ -126,7 +128,7 @@ install-error:
  	fi
  
  install-icons:
@@ -63,7 +71,7 @@ $NetBSD: patch-aa,v 1.8 2003/02/02 09:59:09 jlam Exp $
             echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
          else \
  	    echo Installing icons ; \
-@@ -136,7 +140,7 @@ install-icons:
+@@ -136,7 +138,7 @@ install-icons:
  	fi
  
  install-cgi:
diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an
deleted file mode 100644
index 2b9ac6c753e..00000000000
--- a/www/apache2/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.5 2003/01/28 14:21:58 martti Exp $
-
---- srclib/apr/configure.in.orig	2003-01-06 21:04:08.000000000 +0200
-+++ srclib/apr/configure.in	2003-01-28 16:11:24.000000000 +0200
-@@ -1635,7 +1635,7 @@
-   if test "$apr_devrandom" = "yes"; then
-     # /dev/random on OpenBSD doesn't provide random data, so
-     # prefer /dev/arandom, which does; see random(4).
--    for f in /dev/arandom /dev/random /dev/urandom; do
-+    for f in /dev/arandom /dev/urandom /dev/random; do
-       if test -r $f; then
-         apr_devrandom=$f
-         rand=1
diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao
deleted file mode 100644
index 827a75af3a6..00000000000
--- a/www/apache2/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.5 2003/01/28 14:21:59 martti Exp $
-
---- srclib/apr/configure.orig	2003-01-18 17:20:31.000000000 +0200
-+++ srclib/apr/configure	2003-01-28 16:13:11.000000000 +0200
-@@ -24713,7 +24713,7 @@
-   if test "$apr_devrandom" = "yes"; then
-     # /dev/random on OpenBSD doesn't provide random data, so
-     # prefer /dev/arandom, which does; see random(4).
--    for f in /dev/arandom /dev/random /dev/urandom; do
-+    for f in /dev/arandom /dev/urandom /dev/random; do
-       if test -r $f; then
-         apr_devrandom=$f
-         rand=1
diff --git a/www/apache2/patches/patch-ap b/www/apache2/patches/patch-ap
deleted file mode 100644
index f18b89ac892..00000000000
--- a/www/apache2/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2003/04/03 08:29:00 itojun Exp $
-
---- srclib/apr-util/config.layout.orig	Thu Apr  3 17:15:08 2003
-+++ srclib/apr-util/config.layout	Thu Apr  3 17:14:15 2003
-@@ -229,3 +229,17 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix     -${APRUTIL_MAJOR_VERSION}
- </Layout>
-+
-+#   NetBSD (pkgsrc) layout
-+<Layout NetBSD>
-+    prefix:        /usr/pkg
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libexecdir:    ${exec_prefix}/lib/httpd
-+    mandir:        ${prefix}/man
-+    datadir:       ${prefix}/share/httpd
-+    includedir:    ${prefix}/include/apr
-+    localstatedir: /var
-+    runtimedir:    ${localstatedir}/run
-+</Layout>
diff --git a/www/apache2/patches/patch-aq b/www/apache2/patches/patch-aq
deleted file mode 100644
index 0336d9558e3..00000000000
--- a/www/apache2/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2003/04/03 08:29:01 itojun Exp $
-
---- srclib/apr/config.layout.orig	Thu Apr  3 17:14:54 2003
-+++ srclib/apr/config.layout	Thu Apr  3 17:14:01 2003
-@@ -229,3 +229,17 @@
-     infodir:       ${exec_prefix}/share/info
-     libsuffix:    -${APR_MAJOR_VERSION}
- </Layout>
-+
-+#   NetBSD (pkgsrc) layout
-+<Layout NetBSD>
-+    prefix:        /usr/pkg
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libexecdir:    ${exec_prefix}/lib/httpd
-+    mandir:        ${prefix}/man
-+    datadir:       ${prefix}/share/httpd
-+    includedir:    ${prefix}/include/apr
-+    localstatedir: /var
-+    runtimedir:    ${localstatedir}/run
-+</Layout>