Fix up apache and apache-modssl pkgs:

- Now that bsd.pkg.mk filters out dlopen style .so's on NOPIC systems,
  re-merge the PLIST.
- Rewrite apache-modssl's Makefile and PLIST to share apache's, reducing
  logic duplication.

3 files changed, 4 insertions, 7 deletions

diff --git a/www/apache/pkg/PLIST-mi b/www/apache/pkg/PLIST
index a08add3fe39..d1dba55a3b4 100644
--- a/www/apache/pkg/PLIST-mi
+++ b/www/apache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-mi,v 1.5 1998/09/05 23:14:45 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/10/03 21:01:14 tv Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -244,8 +244,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
+lib/apache/mod_include.so
+@exec mkdir -p %D/http/logs %D/http/proxy %D/lib/apache
 man/man1/ab.1
 man/man1/apachectl.1
 man/man1/dbmmanage.1
@@ -261,6 +261,7 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
+@dirrm lib/apache
 @dirrm http/cgi-bin
 @dirrm http/conf
 @dirrm http/htdocs/manual/images
diff --git a/www/apache/pkg/PLIST-md.shared b/www/apache/pkg/PLIST-md.shared
deleted file mode 100644
index d5c86bc0ad0..00000000000
--- a/www/apache/pkg/PLIST-md.shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@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-md.static b/www/apache/pkg/PLIST-md.static
deleted file mode 100644
index 74cbca0f5c9..00000000000
--- a/www/apache/pkg/PLIST-md.static
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST-md.static,v 1.1 1998/06/04 19:38:37 tv Exp $