* Create the http/logs and http/proxy directories when pkg_add'ing

  the package (albeit in a rather kludgy way).
* Update order of @dirrm statements in PLIST files so that the
  pkg_delete deletes the directories properly.
* Note in description that proxy support is in.

4 files changed, 17 insertions, 8 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index b869e4fb4f6..7264ce9501e 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/06/22 13:14:31 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/07/21 21:34:09 cjs Exp $
 #
 
 DISTNAME=       apache_1.3.0
@@ -19,6 +19,12 @@ CONFIGURE_ARGS+=--compat --prefix=${PREFIX}/http --exec-prefix=${PREFIX} \
 # Under Apache 1.3, modules can be compiled to link dynamically to the server
 # using the "apxs" program.  See apxs(8).
 
+# Create dummy files because there's no way (that I can see --cjs)
+# to make an empty directory with pkg_add.
+post-install:
+	touch ${PREFIX}/http/logs/.keep_me
+	touch ${PREFIX}/http/proxy/.keep_me
+
 .include "../../mk/bsd.pkg.mk"
 
 # Define some modules that are often replaced as shared modules that can be
diff --git a/www/apache/pkg/DESCR b/www/apache/pkg/DESCR
index 8ed3f8420d0..ec312aa9461 100644
--- a/www/apache/pkg/DESCR
+++ b/www/apache/pkg/DESCR
@@ -1,6 +1,6 @@
-The latest beta version of the most popular web server on the 'net.
-This version is quite stable, and includes proxy server support, as
-well as the ability to add modules that add many other features.
+The latest version of the most popular web server on the 'net.
+This compile includes proxy server support, as well as the ability
+to add modules that add many other features.
 
 You'll have to edit the configuration files in /usr/pkg/http/conf
 before you start it. The default root directory for documents is
diff --git a/www/apache/pkg/PLIST-md.shared b/www/apache/pkg/PLIST-md.shared
index e3139f9e22e..d5c86bc0ad0 100644
--- a/www/apache/pkg/PLIST-md.shared
+++ b/www/apache/pkg/PLIST-md.shared
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST-md.shared,v 1.1 1998/06/04 19:38:36 tv Exp $
+@comment $NetBSD: PLIST-md.shared,v 1.2 1998/07/21 21:34:09 cjs Exp $
 lib/apache/mod_include.so
+@dirrm lib/apache
diff --git a/www/apache/pkg/PLIST-mi b/www/apache/pkg/PLIST-mi
index 24d35bfa8aa..ef169285a45 100644
--- a/www/apache/pkg/PLIST-mi
+++ b/www/apache/pkg/PLIST-mi
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-mi,v 1.2 1998/06/06 23:48:21 tv Exp $
+@comment $NetBSD: PLIST-mi,v 1.3 1998/07/21 21:34:09 cjs Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -240,6 +240,8 @@ http/include/util_date.h
 http/include/util_md5.h
 http/include/util_script.h
 http/include/util_uri.h
+http/logs/.keep_me
+http/proxy/.keep_me
 man/man1/ab.1
 man/man1/apachectl.1
 man/man1/dbmmanage.1
@@ -257,14 +259,14 @@ sbin/logresolve
 sbin/rotatelogs
 @dirrm http/cgi-bin
 @dirrm http/conf
-@dirrm http/htdocs
 @dirrm http/htdocs/manual/images
 @dirrm http/htdocs/manual/misc
 @dirrm http/htdocs/manual/mod
 @dirrm http/htdocs/manual/vhosts
 @dirrm http/htdocs/manual
+@dirrm http/htdocs
 @dirrm http/icons
 @dirrm http/include
 @dirrm http/logs
+@dirrm http/proxy
 @dirrm http
-@dirrm lib/apache