27 files changed, 1 insertions, 32 deletions

diff --git a/graphics/gridpix/pkg-plist b/graphics/gridpix/pkg-plist
index 4cea5af9d393..d6d40ff2a03a 100644
--- a/graphics/gridpix/pkg-plist
+++ b/graphics/gridpix/pkg-plist
@@ -71,4 +71,3 @@ www/data/images/zoomout.png
 @unexec /bin/rmdir %D/www/data/gridpix 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/www/data/images 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/www/data 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/www 2>/dev/null || /usr/bin/true
diff --git a/mail/mailgraph/pkg-plist b/mail/mailgraph/pkg-plist
index 8cfd82887507..9715ca9caa8a 100644
--- a/mail/mailgraph/pkg-plist
+++ b/mail/mailgraph/pkg-plist
@@ -2,4 +2,3 @@ etc/rc.d/mailgraph.sh
 www/cgi-bin/mailgraph.cgi
 sbin/mailgraph.pl
 @unexec rmdir %D/www/cgi-bin 2>/dev/null || true
-@unexec rmdir %D/www 2>/dev/null || true
diff --git a/misc/achievo/pkg-plist b/misc/achievo/pkg-plist
index ee15f0a44844..ce29c77750b5 100644
--- a/misc/achievo/pkg-plist
+++ b/misc/achievo/pkg-plist
@@ -533,4 +533,3 @@ www/data.default/achievo/version.inc
 @dirrm www/data.default/achievo/atk
 @dirrm www/data.default/achievo
 @unexec rmdir www/data.default 2>/dev/null || true
-@unexec rmdir www 2>/dev/null || true
diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist
index e8a312a5e338..db3bb9d67a53 100644
--- a/russian/apache13-modssl/pkg-plist
+++ b/russian/apache13-modssl/pkg-plist
@@ -280,7 +280,6 @@ sbin/rotatelogs
 %%SUEXEC%%sbin/suexec
 %%DOCSDIR%%/apache_pb.gif
 %%DOCSDIR%%/ra-powered.gif
-@exec mkdir -p %D/www
 @exec echo "Make link %B -> %D/www/data.default" && ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
@@ -923,4 +922,3 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@dirrm www
diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist
index 841666910be6..f81d4d0bb415 100644
--- a/russian/apache13/pkg-plist
+++ b/russian/apache13/pkg-plist
@@ -254,7 +254,6 @@ sbin/rotatelogs
 %%SUEXEC%%sbin/suexec
 %%DOCSDIR%%/apache_pb.gif
 %%DOCSDIR%%/ra-powered.gif
-@exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default
 @unexec rm -f %D/www/data.default
 @exec [ ! -d %D/www/data ] && ln -fs %B %D/www/data
@@ -830,4 +829,3 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@dirrm www
diff --git a/russian/cyrproxy/pkg-plist b/russian/cyrproxy/pkg-plist
index 4553af3fdddf..c3770dbade5e 100644
--- a/russian/cyrproxy/pkg-plist
+++ b/russian/cyrproxy/pkg-plist
@@ -24,4 +24,3 @@ www/cgi-bin/cyrwww
 @dirrm share/cyrproxy
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/www/cgi-bin 2> /dev/null || true
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/sysutils/uptimed/pkg-plist b/sysutils/uptimed/pkg-plist
index 05ea892c345e..b8700c446875 100644
--- a/sysutils/uptimed/pkg-plist
+++ b/sysutils/uptimed/pkg-plist
@@ -11,4 +11,3 @@ www/cgi-bin/uprecords.conf
 www/cgi-bin/uprecords.footer
 www/cgi-bin/uprecords.header
 @unexec rmdir %D/www/cgi-bin 2>/dev/null || true
-@unexec rmdir %D/www 2>/dev/null || true
diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist
index 44abe5d59558..ea7f610234ea 100644
--- a/www/apache13+ipv6/pkg-plist
+++ b/www/apache13+ipv6/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.18 2003-10-29 11:36:44 sumikawa Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.19 2004-06-09 06:16:00 kris Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
@@ -668,4 +668,3 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@dirrm www
diff --git a/www/apache13-fp/pkg-plist b/www/apache13-fp/pkg-plist
index 1ef71f77de05..51a8ed6f6bcb 100644
--- a/www/apache13-fp/pkg-plist
+++ b/www/apache13-fp/pkg-plist
@@ -657,4 +657,3 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/apache13-modperl/pkg-plist b/www/apache13-modperl/pkg-plist
index c2f7889ce639..14b500fdbc93 100644
--- a/www/apache13-modperl/pkg-plist
+++ b/www/apache13-modperl/pkg-plist
@@ -669,7 +669,6 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@unexec rmdir %D/www 2>/dev/null || true
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Connection.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants.pm
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index fc4040506a99..5363860248d7 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -760,4 +760,3 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@unexec rmdir %D/www 2>/dev/null || true
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index f32b117f418e..8b475e2dac88 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -645,4 +645,3 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index 1be0a2b0ef5f..b1ee92afe930 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -673,4 +673,3 @@ www/icons/world2.png
 @dirrm www/icons/small
 @dirrm www/icons
 @dirrm www/proxy
-@dirrm www
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 732c868ecbbb..7e3e22a4e8d9 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -1240,7 +1240,6 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.xml.de
 %%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.xml.meta
-@exec mkdir -p %D/www
 %%CGI%%@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 %%CGI%%@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin-dist %D/www/cgi-bin
 %%CGI%%www/cgi-bin-dist/printenv
@@ -1538,7 +1537,6 @@ share/apache2/build/special.mk
 %%ERROR%%@dirrm www/error-dist
 %%WWWDATA%%@dirrm www/data-dist
 %%CGI%%@dirrm www/cgi-bin-dist
-@unexec rmdir %D/www 2> /dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/vhosts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style/zip
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style/xsl/util
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 732c868ecbbb..7e3e22a4e8d9 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -1240,7 +1240,6 @@ share/apache2/build/special.mk
 %%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.xml.de
 %%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.xml.ko
 %%PORTDOCS%%%%DOCSDIR%%/vhosts/name-based.xml.meta
-@exec mkdir -p %D/www
 %%CGI%%@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
 %%CGI%%@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin-dist %D/www/cgi-bin
 %%CGI%%www/cgi-bin-dist/printenv
@@ -1538,7 +1537,6 @@ share/apache2/build/special.mk
 %%ERROR%%@dirrm www/error-dist
 %%WWWDATA%%@dirrm www/data-dist
 %%CGI%%@dirrm www/cgi-bin-dist
-@unexec rmdir %D/www 2> /dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/vhosts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style/zip
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style/xsl/util
diff --git a/www/cgiwrap/pkg-plist b/www/cgiwrap/pkg-plist
index 78be1a7cad25..08221bfbc6e2 100644
--- a/www/cgiwrap/pkg-plist
+++ b/www/cgiwrap/pkg-plist
@@ -22,5 +22,4 @@ www/cgi-bin/cgiwrapd
 www/cgi-bin/nph-cgiwrap
 www/cgi-bin/nph-cgiwrapd
 @unexec rmdir %D/www/cgi-bin 2>/dev/null || true
-@unexec rmdir %D/www 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/fxhtml/pkg-plist b/www/fxhtml/pkg-plist
index 09bcdc1bda78..dfa17a5282c6 100644
--- a/www/fxhtml/pkg-plist
+++ b/www/fxhtml/pkg-plist
@@ -2,4 +2,3 @@ www/data/demo.fx
 www/cgi-bin/fxhtml
 @unexec rmdir %D/www/data 2> /dev/null || true
 @unexec rmdir %D/www/cgi-bin 2> /dev/null || true
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/monkey/pkg-plist b/www/monkey/pkg-plist
index b9b31fedc21a..e7226ace0a0e 100644
--- a/www/monkey/pkg-plist
+++ b/www/monkey/pkg-plist
@@ -30,4 +30,3 @@ www/data/php/index.php
 @dirrm www/data/docs
 @dirrm www/data
 @dirrm www/cgi-bin
-@dirrm www
diff --git a/www/npc/pkg-plist b/www/npc/pkg-plist
index d1f038804c4f..f6e08a247b4b 100644
--- a/www/npc/pkg-plist
+++ b/www/npc/pkg-plist
@@ -5,4 +5,3 @@ share/examples/npc/sample1.idx
 share/examples/npc/sample2.idx
 @dirrm share/examples/npc
 @dirrm www/cgi-bin
-@dirrm www
diff --git a/www/ssserver/pkg-plist b/www/ssserver/pkg-plist
index d1fff4173816..f5d258dd359e 100644
--- a/www/ssserver/pkg-plist
+++ b/www/ssserver/pkg-plist
@@ -63,4 +63,3 @@ www/cgi-bin/ssserverdata/template8.txt
 @mode
 @unexec rm -fR %B>/dev/null || true
 @unexec rmdir %D/www/cgi-bin 2> /dev/null || true
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/thttpd/pkg-plist b/www/thttpd/pkg-plist
index 7822c8c1c112..9f5b4d0ac2b6 100644
--- a/www/thttpd/pkg-plist
+++ b/www/thttpd/pkg-plist
@@ -13,4 +13,3 @@ www/cgi-bin/ssi
 @unexec rmdir %D/www/cgi-bin 2> /dev/null || true
 @unexec rmdir %D/www/data 2> /dev/null || true
 @unexec rmdir %D/www/logs 2> /dev/null || true
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index a36497f6074a..1e61c51cfdc0 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -3052,4 +3052,3 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrm %%ZOPEBASEDIR%%
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index a36497f6074a..1e61c51cfdc0 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -3052,4 +3052,3 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrm %%ZOPEBASEDIR%%
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index a36497f6074a..1e61c51cfdc0 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -3052,4 +3052,3 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrm %%ZOPEBASEDIR%%
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index a36497f6074a..1e61c51cfdc0 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -3052,4 +3052,3 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrm %%ZOPEBASEDIR%%
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index a36497f6074a..1e61c51cfdc0 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -3052,4 +3052,3 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrm %%ZOPEBASEDIR%%
-@unexec rmdir %D/www 2> /dev/null || true
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index a36497f6074a..1e61c51cfdc0 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -3052,4 +3052,3 @@ etc/rc.d/zope.sh
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
 @dirrm %%ZOPEBASEDIR%%
-@unexec rmdir %D/www 2> /dev/null || true