Add libexec/cgi-bin directory to standard /usr/pkg hierarchy. Remove all

the per-package code that attempt to remove this directory if it's empty.

9 files changed, 9 insertions, 20 deletions

diff --git a/www/apache-current/pkg/PLIST b/www/apache-current/pkg/PLIST
index f71cb922135..db489bcb94a 100644
--- a/www/apache-current/pkg/PLIST
+++ b/www/apache-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/30 22:06:01 itojun Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/02 22:22:42 jlam Exp $
 bin/ab
 bin/apachectl
 bin/apxs
@@ -401,7 +401,6 @@ share/httpd/icons/a.gif
 share/httpd/icons/world2.gif
 share/httpd/icons/README
 @dirrm include/httpd
-@dirrm libexec/cgi-bin
 @dirrm share/httpd/htdocs/manual/misc
 @dirrm share/httpd/htdocs/manual/developer
 @dirrm share/httpd/htdocs/manual/platform
diff --git a/www/apache/pkg/DEINSTALL b/www/apache/pkg/DEINSTALL
index bab5bd8609b..13fc444fab7 100644
--- a/www/apache/pkg/DEINSTALL
+++ b/www/apache/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.7 2001/04/29 20:42:29 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.8 2001/05/02 22:22:43 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -11,7 +11,6 @@ RMDIR="@RMDIR@"
 TRUE="@TRUE@"
 
 SERVERROOT="@APACHE_SYSCONFDIR@"
-CGIBINDIR=${PKG_PREFIX}/libexec/cgi-bin
 DATADIR=${PKG_PREFIX}/share/httpd
 LOGDIR=/var/log/httpd
 SPOOLDIR=/var/spool/httpd
@@ -52,7 +51,6 @@ POST-DEINSTALL)
 	${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE}
 	${RMDIR} ${DATADIR}/htdocs 2>/dev/null || ${TRUE}
 	${RMDIR} ${DATADIR} 2>/dev/null || ${TRUE}
-	${RMDIR} ${CGIBINDIR} 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.prm 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.key 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.csr 2>/dev/null || ${TRUE}
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index f53ba492779..0cb3212c49a 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2001/04/14 19:42:54 kim Exp $
+@comment $NetBSD: PLIST,v 1.21 2001/05/02 22:22:43 jlam Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -414,4 +414,3 @@ share/httpd/icons/world2.gif
 @dirrm share/examples/httpd
 @dirrm include/httpd/xml
 @dirrm include/httpd
-@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true
diff --git a/www/apache6/pkg/DEINSTALL b/www/apache6/pkg/DEINSTALL
index 0c57cef7655..1ef08a3f7e5 100644
--- a/www/apache6/pkg/DEINSTALL
+++ b/www/apache6/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.3 2001/04/29 21:21:14 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2001/05/02 22:22:43 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -11,7 +11,6 @@ RMDIR="@RMDIR@"
 TRUE="@TRUE@"
 
 SERVERROOT="@APACHE_SYSCONFDIR@"
-CGIBINDIR=${PKG_PREFIX}/libexec/cgi-bin
 DATADIR=${PKG_PREFIX}/share/httpd
 LOGDIR=/var/log/httpd
 SPOOLDIR=/var/spool/httpd
@@ -52,7 +51,6 @@ POST-DEINSTALL)
 	${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE}
 	${RMDIR} ${DATADIR}/htdocs 2>/dev/null || ${TRUE}
 	${RMDIR} ${DATADIR} 2>/dev/null || ${TRUE}
-	${RMDIR} ${CGIBINDIR} 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.prm 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.key 2>/dev/null || ${TRUE}
 	${RMDIR} ${SERVERROOT}/ssl.csr 2>/dev/null || ${TRUE}
diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST
index c3ea485c358..a7a2b238d10 100644
--- a/www/apache6/pkg/PLIST
+++ b/www/apache6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2001/04/14 19:42:54 kim Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/05/02 22:22:43 jlam Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -411,4 +411,3 @@ share/httpd/icons/world2.gif
 @dirrm share/examples/httpd
 @dirrm include/httpd/xml
 @dirrm include/httpd
-@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true
diff --git a/www/htdig/pkg/PLIST b/www/htdig/pkg/PLIST
index 6e3927704ee..5240e866ba0 100644
--- a/www/htdig/pkg/PLIST
+++ b/www/htdig/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/02/29 23:31:34 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/05/02 22:22:43 jlam Exp $
 bin/htfuzzy
 bin/htdig
 bin/htmerge
@@ -55,5 +55,4 @@ libexec/cgi-bin/htsearch
 @dirrm share/htdig/common
 @dirrm share/htdig
 @dirrm share/examples/htdig
-@dirrm libexec/cgi-bin
 @dirrm etc/htdig
diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST
index 13b608e0bad..6280ba408e0 100644
--- a/www/php4/pkg/PLIST
+++ b/www/php4/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2001/04/30 03:25:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/05/02 22:22:43 jlam Exp $
 bin/pear
 bin/php
 bin/php-config
@@ -192,7 +192,6 @@ share/examples/php/php.ini-dist
 share/examples/php/php.ini-optimized
 share/php/php4.gif
 @dirrm share/php
-@unexec rmdir -p %D/libexec/cgi-bin 2>/dev/null || true
 @dirrm share/examples/php
 @dirrm lib/php/extensions/no-debug-non-zts-20001214
 @dirrm lib/php/extensions
diff --git a/www/thttpd/pkg/PLIST b/www/thttpd/pkg/PLIST
index 689071fb49c..8eea00e62e5 100644
--- a/www/thttpd/pkg/PLIST
+++ b/www/thttpd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2000/09/20 05:14:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2001/05/02 22:22:44 jlam Exp $
 etc/rc.d/thttpd
 libexec/cgi-bin/redirect
 libexec/cgi-bin/phf
@@ -17,4 +17,3 @@ share/examples/thttpd.conf
 share/thttpd/index.html
 share/thttpd/sitedrivenby.gif
 @dirrm share/thttpd
-@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true
diff --git a/www/wwwcount/pkg/PLIST b/www/wwwcount/pkg/PLIST
index 3fabe3c6a0f..38557e593f1 100644
--- a/www/wwwcount/pkg/PLIST
+++ b/www/wwwcount/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/02/27 22:11:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/05/02 22:22:44 jlam Exp $
 bin/mkstrip
 bin/extdgts
 libdata/wwwcount/digits/A/peng.gif
@@ -102,4 +102,3 @@ man/man1/mkstrip.1
 @dirrm share/doc/wwwcount/Count2.5/eximages
 @dirrm share/doc/wwwcount/Count2.5
 @dirrm share/doc/wwwcount
-@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true