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.

5 files changed, 15 insertions, 77 deletions

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>