Don't hardwire /usr/pkg (pkg/13673).

Correct location of config file in configure script (pkg/13673).
Try to remove some more directories on deinstall.

6 files changed, 33 insertions, 10 deletions

diff --git a/www/apache-current/Makefile b/www/apache-current/Makefile
index 56312e1002e..d072b7beb39 100644
--- a/www/apache-current/Makefile
+++ b/www/apache-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/18 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/14 15:38:08 wiz Exp $
 
 DISTNAME=		httpd-2_0_16-beta
 PKGNAME=		apache-2.0.16
@@ -48,6 +48,13 @@ post-patch:
 	${RM} ${WRKSRC}/docs/conf/*.orig
 	(cd ${WRKSRC}; ${LN} -s ${LOCALBASE}/bin/libtool)
 
+pre-configure:
+	${CP} ${WRKSRC}/config.layout ${WRKSRC}/config.layout.bak
+	${SED} -e 's:PKG_PREFIX:${PREFIX}:g' ${WRKSRC}/config.layout.bak > ${WRKSRC}/config.layout
+	${CP} ${WRKSRC}/docs/conf/httpd-std.conf ${WRKSRC}/docs/conf/httpd-std.conf.bak
+	${SED} -e 's:PKG_PREFIX:${PREFIX}:g' ${WRKSRC}/docs/conf/httpd-std.conf.bak > ${WRKSRC}/docs/conf/httpd-std.conf
+	${RM} ${WRKSRC}/docs/conf/httpd-std.conf.bak ${WRKSRC}/config.layout.bak
+
 pre-install:
 	for i in ${AP_LIBS}; do \
 		${SH} ${WRKSRC}/libtool ${INSTALL_DATA} \
diff --git a/www/apache-current/distinfo b/www/apache-current/distinfo
index d8528eee7eb..783d35d98cd 100644
--- a/www/apache-current/distinfo
+++ b/www/apache-current/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 21:52:55 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/09/14 15:38:08 wiz Exp $
 
 SHA1 (httpd-2_0_16-beta.tar.Z) = 388ba6e11f9dbb39f52512a2354ec20706049c2a
 Size (httpd-2_0_16-beta.tar.Z) = 4950623 bytes
-SHA1 (patch-aa) = b43cd6a31b5c0f318b0cd9e9fbe08938dd7cfda0
+SHA1 (patch-aa) = 4f48e25cc6c84f10d90af699f7eed80e9eaa5a76
 SHA1 (patch-ac) = bf100d182752ad94fbb3d1fb3c9d59edef0425f0
 SHA1 (patch-ad) = 56d3bc6023cd3457cbd96268f43fe2ce505caaa6
-SHA1 (patch-ae) = 5747317d24d8fa09bbd99b170983e59ff38647a4
+SHA1 (patch-ae) = 5dcfc2bb6e007e5f36040d0b5ff85a30a3a31ffc
 SHA1 (patch-af) = fed6d9e6eabeb10bf8d5f9b60c5f8d61306f6b10
 SHA1 (patch-ag) = a6b3e8dc948a90c03dabe4b8b2dc8f43d90f66e2
+SHA1 (patch-ah) = 200a66d936742eb2c28b157dd61afbd4913ed7a0
diff --git a/www/apache-current/patches/patch-aa b/www/apache-current/patches/patch-aa
index 4156c7b9262..0740189d3bd 100644
--- a/www/apache-current/patches/patch-aa
+++ b/www/apache-current/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/30 22:06:01 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2001/09/14 15:38:09 wiz Exp $
 
 --- config.layout-	Fri Mar 30 20:15:06 2001
 +++ config.layout	Fri Mar 30 20:18:04 2001
@@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/30 22:06:01 itojun Exp $
 +
 +#   NetBSD Layout
 +<Layout NetBSD>
-+    prefix:        /usr/pkg
++    prefix:        PKG_PREFIX
 +    exec_prefix:   $prefix
 +    bindir:        $prefix/bin
 +    sbindir:       $prefix/sbin
diff --git a/www/apache-current/patches/patch-ae b/www/apache-current/patches/patch-ae
index 0d5eb3e707f..230909d2456 100644
--- a/www/apache-current/patches/patch-ae
+++ b/www/apache-current/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2001/04/08 10:55:22 itojun Exp $
+$NetBSD: patch-ae,v 1.3 2001/09/14 15:38:09 wiz Exp $
 
 --- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
 +++ docs/conf/httpd-std.conf	Sun Apr  8 12:05:13 2001
@@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.2 2001/04/08 10:55:22 itojun Exp $
  # to be found.
  #
 -TypesConfig conf/mime.types
-+TypesConfig /usr/pkg/etc/httpd/mime.types
++TypesConfig PKG_PREFIX/etc/httpd/mime.types
  
  #
  # DefaultType is the default MIME type the server will use for a document
@@ -51,7 +51,7 @@ $NetBSD: patch-ae,v 1.2 2001/04/08 10:55:22 itojun Exp $
  #
  <IfModule mod_mime_magic.c>
 -    MIMEMagicFile conf/magic
-+    MIMEMagicFile /usr/pkg/etc/httpd/magic
++    MIMEMagicFile PKG_PREFIX/etc/httpd/magic
  </IfModule>
  
  #
diff --git a/www/apache-current/patches/patch-ah b/www/apache-current/patches/patch-ah
new file mode 100644
index 00000000000..8d0ba843517
--- /dev/null
+++ b/www/apache-current/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2001/09/14 15:38:20 wiz Exp $
+
+--- configure.bak	Fri Aug 10 07:23:07 2001
++++ configure	Fri Aug 10 07:23:08 2001
+@@ -9814,7 +9814,7 @@
+ EOF
+ 
+ cat >> confdefs.h <<EOF
+-#define SERVER_CONFIG_FILE "conf/$progname.conf"
++#define SERVER_CONFIG_FILE "etc/httpd/$progname.conf"
+ EOF
+ 
+ cat >> confdefs.h <<EOF
diff --git a/www/apache-current/pkg/PLIST b/www/apache-current/pkg/PLIST
index 6eed85cc464..46e231e352c 100644
--- a/www/apache-current/pkg/PLIST
+++ b/www/apache-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/05/05 16:22:04 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/09/14 15:38:09 wiz Exp $
 bin/ab
 bin/apachectl
 bin/apxs
@@ -472,4 +472,6 @@ share/httpd/icons/world2.gif
 @dirrm share/httpd/htdocs/manual/developer
 @dirrm share/httpd/htdocs/manual
 @dirrm share/httpd/htdocs
+@unexec rmdir %D/share/httpd 2>/dev/null || true
 @dirrm include/httpd
+@unexec rmdir %D/etc/httpd 2>/dev/null || true