aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/3proxy/pkg-plist1
-rw-r--r--net/Sockets/files/patch-Makefile13
-rw-r--r--net/Sockets/pkg-plist2
-rw-r--r--net/afpfs-ng/pkg-plist1
-rw-r--r--net/apinger/pkg-plist1
-rw-r--r--net/aprsc/pkg-plist2
-rw-r--r--net/arp-scan/pkg-plist1
-rw-r--r--net/asio/pkg-plist15
-rw-r--r--net/aslookup/pkg-plist1
-rw-r--r--net/belle-sip/pkg-plist1
-rw-r--r--net/binkd/pkg-plist1
-rw-r--r--net/bmon/pkg-plist2
-rw-r--r--net/c3270/pkg-plist1
-rw-r--r--net/clamz/pkg-plist3
-rw-r--r--net/coda6_client/pkg-plist1
-rw-r--r--net/coda6_server/pkg-plist1
-rw-r--r--net/cvsup-static/pkg-plist1
-rw-r--r--net/dgd/pkg-plist1
-rw-r--r--net/dictd-database/pkg-plist1
-rw-r--r--net/easysoap/pkg-plist1
-rw-r--r--net/echoping/pkg-plist2
-rw-r--r--net/ecore-con/pkg-plist1
-rw-r--r--net/empty/pkg-plist2
-rw-r--r--net/enet/pkg-plist1
-rw-r--r--net/erlang_xmlrpc/pkg-plist4
-rw-r--r--net/etrace/pkg-plist1
-rw-r--r--net/exaddos/pkg-plist8
-rw-r--r--net/findmtu/pkg-plist1
-rw-r--r--net/freenet6/pkg-plist1
-rw-r--r--net/freeradius-client/pkg-plist1
-rw-r--r--net/freerdp/pkg-plist12
-rw-r--r--net/g2ipmsg/pkg-plist2
-rw-r--r--net/gini/pkg-plist1
-rw-r--r--net/gnet2/pkg-plist5
-rw-r--r--net/gnu-dico/pkg-plist9
-rw-r--r--net/go.net/pkg-plist27
-rw-r--r--net/gofish/pkg-plist2
-rw-r--r--net/gogoc/pkg-plist2
-rw-r--r--net/google-daemon/pkg-plist2
-rw-r--r--net/googlecl/pkg-plist10
-rw-r--r--net/gq/pkg-plist6
-rw-r--r--net/grdesktop/pkg-plist4
-rw-r--r--net/gsk/pkg-plist15
-rw-r--r--net/gspoof/pkg-plist3
-rw-r--r--net/gtic/pkg-plist1
-rw-r--r--net/gtknetcat/pkg-plist2
-rw-r--r--net/h323plus/pkg-plist10
-rw-r--r--net/haproxy-devel/pkg-plist5
-rw-r--r--net/haproxy/pkg-plist5
-rw-r--r--net/hlmaster/pkg-plist2
-rw-r--r--net/honeyd/pkg-plist12
-rw-r--r--net/howl/pkg-plist7
-rw-r--r--net/hsflowd/pkg-plist1
-rw-r--r--net/httpry/pkg-plist3
-rw-r--r--net/hupnp/pkg-plist3
-rw-r--r--net/iet/pkg-plist4
-rw-r--r--net/ilbc/pkg-plist1
-rw-r--r--net/iodine/pkg-plist1
-rw-r--r--net/ipsvd/pkg-plist1
-rw-r--r--net/isc-dhcp41-server/pkg-plist3
-rw-r--r--net/isc-dhcp42-server/pkg-plist3
-rw-r--r--net/isc-dhcp43-server/pkg-plist3
-rw-r--r--net/jags/pkg-plist10
-rw-r--r--net/kamailio/pkg-plist12
-rw-r--r--net/kippo/pkg-plist17
-rw-r--r--net/l2tpd/pkg-plist1
-rw-r--r--net/l4ip/pkg-plist1
-rw-r--r--net/lam/pkg-plist4
-rw-r--r--net/ldapbrowser/pkg-plist5
-rw-r--r--net/ldapdiff/pkg-plist2
-rw-r--r--net/ldapsdk/pkg-plist8
-rw-r--r--net/libarms/pkg-plist15
-rw-r--r--net/libbgpdump/pkg-plist2
-rw-r--r--net/libcapn/pkg-plist1
-rw-r--r--net/libcmis/pkg-plist4
-rw-r--r--net/libdnet/pkg-plist1
-rw-r--r--net/libexosip2/pkg-plist1
-rw-r--r--net/libfb/pkg-plist1
-rw-r--r--net/libgnetwork/pkg-plist3
-rw-r--r--net/libkvkontakte/pkg-plist3
-rw-r--r--net/libmediawiki/pkg-plist1
-rw-r--r--net/libmms/pkg-plist1
-rw-r--r--net/libmxp/pkg-plist1
-rw-r--r--net/libnet/pkg-plist5
-rw-r--r--net/libnfs/pkg-plist1
-rw-r--r--net/libnids/pkg-plist1
-rw-r--r--net/libosip2/pkg-plist3
-rw-r--r--net/libsocket++/pkg-plist2
-rw-r--r--net/libsocketcpp/pkg-plist1
-rw-r--r--net/libsrtp/pkg-plist1
-rw-r--r--net/libtnl/pkg-plist1
-rw-r--r--net/libtrace/pkg-plist1
-rw-r--r--net/libunp/pkg-plist1
-rw-r--r--net/libutp/pkg-plist1
-rw-r--r--net/libvncserver/pkg-plist1
-rw-r--r--net/liferea/pkg-plist19
-rw-r--r--net/linc/pkg-plist2
-rw-r--r--net/linphone/pkg-plist9
-rw-r--r--net/linuxigd/pkg-plist1
-rw-r--r--net/liveMedia/pkg-plist4
-rw-r--r--net/lualdap/pkg-plist1
-rw-r--r--net/luasocket/pkg-plist4
-rw-r--r--net/mono-zeroconf/pkg-plist14
-rw-r--r--net/mopd/pkg-plist1
-rw-r--r--net/ndpi/pkg-plist2
-rw-r--r--net/nepenthes/pkg-plist4
-rw-r--r--net/net6/pkg-plist3
-rw-r--r--net/netatalk/pkg-plist4
-rw-r--r--net/netembryo/pkg-plist1
-rw-r--r--net/netwib/pkg-plist6
-rw-r--r--net/neubot/pkg-plist30
-rw-r--r--net/nmsg/pkg-plist8
-rw-r--r--net/nos-ttb/pkg-plist1
-rw-r--r--net/nstxd/pkg-plist1
-rw-r--r--net/ntlmaps/pkg-plist3
-rw-r--r--net/ntop/pkg-plist26
-rw-r--r--net/ntp-rc/pkg-plist10
-rw-r--r--net/nusoap/pkg-plist2
-rw-r--r--net/opal/pkg-plist20
-rw-r--r--net/opendpi/pkg-plist2
-rw-r--r--net/openmpi-devel/pkg-plist26
-rw-r--r--net/openmpi/pkg-plist26
-rw-r--r--net/opennx/pkg-plist26
-rw-r--r--net/openradius/pkg-plist8
-rw-r--r--net/opentracker/pkg-plist1
-rw-r--r--net/openvswitch/pkg-plist22
-rw-r--r--net/ortp/pkg-plist1
-rw-r--r--net/owamp/pkg-plist1
-rw-r--r--net/owncloud-csync/pkg-plist7
-rw-r--r--net/packter-agent/pkg-plist2
-rw-r--r--net/pdb/pkg-plist1
-rw-r--r--net/pecl-radius/pkg-plist1
-rw-r--r--net/phamm/pkg-plist56
-rw-r--r--net/pktanon/pkg-plist2
-rw-r--r--net/pmf/pkg-plist4
-rw-r--r--net/poptop/pkg-plist1
-rw-r--r--net/portfwd/pkg-plist2
-rw-r--r--net/proxy-suite/pkg-plist1
-rw-r--r--net/ptpd2/pkg-plist1
-rw-r--r--net/pvm/pkg-plist6
-rw-r--r--net/py-gntp/pkg-plist3
-rw-r--r--net/py-libnet/pkg-plist2
-rw-r--r--net/py-pcs/pkg-plist2
-rw-r--r--net/py-soapy/pkg-plist3
-rw-r--r--net/pygopherd/pkg-plist3
-rw-r--r--net/qjsonrpc/pkg-plist2
-rw-r--r--net/qoauth/pkg-plist4
-rw-r--r--net/qtweetlib/pkg-plist1
-rw-r--r--net/queso/pkg-plist1
-rw-r--r--net/quiterss/pkg-plist4
-rw-r--r--net/radiusclient/pkg-plist1
-rw-r--r--net/raggle/pkg-plist8
-rw-r--r--net/ranch/pkg-plist8
-rw-r--r--net/rdesktop/pkg-plist3
-rw-r--r--net/remmina/pkg-plist2
-rw-r--r--net/remotebox/Makefile4
-rw-r--r--net/remotebox/pkg-plist5
-rw-r--r--net/remotedesk/pkg-plist3
-rw-r--r--net/reposado/pkg-plist2
-rw-r--r--net/rsplib/Makefile5
-rw-r--r--net/rsplib/pkg-plist3
-rw-r--r--net/rtg/pkg-plist3
-rw-r--r--net/ruby-dict/pkg-plist1
-rw-r--r--net/ruby-icmp/pkg-plist1
-rw-r--r--net/ruby-tserver/pkg-plist3
-rw-r--r--net/rude/pkg-plist1
-rw-r--r--net/scr_ipfm/pkg-plist12
-rw-r--r--net/sdl_net/pkg-plist1
-rw-r--r--net/serveez/pkg-plist1
-rw-r--r--net/serviio/pkg-plist4
-rw-r--r--net/shadowsocks-libev/pkg-plist1
-rw-r--r--net/shmux/pkg-plist1
-rw-r--r--net/sie-nmsg/pkg-plist1
-rw-r--r--net/sippy_b2bua/pkg-plist3
-rw-r--r--net/siproxd/pkg-plist1
-rw-r--r--net/skstream/pkg-plist6
-rw-r--r--net/sl2tps/pkg-plist1
-rw-r--r--net/slurm/pkg-plist2
-rw-r--r--net/smm++/pkg-plist49
-rw-r--r--net/sniffit/pkg-plist1
-rw-r--r--net/sntop/pkg-plist1
-rw-r--r--net/socketbind/pkg-plist1
-rw-r--r--net/sofia-sip/pkg-plist4
-rw-r--r--net/spideroak/pkg-plist11
-rw-r--r--net/splatd/pkg-plist6
-rw-r--r--net/spread-j/pkg-plist2
-rw-r--r--net/sprinkle/pkg-plist1
-rw-r--r--net/spserver/pkg-plist1
-rw-r--r--net/ssltunnel-client/pkg-plist2
-rw-r--r--net/ssvnc/pkg-plist3
-rw-r--r--net/tac_plus4/pkg-plist1
-rw-r--r--net/tapidbus/pkg-plist2
-rw-r--r--net/tclsoap/pkg-plist2
-rw-r--r--net/tcpick/pkg-plist2
-rw-r--r--net/tcpreen/pkg-plist1
-rw-r--r--net/tcpsg/pkg-plist1
-rw-r--r--net/tcpview/pkg-plist2
-rw-r--r--net/thcrut/pkg-plist1
-rw-r--r--net/tigervnc/pkg-plist18
-rw-r--r--net/tightvnc/pkg-plist2
-rw-r--r--net/tinyfugue/pkg-plist1
-rw-r--r--net/tinyldap/pkg-plist1
-rw-r--r--net/tn5250/pkg-plist2
-rw-r--r--net/tn5250j/pkg-plist1
-rw-r--r--net/tramp/pkg-plist1
-rw-r--r--net/trickle/pkg-plist1
-rw-r--r--net/tridiavnc/pkg-plist2
-rw-r--r--net/tsclient/pkg-plist11
-rw-r--r--net/tsocks/pkg-plist2
-rw-r--r--net/tucan/pkg-plist54
-rw-r--r--net/twitux/pkg-plist18
-rw-r--r--net/udt/pkg-plist3
-rw-r--r--net/uget/pkg-plist6
-rw-r--r--net/ulxmlrpcpp/pkg-plist4
-rw-r--r--net/unix2tcp/pkg-plist1
-rw-r--r--net/uriparser/pkg-plist1
-rw-r--r--net/urlendec/pkg-plist1
-rw-r--r--net/vde2/pkg-plist4
-rw-r--r--net/vnc/pkg-plist2
-rw-r--r--net/wireshark/pkg-plist13
-rw-r--r--net/wizd/pkg-plist4
-rw-r--r--net/wmnetload/pkg-plist1
-rw-r--r--net/wmpiki/pkg-plist1
-rw-r--r--net/wol/pkg-plist1
-rw-r--r--net/x11vnc/pkg-plist3
-rw-r--r--net/xipmsg/pkg-plist1
-rw-r--r--net/xmlrpc-c-devel/pkg-plist1
-rw-r--r--net/xprobe/pkg-plist1
-rw-r--r--net/xpvm/pkg-plist4
-rw-r--r--net/xrdp-devel/pkg-plist3
-rw-r--r--net/yate/pkg-plist18
-rw-r--r--net/yaz++/pkg-plist3
-rw-r--r--net/yazproxy/pkg-plist5
-rw-r--r--net/zebra-server/Makefile5
-rw-r--r--net/zebra-server/pkg-plist16
-rw-r--r--net/zebra/pkg-plist1
-rw-r--r--net/zillion/pkg-plist2
237 files changed, 27 insertions, 1124 deletions
diff --git a/net/3proxy/pkg-plist b/net/3proxy/pkg-plist
index 1ac64e76ef19..6ac79adba293 100644
--- a/net/3proxy/pkg-plist
+++ b/net/3proxy/pkg-plist
@@ -23,4 +23,3 @@ man/man8/proxy.8.gz
man/man8/socks.8.gz
man/man8/tcppm.8.gz
man/man8/udppm.8.gz
-@dirrm lib/3proxy
diff --git a/net/Sockets/files/patch-Makefile b/net/Sockets/files/patch-Makefile
index 4f352ce7c542..4b386f159d35 100644
--- a/net/Sockets/files/patch-Makefile
+++ b/net/Sockets/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig 2013-04-10 19:52:39.000000000 +0200
-+++ Makefile 2013-07-04 08:17:52.000000000 +0200
+--- Makefile.orig 2013-04-10 17:52:39 UTC
++++ Makefile
@@ -1,11 +1,11 @@
# platforms:
-# linux-x86-32
@@ -14,7 +14,7 @@
# 'Makefile.version' defines the $(VERSION) of the library, and also
# setup the OBJS variable - stuff to be compiled.
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ PREFIX = /usr/local
INCLUDE = -I/usr/include/libxml2
# Add for libxml2 if not in above location
@@ -23,7 +23,7 @@
# CXX, CFLAGS, LIBS, LDFLAGS, LDFLAGSSO
include Makefile.Defines.$(PLATFORM)
-@@ -96,9 +96,9 @@
+@@ -96,9 +96,9 @@ diff:
install: all
@mkdir -p $(DESTDIR)/$(PREFIX)/lib
@@ -35,7 +35,7 @@
@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/SSLSocket.*
@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsGetSocket.*
@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsSocket.*
-@@ -112,12 +112,12 @@
+@@ -112,12 +112,12 @@ install: all
@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Min*Handler.h
@rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Uid.h
@mkdir -p $(DESTDIR)/$(PREFIX)/bin
@@ -43,9 +43,10 @@
+ @${BSD_INSTALL_PROGRAM} $(CONFNAME) $(DESTDIR)/$(PREFIX)/bin
install_shared: install shared
- @mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
+- @mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
- install -m 0644 $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
- install -m 0644 pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
++ @mkdir -p $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
+ @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
+ @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so
diff --git a/net/Sockets/pkg-plist b/net/Sockets/pkg-plist
index 1973b167a5df..42a52f1051f3 100644
--- a/net/Sockets/pkg-plist
+++ b/net/Sockets/pkg-plist
@@ -72,5 +72,3 @@ lib/libSockets.a
lib/libSockets.so
lib/libSockets.so.2
lib/libSockets.so.2.3.9.9
-@dirrm include/Sockets
-@dirrmtry lib/pkgconfig
diff --git a/net/afpfs-ng/pkg-plist b/net/afpfs-ng/pkg-plist
index 4e85114f0e7e..6b69d6e01c9e 100644
--- a/net/afpfs-ng/pkg-plist
+++ b/net/afpfs-ng/pkg-plist
@@ -15,4 +15,3 @@ include/afpfs-ng/afp.h
include/afpfs-ng/utils.h
man/man1/afpcmd.1.gz
man/man1/afpgetstatus.1.gz
-@dirrm include/afpfs-ng
diff --git a/net/apinger/pkg-plist b/net/apinger/pkg-plist
index 7efdabedb1ce..97a2fa7ff72a 100644
--- a/net/apinger/pkg-plist
+++ b/net/apinger/pkg-plist
@@ -3,4 +3,3 @@ etc/apinger.conf.sample
%%DOCSDIR%%/README
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/AUTHORS
-@dirrm %%DOCSDIR%%
diff --git a/net/aprsc/pkg-plist b/net/aprsc/pkg-plist
index 60e1f5badd08..8990ab615ef3 100644
--- a/net/aprsc/pkg-plist
+++ b/net/aprsc/pkg-plist
@@ -11,5 +11,3 @@ etc/aprsc/web/jquery.flot.selection.min.js
man/man8/aprsc.8.gz
sbin/aprsc
sbin/aprsc_munin
-@dirrm etc/aprsc/web
-@dirrm etc/aprsc
diff --git a/net/arp-scan/pkg-plist b/net/arp-scan/pkg-plist
index 8ce70ee6d4fe..0a4f220c39a3 100644
--- a/net/arp-scan/pkg-plist
+++ b/net/arp-scan/pkg-plist
@@ -10,4 +10,3 @@ man/man1/arp-scan.1.gz
man/man1/get-iab.1.gz
man/man1/get-oui.1.gz
man/man5/mac-vendor.5.gz
-@dirrm %%DATADIR%%
diff --git a/net/asio/pkg-plist b/net/asio/pkg-plist
index 5f282715ea51..4dceea2c3cd5 100644
--- a/net/asio/pkg-plist
+++ b/net/asio/pkg-plist
@@ -293,18 +293,3 @@ include/asio/windows/stream_handle.hpp
include/asio/windows/stream_handle_service.hpp
include/asio/write.hpp
include/asio/write_at.hpp
-@dirrm include/asio/windows
-@dirrm include/asio/ssl/detail
-@dirrm include/asio/ssl
-@dirrm include/asio/posix
-@dirrm include/asio/local/detail/impl
-@dirrm include/asio/local/detail
-@dirrm include/asio/local
-@dirrm include/asio/ip/impl
-@dirrm include/asio/ip/detail/impl
-@dirrm include/asio/ip/detail
-@dirrm include/asio/ip
-@dirrm include/asio/impl
-@dirrm include/asio/detail/impl
-@dirrm include/asio/detail
-@dirrm include/asio
diff --git a/net/aslookup/pkg-plist b/net/aslookup/pkg-plist
index ba3a57e1884e..6241928ec749 100644
--- a/net/aslookup/pkg-plist
+++ b/net/aslookup/pkg-plist
@@ -1,4 +1,3 @@
bin/aslookup
%%PORTDOCS%%%%DOCSDIR%%/readme-eng.txt
%%PORTDOCS%%%%DOCSDIR%%/readme-jp.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/belle-sip/pkg-plist b/net/belle-sip/pkg-plist
index bac7d05254f9..eb1faa980b68 100644
--- a/net/belle-sip/pkg-plist
+++ b/net/belle-sip/pkg-plist
@@ -29,4 +29,3 @@ lib/libbellesip.so
lib/libbellesip.so.0
lib/libbellesip.so.0.0.0
libdata/pkgconfig/belle-sip.pc
-@dirrm include/belle-sip
diff --git a/net/binkd/pkg-plist b/net/binkd/pkg-plist
index 23087a4b5bfc..a5ac99104322 100644
--- a/net/binkd/pkg-plist
+++ b/net/binkd/pkg-plist
@@ -4,4 +4,3 @@ man/man8/binkd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.FIX
%%PORTDOCS%%%%DOCSDIR%%/SRIF.TXT
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/bmon/pkg-plist b/net/bmon/pkg-plist
index 768e9473996e..de28576e38c0 100644
--- a/net/bmon/pkg-plist
+++ b/net/bmon/pkg-plist
@@ -1,5 +1,3 @@
bin/bmon
man/man8/bmon.8.gz
%%PORTDOCS%%%%DOCSDIR%%/examples/bmon.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/c3270/pkg-plist b/net/c3270/pkg-plist
index 5b6716c67579..1cef745e0e83 100644
--- a/net/c3270/pkg-plist
+++ b/net/c3270/pkg-plist
@@ -8,4 +8,3 @@ man/man5/ibm_hosts.5.gz
%%DBCS%%etc/x3270/icudt28l_ibm-1027_P100-1995.cnv
%%DBCS%%etc/x3270/icudt28l_ibm-300_P110-1997.cnv
%%DBCS%%etc/x3270/icudt28l_ibm-837_P100-2000.cnv
-@dirrmtry etc/x3270
diff --git a/net/clamz/pkg-plist b/net/clamz/pkg-plist
index 03cad0b48ac1..37de723edc35 100644
--- a/net/clamz/pkg-plist
+++ b/net/clamz/pkg-plist
@@ -2,6 +2,3 @@ bin/clamz
share/applications/clamz.desktop
share/mime/packages/clamz.xml
man/man1/clamz.1.gz
-@dirrmtry share/mime/packages
-@dirrmtry share/mime
-@dirrmtry share
diff --git a/net/coda6_client/pkg-plist b/net/coda6_client/pkg-plist
index 268d9bf9985f..f30c93915cbd 100644
--- a/net/coda6_client/pkg-plist
+++ b/net/coda6_client/pkg-plist
@@ -41,4 +41,3 @@ sbin/venus
sbin/venus-setup
sbin/volmunge
sbin/vutil
-@dirrmtry etc/coda
diff --git a/net/coda6_server/pkg-plist b/net/coda6_server/pkg-plist
index f7dbcf32b21f..fc3b70d31c67 100644
--- a/net/coda6_server/pkg-plist
+++ b/net/coda6_server/pkg-plist
@@ -4,7 +4,6 @@ bin/rpc2ping
bin/rvmsizer
bin/smon2
etc/coda/server.conf.ex
-@dirrmtry etc/coda
man/man5/backuplogs.5.gz
man/man5/dumpfile.5.gz
man/man5/dumplist.5.gz
diff --git a/net/cvsup-static/pkg-plist b/net/cvsup-static/pkg-plist
index 042bffd64a7c..4b73c626d3e9 100644
--- a/net/cvsup-static/pkg-plist
+++ b/net/cvsup-static/pkg-plist
@@ -5,4 +5,3 @@ man/man1/cvsup.1.gz
man/man8/cvsupd.8.gz
sbin/cvsupd
share/cvsup/License
-@dirrm share/cvsup
diff --git a/net/dgd/pkg-plist b/net/dgd/pkg-plist
index 0fad98f80021..db4369b39951 100644
--- a/net/dgd/pkg-plist
+++ b/net/dgd/pkg-plist
@@ -2,4 +2,3 @@ bin/precomp
etc/dgd/mud.dgd.sample
etc/rc.d/dgd.sh.sample
sbin/dgd
-@dirrm etc/dgd
diff --git a/net/dictd-database/pkg-plist b/net/dictd-database/pkg-plist
index 78b76381d473..dfe16d5b795b 100644
--- a/net/dictd-database/pkg-plist
+++ b/net/dictd-database/pkg-plist
@@ -24,4 +24,3 @@ lib/dict/world02.dict.dz
lib/dict/world02.index
lib/dict/world95.dict.dz
lib/dict/world95.index
-@dirrm lib/dict
diff --git a/net/easysoap/pkg-plist b/net/easysoap/pkg-plist
index 0ac1d26b2927..0d0053412522 100644
--- a/net/easysoap/pkg-plist
+++ b/net/easysoap/pkg-plist
@@ -44,4 +44,3 @@ lib/libeasysoap.a
lib/libeasysoap.so
lib/libeasysoap.so.0
lib/libeasysoap.so.0.0.0
-@dirrm include/easysoap
diff --git a/net/echoping/pkg-plist b/net/echoping/pkg-plist
index 930f5a755b36..ac44660bb397 100644
--- a/net/echoping/pkg-plist
+++ b/net/echoping/pkg-plist
@@ -27,5 +27,3 @@ man/man1/echoping_dns.1.gz
%%WITH_PGSQL%%man/man1/echoping_postgresql.1.gz
man/man1/echoping_random.1.gz
man/man1/echoping_whois.1.gz
-@dirrm include/echoping
-@dirrm lib/echoping
diff --git a/net/ecore-con/pkg-plist b/net/ecore-con/pkg-plist
index cd1c77b835fb..a79dffa5e5ad 100644
--- a/net/ecore-con/pkg-plist
+++ b/net/ecore-con/pkg-plist
@@ -2,4 +2,3 @@ include/ecore-1/Ecore_Con.h
lib/libecore_con.so
lib/libecore_con.so.8
libdata/pkgconfig/ecore-con.pc
-@dirrmtry include/ecore-1
diff --git a/net/empty/pkg-plist b/net/empty/pkg-plist
index 68a468a3c72e..d47e41696e89 100644
--- a/net/empty/pkg-plist
+++ b/net/empty/pkg-plist
@@ -12,5 +12,3 @@ man/man1/empty.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/em_telnet_2.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/emsu.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/runtests.sh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/enet/pkg-plist b/net/enet/pkg-plist
index 0bd7546ebd0b..21e0ce5a23e8 100644
--- a/net/enet/pkg-plist
+++ b/net/enet/pkg-plist
@@ -12,4 +12,3 @@ lib/libenet.so
lib/libenet.so.7
lib/libenet.so.7.0.0
libdata/pkgconfig/libenet.pc
-@dirrm include/enet
diff --git a/net/erlang_xmlrpc/pkg-plist b/net/erlang_xmlrpc/pkg-plist
index 2c9e63dc7889..6d021240c9ad 100644
--- a/net/erlang_xmlrpc/pkg-plist
+++ b/net/erlang_xmlrpc/pkg-plist
@@ -28,7 +28,3 @@ man/man3/erlang_xmlrpc.3.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/robust_bank_server.erl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/robust_banking.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validator.erl
-@dirrm lib/erlang/lib/xmlrpc-%%VERSION%%/src
-@dirrm lib/erlang/lib/xmlrpc-%%VERSION%%/ebin
-@dirrm lib/erlang/lib/xmlrpc-%%VERSION%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/etrace/pkg-plist b/net/etrace/pkg-plist
index 9504b6e90ea1..eb23db652a3a 100644
--- a/net/etrace/pkg-plist
+++ b/net/etrace/pkg-plist
@@ -3,4 +3,3 @@ bin/etrace
%%DATADIR%%/ike
@sample %%DATADIR%%/profile.sample
man/man8/etrace.8.gz
-@dirrmtry %%DATADIR%%
diff --git a/net/exaddos/pkg-plist b/net/exaddos/pkg-plist
index abe3f7016258..fe1ceacba188 100644
--- a/net/exaddos/pkg-plist
+++ b/net/exaddos/pkg-plist
@@ -42,15 +42,7 @@ www/exaddos/html/index.html
www/exaddos/html/overview.html
www/exaddos/html/talkers.html
www/exaddos/html/talker.html
-@dirrm www/exaddos/html/inc
-@dirrm www/exaddos/html
-@dirrm www/exaddos
-@dirrm %%PYTHON_SITELIBDIR%%/exaddos/leak
-@dirrm %%PYTHON_SITELIBDIR%%/exaddos
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
@unexec if cmp -s %D/etc/exaddos/exaddos.conf %D/etc/exaddos/exaddos.conf.sample ; then rm -f %D/etc/exaddos/exaddos.conf ; fi
etc/exaddos/exaddos.conf.sample
@exec if [ ! -f %D/etc/exaddos/exaddos.conf ]; then cp -p %D/%F %B/exaddos.conf; fi
-@dirrmtry etc/exaddos
@unexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/exaddos`` to remove any configuration files left."; fi
diff --git a/net/findmtu/pkg-plist b/net/findmtu/pkg-plist
index c3ca3a8a3867..2fcee2e003f8 100644
--- a/net/findmtu/pkg-plist
+++ b/net/findmtu/pkg-plist
@@ -2,4 +2,3 @@ bin/findmtu
bin/findmtu.real
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/freenet6/pkg-plist b/net/freenet6/pkg-plist
index 48653fa33850..f2ba90acdc6c 100644
--- a/net/freenet6/pkg-plist
+++ b/net/freenet6/pkg-plist
@@ -4,4 +4,3 @@ etc/freenet6/README
@sample etc/freenet6/gw6c.conf.sample
man/man5/gw6c.conf.5.gz
man/man8/gw6c.8.gz
-@dirrmtry etc/freenet6
diff --git a/net/freeradius-client/pkg-plist b/net/freeradius-client/pkg-plist
index f4d9c6366cd0..6f3e6d6eda2b 100644
--- a/net/freeradius-client/pkg-plist
+++ b/net/freeradius-client/pkg-plist
@@ -19,4 +19,3 @@ sbin/radexample
sbin/radiusclient
sbin/radlogin
sbin/radstatus
-@dirrm etc/radiusclient
diff --git a/net/freerdp/pkg-plist b/net/freerdp/pkg-plist
index b9347c148943..07384d77395d 100644
--- a/net/freerdp/pkg-plist
+++ b/net/freerdp/pkg-plist
@@ -278,15 +278,3 @@ lib/libwinpr-winsock.so.0.1.0
%%X11%%lib/libxfreerdp-client.so.1.1.0
libdata/pkgconfig/freerdp.pc
%%X11%%man/man1/xfreerdp.1.gz
-@dirrmtry include/winpr
-@dirrmtry include/freerdp/utils
-@dirrmtry include/freerdp/server
-@dirrmtry include/freerdp/rail
-@dirrmtry include/freerdp/locale
-@dirrmtry include/freerdp/gdi
-@dirrmtry include/freerdp/crypto
-@dirrmtry include/freerdp/codec
-@dirrmtry include/freerdp/client
-@dirrmtry include/freerdp/channels
-@dirrmtry include/freerdp/cache
-@dirrmtry include/freerdp
diff --git a/net/g2ipmsg/pkg-plist b/net/g2ipmsg/pkg-plist
index da3ea82b7bd2..9ecbf5fc33b6 100644
--- a/net/g2ipmsg/pkg-plist
+++ b/net/g2ipmsg/pkg-plist
@@ -9,5 +9,3 @@ share/pixmaps/g2ipmsg/ipmsg.xpm
share/pixmaps/g2ipmsg/ipmsgrev.xpm
share/pixmaps/ipmsg.png
share/sounds/g2ipmsg/g2ipmsg.ogg
-@dirrm share/sounds/g2ipmsg
-@dirrm share/pixmaps/g2ipmsg
diff --git a/net/gini/pkg-plist b/net/gini/pkg-plist
index 5a5da33584de..27f14a99203f 100644
--- a/net/gini/pkg-plist
+++ b/net/gini/pkg-plist
@@ -6,4 +6,3 @@ man/man1/ginifeed.1.gz
man/man8/gini.8.gz
sbin/gini
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/gnet2/pkg-plist b/net/gnet2/pkg-plist
index 1c7bc06c35e1..a9be85bf1d35 100644
--- a/net/gnet2/pkg-plist
+++ b/net/gnet2/pkg-plist
@@ -55,8 +55,3 @@ share/aclocal/gnet-2.0.m4
%%PORTDOCS%%%%DOCSDIR%%/gnet/right.png
%%PORTDOCS%%%%DOCSDIR%%/gnet/style.css
%%PORTDOCS%%%%DOCSDIR%%/gnet/up.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gnet
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/gnet-2.0/include
-@dirrm lib/gnet-2.0
-@dirrm include/gnet-2.0
diff --git a/net/gnu-dico/pkg-plist b/net/gnu-dico/pkg-plist
index b1b5aa0f624a..08764d4f5f3e 100644
--- a/net/gnu-dico/pkg-plist
+++ b/net/gnu-dico/pkg-plist
@@ -53,11 +53,4 @@ sbin/dicod
%%NLS%%share/locale/fi/LC_MESSAGES/dico.mo
%%NLS%%share/locale/pl/LC_MESSAGES/dico.mo
%%NLS%%share/locale/uk/LC_MESSAGES/dico.mo
-@dirrm share/dico/%%PORTVERSION%%/include
-@dirrm share/dico/%%PORTVERSION%%
-@dirrm share/dico
-@dirrmtry lib/dico
-@dirrm include/dico
-%%GUILE%%@exec mkdir -p %D/share/guile/site/dico
-%%GUILE%%@dirrmtry share/guile/site/dico
-%%GUILE%%@dirrmtry share/guile/site
+%%GUILE%%@dir share/guile/site/dico
diff --git a/net/go.net/pkg-plist b/net/go.net/pkg-plist
index c6977a08fba2..6b3a372efd35 100644
--- a/net/go.net/pkg-plist
+++ b/net/go.net/pkg-plist
@@ -221,30 +221,3 @@
%%GO_SRCDIR%%/%%GO_PKGNAME%%/websocket/server.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/websocket/websocket.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/websocket/websocket_test.go
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/websocket
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/spdy
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/publicsuffix
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/proxy
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/netutil
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ipv6
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ipv4
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/idna
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/html/testdata/webkit/scripted
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/html/testdata/webkit
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/html/testdata
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/html/charset/testdata
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/html/charset
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/html/atom
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/html
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/dict
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%
-@dirrmtry %%GO_SRCDIR%%/code.google.com/p
-@dirrmtry %%GO_SRCDIR%%/code.google.com
-@dirrmtry %%GO_SRCDIR%%
-@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%/html
-@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%
-@dirrmtry %%GO_LIBDIR%%/code.google.com/p
-@dirrmtry %%GO_LIBDIR%%/code.google.com
-@dirrmtry %%GO_LIBDIR%%
-@dirrmtry share/go/pkg
-@dirrmtry share/go
diff --git a/net/gofish/pkg-plist b/net/gofish/pkg-plist
index 59f2b4393219..c2ed9b1e5ed3 100644
--- a/net/gofish/pkg-plist
+++ b/net/gofish/pkg-plist
@@ -19,5 +19,3 @@ man/man5/dotcache.5.gz
man/man5/gofish.5.gz
sbin/gofish
sbin/gopherd
-@dirrm gopher/icons
-@dirrm gopher
diff --git a/net/gogoc/pkg-plist b/net/gogoc/pkg-plist
index 58f5d3533dbe..c4e33190a1d5 100644
--- a/net/gogoc/pkg-plist
+++ b/net/gogoc/pkg-plist
@@ -5,5 +5,3 @@ man/man5/gogoc.conf.5.gz
man/man8/gogoc.8.gz
template/README
template/freebsd.sh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry template
diff --git a/net/google-daemon/pkg-plist b/net/google-daemon/pkg-plist
index fe0d3023ca28..0933c993293b 100644
--- a/net/google-daemon/pkg-plist
+++ b/net/google-daemon/pkg-plist
@@ -14,5 +14,3 @@ share/google/google_daemon/manage_addresses.py
share/google/google_daemon/manage_addresses.pyc
share/google/google_daemon/utils.py
share/google/google_daemon/utils.pyc
-@dirrmtry share/google/google_daemon
-@dirrmtry share/google
diff --git a/net/googlecl/pkg-plist b/net/googlecl/pkg-plist
index 73231e9da6fd..b735db602717 100644
--- a/net/googlecl/pkg-plist
+++ b/net/googlecl/pkg-plist
@@ -96,13 +96,3 @@ man/man1/google.1.gz
%%PYTHON_SITELIBDIR%%/googlecl/youtube/service.py
%%PYTHON_SITELIBDIR%%/googlecl/youtube/service.pyc
%%PYTHON_SITELIBDIR%%/googlecl/youtube/service.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/youtube
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/picasa
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/finance
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/docs
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/discovery
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/contacts
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/config
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/calendar
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl/blogger
-@dirrm %%PYTHON_SITELIBDIR%%/googlecl
diff --git a/net/gq/pkg-plist b/net/gq/pkg-plist
index 549b4af0986d..d92bd74f944d 100644
--- a/net/gq/pkg-plist
+++ b/net/gq/pkg-plist
@@ -22,9 +22,3 @@ share/locale/ja/LC_MESSAGES/gq.mo
share/locale/zh_CN/LC_MESSAGES/gq.mo
share/omf/gq-manual/gq-manual-C.omf
share/omf/gq-manual/gq-manual-de.omf
-@dirrm share/pixmaps/gq
-@dirrm %%DATADIR%%
-@dirrm share/gnome/help/gq-manual/C
-@dirrm share/gnome/help/gq-manual/de
-@dirrm share/gnome/help/gq-manual
-@dirrm share/omf/gq-manual
diff --git a/net/grdesktop/pkg-plist b/net/grdesktop/pkg-plist
index c6208f979dfa..e3377dd9262a 100644
--- a/net/grdesktop/pkg-plist
+++ b/net/grdesktop/pkg-plist
@@ -27,7 +27,3 @@ share/pixmaps/grdesktop.png
share/locale/de/LC_MESSAGES/grdesktop.mo
share/locale/es/LC_MESSAGES/grdesktop.mo
share/locale/fr/LC_MESSAGES/grdesktop.mo
-@dirrm share/pixmaps/grdesktop
-@dirrm share/omf/grdesktop
-@dirrm share/gnome/help/grdesktop/C
-@dirrm share/gnome/help/grdesktop
diff --git a/net/gsk/pkg-plist b/net/gsk/pkg-plist
index 7d8def03411f..bff45c271445 100644
--- a/net/gsk/pkg-plist
+++ b/net/gsk/pkg-plist
@@ -199,18 +199,3 @@ libdata/pkgconfig/gsk-1.0.pc
%%PORTDOCS%%%%DOCSDIR%%/html/tutorial-httpserver.html
%%PORTDOCS%%%%DOCSDIR%%/html/tutorial-server.html
%%PORTDOCS%%%%DOCSDIR%%/html/up.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/gsk-1.0/gsk/zlib
-@dirrm include/gsk-1.0/gsk/xmlrpc
-@dirrm include/gsk-1.0/gsk/url
-@dirrm include/gsk-1.0/gsk/store
-@dirrm include/gsk-1.0/gsk/ssl
-@dirrm include/gsk-1.0/gsk/mime
-@dirrm include/gsk-1.0/gsk/http
-@dirrm include/gsk-1.0/gsk/hash
-@dirrm include/gsk-1.0/gsk/dns
-@dirrm include/gsk-1.0/gsk/control
-@dirrm include/gsk-1.0/gsk/common
-@dirrm include/gsk-1.0/gsk
-@dirrm include/gsk-1.0
diff --git a/net/gspoof/pkg-plist b/net/gspoof/pkg-plist
index b8e01a1fc5be..1ecdc2bccde9 100644
--- a/net/gspoof/pkg-plist
+++ b/net/gspoof/pkg-plist
@@ -1,6 +1,3 @@
bin/gspoof
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%DATADIR%%/pixmap/icon.png
-@dirrm %%DATADIR%%/pixmap
-@dirrm %%DATADIR%%
diff --git a/net/gtic/pkg-plist b/net/gtic/pkg-plist
index 7cbb1b9272c5..6cc3ddae6a55 100644
--- a/net/gtic/pkg-plist
+++ b/net/gtic/pkg-plist
@@ -5,4 +5,3 @@
@sample %%ETCDIR%%/help.sample
@sample %%ETCDIR%%/users.sample
sbin/gtic
-@dirrmtry %%ETCDIR%%
diff --git a/net/gtknetcat/pkg-plist b/net/gtknetcat/pkg-plist
index 7e35d3835773..c264477eaab2 100644
--- a/net/gtknetcat/pkg-plist
+++ b/net/gtknetcat/pkg-plist
@@ -13,5 +13,3 @@ share/applications/gtknetcat.desktop
share/gtknetcat/wizard.glade
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gtknetcat.mo
share/pixmaps/gtknetcat.png
-@dirrm share/gtknetcat
-@dirrm %%PYTHON_SITELIBDIR%%/gtknetcat
diff --git a/net/h323plus/pkg-plist b/net/h323plus/pkg-plist
index 51922b0ff4d3..41b23091edd7 100644
--- a/net/h323plus/pkg-plist
+++ b/net/h323plus/pkg-plist
@@ -117,13 +117,3 @@ lib/libh323.so.1
lib/libh323.so
lib/libopenh323.so
share/openh323/openh323u.mak
-@dirrmtry include/openh323/codec
-@dirrmtry include/openh323/h224
-@dirrmtry include/openh323/h230
-@dirrmtry include/openh323/h235
-@dirrmtry include/openh323/h341
-@dirrmtry include/openh323/h350
-@dirrmtry include/openh323/h450
-@dirrmtry include/openh323/h460
-@dirrmtry include/openh323
-@dirrmtry share/openh323
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
index ac4e0f4f1c04..b1738b5df334 100644
--- a/net/haproxy-devel/pkg-plist
+++ b/net/haproxy-devel/pkg-plist
@@ -53,9 +53,6 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig
%%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build.cfg
@@ -92,5 +89,3 @@ sbin/haproxy
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/errorfiles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/haproxy/pkg-plist b/net/haproxy/pkg-plist
index ac4e0f4f1c04..b1738b5df334 100644
--- a/net/haproxy/pkg-plist
+++ b/net/haproxy/pkg-plist
@@ -53,9 +53,6 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig
%%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build.cfg
@@ -92,5 +89,3 @@ sbin/haproxy
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/errorfiles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/hlmaster/pkg-plist b/net/hlmaster/pkg-plist
index 756386d68ba7..7143cfd94858 100644
--- a/net/hlmaster/pkg-plist
+++ b/net/hlmaster/pkg-plist
@@ -7,5 +7,3 @@ man/man1/hlmaster.list.1.gz
%%PORTEXAMPLES%%share/examples/hlmaster/filter.list
%%PORTEXAMPLES%%share/examples/hlmaster/server.list
%%PORTEXAMPLES%%share/examples/hlmaster/woncomm.lst
-%%PORTEXAMPLES%%@dirrm share/examples/hlmaster
-%%PORTDOCS%%@dirrm share/doc/hlmaster
diff --git a/net/honeyd/pkg-plist b/net/honeyd/pkg-plist
index 66f31789f7e2..39a42122b575 100644
--- a/net/honeyd/pkg-plist
+++ b/net/honeyd/pkg-plist
@@ -60,15 +60,3 @@ man/man8/honeyd.8.gz
%%DATADIR%%/scripts/kuang2.conf
%%DATADIR%%/scripts/smtp.pl
%%DATADIR%%/scripts/proxy.pl
-@dirrm include/honeyd
-@dirrm lib/honeyd
-@dirrm %%DATADIR%%/scripts/snmp
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/webserver/htdocs/templates/inc
-@dirrm %%DATADIR%%/webserver/htdocs/templates
-@dirrm %%DATADIR%%/webserver/htdocs/graphs
-@dirrm %%DATADIR%%/webserver/htdocs/images
-@dirrm %%DATADIR%%/webserver/htdocs/styles
-@dirrm %%DATADIR%%/webserver/htdocs
-@dirrm %%DATADIR%%/webserver
-@dirrm %%DATADIR%%
diff --git a/net/howl/pkg-plist b/net/howl/pkg-plist
index bd92df3b8060..0ed912ddda2d 100644
--- a/net/howl/pkg-plist
+++ b/net/howl/pkg-plist
@@ -47,10 +47,3 @@ libdata/pkgconfig/howl.pc
%%DATADIR%%/help/txt_rec_str_iter-summary.html
%%DATADIR%%/help/txt_rec_str_iter.html
man/man8/mDNSResponder.8.gz
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%
-@dirrm include/howl/salt
-@dirrm include/howl/rendezvous
-@dirrm include/howl/discovery
-@dirrm include/howl/corby
-@dirrm include/howl
diff --git a/net/hsflowd/pkg-plist b/net/hsflowd/pkg-plist
index 54258b7a4fe9..ea91f25937e8 100644
--- a/net/hsflowd/pkg-plist
+++ b/net/hsflowd/pkg-plist
@@ -2,5 +2,4 @@
%%ETCDIR%%/hsflowd.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/hsflowd.conf ]; then cp -p %D/%F %B/hsflowd.conf; fi
sbin/hsflowd
-@dirrmtry %%ETCDIR%%
@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi
diff --git a/net/httpry/pkg-plist b/net/httpry/pkg-plist
index a26cd7fb9d9e..57340ce80608 100644
--- a/net/httpry/pkg-plist
+++ b/net/httpry/pkg-plist
@@ -22,6 +22,3 @@ man/man1/httpry.1.gz
%%EXTRASCRIPTS%%bin/httpry-scripts/plugins/log_summary.cfg
%%PORTDOCS%%%%DOCSDIR%%/perl-tools
%%PORTDOCS%%%%DOCSDIR%%/format-string
-%%EXTRASCRIPTS%%@dirrm bin/httpry-scripts/plugins
-%%EXTRASCRIPTS%%@dirrm bin/httpry-scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/hupnp/pkg-plist b/net/hupnp/pkg-plist
index 41844b24c270..ad998dfe15a1 100644
--- a/net/hupnp/pkg-plist
+++ b/net/hupnp/pkg-plist
@@ -112,6 +112,3 @@ lib/libQtSolutions_SOAP-2.7.so
lib/libQtSolutions_SOAP-2.7.so.1
lib/libQtSolutions_SOAP-2.7.so.1.0
lib/libQtSolutions_SOAP-2.7.so.1.0.0
-@dirrm include/HUpnpCore/public
-@dirrm include/HUpnpCore/private
-@dirrm include/HUpnpCore
diff --git a/net/iet/pkg-plist b/net/iet/pkg-plist
index 58a9f831dfaa..75ba699eaa49 100644
--- a/net/iet/pkg-plist
+++ b/net/iet/pkg-plist
@@ -1,5 +1,4 @@
modules/iet.ko
-@exec mkdir -p %D/etc/iet
@unexec if cmp -s %D/%%DATADIR%%/ietd.conf %D/etc/iet/ietd.conf ; then rm -f %D/etc/iet/ietd.conf ; fi
%%DATADIR%%/ietd.conf
@exec if [ ! -f %D/etc/iet/ietd.conf ]; then cp -p %D/%F %D/etc/iet/ietd.conf; fi
@@ -12,10 +11,9 @@ modules/iet.ko
@unexec if cmp -s %D/%%DATADIR%%/targets.allow %D/etc/iet/targets.allow ; then rm -f %D/etc/iet/targets.allow ; fi
%%DATADIR%%/targets.allow
@exec if [ ! -f %D/etc/iet/targets.allow ]; then cp -p %D/%F %D/etc/iet/targets.allow; fi
-@dirrmtry etc/iet
-@dirrm %%DATADIR%%
man/man5/ietd.conf.5.gz
man/man8/ietadm.8.gz
man/man8/ietd.8.gz
sbin/ietd
sbin/ietadm
+@dir etc/iet
diff --git a/net/ilbc/pkg-plist b/net/ilbc/pkg-plist
index 53c929dc3e35..b7f7a29299b3 100644
--- a/net/ilbc/pkg-plist
+++ b/net/ilbc/pkg-plist
@@ -5,4 +5,3 @@ lib/libilbc.a
lib/libilbc.so
lib/libilbc.so.0
lib/libilbc.so.0.0.0
-@dirrm include/ilbc
diff --git a/net/iodine/pkg-plist b/net/iodine/pkg-plist
index 894077035468..4b9c1059f54f 100644
--- a/net/iodine/pkg-plist
+++ b/net/iodine/pkg-plist
@@ -4,4 +4,3 @@ man/man8/iodine.8.gz
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ipsvd/pkg-plist b/net/ipsvd/pkg-plist
index 5ac7097b2936..9db84ab85660 100644
--- a/net/ipsvd/pkg-plist
+++ b/net/ipsvd/pkg-plist
@@ -24,4 +24,3 @@ man/man8/udpsvd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/udpsvd.8.html
%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
%%PORTDOCS%%%%DOCSDIR%%/usedietlibc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/isc-dhcp41-server/pkg-plist b/net/isc-dhcp41-server/pkg-plist
index 21c72e231509..39ca60742032 100644
--- a/net/isc-dhcp41-server/pkg-plist
+++ b/net/isc-dhcp41-server/pkg-plist
@@ -42,6 +42,3 @@ lib/libdhcpctl.a
lib/libomapi.a
lib/libdst.a
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
-%%LDAP%%@dirrm %%SCHEMA_DIR%%
-@dirrm include/omapip
-@dirrm include/isc-dhcp
diff --git a/net/isc-dhcp42-server/pkg-plist b/net/isc-dhcp42-server/pkg-plist
index 1c8b406c3679..d090f66b0ea2 100644
--- a/net/isc-dhcp42-server/pkg-plist
+++ b/net/isc-dhcp42-server/pkg-plist
@@ -32,6 +32,3 @@ lib/libdhcpctl.a
lib/libomapi.a
lib/libdst.a
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
-%%LDAP%%@dirrm %%SCHEMA_DIR%%
-@dirrm include/omapip
-@dirrm include/isc-dhcp
diff --git a/net/isc-dhcp43-server/pkg-plist b/net/isc-dhcp43-server/pkg-plist
index 1c8b406c3679..d090f66b0ea2 100644
--- a/net/isc-dhcp43-server/pkg-plist
+++ b/net/isc-dhcp43-server/pkg-plist
@@ -32,6 +32,3 @@ lib/libdhcpctl.a
lib/libomapi.a
lib/libdst.a
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
-%%LDAP%%@dirrm %%SCHEMA_DIR%%
-@dirrm include/omapip
-@dirrm include/isc-dhcp
diff --git a/net/jags/pkg-plist b/net/jags/pkg-plist
index 2a9157f17d38..251443d15e3e 100644
--- a/net/jags/pkg-plist
+++ b/net/jags/pkg-plist
@@ -67,11 +67,5 @@ bin/fixsmbcop
%%DATADIR%%/sounds/share2.ogg
%%DATADIR%%/sounds/unmall2.ogg
%%DATADIR%%/jags.conf.sample
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/plugins/samba-2.0.7.plugin
-@dirrm %%DATADIR%%/plugins/samba-2.0.7.cyrillic.plugin
-@dirrm %%DATADIR%%/plugins/offline.plugin
-@dirrm %%DATADIR%%/plugins/freebsd-samba-2.0.7.plugin
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%
+@dir %%DATADIR%%/plugins/freebsd-samba-2.0.7.plugin
+@dir %%DATADIR%%/plugins/offline.plugin
diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
index 5cea010d9b44..cbad28ad0a78 100644
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@@ -435,18 +435,6 @@ lib/kamailio/modules/xprint.so
%%PORTDOCS%%%%DOCSDIR%%/modules/README.xhttp_rpc
%%PORTDOCS%%%%DOCSDIR%%/modules/README.xlog
%%PORTDOCS%%%%DOCSDIR%%/modules/README.xprint
-@dirrmtry etc/kamailio
-@dirrm lib/kamailio/kamctl/dbtextdb
-@dirrm lib/kamailio/kamctl
-@dirrm lib/kamailio/modules
-@dirrm lib/kamailio
-@dirrm %%DATADIR%%/dbtext/kamailio
-@dirrm %%DATADIR%%/dbtext
-%%MYSQL%%@dirrm %%DATADIR%%/mysql
-%%PGSQL%%@dirrm %%DATADIR%%/postgres
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
man/man5/kamailio.cfg.5.gz
man/man8/kamailio.8.gz
man/man8/kamcmd.8.gz
diff --git a/net/kippo/pkg-plist b/net/kippo/pkg-plist
index 371bc65c5d99..e19713924d81 100644
--- a/net/kippo/pkg-plist
+++ b/net/kippo/pkg-plist
@@ -54,20 +54,3 @@
%%DATADIR%%/utils/passdb.py
%%DATADIR%%/utils/playlog.py
%%DATADIR%%/utils/fsctl.py
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/doc/sql
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/honeyfs/etc
-@dirrm %%DATADIR%%/honeyfs/proc
-@dirrm %%DATADIR%%/honeyfs
-@dirrm %%DATADIR%%/kippo/commands
-@dirrm %%DATADIR%%/kippo/core
-@dirrm %%DATADIR%%/kippo/dblog
-@dirrm %%DATADIR%%/kippo
-@dirrm %%DATADIR%%/txtcmds/bin
-@dirrm %%DATADIR%%/txtcmds/sbin
-@dirrm %%DATADIR%%/txtcmds/usr/bin
-@dirrm %%DATADIR%%/txtcmds/usr
-@dirrm %%DATADIR%%/txtcmds
-@dirrm %%DATADIR%%/utils
-@dirrm %%DATADIR%%
diff --git a/net/l2tpd/pkg-plist b/net/l2tpd/pkg-plist
index eb4bbc0848c8..812e287ac8b0 100644
--- a/net/l2tpd/pkg-plist
+++ b/net/l2tpd/pkg-plist
@@ -4,4 +4,3 @@ bin/l2tpd
man/man5/l2tp-secrets.5.gz
man/man5/l2tpd.conf.5.gz
man/man8/l2tpd.8.gz
-@dirrm %%ETCDIR%%
diff --git a/net/l4ip/pkg-plist b/net/l4ip/pkg-plist
index 98678931a8eb..1e7fb24d9971 100644
--- a/net/l4ip/pkg-plist
+++ b/net/l4ip/pkg-plist
@@ -9,4 +9,3 @@ sbin/l4ip
%%EXAMPLESDIR%%/ldap.conf
%%EXAMPLESDIR%%/ldap1.conf
%%EXAMPLESDIR%%/ldap2.conf
-@dirrm %%EXAMPLESDIR%%
diff --git a/net/lam/pkg-plist b/net/lam/pkg-plist
index 69a312aee895..5cdaf9b1d5e8 100644
--- a/net/lam/pkg-plist
+++ b/net/lam/pkg-plist
@@ -452,7 +452,3 @@ man/man7/mpi.7.gz
%%DATADIR%%/doc/ptmalloc2-COPYRIGHT
%%DATADIR%%/doc/romio-users-guide.ps.gz
%%DATADIR%%/mpi.share
-@dirrm include/mpi2cxx
-%%32BIT_ONLY%%@dirrm lib/lam
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%
diff --git a/net/ldapbrowser/pkg-plist b/net/ldapbrowser/pkg-plist
index 146a83392a0a..0123f17722d1 100644
--- a/net/ldapbrowser/pkg-plist
+++ b/net/ldapbrowser/pkg-plist
@@ -27,8 +27,3 @@ lib/ldapbrowser/templates/person.template
lib/ldapbrowser/templates/organizationalUnit.template
lib/ldapbrowser/uofmichigan.cfg
lib/ldapbrowser/uofmichigan.cfg.sample
-@dirrm lib/ldapbrowser/templates
-@dirrm lib/ldapbrowser/lib
-@dirrm lib/ldapbrowser/help
-@dirrm lib/ldapbrowser/applet
-@dirrm lib/ldapbrowser
diff --git a/net/ldapdiff/pkg-plist b/net/ldapdiff/pkg-plist
index 296caa3ed1e1..fb3584c100e1 100644
--- a/net/ldapdiff/pkg-plist
+++ b/net/ldapdiff/pkg-plist
@@ -5,5 +5,3 @@ man/man1/ldapdiff.1.gz
%%DATADIR%%/samples/webtomware_without_jpeg.user.ldif
%%DATADIR%%/samples/webtomware.init.ldif
%%DATADIR%%/samples/webtomware.user.ldif
-@dirrm %%DATADIR%%/samples
-@dirrm %%DATADIR%%
diff --git a/net/ldapsdk/pkg-plist b/net/ldapsdk/pkg-plist
index 6f420fe6c292..2f23d0410fe1 100644
--- a/net/ldapsdk/pkg-plist
+++ b/net/ldapsdk/pkg-plist
@@ -30,11 +30,3 @@ mozilla/directory/public/ldap-private/ldap-int.h
mozilla/directory/public/ldap-private/ldaplog.h
mozilla/directory/public/ldap-private/ldaprot.h
mozilla/directory/public/ldap-private/portable.h
-@dirrm mozilla/directory/public/ldap-private
-@dirrm mozilla/directory/public/ldap
-@dirrm mozilla/directory/public
-@dirrm mozilla/directory/lib
-@dirrm mozilla/directory/etc
-@dirrm mozilla/directory/bin
-@dirrm mozilla/directory
-@dirrm mozilla
diff --git a/net/libarms/pkg-plist b/net/libarms/pkg-plist
index ac0dc4b6da71..c0520d7d23cd 100644
--- a/net/libarms/pkg-plist
+++ b/net/libarms/pkg-plist
@@ -161,18 +161,3 @@ lib/libarms.so.0.0.1
%%DOCSDIR%%/doc/objects.inv
%%DOCSDIR%%/doc/search.html
%%DOCSDIR%%/doc/searchindex.js
-@dirrm %%DOCSDIR%%/doc/intro
-@dirrm %%DOCSDIR%%/doc/impl
-@dirrm %%DOCSDIR%%/doc/arch
-@dirrm %%DOCSDIR%%/doc/appendix
-@dirrm %%DOCSDIR%%/doc/api
-@dirrm %%DOCSDIR%%/doc/_static
-@dirrm %%DOCSDIR%%/doc/_sources/intro
-@dirrm %%DOCSDIR%%/doc/_sources/impl
-@dirrm %%DOCSDIR%%/doc/_sources/arch
-@dirrm %%DOCSDIR%%/doc/_sources/appendix
-@dirrm %%DOCSDIR%%/doc/_sources/api
-@dirrm %%DOCSDIR%%/doc/_sources
-@dirrm %%DOCSDIR%%/doc/_images
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%
diff --git a/net/libbgpdump/pkg-plist b/net/libbgpdump/pkg-plist
index da766d6c99d4..6502e8f72a85 100644
--- a/net/libbgpdump/pkg-plist
+++ b/net/libbgpdump/pkg-plist
@@ -6,5 +6,3 @@ include/bgpdump_formats.h
include/bgpdump_lib.h
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/libcapn/pkg-plist b/net/libcapn/pkg-plist
index 5d712ffaac16..add811f9c8ca 100644
--- a/net/libcapn/pkg-plist
+++ b/net/libcapn/pkg-plist
@@ -5,4 +5,3 @@ lib/libcapn.so
lib/libcapn.so.1
lib/libcapn.so.1.0.0
libdata/pkgconfig/libcapn.pc
-@dirrm include/capn
diff --git a/net/libcmis/pkg-plist b/net/libcmis/pkg-plist
index 96e382ca9ab0..9c96ead5f10d 100644
--- a/net/libcmis/pkg-plist
+++ b/net/libcmis/pkg-plist
@@ -41,7 +41,3 @@ lib/libcmis-c-%%MAJVER%%.so.4
lib/libcmis-c-%%MAJVER%%.so.4.0.1
libdata/pkgconfig/libcmis-%%MAJVER%%.pc
libdata/pkgconfig/libcmis-c-%%MAJVER%%.pc
-@dirrm include/libcmis-c-%%MAJVER%%/libcmis-c
-@dirrm include/libcmis-c-%%MAJVER%%
-@dirrm include/libcmis-%%MAJVER%%/libcmis
-@dirrm include/libcmis-%%MAJVER%%
diff --git a/net/libdnet/pkg-plist b/net/libdnet/pkg-plist
index 9839ca4e025d..8478859d4aa8 100644
--- a/net/libdnet/pkg-plist
+++ b/net/libdnet/pkg-plist
@@ -22,4 +22,3 @@ include/dnet/tun.h
include/dnet/udp.h
man/man3/dnet.3.gz
man/man8/dnet.8.gz
-@dirrm include/dnet
diff --git a/net/libexosip2/pkg-plist b/net/libexosip2/pkg-plist
index eed8f2282036..e4acf411ae5b 100644
--- a/net/libexosip2/pkg-plist
+++ b/net/libexosip2/pkg-plist
@@ -12,4 +12,3 @@ lib/libeXosip2.a
lib/libeXosip2.so
lib/libeXosip2.so.%%SHLIB_VER%%
lib/libeXosip2.so.%%SHLIB_VER%%.0.0
-@dirrm include/eXosip2
diff --git a/net/libfb/pkg-plist b/net/libfb/pkg-plist
index 759e55c2849d..5b056c5ee238 100644
--- a/net/libfb/pkg-plist
+++ b/net/libfb/pkg-plist
@@ -3,4 +3,3 @@ include/libfb/fb_context.h
include/libfb/fb_lib.h
include/libfb/sha1.h
lib/libfb.a
-@dirrm include/libfb
diff --git a/net/libgnetwork/pkg-plist b/net/libgnetwork/pkg-plist
index 55880ae58510..49a4c3cd7b67 100644
--- a/net/libgnetwork/pkg-plist
+++ b/net/libgnetwork/pkg-plist
@@ -73,6 +73,3 @@ share/locale/sr/LC_MESSAGES/libgnetwork-1.0.mo
share/locale/sr@Latn/LC_MESSAGES/libgnetwork-1.0.mo
share/locale/sv/LC_MESSAGES/libgnetwork-1.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnetwork-1.0.mo
-@dirrm %%DOCSDIR%%
-@dirrm include/libgnetwork-1.0/libgnetwork
-@dirrm include/libgnetwork-1.0
diff --git a/net/libkvkontakte/pkg-plist b/net/libkvkontakte/pkg-plist
index e5a512f22ffd..02bcc3c3b291 100644
--- a/net/libkvkontakte/pkg-plist
+++ b/net/libkvkontakte/pkg-plist
@@ -38,6 +38,3 @@ lib/cmake/LibKVkontakte/LibKVkontakteTargets.cmake
lib/libkvkontakte.so
lib/libkvkontakte.so.1
lib/libkvkontakte.so.1.0.0
-@dirrm lib/cmake/LibKVkontakte
-@dirrmtry lib/cmake
-@dirrm include/libkvkontakte
diff --git a/net/libmediawiki/pkg-plist b/net/libmediawiki/pkg-plist
index 692efd1d0a25..33c1dd3ab048 100644
--- a/net/libmediawiki/pkg-plist
+++ b/net/libmediawiki/pkg-plist
@@ -25,4 +25,3 @@ lib/libmediawiki.so.1
lib/libmediawiki.so.1.0.0
libdata/pkgconfig/libmediawiki.pc
share/apps/cmake/modules/FindMediawiki.cmake
-@dirrm include/libmediawiki
diff --git a/net/libmms/pkg-plist b/net/libmms/pkg-plist
index 4033fb0b7623..e43a25c73b96 100644
--- a/net/libmms/pkg-plist
+++ b/net/libmms/pkg-plist
@@ -8,4 +8,3 @@ lib/libmms.so
lib/libmms.so.0
lib/libmms.so.0.0.2
libdata/pkgconfig/libmms.pc
-@dirrm include/libmms
diff --git a/net/libmxp/pkg-plist b/net/libmxp/pkg-plist
index 397df0852599..e1d6c64b3328 100644
--- a/net/libmxp/pkg-plist
+++ b/net/libmxp/pkg-plist
@@ -2,4 +2,3 @@ include/libmxp/libmxp.h
lib/libmxp.so.0.0.4
lib/libmxp.so.0
lib/libmxp.so
-@dirrm include/libmxp
diff --git a/net/libnet/pkg-plist b/net/libnet/pkg-plist
index c0a5480442c3..843d06087115 100644
--- a/net/libnet/pkg-plist
+++ b/net/libnet/pkg-plist
@@ -72,8 +72,3 @@ man/man3/libnet.h.3.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tring_tcp2.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp1.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp2.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/%%SNAME%%
-@dirrm include/%%SNAME%%/libnet
-@dirrm include/%%SNAME%%
diff --git a/net/libnfs/pkg-plist b/net/libnfs/pkg-plist
index 6c5ec5869b96..3bf0af4a65fe 100644
--- a/net/libnfs/pkg-plist
+++ b/net/libnfs/pkg-plist
@@ -9,4 +9,3 @@ include/nfsc/libnfs-raw-rquota.h
include/nfsc/libnfs-raw.h
include/nfsc/libnfs.h
libdata/pkgconfig/libnfs.pc
-@dirrm include/nfsc
diff --git a/net/libnids/pkg-plist b/net/libnids/pkg-plist
index 4ed3b3525145..0956beabcc18 100644
--- a/net/libnids/pkg-plist
+++ b/net/libnids/pkg-plist
@@ -10,4 +10,3 @@ man/man3/libnids.3.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TESTS
%%PORTDOCS%%%%DOCSDIR%%/bugtraq_post
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/libosip2/pkg-plist b/net/libosip2/pkg-plist
index b891f6c07bb6..6537adf697ec 100644
--- a/net/libosip2/pkg-plist
+++ b/net/libosip2/pkg-plist
@@ -50,6 +50,3 @@ lib/libosipparser2.so
lib/libosipparser2.so.11
lib/libosipparser2.so.11.0.0
libdata/pkgconfig/libosip2.pc
-@dirrm include/osipparser2/headers
-@dirrm include/osipparser2
-@dirrm include/osip2
diff --git a/net/libsocket++/pkg-plist b/net/libsocket++/pkg-plist
index 1fd7baaa8eb2..44ce50931e7a 100644
--- a/net/libsocket++/pkg-plist
+++ b/net/libsocket++/pkg-plist
@@ -13,5 +13,3 @@ include/socket++/sockinet.h
include/socket++/sockstream.h
include/socket++/sockunix.h
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/socket++
diff --git a/net/libsocketcpp/pkg-plist b/net/libsocketcpp/pkg-plist
index 2387a9a2086a..51959cb21db6 100644
--- a/net/libsocketcpp/pkg-plist
+++ b/net/libsocketcpp/pkg-plist
@@ -5,4 +5,3 @@ lib/libsocketcpp.a
lib/libsocketcpp.so
lib/libsocketcpp.so.0
lib/libsocketcpp.so.0.0.0
-@dirrm include/libsocketcpp
diff --git a/net/libsrtp/pkg-plist b/net/libsrtp/pkg-plist
index be8bf4e9b13d..e4c068b8470e 100644
--- a/net/libsrtp/pkg-plist
+++ b/net/libsrtp/pkg-plist
@@ -33,4 +33,3 @@ include/srtp/srtp_priv.h
include/srtp/stat.h
include/srtp/ut_sim.h
include/srtp/xfm.h
-@dirrm include/srtp
diff --git a/net/libtnl/pkg-plist b/net/libtnl/pkg-plist
index 2d0c48db2c35..dc14292d56ae 100644
--- a/net/libtnl/pkg-plist
+++ b/net/libtnl/pkg-plist
@@ -35,4 +35,3 @@ lib/libtnl.a
lib/libtnl.so
lib/libtnl.so.1
%%PROFILE%%lib/libtnl_p.a
-@dirrm include/tnl
diff --git a/net/libtrace/pkg-plist b/net/libtrace/pkg-plist
index ec8f8531b724..e4ecbe6b82cb 100644
--- a/net/libtrace/pkg-plist
+++ b/net/libtrace/pkg-plist
@@ -93,4 +93,3 @@ man/man1/tracestats.1.gz
man/man1/tracesummary.1.gz
man/man1/tracetop.1.gz
man/man1/tracetopends.1.gz
-@dirrm lib/libpacketdump
diff --git a/net/libunp/pkg-plist b/net/libunp/pkg-plist
index 8ce98690c68e..da34053d3168 100644
--- a/net/libunp/pkg-plist
+++ b/net/libunp/pkg-plist
@@ -3,4 +3,3 @@ include/unp/config.h
include/unp/addrinfo.h
lib/libunp.a
lib/libunp_r.a
-@dirrm include/unp
diff --git a/net/libutp/pkg-plist b/net/libutp/pkg-plist
index a7f198f12bd6..17046de36c96 100644
--- a/net/libutp/pkg-plist
+++ b/net/libutp/pkg-plist
@@ -4,4 +4,3 @@ lib/libutp.a
include/libutp/utp.h
include/libutp/utp_utils.h
include/libutp/utypes.h
-@dirrm include/libutp
diff --git a/net/libvncserver/pkg-plist b/net/libvncserver/pkg-plist
index eedeb70fe28b..f79756a7b652 100644
--- a/net/libvncserver/pkg-plist
+++ b/net/libvncserver/pkg-plist
@@ -17,4 +17,3 @@ lib/libvncserver.so.0
lib/libvncserver.so.0.0.0
libdata/pkgconfig/libvncclient.pc
libdata/pkgconfig/libvncserver.pc
-@dirrm include/rfb
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 3f9c9398ce12..462256c31ee8 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -158,22 +158,3 @@ share/locale/uk/LC_MESSAGES/liferea.mo
share/locale/vi/LC_MESSAGES/liferea.mo
share/locale/zh_CN/LC_MESSAGES/liferea.mo
share/locale/zh_TW/LC_MESSAGES/liferea.mo
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrm share/liferea/xslt
-@dirrm share/liferea/pixmaps
-@dirrm share/liferea/opml
-@dirrm share/liferea/gir-1.0
-@dirrm share/liferea/dtd
-@dirrm share/liferea/doc/html
-@dirrm share/liferea/doc
-@dirrm share/liferea/css
-@dirrm share/liferea
-@dirrmtry man/pl/man1
-@dirrmtry man/pl
-@dirrmtry share/appdata
-@dirrm lib/liferea/plugins
-@dirrm lib/liferea/girepository-1.0
-@dirrm lib/liferea
diff --git a/net/linc/pkg-plist b/net/linc/pkg-plist
index b242cb31dcff..ca3a1f2cd88c 100644
--- a/net/linc/pkg-plist
+++ b/net/linc/pkg-plist
@@ -11,5 +11,3 @@ lib/liblinc.so.1
lib/liblinc.so.1.0.0
libdata/pkgconfig/linc.pc
share/aclocal/linc.m4
-@dirrm include/linc-1.0/linc
-@dirrm include/linc-1.0
diff --git a/net/linphone/pkg-plist b/net/linphone/pkg-plist
index 9efb9a2c51d6..fda482996e91 100644
--- a/net/linphone/pkg-plist
+++ b/net/linphone/pkg-plist
@@ -110,12 +110,3 @@ share/sounds/linphone/rings/sweet.wav
share/sounds/linphone/rings/synth.wav
share/sounds/linphone/rings/tapping.wav
share/sounds/linphone/rings/toy-mono.wav
-@dirrm include/linphone
-@dirrmtry man/cs/man1
-@dirrmtry man/cs
-@dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb_NO
-@dirrm share/pixmaps/linphone
-@dirrm share/sounds/linphone/rings
-@dirrm share/sounds/linphone
diff --git a/net/linuxigd/pkg-plist b/net/linuxigd/pkg-plist
index 29adda15482d..54a78b35c560 100644
--- a/net/linuxigd/pkg-plist
+++ b/net/linuxigd/pkg-plist
@@ -5,4 +5,3 @@ etc/linuxigd/gateicfgSCPD.xml
@sample etc/upnpd.conf.sample
man/man8/upnpd.8.gz
sbin/upnpd
-@dirrm etc/linuxigd
diff --git a/net/liveMedia/pkg-plist b/net/liveMedia/pkg-plist
index bde22ab5e9fa..d515a2009546 100644
--- a/net/liveMedia/pkg-plist
+++ b/net/liveMedia/pkg-plist
@@ -190,7 +190,3 @@ lib/libgroupsock.so.1.0.1
lib/libliveMedia.so
lib/libliveMedia.so.16
lib/libliveMedia.so.16.0.1
-@dirrm include/liveMedia
-@dirrm include/groupsock
-@dirrm include/UsageEnvironment
-@dirrm include/BasicUsageEnvironment
diff --git a/net/lualdap/pkg-plist b/net/lualdap/pkg-plist
index 1a2bd4607a96..68eddb69894f 100644
--- a/net/lualdap/pkg-plist
+++ b/net/lualdap/pkg-plist
@@ -3,4 +3,3 @@
%%PORTDOCS%%%%DOCSDIR%%/license.html
%%PORTDOCS%%%%DOCSDIR%%/lualdap.png
%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/luasocket/pkg-plist b/net/luasocket/pkg-plist
index 214a977996a1..0431c5ce1feb 100644
--- a/net/luasocket/pkg-plist
+++ b/net/luasocket/pkg-plist
@@ -26,7 +26,3 @@
%%PORTDOCS%%%%DOCSDIR%%/tcp.html
%%PORTDOCS%%%%DOCSDIR%%/udp.html
%%PORTDOCS%%%%DOCSDIR%%/url.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%LUA_MODLIBDIR%%/mime
-@dirrm %%LUA_MODLIBDIR%%/socket
-@dirrm %%LUA_MODSHAREDIR%%/socket
diff --git a/net/mono-zeroconf/pkg-plist b/net/mono-zeroconf/pkg-plist
index df4cead14b3d..6ddb741f0a93 100644
--- a/net/mono-zeroconf/pkg-plist
+++ b/net/mono-zeroconf/pkg-plist
@@ -18,17 +18,3 @@ lib/mono/mono-zeroconf/Mono.Zeroconf.dll
%%PORTDOCS%%lib/monodoc/sources/mono-zeroconf-docs.tree
%%PORTDOCS%%lib/monodoc/sources/mono-zeroconf-docs.zip
libdata/pkgconfig/mono-zeroconf.pc
-%%PORTDOCS%%@dirrmtry lib/monodoc/sources
-%%PORTDOCS%%@dirrmtry lib/monodoc
-@dirrm lib/mono/mono-zeroconf
-@dirrm lib/mono/gac/policy.4.0.Mono.Zeroconf/0.0.0.0__e60c4f4a95e1099e
-@dirrm lib/mono/gac/policy.4.0.Mono.Zeroconf
-@dirrm lib/mono/gac/policy.3.0.Mono.Zeroconf/0.0.0.0__e60c4f4a95e1099e
-@dirrm lib/mono/gac/policy.3.0.Mono.Zeroconf
-@dirrm lib/mono/gac/policy.2.0.Mono.Zeroconf/0.0.0.0__e60c4f4a95e1099e
-@dirrm lib/mono/gac/policy.2.0.Mono.Zeroconf
-@dirrm lib/mono/gac/policy.1.0.Mono.Zeroconf/0.0.0.0__e60c4f4a95e1099e
-@dirrm lib/mono/gac/policy.1.0.Mono.Zeroconf
-@dirrm lib/mono/gac/Mono.Zeroconf/4.0.0.90__e60c4f4a95e1099e
-@dirrm lib/mono/gac/Mono.Zeroconf
-@dirrm lib/mono-zeroconf
diff --git a/net/mopd/pkg-plist b/net/mopd/pkg-plist
index 4bf6d025b0f8..bfb4c7782cb4 100644
--- a/net/mopd/pkg-plist
+++ b/net/mopd/pkg-plist
@@ -10,4 +10,3 @@ sbin/mopchk
sbin/mopa.out
%%PORTDOCS%%%%DOCSDIR%%/VAX-netboot-HOWTO
%%PORTDOCS%%%%DOCSDIR%%/VS3100-console-cmds.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ndpi/pkg-plist b/net/ndpi/pkg-plist
index 51132067c793..c7d684ab8dad 100644
--- a/net/ndpi/pkg-plist
+++ b/net/ndpi/pkg-plist
@@ -13,5 +13,3 @@ lib/libndpi.so
lib/libndpi.so.1
lib/libndpi.so.1.0.0
libdata/pkgconfig/libndpi.pc
-@dirrm include/libndpi-%%MAJOR_VER%%/libndpi
-@dirrm include/libndpi-%%MAJOR_VER%%
diff --git a/net/nepenthes/pkg-plist b/net/nepenthes/pkg-plist
index 223f7fef224d..243f93b5a1c1 100644
--- a/net/nepenthes/pkg-plist
+++ b/net/nepenthes/pkg-plist
@@ -164,7 +164,3 @@ man/man8/nepenthes.8.gz
%%DATADIR%%/README.VFS
%%DATADIR%%/logo-shaded.svg
%%DATADIR%%/signatures/shellcode-signatures.sc
-@dirrm %%DATADIR%%/signatures
-@dirrm %%DATADIR%%
-@dirrm lib/nepenthes
-@dirrm %%ETCDIR%%
diff --git a/net/net6/pkg-plist b/net/net6/pkg-plist
index 695f421f1a7b..1d8c4a13ae46 100644
--- a/net/net6/pkg-plist
+++ b/net/net6/pkg-plist
@@ -41,6 +41,3 @@ libdata/pkgconfig/net6-1.3.pc
%%NLS%%share/locale/sv/LC_MESSAGES/net6.mo
%%NLS%%share/locale/uk/LC_MESSAGES/net6.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/net6.mo
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-@dirrm include/net6
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index f2f11d7beb0d..34ff8ace285a 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -175,7 +175,3 @@ sbin/cnid_metad
%%TIMELORD%%sbin/timelord
share/aclocal/netatalk.m4
%%APPLETALK%%%%DATADIR%%/pagecount.ps
-%%APPLETALK%%@dirrm share/netatalk
-@dirrm include/netatalk
-@dirrm include/atalk
-@dirrm libexec/netatalk-uams
diff --git a/net/netembryo/pkg-plist b/net/netembryo/pkg-plist
index 546daaedf348..932f839b07bd 100644
--- a/net/netembryo/pkg-plist
+++ b/net/netembryo/pkg-plist
@@ -8,4 +8,3 @@ lib/libnetembryo.so.9
lib/libnetembryo.so.9.0.0
libdata/pkgconfig/libnetembryo.pc
libdata/pkgconfig/libnetembryo-sctp.pc
-@dirrm include/netembryo
diff --git a/net/netwib/pkg-plist b/net/netwib/pkg-plist
index da03f5f06fc2..2867a84814ed 100644
--- a/net/netwib/pkg-plist
+++ b/net/netwib/pkg-plist
@@ -139,9 +139,3 @@ man/man3/netwib_net.3.gz
man/man3/netwib_pkt.3.gz
man/man3/netwib_shw.3.gz
man/man3/netwib_sys.3.gz
-@dirrm include/netwib%%SHORTPORTVERSION%%/dat
-@dirrm include/netwib%%SHORTPORTVERSION%%/net
-@dirrm include/netwib%%SHORTPORTVERSION%%/pkt
-@dirrm include/netwib%%SHORTPORTVERSION%%/shw
-@dirrm include/netwib%%SHORTPORTVERSION%%/sys
-@dirrm include/netwib%%SHORTPORTVERSION%%
diff --git a/net/neubot/pkg-plist b/net/neubot/pkg-plist
index daa07f57dfc4..77965e4e6ffd 100644
--- a/net/neubot/pkg-plist
+++ b/net/neubot/pkg-plist
@@ -370,33 +370,3 @@ share/icons/hicolor/scalable/apps/neubot.svg
%%DATADIR%%/neubot/www/test/speedtest.html
%%DATADIR%%/neubot/www/test/speedtest.json
%%DATADIR%%/neubot/www/update.html
-@dirrm %%DATADIR%%/neubot/www/test
-@dirrm %%DATADIR%%/neubot/www/lang
-@dirrm %%DATADIR%%/neubot/www/js
-@dirrm %%DATADIR%%/neubot/www/img
-@dirrm %%DATADIR%%/neubot/www/css
-@dirrm %%DATADIR%%/neubot/www
-@dirrm %%DATADIR%%/neubot/updater
-@dirrm %%DATADIR%%/neubot/speedtest
-@dirrm %%DATADIR%%/neubot/simplejson
-@dirrm %%DATADIR%%/neubot/rendezvous
-@dirrm %%DATADIR%%/neubot/notifier
-@dirrm %%DATADIR%%/neubot/net
-@dirrm %%DATADIR%%/neubot/negotiate
-@dirrm %%DATADIR%%/neubot/main
-@dirrm %%DATADIR%%/neubot/http
-@dirrm %%DATADIR%%/neubot/debug
-@dirrm %%DATADIR%%/neubot/database
-@dirrm %%DATADIR%%/neubot/bittorrent
-@dirrm %%DATADIR%%/neubot/api
-@dirrm %%DATADIR%%/neubot
-@dirrm %%DATADIR%%/mod_dash
-@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
-@dirrmtry etc/neubot
diff --git a/net/nmsg/pkg-plist b/net/nmsg/pkg-plist
index 1e1613b5e80a..552999af0cfd 100644
--- a/net/nmsg/pkg-plist
+++ b/net/nmsg/pkg-plist
@@ -270,11 +270,3 @@ share/nmsg/base/xml.proto
%%EXAMPLES%%%%EXAMPLESDIR%%/nmsg-packet2pcap.c
%%EXAMPLES%%%%EXAMPLESDIR%%/nmsg_callback.c
%%EXAMPLES%%%%EXAMPLESDIR%%/print_srcip.c
-@dirrmtry include/nmsg/base
-@dirrmtry include/nmsg
-@dirrmtry lib/nmsg
-@dirrmtry share/nmsg/base
-@dirrmtry share/nmsg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/nos-ttb/pkg-plist b/net/nos-ttb/pkg-plist
index 569e1a88b1c4..5882fd27bb6f 100644
--- a/net/nos-ttb/pkg-plist
+++ b/net/nos-ttb/pkg-plist
@@ -1,4 +1,3 @@
bin/ttb
share/ttb/ttb.glade
share/ttb/ttb.png
-@dirrm share/ttb
diff --git a/net/nstxd/pkg-plist b/net/nstxd/pkg-plist
index a424dac99df1..a9a9415f0cd8 100644
--- a/net/nstxd/pkg-plist
+++ b/net/nstxd/pkg-plist
@@ -1,4 +1,3 @@
man/man8/nstxd.8.gz
sbin/nstxd
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/ntlmaps/pkg-plist b/net/ntlmaps/pkg-plist
index 8386701b4c2d..cd86e1b01a21 100644
--- a/net/ntlmaps/pkg-plist
+++ b/net/ntlmaps/pkg-plist
@@ -65,6 +65,3 @@ share/examples/ntlmaps/server.cfg
%%PYTHON_SITELIBDIR%%/ntlmaps/www_client.py
%%PYTHON_SITELIBDIR%%/ntlmaps/www_client.pyc
%%PYTHON_SITELIBDIR%%/ntlmaps/www_client.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/ntlmaps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/examples/ntlmaps
diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist
index 15907b2054b4..fb7e39873f2d 100644
--- a/net/ntop/pkg-plist
+++ b/net/ntop/pkg-plist
@@ -1,4 +1,3 @@
-@stopdaemon ntop
bin/ntop
etc/ntop/GeoIPASNum.dat
etc/ntop/GeoLiteCity.dat
@@ -486,27 +485,4 @@ man/man8/ntop.8.gz
%%DATADIR%%/python/templates/rrdAlarmConfigurator.tmpl
%%DATADIR%%/python/templates/rrdAlarmConfiguratorHelp.tmpl
%%DATADIR%%/python/templates/rrdAlarmStart.tmpl
-@dirrm lib/ntop/plugins
-@dirrm lib/ntop
-@dirrm etc/ntop
-@dirrm %%DATADIR%%/python/templates
-@dirrm %%DATADIR%%/python/rrdalarm/scripts
-@dirrm %%DATADIR%%/python/rrdalarm
-@dirrm %%DATADIR%%/python/json/iphone
-@dirrm %%DATADIR%%/python/json
-@dirrm %%DATADIR%%/python/docs/src
-@dirrm %%DATADIR%%/python/docs
-@dirrm %%DATADIR%%/python
-@dirrm %%DATADIR%%/html/statsicons/os
-@dirrm %%DATADIR%%/html/statsicons/flags
-@dirrm %%DATADIR%%/html/statsicons
-@dirrm %%DATADIR%%/html/jscalendar/lang
-@dirrm %%DATADIR%%/html/jscalendar
-@dirrm %%DATADIR%%/html/jqplot/plugins
-@dirrm %%DATADIR%%/html/jqplot
-@dirrm %%DATADIR%%/html/img_inquisitor
-@dirrm %%DATADIR%%/html
-@dirrm %%DATADIR%%
-@exec mkdir -p %%DBDIR%%/ntop
-@exec chown -R nobody:nobody %%DBDIR%%/ntop
-@dirrmtry %%DBDIR%%/ntop
+@dir(nobody,nobody,) %%DBDIR%%/ntop
diff --git a/net/ntp-rc/pkg-plist b/net/ntp-rc/pkg-plist
index b3f44d32a492..3c8523ab6635 100644
--- a/net/ntp-rc/pkg-plist
+++ b/net/ntp-rc/pkg-plist
@@ -220,13 +220,3 @@ man/man1/ntp-keygen.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/malarky.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pogo.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rackety.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pic
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/hints
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/description_files
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/nusoap/pkg-plist b/net/nusoap/pkg-plist
index d4125a6b9759..1e8d59adc3a5 100644
--- a/net/nusoap/pkg-plist
+++ b/net/nusoap/pkg-plist
@@ -36,5 +36,3 @@
%%EXAMPLESDIR%%/wsdlclient7.php
%%EXAMPLESDIR%%/wsdlclient8.php
%%EXAMPLESDIR%%/wsdlclient9.php
-@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%DATADIR%%
diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist
index 0290981344f5..a950dfc8ec61 100644
--- a/net/opal/pkg-plist
+++ b/net/opal/pkg-plist
@@ -161,23 +161,3 @@ lib/opal-%%VERSION%%/codecs/video/mpeg4_ffmpeg_ptplugin.so
%%FAX%%lib/opal-%%VERSION%%/fax/spandsp_ptplugin.so
%%LID%%lib/opal-%%VERSION%%/lid/vpb_ptplugin.so
libdata/pkgconfig/opal.pc
-%%LID%%@dirrm lib/opal-%%VERSION%%/lid
-%%FAX%%@dirrm lib/opal-%%VERSION%%/fax
-%%VIDEO%%@dirrm lib/opal-%%VERSION%%/codecs/video
-@dirrm lib/opal-%%VERSION%%/codecs/audio
-@dirrm lib/opal-%%VERSION%%/codecs
-@dirrm lib/opal-%%VERSION%%
-@dirrm include/opal/zrtp
-@dirrm include/opal/t38
-@dirrm include/opal/t120
-@dirrm include/opal/sip
-@dirrm include/opal/rtp
-@dirrm include/opal/opal
-@dirrm include/opal/lids
-@dirrm include/opal/im
-@dirrm include/opal/iax2
-@dirrm include/opal/h460
-@dirrm include/opal/h323
-@dirrm include/opal/codec
-@dirrm include/opal/asn
-@dirrm include/opal
diff --git a/net/opendpi/pkg-plist b/net/opendpi/pkg-plist
index f890de82ece5..83f264148972 100644
--- a/net/opendpi/pkg-plist
+++ b/net/opendpi/pkg-plist
@@ -9,5 +9,3 @@ lib/libopendpi.a
lib/libopendpi.so
lib/libopendpi.so.1
lib/libopendpi.so.1.0.2
-@dirrm include/libopendpi-1.2/libopendpi
-@dirrm include/libopendpi-1.2
diff --git a/net/openmpi-devel/pkg-plist b/net/openmpi-devel/pkg-plist
index b86c91851d36..d1ccf2f4def5 100644
--- a/net/openmpi-devel/pkg-plist
+++ b/net/openmpi-devel/pkg-plist
@@ -935,29 +935,3 @@
%%MPIDIR%%/%%DATADIR%%/ortecc-wrapper-data.txt
%%MPIDIR%%/%%DATADIR%%/shmemcc-wrapper-data.txt
%%MPIDIR%%/%%DATADIR%%/shmemfort-wrapper-data.txt
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/vtsetup
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/otf
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace
-%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace/open-trace-format
-%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace
-@dirrmtry %%MPIDIR%%/%%DATADIR%%/amca-param-sets
-@dirrmtry %%MPIDIR%%/%%DATADIR%%
-@dirrmtry %%MPIDIR%%/share
-@dirrmtry %%MPIDIR%%/man/man7
-@dirrmtry %%MPIDIR%%/man/man3
-@dirrmtry %%MPIDIR%%/man/man1
-@dirrmtry %%MPIDIR%%/man
-@dirrmtry %%MPIDIR%%/lib/pkgconfig
-@dirrmtry %%MPIDIR%%/lib/openmpi
-@dirrmtry %%MPIDIR%%/lib
-@dirrmtry %%MPIDIR%%/include/openmpi/ompi/mpi/cxx
-@dirrmtry %%MPIDIR%%/include/openmpi/ompi/mpi
-@dirrmtry %%MPIDIR%%/include/openmpi/ompi
-@dirrmtry %%MPIDIR%%/include/openmpi
-@dirrmtry %%MPIDIR%%/include/mpp
-@dirrmtry %%MPIDIR%%/include
-@dirrmtry %%MPIDIR%%/etc
-@dirrmtry %%MPIDIR%%/bin
-@dirrmtry %%MPIDIR%%
-@dirrmtry %%MPIBASE%%
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 8aa42eb406df..b6d2d6199fe4 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -940,29 +940,3 @@
%%MPIDIR%%/%%DATADIR%%/ortecc-wrapper-data.txt
%%MPIDIR%%/%%DATADIR%%/shmemcc-wrapper-data.txt
%%MPIDIR%%/%%DATADIR%%/shmemfort-wrapper-data.txt
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/vtsetup
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc/otf
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace/doc
-%%VT%%@dirrmtry %%MPIDIR%%/share/vampirtrace
-%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace/open-trace-format
-%%VT%%@dirrmtry %%MPIDIR%%/include/vampirtrace
-@dirrmtry %%MPIDIR%%/%%DATADIR%%/amca-param-sets
-@dirrmtry %%MPIDIR%%/%%DATADIR%%
-@dirrmtry %%MPIDIR%%/share
-@dirrmtry %%MPIDIR%%/man/man7
-@dirrmtry %%MPIDIR%%/man/man3
-@dirrmtry %%MPIDIR%%/man/man1
-@dirrmtry %%MPIDIR%%/man
-@dirrmtry %%MPIDIR%%/lib/pkgconfig
-@dirrmtry %%MPIDIR%%/lib/openmpi
-@dirrmtry %%MPIDIR%%/lib
-@dirrmtry %%MPIDIR%%/include/openmpi/ompi/mpi/cxx
-@dirrmtry %%MPIDIR%%/include/openmpi/ompi/mpi
-@dirrmtry %%MPIDIR%%/include/openmpi/ompi
-@dirrmtry %%MPIDIR%%/include/openmpi
-@dirrmtry %%MPIDIR%%/include/mpp
-@dirrmtry %%MPIDIR%%/include
-@dirrmtry %%MPIDIR%%/etc
-@dirrmtry %%MPIDIR%%/bin
-@dirrmtry %%MPIDIR%%
-@dirrmtry %%MPIBASE%%
diff --git a/net/opennx/pkg-plist b/net/opennx/pkg-plist
index dd24336134e9..8cc3147363e2 100644
--- a/net/opennx/pkg-plist
+++ b/net/opennx/pkg-plist
@@ -42,29 +42,3 @@ share/keys/server.id_dsa.key.pub
%%NLS%%share/locale/ja/LC_MESSAGES/opennx.mo
%%NLS%%share/locale/ru/LC_MESSAGES/opennx.mo
share/pconnect.html
-@dirrmtry share/keys
-@dirrmtry share/icons/scalable/mimetypes
-@dirrmtry share/icons/scalable/apps
-@dirrmtry share/icons/scalable
-@dirrmtry share/icons/512x512/mimetypes
-@dirrmtry share/icons/512x512/apps
-@dirrmtry share/icons/512x512
-@dirrmtry share/icons/48x48/mimetypes
-@dirrmtry share/icons/48x48/apps
-@dirrmtry share/icons/48x48
-@dirrmtry share/icons/32x32/mimetypes
-@dirrmtry share/icons/32x32/apps
-@dirrmtry share/icons/32x32
-@dirrmtry share/icons/256x256/mimetypes
-@dirrmtry share/icons/256x256/apps
-@dirrmtry share/icons/256x256
-@dirrmtry share/icons/16x16/mimetypes
-@dirrmtry share/icons/16x16/apps
-@dirrmtry share/icons/16x16
-@dirrmtry share/icons/128x128/mimetypes
-@dirrmtry share/icons/128x128/apps
-@dirrmtry share/icons/128x128
-@dirrmtry share/icons
-@dirrmtry share/cups
-@dirrmtry share/applnk/xdg
-@dirrmtry share/applnk
diff --git a/net/openradius/pkg-plist b/net/openradius/pkg-plist
index 182d04da094f..c659d5bdb265 100644
--- a/net/openradius/pkg-plist
+++ b/net/openradius/pkg-plist
@@ -57,11 +57,3 @@ sbin/radiusd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configuration.sample-postgres
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configuration.sample-unixpass
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configuration.sample-usersfile
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/accounts
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/openradius
-@dirrmtry %%ETCDIR%%/subdicts
-@dirrmtry %%ETCDIR%%/modules
-@dirrmtry %%ETCDIR%%/legacy
-@dirrmtry %%ETCDIR%%
diff --git a/net/opentracker/pkg-plist b/net/opentracker/pkg-plist
index 006c798cccca..59e651fe1378 100644
--- a/net/opentracker/pkg-plist
+++ b/net/opentracker/pkg-plist
@@ -2,4 +2,3 @@ bin/opentracker
@unexec if cmp -s %D/%%ETCDIR%%/opentracker.conf.sample %D/%%ETCDIR%%/opentracker.conf; then rm -f %D/%%ETCDIR%%/opentracker.conf; fi
%%ETCDIR%%/opentracker.conf.sample
@exec cp -np %D/%F %B/opentracker.conf
-@dirrm etc/opentracker
diff --git a/net/openvswitch/pkg-plist b/net/openvswitch/pkg-plist
index 211b6a42f687..6df8f024d620 100644
--- a/net/openvswitch/pkg-plist
+++ b/net/openvswitch/pkg-plist
@@ -85,22 +85,6 @@ share/openvswitch/scripts/ovs-bugtool-coverage-show
share/openvswitch/scripts/ovs-bugtool-vsctl-show
share/openvswitch/scripts/ovs-bugtool-daemons-ver
share/openvswitch/scripts/ovs-bugtool-bond-show
-@dirrmtry var/log/openvswitch
-@dirrmtry var/log
-@dirrmtry var/lib/openvswitch/pki
-@dirrmtry var/lib/openvswitch
-@dirrmtry var/lib
-@dirrmtry var/run/openvswitch
-@dirrmtry var/run
-@dirrmtry var
-@dirrmtry share/openvswitch/scripts
-@dirrmtry share/openvswitch/python/ovstest
-@dirrmtry share/openvswitch/python/ovs/db
-@dirrmtry share/openvswitch/python/ovs
-@dirrmtry share/openvswitch/python
-@dirrmtry share/openvswitch/bugtool-plugins/system-logs
-@dirrmtry share/openvswitch/bugtool-plugins/system-configuration
-@dirrmtry share/openvswitch/bugtool-plugins/network-status
-@dirrmtry share/openvswitch/bugtool-plugins/kernel-info
-@dirrmtry share/openvswitch/bugtool-plugins
-@dirrmtry share/openvswitch
+@dir var/lib/openvswitch/pki
+@dir var/log/openvswitch
+@dir var/run/openvswitch
diff --git a/net/ortp/pkg-plist b/net/ortp/pkg-plist
index 2feb30946912..f387e860eefa 100644
--- a/net/ortp/pkg-plist
+++ b/net/ortp/pkg-plist
@@ -20,4 +20,3 @@ lib/libortp.so
lib/libortp.so.9
lib/libortp.so.9.0.0
libdata/pkgconfig/ortp.pc
-@dirrm include/ortp
diff --git a/net/owamp/pkg-plist b/net/owamp/pkg-plist
index a0d2745397de..f1b1748bc592 100644
--- a/net/owamp/pkg-plist
+++ b/net/owamp/pkg-plist
@@ -39,4 +39,3 @@ man/man5/owampd.conf.5.gz
man/man5/owampd.limits.5.gz
man/man5/owampd.pfs.5.gz
man/man8/owampd.8.gz
-@dirrm include/I2util
diff --git a/net/owncloud-csync/pkg-plist b/net/owncloud-csync/pkg-plist
index 04f777d80306..f55ec887b2bd 100644
--- a/net/owncloud-csync/pkg-plist
+++ b/net/owncloud-csync/pkg-plist
@@ -44,10 +44,3 @@ lib/libocsync.so.0.2.1
%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/tip.png
%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/up.png
%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/warning.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide/images/icons/callouts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide/images/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry include/ocsync
-@dirrmtry %%ETCDIR%%
diff --git a/net/packter-agent/pkg-plist b/net/packter-agent/pkg-plist
index 9d00071e443f..def5d2b85444 100644
--- a/net/packter-agent/pkg-plist
+++ b/net/packter-agent/pkg-plist
@@ -10,5 +10,3 @@ bin/pt_thmon
%%PACKTERTC%%%%DATADIR%%/packter_tc/itm.conf
%%PACKTERTC%%%%DATADIR%%/packter_tc/packter_tc.pl
%%PACKTERTC%%%%DATADIR%%/packter_tc/xsd.pl
-%%PACKTERTC%%@dirrm %%DATADIR%%/packter_tc
-%%PACKTERTC%%@dirrm %%DATADIR%%
diff --git a/net/pdb/pkg-plist b/net/pdb/pkg-plist
index 9de94282249d..007b2cd7e1d2 100644
--- a/net/pdb/pkg-plist
+++ b/net/pdb/pkg-plist
@@ -8,4 +8,3 @@ bin/pdb.py
%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.py
%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.pyc
%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/pktdbg
diff --git a/net/pecl-radius/pkg-plist b/net/pecl-radius/pkg-plist
index aaa7ac9f2c17..1037401868d3 100644
--- a/net/pecl-radius/pkg-plist
+++ b/net/pecl-radius/pkg-plist
@@ -3,4 +3,3 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/des.php
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mschap.php
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mschaptest.php
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/phamm/pkg-plist b/net/phamm/pkg-plist
index e2f9b10c7b86..f826a5429c28 100644
--- a/net/phamm/pkg-plist
+++ b/net/phamm/pkg-plist
@@ -108,59 +108,3 @@
%%PHAMMDIR%%/www-data/style/phamm/img/TRUE.png
%%PHAMMDIR%%/www-data/style/phamm/img/navigation.png
%%PHAMMDIR%%/www-data/style/phamm/main.css
-@dirrm %%PHAMMDIR%%/www-data/style/phamm/img
-@dirrm %%PHAMMDIR%%/www-data/style/phamm
-@dirrm %%PHAMMDIR%%/www-data/style
-@dirrm %%PHAMMDIR%%/www-data/img
-@dirrm %%PHAMMDIR%%/www-data
-@dirrm %%PHAMMDIR%%/tools
-@dirrm %%PHAMMDIR%%/po
-@dirrm %%PHAMMDIR%%/plugins
-@dirrm %%PHAMMDIR%%/locales/vi_VN/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/vi_VN
-@dirrm %%PHAMMDIR%%/locales/vi/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/vi
-@dirrm %%PHAMMDIR%%/locales/ru_RU/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/ru_RU
-@dirrm %%PHAMMDIR%%/locales/ru/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/ru
-@dirrm %%PHAMMDIR%%/locales/pl_PL/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/pl_PL
-@dirrm %%PHAMMDIR%%/locales/it_IT/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/it_IT
-@dirrm %%PHAMMDIR%%/locales/hu_HU/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/hu_HU
-@dirrm %%PHAMMDIR%%/locales/fr_FR/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/fr_FR
-@dirrm %%PHAMMDIR%%/locales/es_ES/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/es_ES
-@dirrm %%PHAMMDIR%%/locales/de_DE/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/de_DE
-@dirrm %%PHAMMDIR%%/locales/da_DK/LC_MESSAGES
-@dirrm %%PHAMMDIR%%/locales/da_DK
-@dirrm %%PHAMMDIR%%/locales
-@dirrm %%PHAMMDIR%%/lib
-@dirrm %%PHAMMDIR%%/docs
-@dirrm %%PHAMMDIR%%/DTD
-@dirrm %%PHAMMDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/schema/contrib
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/schema
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ldif
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/squid
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/smbldap-tools
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/slapd
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/sasl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/pure-ftpd-ldap
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/postfix
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/phamm
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/pdns-backend-ldap
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/libnss-ldap
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/gnarwl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/dovecot
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/davical
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/cron
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/courier-authlib-ldap
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/apache2.2
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/amavisd-new
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/pktanon/pkg-plist b/net/pktanon/pkg-plist
index 0efdad6a0aa6..6713324189cc 100644
--- a/net/pktanon/pkg-plist
+++ b/net/pktanon/pkg-plist
@@ -3,5 +3,3 @@ bin/pktanon
%%DATADIR%%/profiles/settings_identity.xml
%%DATADIR%%/profiles/settings_low.xml
%%DATADIR%%/profiles/settings_medium.xml
-@dirrm %%DATADIR%%/profiles
-@dirrm %%DATADIR%%
diff --git a/net/pmf/pkg-plist b/net/pmf/pkg-plist
index eda4f128f81e..ff6a4c7ed1d0 100644
--- a/net/pmf/pkg-plist
+++ b/net/pmf/pkg-plist
@@ -95,7 +95,3 @@ bin/pmf
%%DATADIR%%/helpfiles/substitute_history
%%DATADIR%%/helpfiles/variables
%%DATADIR%%/helpfiles/verbose
-@dirrm %%DATADIR%%/helpfiles
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/poptop/pkg-plist b/net/poptop/pkg-plist
index d6dc1b053a18..a78f340971d1 100644
--- a/net/poptop/pkg-plist
+++ b/net/poptop/pkg-plist
@@ -6,4 +6,3 @@ man/man8/pptpctrl.8.gz
man/man8/pptpd.8.gz
sbin/pptpctrl
sbin/pptpd
-@dirrm lib/pptpd
diff --git a/net/portfwd/pkg-plist b/net/portfwd/pkg-plist
index 7bbbcbcc7c69..2204016cacf2 100644
--- a/net/portfwd/pkg-plist
+++ b/net/portfwd/pkg-plist
@@ -7,7 +7,6 @@ man/man8/portfwd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/conf.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%EXAMPLESDIR%%/alias.cfg
%%EXAMPLESDIR%%/bind-new.cfg
%%EXAMPLESDIR%%/bind.cfg
@@ -26,4 +25,3 @@ man/man8/portfwd.8.gz
%%EXAMPLESDIR%%/test.cfg
%%EXAMPLESDIR%%/udp.cfg
%%EXAMPLESDIR%%/x.cfg
-@dirrm %%EXAMPLESDIR%%
diff --git a/net/proxy-suite/pkg-plist b/net/proxy-suite/pkg-plist
index 176c647e7c4c..45fbe47031a3 100644
--- a/net/proxy-suite/pkg-plist
+++ b/net/proxy-suite/pkg-plist
@@ -2,4 +2,3 @@ sbin/ftp-proxy
etc/proxy-suite/ftp-proxy.conf.sample
man/man5/ftp-proxy.conf.5.gz
man/man8/ftp-proxy.8.gz
-@dirrm etc/proxy-suite
diff --git a/net/ptpd2/pkg-plist b/net/ptpd2/pkg-plist
index fafbd4ce123a..ce056d224f48 100644
--- a/net/ptpd2/pkg-plist
+++ b/net/ptpd2/pkg-plist
@@ -4,4 +4,3 @@ man/man5/ptpd2.conf.5.gz
%%ETCDIR%%/client-e2e-8023.conf.sample
%%ETCDIR%%/client-e2e-pcap.conf.sample
%%ETCDIR%%/client-e2e-socket.conf.sample
-@dirrmtry %%ETCDIR%%
diff --git a/net/pvm/pkg-plist b/net/pvm/pkg-plist
index ff12f1eb23f4..ce791d89caf5 100644
--- a/net/pvm/pkg-plist
+++ b/net/pvm/pkg-plist
@@ -243,9 +243,3 @@ man/man3/pvmftidtoh.3.gz
man/man3/pvmftrecv.3.gz
man/man3/pvmfunpack.3.gz
man/man3/pvmfupkmesg.3.gz
-@dirrm lib/pvm/lib/FREEBSD
-@dirrm lib/pvm/lib
-@dirrm lib/pvm/conf
-@dirrm lib/pvm/bin/FREEBSD
-@dirrm lib/pvm/bin
-@dirrm lib/pvm
diff --git a/net/py-gntp/pkg-plist b/net/py-gntp/pkg-plist
index 593561aea349..4af377577c31 100644
--- a/net/py-gntp/pkg-plist
+++ b/net/py-gntp/pkg-plist
@@ -27,6 +27,3 @@
%%PORTDOCS%%%%DOCSDIR%%/objects.inv
%%PORTDOCS%%%%DOCSDIR%%/search.html
%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/py-libnet/pkg-plist b/net/py-libnet/pkg-plist
index 58e69920fd48..6374676e7761 100644
--- a/net/py-libnet/pkg-plist
+++ b/net/py-libnet/pkg-plist
@@ -5,5 +5,3 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lnsh/dnsv4.libnet
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lnsh/tcpsyn.libnet
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lnsh/tcpxmas.libnet
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/lnsh
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net/py-pcs/pkg-plist b/net/py-pcs/pkg-plist
index 2b300a0d00dd..27b541f10a1e 100644
--- a/net/py-pcs/pkg-plist
+++ b/net/py-pcs/pkg-plist
@@ -154,5 +154,3 @@
%%PYTHON_SITELIBDIR%%/pcs/packets/vlan.pyo
%%PYTHON_SITELIBDIR%%/pcs/clock.so
%%PYTHON_SITELIBDIR%%/pcs/pcap.so
-@dirrm %%PYTHON_SITELIBDIR%%/pcs/packets
-@dirrm %%PYTHON_SITELIBDIR%%/pcs
diff --git a/net/py-soapy/pkg-plist b/net/py-soapy/pkg-plist
index 22f2d02174c3..2cdd969170b6 100644
--- a/net/py-soapy/pkg-plist
+++ b/net/py-soapy/pkg-plist
@@ -9,6 +9,3 @@
%%PYTHON_SITELIBDIR%%/soap.py
%%PYTHON_SITELIBDIR%%/soap.pyc
%%PYTHON_SITELIBDIR%%/soap.pyo
-%%PORTEXAMPLES%%@dirrm share/examples/py-soapy/test
-%%PORTEXAMPLES%%@dirrm share/examples/py-soapy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/pygopherd/pkg-plist b/net/pygopherd/pkg-plist
index adafce19084b..1ef7c38adc15 100644
--- a/net/pygopherd/pkg-plist
+++ b/net/pygopherd/pkg-plist
@@ -131,7 +131,4 @@ etc/pygopherd/mime.types
%%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyc
%%PYTHON_SITELIBDIR%%/pygopherd/zipfile.pyo
man/man8/pygopherd.8.gz
-@dirrm %%PYTHON_SITELIBDIR%%/pygopherd/handlers
-@dirrm %%PYTHON_SITELIBDIR%%/pygopherd/protocols
-@dirrm %%PYTHON_SITELIBDIR%%/pygopherd
@unexec rmdir %D/etc/pygopherd 2> /dev/null || echo "If you do not plan on reinstalling pygopherd, you can safely remove %D/etc/pygopherd"
diff --git a/net/qjsonrpc/pkg-plist b/net/qjsonrpc/pkg-plist
index 27be9bcef990..c8fffcce7b45 100644
--- a/net/qjsonrpc/pkg-plist
+++ b/net/qjsonrpc/pkg-plist
@@ -11,5 +11,3 @@ lib/libqjsonrpc.so.1
lib/libqjsonrpc.so.1.0
lib/libqjsonrpc.so.1.0.0
libdata/pkgconfig/qjsonrpc.pc
-@dirrm include/qjsonrpc/json
-@dirrm include/qjsonrpc
diff --git a/net/qoauth/pkg-plist b/net/qoauth/pkg-plist
index 54ea1ac79119..6bce8d9db68f 100644
--- a/net/qoauth/pkg-plist
+++ b/net/qoauth/pkg-plist
@@ -9,7 +9,3 @@ lib/libqoauth.so.1.0
lib/libqoauth.so.1.0.1
libdata/pkgconfig/qoauth.pc
share/qt4/mkspecs/features/oauth.prf
-@dirrmtry share/qt4/mkspecs/features
-@dirrmtry share/qt4/mkspecs
-@dirrmtry share/qt4
-@dirrm include/QtOAuth
diff --git a/net/qtweetlib/pkg-plist b/net/qtweetlib/pkg-plist
index 7b2a562e2aab..cd7f9e4bb7f0 100644
--- a/net/qtweetlib/pkg-plist
+++ b/net/qtweetlib/pkg-plist
@@ -74,4 +74,3 @@ include/QTweetLib/qtweetusertimeline.h
lib/libQTweetLib.so
lib/libQTweetLib.so.1
lib/libQTweetLib.so.1.0.0
-@dirrm include/QTweetLib
diff --git a/net/queso/pkg-plist b/net/queso/pkg-plist
index 09ee81eaa64b..f8dc6bb605dc 100644
--- a/net/queso/pkg-plist
+++ b/net/queso/pkg-plist
@@ -3,4 +3,3 @@ sbin/queso
etc/queso.conf.sample
@exec [ -f %B/queso.conf.sample ] || cp %B/%f %B/queso.conf.sample
%%PORTDOCS%%%%DOCSDIR%%/Documentation.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/quiterss/pkg-plist b/net/quiterss/pkg-plist
index 8b462c21e920..423527e2b547 100644
--- a/net/quiterss/pkg-plist
+++ b/net/quiterss/pkg-plist
@@ -46,7 +46,3 @@ share/quiterss/style/pink.qss
share/quiterss/style/purple.qss
share/quiterss/style/system.qss
share/quiterss/style/system2.qss
-@dirrmtry share/quiterss/lang
-@dirrmtry share/quiterss/sound
-@dirrmtry share/quiterss/style
-@dirrmtry share/quiterss
diff --git a/net/radiusclient/pkg-plist b/net/radiusclient/pkg-plist
index 79051f397aef..6c3588beea8d 100644
--- a/net/radiusclient/pkg-plist
+++ b/net/radiusclient/pkg-plist
@@ -18,4 +18,3 @@ sbin/radexample
sbin/radiusclient
sbin/radlogin
sbin/radstatus
-@dirrmtry %%ETCDIR%%
diff --git a/net/raggle/pkg-plist b/net/raggle/pkg-plist
index 190f8d598554..070dd2daf72d 100644
--- a/net/raggle/pkg-plist
+++ b/net/raggle/pkg-plist
@@ -8,7 +8,6 @@ bin/raggle
%%PORTDOCS%%%%DOCSDIR%%/default_config.rb
%%PORTDOCS%%%%DOCSDIR%%/pauls_feeds.opml.gz
%%PORTDOCS%%%%DOCSDIR%%/theme_documentation.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%DATADIR%%/extras/feed_dump.rb
%%DATADIR%%/extras/feed_sizes.rb
%%DATADIR%%/extras/rss_dir_list.rb
@@ -37,10 +36,3 @@ bin/raggle
%%DATADIR%%/themes/mono.yaml
%%DATADIR%%/themes/pane.yaml
%%DATADIR%%/themes/vert.yaml
-@dirrm %%DATADIR%%/extras/web_ui/images
-@dirrm %%DATADIR%%/extras/web_ui/inc
-@dirrm %%DATADIR%%/extras/web_ui
-@dirrm %%DATADIR%%/extras/win32
-@dirrm %%DATADIR%%/extras
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
diff --git a/net/ranch/pkg-plist b/net/ranch/pkg-plist
index 8fd659ae1b66..970b5061918e 100644
--- a/net/ranch/pkg-plist
+++ b/net/ranch/pkg-plist
@@ -38,11 +38,3 @@ lib/erlang/lib/ranch-%%VERSION%%/src/ranch_transport.erl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp_reverse/src/tcp_reverse.app.src
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp_reverse/src/tcp_reverse_app.erl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp_reverse/src/tcp_reverse_sup.erl
-@dirrm lib/erlang/lib/ranch-%%VERSION%%/src
-@dirrm lib/erlang/lib/ranch-%%VERSION%%/ebin
-@dirrm lib/erlang/lib/ranch-%%VERSION%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcp_reverse/src
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcp_reverse
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcp_echo/src
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcp_echo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/rdesktop/pkg-plist b/net/rdesktop/pkg-plist
index bfb434658ce5..6919444ceaee 100644
--- a/net/rdesktop/pkg-plist
+++ b/net/rdesktop/pkg-plist
@@ -8,7 +8,6 @@ man/man1/rdesktop.1.gz
%%PORTDOCS%%%%DOCSDIR%%/licensing.txt
%%PORTDOCS%%%%DOCSDIR%%/patches.txt
%%PORTDOCS%%%%DOCSDIR%%/redirection.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%DATADIR%%/keymaps/ar
%%DATADIR%%/keymaps/common
%%DATADIR%%/keymaps/convert-map
@@ -50,5 +49,3 @@ man/man1/rdesktop.1.gz
%%DATADIR%%/keymaps/sv
%%DATADIR%%/keymaps/th
%%DATADIR%%/keymaps/tr
-@dirrmtry %%DATADIR%%/keymaps
-@dirrmtry %%DATADIR%%
diff --git a/net/remmina/pkg-plist b/net/remmina/pkg-plist
index 413386ae0adf..286b4284a478 100644
--- a/net/remmina/pkg-plist
+++ b/net/remmina/pkg-plist
@@ -44,4 +44,4 @@ share/icons/hicolor/scalable/apps/remmina.svg
%%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo
%%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo
-@dirrmtry include/remmina
+@dir include/remmina
diff --git a/net/remotebox/Makefile b/net/remotebox/Makefile
index 9636cc83df93..1460fce10e07 100644
--- a/net/remotebox/Makefile
+++ b/net/remotebox/Makefile
@@ -3,6 +3,7 @@
PORTNAME= remotebox
PORTVERSION= 1.8.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://remotebox.knobgoblin.org.uk/downloads/
DISTNAME= RemoteBox-${PORTVERSION}
@@ -19,7 +20,8 @@ RUN_DEPENDS= p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
LICENSE_FILE_GPLv2= ${WRKSRC}/docs/COPYING
NO_BUILD= yes
-USES= tar:bzip2
+USES= shebangfix tar:bzip2
+SHEBANG_FILES= remotebox
INSTALLS_ICONS= yes
OPTIONS_DEFINE= DOCS
diff --git a/net/remotebox/pkg-plist b/net/remotebox/pkg-plist
index 91e2f31d18ae..bf3c8a351464 100644
--- a/net/remotebox/pkg-plist
+++ b/net/remotebox/pkg-plist
@@ -221,8 +221,3 @@ share/pixmaps/remotebox.png
%%DATADIR%%/remotebox.xml
%%DATADIR%%/vboxService.pm
%%DATADIR%%/vboxserializers.pl
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/icons/gueststatus
-@dirrmtry %%DATADIR%%/icons/os
-@dirrmtry %%DATADIR%%/icons
-@dirrmtry %%DATADIR%%
diff --git a/net/remotedesk/pkg-plist b/net/remotedesk/pkg-plist
index d5b97cc111b4..5652b90bbbaf 100644
--- a/net/remotedesk/pkg-plist
+++ b/net/remotedesk/pkg-plist
@@ -9,6 +9,3 @@ GNUstep/Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm/objects.gorm
GNUstep/Local/Applications/RemoteDesk.app/Resources/remotedesk.tiff
GNUstep/Local/Applications/RemoteDesk.app/stamp.make
GNUstep/Local/Tools/RemoteDesk
-@dirrm GNUstep/Local/Applications/RemoteDesk.app/Resources/RemoteDesk.gorm
-@dirrm GNUstep/Local/Applications/RemoteDesk.app/Resources
-@dirrm GNUstep/Local/Applications/RemoteDesk.app
diff --git a/net/reposado/pkg-plist b/net/reposado/pkg-plist
index 59012eef8806..3d2606a2e955 100644
--- a/net/reposado/pkg-plist
+++ b/net/reposado/pkg-plist
@@ -6,7 +6,6 @@ bin/repoutil
%%PYTHON_SITELIBDIR%%/reposadolib/reposadocommon.py
%%PYTHON_SITELIBDIR%%/reposadolib/reposadocommon.pyc
%%PYTHON_SITELIBDIR%%/reposadolib/reposadocommon.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/reposadolib
%%PORTDOCS%%%%DOCSDIR%%/client_configuration.txt
%%PORTDOCS%%%%DOCSDIR%%/getting_started.txt
%%PORTDOCS%%%%DOCSDIR%%/reference.txt
@@ -16,4 +15,3 @@ bin/repoutil
%%PORTDOCS%%%%DOCSDIR%%/reposado_py2exe.txt
%%PORTDOCS%%%%DOCSDIR%%/URL_rewrites.txt
%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/rsplib/Makefile b/net/rsplib/Makefile
index fc52830e1d33..93cf4837aa70 100644
--- a/net/rsplib/Makefile
+++ b/net/rsplib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rsplib
PORTVERSION= 3.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.exp-math.uni-essen.de/~dreibh/rserpool/download/
@@ -17,7 +17,8 @@ CONFIGURE_ARGS= --disable-maintainer-mode \
--enable-qt --with-qt-lib=${QT_LIBDIR} \
--with-qt-include=${QT_INCDIR}
INSTALL_TARGET= install-strip
-USES= gmake libtool
+USES= gmake libtool shebangfix
+SHEBANG_FILES= rsplib/scriptingserviceexample
USE_LDCONFIG= yes
USE_QT4= gui xml moc_build
diff --git a/net/rsplib/pkg-plist b/net/rsplib/pkg-plist
index 2e34424df8df..3b79324240ae 100644
--- a/net/rsplib/pkg-plist
+++ b/net/rsplib/pkg-plist
@@ -352,6 +352,3 @@ share/fgpconfig/input-249.fsf
share/fgpconfig/input-250.fsf
share/fractalpooluser/fractalpooluser_de_DE.qm
share/fractalpooluser/fractalpooluser_nb_NO.qm
-@dirrm share/fractalpooluser
-@dirrm share/fgpconfig
-@dirrm include/rserpool
diff --git a/net/rtg/pkg-plist b/net/rtg/pkg-plist
index b5e9595bb32b..a11f68c26ac3 100644
--- a/net/rtg/pkg-plist
+++ b/net/rtg/pkg-plist
@@ -22,6 +22,3 @@ www/data/rtg.php
www/data/rtg.png
www/data/rtgback.png
www/data/view.php
-@dirrmtry contrib
-@dirrmtry %%ETCDIR%%
-@dirrmtry www/data
diff --git a/net/ruby-dict/pkg-plist b/net/ruby-dict/pkg-plist
index 920cb5042ca8..d50499f760eb 100644
--- a/net/ruby-dict/pkg-plist
+++ b/net/ruby-dict/pkg-plist
@@ -4,4 +4,3 @@ bin/rdict
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dict.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdict.html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/net/ruby-icmp/pkg-plist b/net/ruby-icmp/pkg-plist
index 06d0a6c1a6c8..b749d7d67667 100644
--- a/net/ruby-icmp/pkg-plist
+++ b/net/ruby-icmp/pkg-plist
@@ -2,4 +2,3 @@
%%RUBY_SITELIBDIR%%/icmp.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ping.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/traceroute.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/net/ruby-tserver/pkg-plist b/net/ruby-tserver/pkg-plist
index 1cf05ae2f53a..5e367748d4b5 100644
--- a/net/ruby-tserver/pkg-plist
+++ b/net/ruby-tserver/pkg-plist
@@ -1,7 +1,4 @@
%%RUBY_SITELIBDIR%%/tserver.rb
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tommy.css
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/port-forward
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/net/rude/pkg-plist b/net/rude/pkg-plist
index a326ae1ca1cd..09e26128b38b 100644
--- a/net/rude/pkg-plist
+++ b/net/rude/pkg-plist
@@ -11,4 +11,3 @@ man/man8/rude.8.gz
%%PORTDOCS%%%%DOCSDIR%%/crude_jitter.pl
%%PORTDOCS%%%%DOCSDIR%%/crude_parse.pl
%%PORTDOCS%%%%DOCSDIR%%/dump2trace.pl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/scr_ipfm/pkg-plist b/net/scr_ipfm/pkg-plist
index 273392630811..b8e9f16784d8 100644
--- a/net/scr_ipfm/pkg-plist
+++ b/net/scr_ipfm/pkg-plist
@@ -42,15 +42,3 @@
%%MYADMDIR%%/yearinglobal.php
%%MYADMDIR%%/yearly-graph.php
%%MYADMDIR%%/yearly.php
-@dirrm %%MYADMDIR%%/themes/yellow
-@dirrm %%MYADMDIR%%/themes/white
-@dirrm %%MYADMDIR%%/themes/orange
-@dirrm %%MYADMDIR%%/themes/meat
-@dirrm %%MYADMDIR%%/themes/green
-@dirrm %%MYADMDIR%%/themes/default
-@dirrm %%MYADMDIR%%/themes/blue
-@dirrm %%MYADMDIR%%/themes
-@dirrm %%MYADMDIR%%/images
-@dirrm %%MYADMDIR%%/contrib
-@dirrm %%MYADMDIR%%
-@dirrmtry www/data
diff --git a/net/sdl_net/pkg-plist b/net/sdl_net/pkg-plist
index 2669c041cb0b..92f79dbfcc7a 100644
--- a/net/sdl_net/pkg-plist
+++ b/net/sdl_net/pkg-plist
@@ -4,4 +4,3 @@ lib/libSDL_net-1.2.so.0.8.0
lib/libSDL_net.a
lib/libSDL_net.so
libdata/pkgconfig/SDL_net.pc
-@dirrmtry include/SDL
diff --git a/net/serveez/pkg-plist b/net/serveez/pkg-plist
index 9ed07e4274ee..0354ea5cf4c6 100644
--- a/net/serveez/pkg-plist
+++ b/net/serveez/pkg-plist
@@ -15,4 +15,3 @@ share/aclocal/serveez.m4
%%DATADIR%%/mandel-client.scm
%%DATADIR%%/mandel-server.scm
%%DATADIR%%/mandel-shared.scm
-@dirrm %%DATADIR%%
diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist
index 04075d776ae0..60c2ee39e279 100644
--- a/net/serviio/pkg-plist
+++ b/net/serviio/pkg-plist
@@ -36,8 +36,6 @@ bin/serviio-console
%%JAVAJARDIR%%/serviio/streamflyer-core.jar
%%JAVAJARDIR%%/serviio/winp.jar
%%JAVAJARDIR%%/serviio/xstream.jar
-@dirrm %%JAVAJARDIR%%/serviio/plugins
-@dirrm %%JAVAJARDIR%%/serviio
@unexec cmp %D/%%ETCDIR%%/application-profiles.xml %D/%%ETCDIR%%/application-profiles.dist.xml && rm -f %D/%%ETCDIR%%/application-profiles.xml || echo Modified application-profiles.xml remains in %D/%%ETCDIR%%
@unexec cmp %D/%%ETCDIR%%/profiles.xml %D/%%ETCDIR%%/profiles.dist.xml && rm -f %D/%%ETCDIR%%/profiles.xml || echo Modified profiles.xml remains in %D/%%ETCDIR%%
@unexec cmp %D/%%ETCDIR%%/log4j.xml %D/%%ETCDIR%%/log4j.dist.xml && rm -f %D/%%ETCDIR%%/log4j.xml || echo Modified log4j.xml remains in %D/%%ETCDIR%%
@@ -50,4 +48,4 @@ bin/serviio-console
@exec [ -f %D/%%ETCDIR%%/profiles.xml ] || cp -v %D/%%ETCDIR%%/profiles.dist.xml %D/%%ETCDIR%%/profiles.xml
@exec [ -f %D/%%ETCDIR%%/log4j.xml ] || cp -v %D/%%ETCDIR%%/log4j.dist.xml %D/%%ETCDIR%%/log4j.xml
@exec [ -f %D/%%ETCDIR%%/console-log4j.properties ] || cp -v %D/%%ETCDIR%%/console-log4j.dist.properties %D/%%ETCDIR%%/console-log4j.properties
-@dirrmtry %%ETCDIR%%
+@dir %%JAVAJARDIR%%/serviio/plugins
diff --git a/net/shadowsocks-libev/pkg-plist b/net/shadowsocks-libev/pkg-plist
index 1cedf172d8b1..3144da07317f 100644
--- a/net/shadowsocks-libev/pkg-plist
+++ b/net/shadowsocks-libev/pkg-plist
@@ -4,4 +4,3 @@ man/man8/shadowsocks.8.gz
@unexec if cmp -s %D/etc/shadowsocks-libev/config.json %D/etc/shadowsocks-libev/config.json.sample ; then rm -f %D/etc/shadowsocks-libev/config.json ; fi
etc/shadowsocks-libev/config.json.sample
@exec if [ ! -f %D/etc/shadowsocks-libev/config.json ]; then cp -p %D/%F %B/config.json ; fi
-@dirrm etc/shadowsocks-libev
diff --git a/net/shmux/pkg-plist b/net/shmux/pkg-plist
index f09289d07da8..2f35283bb2ee 100644
--- a/net/shmux/pkg-plist
+++ b/net/shmux/pkg-plist
@@ -1,4 +1,3 @@
bin/shmux
%%EXAMPLESDIR%%/mcmd.sh
-@dirrm %%EXAMPLESDIR%%
man/man1/shmux.1.gz
diff --git a/net/sie-nmsg/pkg-plist b/net/sie-nmsg/pkg-plist
index 837a5f240f61..7c6b3fdcd5c6 100644
--- a/net/sie-nmsg/pkg-plist
+++ b/net/sie-nmsg/pkg-plist
@@ -6,4 +6,3 @@ include/nmsg/sie/qr.pb-c.h
include/nmsg/sie/reputation.pb-c.h
lib/nmsg/nmsg_msg9_sie.a
lib/nmsg/nmsg_msg9_sie.so
-@dirrm include/nmsg/sie
diff --git a/net/sippy_b2bua/pkg-plist b/net/sippy_b2bua/pkg-plist
index fab9c9b3fa67..3a9d9f2ec323 100644
--- a/net/sippy_b2bua/pkg-plist
+++ b/net/sippy_b2bua/pkg-plist
@@ -235,8 +235,5 @@ etc/sippy/dictionary
%%PYTHON_SITELIBDIR%%/sippy/b2bua_simple.py
%%PYTHON_SITELIBDIR%%/sippy/b2bua_simple.pyc
%%PYTHON_SITELIBDIR%%/sippy/b2bua_simple.pyo
-@dirrm etc/sippy
-@dirrm %%PYTHON_SITELIBDIR%%/sippy
%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
diff --git a/net/siproxd/pkg-plist b/net/siproxd/pkg-plist
index 18f574376a38..888a1f8548ee 100644
--- a/net/siproxd/pkg-plist
+++ b/net/siproxd/pkg-plist
@@ -11,4 +11,3 @@ lib/siproxd/plugin_logcall.so
lib/siproxd/plugin_shortdial.la
lib/siproxd/plugin_shortdial.so
sbin/siproxd
-@dirrm lib/siproxd
diff --git a/net/skstream/pkg-plist b/net/skstream/pkg-plist
index aee6a14f6c74..464919d8f2e7 100644
--- a/net/skstream/pkg-plist
+++ b/net/skstream/pkg-plist
@@ -3,7 +3,6 @@
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README.FreeSockets
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
include/skstream-0.3/skstream/skaddress.h
include/skstream-0.3/skstream/sksocket.h
include/skstream-0.3/skstream/skstream.h
@@ -18,8 +17,3 @@ lib/libskstream-0.3.so.7.0.0
libdata/pkgconfig/skstream-0.3.pc
libdata/pkgconfig/skstream-unix-0.3.pc
lib/skstream-0.3/include/skstream/skstreamconfig.h
-@dirrm include/skstream-0.3/skstream
-@dirrm include/skstream-0.3
-@dirrm lib/skstream-0.3/include/skstream
-@dirrm lib/skstream-0.3/include
-@dirrm lib/skstream-0.3
diff --git a/net/sl2tps/pkg-plist b/net/sl2tps/pkg-plist
index 1cb3fc7ee29d..b9a3c87ea221 100644
--- a/net/sl2tps/pkg-plist
+++ b/net/sl2tps/pkg-plist
@@ -1,4 +1,3 @@
bin/sl2tps
@sample %%ETCDIR%%/config.xml.sample
man/man1/sl2tps.1.gz
-@dirrmtry %%ETCDIR%%
diff --git a/net/slurm/pkg-plist b/net/slurm/pkg-plist
index 28d11ff1fb3a..c311ae34fa7c 100644
--- a/net/slurm/pkg-plist
+++ b/net/slurm/pkg-plist
@@ -7,5 +7,3 @@ man/man1/slurm.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/KEYS
%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/slurm
diff --git a/net/smm++/pkg-plist b/net/smm++/pkg-plist
index 702524161d09..7c35876d5489 100644
--- a/net/smm++/pkg-plist
+++ b/net/smm++/pkg-plist
@@ -333,52 +333,3 @@ lib/smm/sources/rsc/tclIndex
lib/smm/sources/rsc/util.tcl
lib/smm/sources/startup.tcl
lib/smm/sources/tclIndex
-@dirrm lib/smm/sources/rsc
-@dirrm lib/smm/sources/mudding
-@dirrm lib/smm/sources/mapping
-@dirrm lib/smm/sources/main
-@dirrm lib/smm/sources/itcl/iwidgets/generic
-@dirrm lib/smm/sources/itcl/iwidgets/demos
-@dirrm lib/smm/sources/itcl/iwidgets
-@dirrm lib/smm/sources/itcl
-@dirrm lib/smm/sources/error
-@dirrm lib/smm/sources/editor
-@dirrm lib/smm/sources/c
-@dirrm lib/smm/sources
-@dirrm lib/smm/images/system/stuff
-@dirrm lib/smm/images/system/exits
-@dirrm lib/smm/images/system/buttons
-@dirrm lib/smm/images/system/bg
-@dirrm lib/smm/images/system
-@dirrm lib/smm/images/stuff_XL/ornaments
-@dirrm lib/smm/images/stuff_XL
-@dirrm lib/smm/images/stuff/provisions
-@dirrm lib/smm/images/stuff/nr
-@dirrm lib/smm/images/stuff/misc
-@dirrm lib/smm/images/stuff/furniture
-@dirrm lib/smm/images/stuff/equipment
-@dirrm lib/smm/images/stuff/books
-@dirrm lib/smm/images/stuff/beings
-@dirrm lib/smm/images/stuff/abc
-@dirrm lib/smm/images/stuff
-@dirrm lib/smm/images/bg_color_ontop/walls
-@dirrm lib/smm/images/bg_color_ontop/roads
-@dirrm lib/smm/images/bg_color_ontop/misc
-@dirrm lib/smm/images/bg_color_ontop/landscape
-@dirrm lib/smm/images/bg_color_ontop/buildings
-@dirrm lib/smm/images/bg_color_ontop
-@dirrm lib/smm/images/bg_color_below/landscape
-@dirrm lib/smm/images/bg_color_below/coast
-@dirrm lib/smm/images/bg_color_below
-@dirrm lib/smm/images/bg_bw_ontop/walls
-@dirrm lib/smm/images/bg_bw_ontop/misc
-@dirrm lib/smm/images/bg_bw_ontop/landscape
-@dirrm lib/smm/images/bg_bw_ontop/buildings
-@dirrm lib/smm/images/bg_bw_ontop
-@dirrm lib/smm/images/bg_bw_below/underworld
-@dirrm lib/smm/images/bg_bw_below
-@dirrm lib/smm/images
-@dirrm lib/smm/config/scripts
-@dirrm lib/smm/config/namecreator
-@dirrm lib/smm/config
-@dirrm lib/smm
diff --git a/net/sniffit/pkg-plist b/net/sniffit/pkg-plist
index 08d9bd16d659..d2b05720f1cb 100644
--- a/net/sniffit/pkg-plist
+++ b/net/sniffit/pkg-plist
@@ -2,4 +2,3 @@ sbin/sniffit
man/man5/sniffit.5.gz
man/man8/sniffit.8.gz
%%PORTDOCS%%share/doc/sniffit/README.FIRST
-%%PORTDOCS%%@dirrm share/doc/sniffit
diff --git a/net/sntop/pkg-plist b/net/sntop/pkg-plist
index 018149aacc81..a077f42b54e6 100644
--- a/net/sntop/pkg-plist
+++ b/net/sntop/pkg-plist
@@ -3,4 +3,3 @@ bin/sntop
man/man1/sntop.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alarm.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sntoprc.EXAMPLE
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/socketbind/pkg-plist b/net/socketbind/pkg-plist
index 550ede79f431..c3751cec1aba 100644
--- a/net/socketbind/pkg-plist
+++ b/net/socketbind/pkg-plist
@@ -1,4 +1,3 @@
lib/libsocketbind.so.1
lib/libsocketbind.so
%%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
diff --git a/net/sofia-sip/pkg-plist b/net/sofia-sip/pkg-plist
index 2dd1b5e03715..0cc781acf140 100644
--- a/net/sofia-sip/pkg-plist
+++ b/net/sofia-sip/pkg-plist
@@ -135,7 +135,3 @@ man/man1/sip-options.1.gz
man/man1/stunc.1.gz
%%DATADIR%%/msg_parser.awk
%%DATADIR%%/tag_dll.awk
-@dirrm include/sofia-sip-1.12/sofia-resolv
-@dirrm include/sofia-sip-1.12/sofia-sip
-@dirrm include/sofia-sip-1.12
-@dirrm %%DATADIR%%
diff --git a/net/spideroak/pkg-plist b/net/spideroak/pkg-plist
index dec55324532c..aa2ecdd66a7c 100644
--- a/net/spideroak/pkg-plist
+++ b/net/spideroak/pkg-plist
@@ -117,14 +117,3 @@ share/pixmaps/SpiderOakGlobalSync.png
%%DATADIR%%/unicodedata.so
%%DATADIR%%/zlib.so
%%DATADIR%%/zope.interface._zope_interface_coptimizations.so
-@dirrmtry etc/dbus-1/system.d
-@dirrmtry etc/dbus-1
-@dirrmtry etc/xdg/menus/applications-merged
-@dirrmtry etc/xdg/menus
-@dirrmtry etc/xdg
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/SpideroakVersionMatcher-1.1-py2.7-linux-i686.egg/EGG-INFO
-@dirrmtry %%DATADIR%%/SpideroakVersionMatcher-1.1-py2.7-linux-i686.egg
-@dirrmtry %%DATADIR%%/plugins/systemtrayicon
-@dirrmtry %%DATADIR%%/plugins
-@dirrmtry %%DATADIR%%
diff --git a/net/splatd/pkg-plist b/net/splatd/pkg-plist
index a6489b28a475..3c1de51fd33b 100644
--- a/net/splatd/pkg-plist
+++ b/net/splatd/pkg-plist
@@ -39,10 +39,6 @@ sbin/splatd
%%PYTHON_SITELIBDIR%%/splat/ldaputils/client.py
%%PYTHON_SITELIBDIR%%/splat/ldaputils/client.pyc
%%PYTHON_SITELIBDIR%%/splat/ldaputils/client.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/splat/helpers
-@dirrm %%PYTHON_SITELIBDIR%%/splat/ldaputils
-@dirrm %%PYTHON_SITELIBDIR%%/splat/data
-@dirrm %%PYTHON_SITELIBDIR%%/splat
%%PORTDOCS%%%%DOCSDIR%%/xhtml/ch01.html
%%PORTDOCS%%%%DOCSDIR%%/xhtml/ch01s02.html
%%PORTDOCS%%%%DOCSDIR%%/xhtml/ch01s03.html
@@ -60,5 +56,3 @@ sbin/splatd
%%PORTDOCS%%%%DOCSDIR%%/xhtml/rn01.html
%%PORTDOCS%%%%DOCSDIR%%/xhtml/rn01re01.html
%%PORTDOCS%%%%DOCSDIR%%/xhtml/rn01re02.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xhtml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/spread-j/pkg-plist b/net/spread-j/pkg-plist
index 56a517486e08..7f3b9a0057e9 100644
--- a/net/spread-j/pkg-plist
+++ b/net/spread-j/pkg-plist
@@ -2,5 +2,3 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/Flooder.java
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/recThread.java
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/User.java
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/java
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net/sprinkle/pkg-plist b/net/sprinkle/pkg-plist
index 7ad3dffa55c2..2d976a43e3d5 100644
--- a/net/sprinkle/pkg-plist
+++ b/net/sprinkle/pkg-plist
@@ -5,4 +5,3 @@
%%PORTDOCS%%%%DOCSDIR%%/users.html
%%PORTDOCS%%%%DOCSDIR%%/users.txt
sbin/sprinkle.py
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/spserver/pkg-plist b/net/spserver/pkg-plist
index c3a9809e470f..d4e94c7366d5 100644
--- a/net/spserver/pkg-plist
+++ b/net/spserver/pkg-plist
@@ -37,4 +37,3 @@ lib/libspopenssl.so
lib/libspopenssl.so.1
lib/libspserver.so
lib/libspserver.so.1
-@dirrm include/spserver
diff --git a/net/ssltunnel-client/pkg-plist b/net/ssltunnel-client/pkg-plist
index adfb35fea9ea..87971213d98e 100644
--- a/net/ssltunnel-client/pkg-plist
+++ b/net/ssltunnel-client/pkg-plist
@@ -6,5 +6,3 @@ man/man5/ssltunnelrc.5.gz
%%ETCDIR%%/client.conf.sample
%%PORTDOCS%%%%DOCSDIR%%/client.LISEZ-MOI
%%PORTDOCS%%%%DOCSDIR%%/client.README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%ETCDIR%%
diff --git a/net/ssvnc/pkg-plist b/net/ssvnc/pkg-plist
index a8a284daf4bb..6e8ed7c7d897 100644
--- a/net/ssvnc/pkg-plist
+++ b/net/ssvnc/pkg-plist
@@ -19,6 +19,3 @@ man/man1/ssvncviewer.1.gz
share/applications/ssvnc.desktop
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/stunnel-server.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/ssvnc/util
-@dirrmtry lib/ssvnc
diff --git a/net/tac_plus4/pkg-plist b/net/tac_plus4/pkg-plist
index 368a07921e26..e6ab60dfa259 100644
--- a/net/tac_plus4/pkg-plist
+++ b/net/tac_plus4/pkg-plist
@@ -11,4 +11,3 @@ man/man8/tac_plus.8.gz
man/man8/tac_pwd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/tac_convert
%%PORTDOCS%%%%DOCSDIR%%/users_guide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tapidbus/pkg-plist b/net/tapidbus/pkg-plist
index ecd2f9533e33..3f864d5435ff 100644
--- a/net/tapidbus/pkg-plist
+++ b/net/tapidbus/pkg-plist
@@ -3,5 +3,3 @@ lib/libtapidbus-0.2.so
lib/libtapidbus-0.2.so.0
lib/libtapidbus-0.2.so.0.0.0
libdata/pkgconfig/tapidbus-0.2.pc
-@dirrm include/tapidbus-0.2/tapidbus
-@dirrm include/tapidbus-0.2
diff --git a/net/tclsoap/pkg-plist b/net/tclsoap/pkg-plist
index 229f22fc3195..535130d8ac86 100644
--- a/net/tclsoap/pkg-plist
+++ b/net/tclsoap/pkg-plist
@@ -16,5 +16,3 @@ lib/tclsoap/rpcvar.tcl
lib/tclsoap/smtp.tcl
lib/tclsoap/utils.tcl
lib/tclsoap/xpath.tcl
-@dirrmtry lib/tclsoap/interop
-@dirrmtry lib/tclsoap
diff --git a/net/tcpick/pkg-plist b/net/tcpick/pkg-plist
index 773197501317..a8c7754a078a 100644
--- a/net/tcpick/pkg-plist
+++ b/net/tcpick/pkg-plist
@@ -1,5 +1,3 @@
bin/tcpick
man/it/man8/tcpick.8.gz
man/man8/tcpick.8.gz
-@dirrmtry man/it/man8
-@dirrmtry man/it
diff --git a/net/tcpreen/pkg-plist b/net/tcpreen/pkg-plist
index fe91306badfd..6626e8e434e9 100644
--- a/net/tcpreen/pkg-plist
+++ b/net/tcpreen/pkg-plist
@@ -7,4 +7,3 @@ man/man1/tcpreen.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tcpsg/pkg-plist b/net/tcpsg/pkg-plist
index da540fb3d5ae..434947562a6a 100644
--- a/net/tcpsg/pkg-plist
+++ b/net/tcpsg/pkg-plist
@@ -2,4 +2,3 @@ sbin/tcpsg
etc/tcpsg.conf
%%PORTDOCS%%share/doc/tcpsg/README
%%PORTDOCS%%share/doc/tcpsg/tcpsg.ctl
-%%PORTDOCS%%@dirrm share/doc/tcpsg
diff --git a/net/tcpview/pkg-plist b/net/tcpview/pkg-plist
index b1c78afa761d..8723b681a342 100644
--- a/net/tcpview/pkg-plist
+++ b/net/tcpview/pkg-plist
@@ -5,6 +5,4 @@ lib/tcpview/filters/generic
lib/tcpview/hosts
lib/tcpview/manuf
man/man1/tcpview.1.gz
-@dirrm lib/tcpview/filters
-@dirrm lib/tcpview
lib/X11/app-defaults/Tcpview
diff --git a/net/thcrut/pkg-plist b/net/thcrut/pkg-plist
index 5235407c3402..6ecba627f259 100644
--- a/net/thcrut/pkg-plist
+++ b/net/thcrut/pkg-plist
@@ -2,4 +2,3 @@ bin/thcrut
%%DATADIR%%/manuf
%%DATADIR%%/nmap-os-fingerprints
%%DATADIR%%/thcrut-os-fingerprints
-@dirrm %%DATADIR%%
diff --git a/net/tigervnc/pkg-plist b/net/tigervnc/pkg-plist
index 09b041b9dbba..695d71315cf1 100644
--- a/net/tigervnc/pkg-plist
+++ b/net/tigervnc/pkg-plist
@@ -19,27 +19,9 @@ man/man1/Xvnc.1.gz
%%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/xorg/modules/extensions
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
%%VIEWER%%share/icons/hicolor/16x16/apps/tigervnc.png
%%VIEWER%%share/icons/hicolor/22x22/apps/tigervnc.png
%%VIEWER%%share/icons/hicolor/24x24/apps/tigervnc.png
%%VIEWER%%share/icons/hicolor/32x32/apps/tigervnc.png
%%VIEWER%%share/icons/hicolor/48x48/apps/tigervnc.png
%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg
-%%VIEWER%%@dirrmtry share/icons/hicolor/48x48/apps
-%%VIEWER%%@dirrmtry share/icons/hicolor/48x48
-%%VIEWER%%@dirrmtry share/icons/hicolor/32x32/apps
-%%VIEWER%%@dirrmtry share/icons/hicolor/32x32
-%%VIEWER%%@dirrmtry share/icons/hicolor/24x24/apps
-%%VIEWER%%@dirrmtry share/icons/hicolor/24x24
-%%VIEWER%%@dirrmtry share/icons/hicolor/22x22/apps
-%%VIEWER%%@dirrmtry share/icons/hicolor/22x22
-%%VIEWER%%@dirrmtry share/icons/hicolor/16x16/apps
-%%VIEWER%%@dirrmtry share/icons/hicolor/16x16
-%%VIEWER%%@dirrmtry share/icons/hicolor/scalable/apps
-%%VIEWER%%@dirrmtry share/icons/hicolor/scalable
-%%VIEWER%%@dirrmtry share/icons/hicolor
-%%VIEWER%%@dirrmtry share/icons
diff --git a/net/tightvnc/pkg-plist b/net/tightvnc/pkg-plist
index 429ce1411747..c024c33fa745 100644
--- a/net/tightvnc/pkg-plist
+++ b/net/tightvnc/pkg-plist
@@ -23,8 +23,6 @@ bin/vncviewer
%%JVNC_VIEWER%%%%DATADIR%%/classes/VncViewer.jar
%%JVNC_VIEWER%%%%DATADIR%%/classes/ZlibInStream.class
%%JVNC_VIEWER%%%%DATADIR%%/classes/index.vnc
-%%JVNC_VIEWER%%@dirrm %%DATADIR%%/classes
-%%JVNC_VIEWER%%@dirrm %%DATADIR%%
man/man1/Xvnc.1.gz
man/man1/vncconnect.1.gz
man/man1/vncpasswd.1.gz
diff --git a/net/tinyfugue/pkg-plist b/net/tinyfugue/pkg-plist
index 7ea42f9873ca..6468b8056fc7 100644
--- a/net/tinyfugue/pkg-plist
+++ b/net/tinyfugue/pkg-plist
@@ -66,4 +66,3 @@ lib/%%DISTNAME%%-lib/tr.tf
lib/%%DISTNAME%%-lib/watch.tf
lib/%%DISTNAME%%-lib/world-q.tf
lib/%%DISTNAME%%-lib/worldqueue.tf
-@dirrm lib/%%DISTNAME%%-lib
diff --git a/net/tinyldap/pkg-plist b/net/tinyldap/pkg-plist
index ac21c2bbe26c..a0285183f1ab 100644
--- a/net/tinyldap/pkg-plist
+++ b/net/tinyldap/pkg-plist
@@ -21,4 +21,3 @@ sbin/tinyldap_standalone
%%PORTDOCS%%%%DOCSDIR%%/RFCs
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tn5250/pkg-plist b/net/tn5250/pkg-plist
index 53b777acc7da..b97e26093583 100644
--- a/net/tn5250/pkg-plist
+++ b/net/tn5250/pkg-plist
@@ -40,5 +40,3 @@ man/man1/scs2pdf.1.gz
man/man1/scs2ps.1.gz
man/man1/tn5250.1.gz
man/man5/tn5250rc.5.gz
-@dirrm %%DATADIR%%
-@dirrm include/tn5250
diff --git a/net/tn5250j/pkg-plist b/net/tn5250j/pkg-plist
index 79dd3ca0ed5f..8a60ba8c1b22 100644
--- a/net/tn5250j/pkg-plist
+++ b/net/tn5250j/pkg-plist
@@ -8,4 +8,3 @@ bin/tn5250j
%%PORTDOCS%%%%DOCSDIR%%/e-mail.txt
%%PORTDOCS%%%%DOCSDIR%%/macros.txt
%%PORTDOCS%%%%DOCSDIR%%/scripting.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tramp/pkg-plist b/net/tramp/pkg-plist
index 536efb86ea4c..e2c16a6eae50 100644
--- a/net/tramp/pkg-plist
+++ b/net/tramp/pkg-plist
@@ -39,4 +39,3 @@
%%TRAMP_LISPDIR%%/tramp-cache.elc
%%TRAMP_LISPDIR%%/trampver.el
%%TRAMP_LISPDIR%%/trampver.elc
-@dirrm %%TRAMP_LISPDIR%%
diff --git a/net/trickle/pkg-plist b/net/trickle/pkg-plist
index 8418c207d954..a1d25fe36ba1 100644
--- a/net/trickle/pkg-plist
+++ b/net/trickle/pkg-plist
@@ -6,4 +6,3 @@ man/man1/trickle.1.gz
man/man5/trickled.conf.5.gz
man/man8/trickled.8.gz
lib/trickle/trickle-overload.so
-@dirrm lib/trickle
diff --git a/net/tridiavnc/pkg-plist b/net/tridiavnc/pkg-plist
index 3c31c96a0b20..785f03ef954b 100644
--- a/net/tridiavnc/pkg-plist
+++ b/net/tridiavnc/pkg-plist
@@ -13,5 +13,3 @@ share/vnc/classes/shared.vnc
share/vnc/classes/vncCanvas.class
share/vnc/classes/vncviewer.class
share/vnc/classes/vncviewer.jar
-@dirrm share/vnc/classes
-@dirrm share/vnc
diff --git a/net/tsclient/pkg-plist b/net/tsclient/pkg-plist
index 7a808dc5b617..b2a873ff4250 100644
--- a/net/tsclient/pkg-plist
+++ b/net/tsclient/pkg-plist
@@ -58,14 +58,3 @@ share/pixmaps/tsclient/program.png
share/pixmaps/tsclient/size.png
share/pixmaps/tsclient/sound.png
share/pixmaps/tsclient/tsclient.png
-@dirrm share/pixmaps/tsclient
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/pl_PL/LC_MESSAGES
-@dirrmtry share/locale/pl_PL
-@dirrmtry share/locale/nl_NL/LC_MESSAGES
-@dirrmtry share/locale/nl_NL
-@dirrmtry share/locale/gr/LC_MESSAGES
-@dirrmtry share/locale/gr
diff --git a/net/tsocks/pkg-plist b/net/tsocks/pkg-plist
index a80e33706996..db617b2ffcc2 100644
--- a/net/tsocks/pkg-plist
+++ b/net/tsocks/pkg-plist
@@ -8,5 +8,3 @@ man/man8/tsocks.8.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsocks.conf.complex.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsocks.conf.simple.example
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tucan/pkg-plist b/net/tucan/pkg-plist
index 32e3a0082d99..a4a6731e1a7f 100644
--- a/net/tucan/pkg-plist
+++ b/net/tucan/pkg-plist
@@ -193,57 +193,3 @@ share/pixmaps/tucan.png
%%DATADIR%%/ui/gtk/tray_icon.py
%%DATADIR%%/ui/gtk/tree.py
%%DATADIR%%/ui/gtk/update_manager.py
-@dirrm %%DATADIR%%/ui/gtk
-@dirrm %%DATADIR%%/ui/console
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/media/scalable
-@dirrm %%DATADIR%%/media
-@dirrm %%DATADIR%%/i18n/tr/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/tr
-@dirrm %%DATADIR%%/i18n/sl/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/sl
-@dirrm %%DATADIR%%/i18n/sk/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/sk
-@dirrm %%DATADIR%%/i18n/se/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/se
-@dirrm %%DATADIR%%/i18n/ru/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/ru
-@dirrm %%DATADIR%%/i18n/pt/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/pt
-@dirrm %%DATADIR%%/i18n/pl/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/pl
-@dirrm %%DATADIR%%/i18n/nl/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/nl
-@dirrm %%DATADIR%%/i18n/it/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/it
-@dirrm %%DATADIR%%/i18n/gr/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/gr
-@dirrm %%DATADIR%%/i18n/fr/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/fr
-@dirrm %%DATADIR%%/i18n/es/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/es
-@dirrm %%DATADIR%%/i18n/en/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/en
-@dirrm %%DATADIR%%/i18n/de/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/de
-@dirrm %%DATADIR%%/i18n/da/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/da
-@dirrm %%DATADIR%%/i18n/cs/LC_MESSAGES
-@dirrm %%DATADIR%%/i18n/cs
-@dirrm %%DATADIR%%/i18n
-@dirrm %%DATADIR%%/default_plugins/zshare
-@dirrm %%DATADIR%%/default_plugins/uploading
-@dirrm %%DATADIR%%/default_plugins/sendspace
-@dirrm %%DATADIR%%/default_plugins/rapidshare
-@dirrm %%DATADIR%%/default_plugins/megaupload
-@dirrm %%DATADIR%%/default_plugins/mediafire
-@dirrm %%DATADIR%%/default_plugins/hotfile
-@dirrm %%DATADIR%%/default_plugins/fileserve
-@dirrm %%DATADIR%%/default_plugins/filefactory
-@dirrm %%DATADIR%%/default_plugins/easy-share
-@dirrm %%DATADIR%%/default_plugins/depositfiles
-@dirrm %%DATADIR%%/default_plugins/badongo
-@dirrm %%DATADIR%%/default_plugins/4shared
-@dirrm %%DATADIR%%/default_plugins
-@dirrm %%DATADIR%%/core
-@dirrm %%DATADIR%%
diff --git a/net/twitux/pkg-plist b/net/twitux/pkg-plist
index e988c3a59992..096c01c21440 100644
--- a/net/twitux/pkg-plist
+++ b/net/twitux/pkg-plist
@@ -19,21 +19,3 @@ share/twitux/main_window.xml
share/twitux/prefs_dlg.xml
share/twitux/send_message_dlg.xml
share/twitux/spell_dlg.xml
-@dirrm share/twitux
-@dirrm share/omf/twitux
-@dirrm share/gnome/help/twitux/C/figures
-@dirrm share/gnome/help/twitux/C
-@dirrm share/gnome/help/twitux
-@dirrmtry lib/locale/sv/LC_MESSAGES
-@dirrmtry lib/locale/pt/LC_MESSAGES
-@dirrmtry lib/locale/ja/LC_MESSAGES
-@dirrmtry lib/locale/fr/LC_MESSAGES
-@dirrmtry lib/locale/es/LC_MESSAGES
-@dirrmtry lib/locale/de/LC_MESSAGES
-@dirrmtry lib/locale/sv
-@dirrmtry lib/locale/pt
-@dirrmtry lib/locale/ja
-@dirrmtry lib/locale/fr
-@dirrmtry lib/locale/es
-@dirrmtry lib/locale/de
-@dirrmtry lib/locale
diff --git a/net/udt/pkg-plist b/net/udt/pkg-plist
index a5f19438bd30..d8ad3c8b422c 100644
--- a/net/udt/pkg-plist
+++ b/net/udt/pkg-plist
@@ -54,7 +54,6 @@ bin/udt-test
%%PORTDOCS%%%%DOCSDIR%%/doc/trace.htm
%%PORTDOCS%%%%DOCSDIR%%/doc/select.htm
%%PORTDOCS%%%%DOCSDIR%%/doc/tutorial.htm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
%%PORTDOCS%%%%DOCSDIR%%/hlp/ix_end.gif
%%PORTDOCS%%%%DOCSDIR%%/hlp/ix_list.gif
%%PORTDOCS%%%%DOCSDIR%%/hlp/ix_link.gif
@@ -69,5 +68,3 @@ bin/udt-test
%%PORTDOCS%%%%DOCSDIR%%/hlp/ix_open.gif
%%PORTDOCS%%%%DOCSDIR%%/hlp/ix_listp.gif
%%PORTDOCS%%%%DOCSDIR%%/hlp/ix_endp.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/hlp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/
diff --git a/net/uget/pkg-plist b/net/uget/pkg-plist
index 8932a3504878..a6e88eeef2fc 100644
--- a/net/uget/pkg-plist
+++ b/net/uget/pkg-plist
@@ -47,9 +47,3 @@ share/icons/hicolor/scalable/apps/uget-icon.svg
%%NLS%%share/locale/zh_TW/LC_MESSAGES/uget.mo
share/pixmaps/uget/logo.png
share/sounds/uget/notification.wav
-%%NLS%%@dirrmtry share/locale/bn_BD/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bn_BD
-%%NLS%%@dirrmtry share/locale/ka_GE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ka_GE
-@dirrm share/pixmaps/uget
-@dirrm share/sounds/uget
diff --git a/net/ulxmlrpcpp/pkg-plist b/net/ulxmlrpcpp/pkg-plist
index 2987a0c875eb..3f04c092862d 100644
--- a/net/ulxmlrpcpp/pkg-plist
+++ b/net/ulxmlrpcpp/pkg-plist
@@ -52,7 +52,3 @@ lib/libulxmlrpcpp_contrib.so.24.0.1
libdata/pkgconfig/ulxmlrpcpp.pc
%%DATADIR%%/httpd/index.html
%%DATADIR%%/httpd/logo-ulxmlrpcpp.png
-@dirrm %%DATADIR%%/httpd
-@dirrm %%DATADIR%%
-@dirrm include/ulxmlrpcpp/contrib
-@dirrm include/ulxmlrpcpp
diff --git a/net/unix2tcp/pkg-plist b/net/unix2tcp/pkg-plist
index 05f12eb623c6..eb516dcf4bc2 100644
--- a/net/unix2tcp/pkg-plist
+++ b/net/unix2tcp/pkg-plist
@@ -1,3 +1,2 @@
sbin/unix2tcp
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/uriparser/pkg-plist b/net/uriparser/pkg-plist
index 0bb748900b55..86786b9a6713 100644
--- a/net/uriparser/pkg-plist
+++ b/net/uriparser/pkg-plist
@@ -9,4 +9,3 @@ lib/liburiparser.so
lib/liburiparser.so.1
lib/liburiparser.so.1.0.14
libdata/pkgconfig/liburiparser.pc
-@dirrm include/uriparser
diff --git a/net/urlendec/pkg-plist b/net/urlendec/pkg-plist
index 15dcace295ac..25caab2b1d1a 100644
--- a/net/urlendec/pkg-plist
+++ b/net/urlendec/pkg-plist
@@ -2,4 +2,3 @@ bin/urlencode
bin/urldecode
%%PORTDOCS%%share/doc/urlendec/index.html
%%PORTDOCS%%share/doc/urlendec/rfc1738.txt
-%%PORTDOCS%%@dirrm share/doc/urlendec
diff --git a/net/vde2/pkg-plist b/net/vde2/pkg-plist
index ec47f1184afd..05638b12fa0f 100644
--- a/net/vde2/pkg-plist
+++ b/net/vde2/pkg-plist
@@ -71,7 +71,3 @@ man/man1/vdetaplib.1.gz
man/man1/vdeterm.1.gz
man/man1/wirefilter.1.gz
man/man8/vde_tunctl.8.gz
-@dirrm lib/vde2/vde_l3
-@dirrm lib/vde2
-@dirrm etc/vde2/libvdemgmt
-@dirrm etc/vde2
diff --git a/net/vnc/pkg-plist b/net/vnc/pkg-plist
index 21105577cf23..e2510451bd4b 100644
--- a/net/vnc/pkg-plist
+++ b/net/vnc/pkg-plist
@@ -13,5 +13,3 @@ man/man1/x0vncserver.1.gz
%%SERVER%%%%DATADIR%%/classes/index.vnc
%%SERVER%%%%DATADIR%%/classes/logo150x150.gif
%%SERVER%%%%DATADIR%%/classes/vncviewer.jar
-%%SERVER%%@dirrmtry %%DATADIR%%/classes
-%%SERVER%%@dirrmtry %%DATADIR%%
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index a91125b58927..c84b8b825a03 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -271,16 +271,3 @@ man/man4/wireshark-filter.4.gz
%%DATADIR%%/wireshark-filter.html
%%DATADIR%%/wireshark.html
%%DATADIR%%/ws.css
-@dirrm lib/wireshark/plugins/%%PORTVERSION%%
-@dirrm lib/wireshark/plugins
-@dirrm lib/wireshark
-@dirrm %%DATADIR%%/wimaxasncp
-@dirrm %%DATADIR%%/tpncp
-@dirrm %%DATADIR%%/radius
-@dirrm %%DATADIR%%/profiles/Classic
-@dirrm %%DATADIR%%/profiles/Bluetooth
-@dirrm %%DATADIR%%/profiles
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/dtds
-@dirrm %%DATADIR%%/diameter
-@dirrm %%DATADIR%%
diff --git a/net/wizd/pkg-plist b/net/wizd/pkg-plist
index a080fa5105a7..812a1dabe225 100644
--- a/net/wizd/pkg-plist
+++ b/net/wizd/pkg-plist
@@ -196,7 +196,3 @@ etc/wizd.conf.sample
%%DATADIR%%/skins/simplicity_hires/videos.png
%%DATADIR%%/skins/simplicity_hires/videos2.png
%%DATADIR%%/skins/simplicity_hires/wizd_skin.conf
-@dirrm %%DATADIR%%/skins/simplicity_hires
-@dirrm %%DATADIR%%/skins/simplicity
-@dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%
diff --git a/net/wmnetload/pkg-plist b/net/wmnetload/pkg-plist
index 49c223779984..15457f11be14 100644
--- a/net/wmnetload/pkg-plist
+++ b/net/wmnetload/pkg-plist
@@ -1,3 +1,2 @@
bin/wmnetload
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/wmpiki/pkg-plist b/net/wmpiki/pkg-plist
index 88c8a2b785f9..c1d633cc3e27 100644
--- a/net/wmpiki/pkg-plist
+++ b/net/wmpiki/pkg-plist
@@ -1,4 +1,3 @@
bin/wmpiki
%%PORTDOCS%%%%DOCSDIR%%/config.example
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/wol/pkg-plist b/net/wol/pkg-plist
index c64fafd924c1..98f4cde90b1d 100644
--- a/net/wol/pkg-plist
+++ b/net/wol/pkg-plist
@@ -6,7 +6,6 @@ man/man1/wol.1.gz
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%NLS%%share/locale/de/LC_MESSAGES/wol.mo
%%NLS%%share/locale/es/LC_MESSAGES/wol.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wol.mo
diff --git a/net/x11vnc/pkg-plist b/net/x11vnc/pkg-plist
index 6f99aa4a97e0..47288789c9f5 100644
--- a/net/x11vnc/pkg-plist
+++ b/net/x11vnc/pkg-plist
@@ -13,6 +13,3 @@ man/man1/x11vnc.1.gz
%%DATADIR%%/classes/VncViewer.jar
%%DATADIR%%/classes/index.vnc
share/applications/x11vnc.desktop
-@dirrm %%DATADIR%%/classes/ssl
-@dirrm %%DATADIR%%/classes
-@dirrm %%DATADIR%%
diff --git a/net/xipmsg/pkg-plist b/net/xipmsg/pkg-plist
index 2ff7ae6a7e74..e9c8c819b80f 100644
--- a/net/xipmsg/pkg-plist
+++ b/net/xipmsg/pkg-plist
@@ -17,4 +17,3 @@ lib/X11/xipmsg/xbro13.xbm
lib/X11/xipmsg/xbro14.xbm
lib/X11/xipmsg/xbro15.xbm
man/man1/xipmsg.1.gz
-@dirrm lib/X11/xipmsg
diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist
index 38a7f7fb359f..2b25f60de7c3 100644
--- a/net/xmlrpc-c-devel/pkg-plist
+++ b/net/xmlrpc-c-devel/pkg-plist
@@ -104,4 +104,3 @@ lib/libxmlrpc_xmltok.a
lib/libxmlrpc_xmltok.so
lib/libxmlrpc_xmltok.so.3
lib/libxmlrpc_xmltok.so.3.36
-@dirrm include/xmlrpc-c
diff --git a/net/xprobe/pkg-plist b/net/xprobe/pkg-plist
index fe8e5de5b91e..9ad491716f01 100644
--- a/net/xprobe/pkg-plist
+++ b/net/xprobe/pkg-plist
@@ -3,4 +3,3 @@ bin/xprobe2
%%ETCDIR%%/xprobe2.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/xprobe2.conf ]; then cp -p %D/%F %B/xprobe2.conf; fi
man/man1/xprobe2.1.gz
-@dirrm %%ETCDIR%%
diff --git a/net/xpvm/pkg-plist b/net/xpvm/pkg-plist
index 273a34705b17..dc0ef92daa7f 100644
--- a/net/xpvm/pkg-plist
+++ b/net/xpvm/pkg-plist
@@ -89,7 +89,3 @@ bin/xpvm
%%DATADIR%%/src/xbm/zoom.swipe.l.xbm
%%DATADIR%%/src/xbm/zoom.swipe.r.xbm
%%DATADIR%%/src/xbm/zoom.swipe.xbm
-@dirrm %%DATADIR%%/src/xbm
-@dirrm %%DATADIR%%/src/help
-@dirrm %%DATADIR%%/src
-@dirrm %%DATADIR%%
diff --git a/net/xrdp-devel/pkg-plist b/net/xrdp-devel/pkg-plist
index 4fc58a0059ad..0a92d7305805 100644
--- a/net/xrdp-devel/pkg-plist
+++ b/net/xrdp-devel/pkg-plist
@@ -76,6 +76,3 @@ share/xrdp/cursor1.cur
share/xrdp/sans-10.fv1
share/xrdp/xrdp24b.bmp
share/xrdp/xrdp256.bmp
-@dirrm share/xrdp
-@dirrm lib/xrdp
-@dirrmtry etc/xrdp
diff --git a/net/yate/pkg-plist b/net/yate/pkg-plist
index 1ae1c3191bdb..c635bfde9297 100644
--- a/net/yate/pkg-plist
+++ b/net/yate/pkg-plist
@@ -1390,20 +1390,4 @@ man/man8/yate-config.8.gz
%%DATADIR%%/sounds/ring.au
%%DATADIR%%/sounds/ring.wav
%%DATADIR%%/sounds/tone.wav
-@dirrmtry include/yate
-@dirrmtry lib/yate/client
-@dirrmtry lib/yate/jabber
-@dirrmtry lib/yate/qt4
-@dirrmtry lib/yate/server
-@dirrmtry lib/yate/sip
-@dirrmtry lib/yate
-@dirrmtry %%DATADIR%%/data
-@dirrmtry %%DATADIR%%/help
-@dirrmtry %%DATADIR%%/scripts
-@dirrmtry %%DATADIR%%/skins/default
-@dirrmtry %%DATADIR%%/skins
-@dirrmtry %%DATADIR%%/sounds
-@dirrmtry %%DATADIR%%
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%-5.4.0/api
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%-5.4.0
-@dirrmtry %%ETCDIR%%
+@dir lib/yate/qt4
diff --git a/net/yaz++/pkg-plist b/net/yaz++/pkg-plist
index b4c7895f2eae..b7ceb8d5032d 100644
--- a/net/yaz++/pkg-plist
+++ b/net/yaz++/pkg-plist
@@ -41,6 +41,3 @@ share/doc/yazpp/zoom-query.html
share/doc/yazpp/zoom-record.html
share/doc/yazpp/zoom-resultset.html
share/doc/yazpp/zoom.html
-@dirrm share/doc/yazpp/common
-@dirrm share/doc/yazpp
-@dirrm include/yazpp
diff --git a/net/yazproxy/pkg-plist b/net/yazproxy/pkg-plist
index 05a6096568e0..5e5c1c2d682b 100644
--- a/net/yazproxy/pkg-plist
+++ b/net/yazproxy/pkg-plist
@@ -50,8 +50,3 @@ lib/yazproxy/mod_proxy_sample.so
%%DATADIR%%/yazproxyctl.sh
%%DATADIR%%/zeerex-2.0.xsd
man/man8/yazproxy.8.gz
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/common
-@dirrm %%DOCSDIR%%
-@dirrm lib/yazproxy
-@dirrm include/yazproxy
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index f820fd7b9f82..f5709873f0ab 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zebra-server
PORTVERSION= 2.0.55
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/
DISTNAME= idzebra-${PORTVERSION}
@@ -19,7 +19,8 @@ CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \
--with-tclconfig=${TCL_LIBDIR} \
--with-iconv=${ICONV_PREFIX} --with-expat=${LOCALBASE}
INSTALL_TARGET= install-strip
-USES= iconv libtool tcl
+USES= iconv libtool shebangfix tcl
+SHEBANG_FILES= util/idzebra-abs2dom
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/net/zebra-server/pkg-plist b/net/zebra-server/pkg-plist
index 9561523eb385..31673f584257 100644
--- a/net/zebra-server/pkg-plist
+++ b/net/zebra-server/pkg-plist
@@ -242,19 +242,3 @@ share/idzebra-2.0/tab/wais-variant.est
share/idzebra-2.0/tab/wais.abs
share/idzebra-2.0/tab/words-icu-da.xml
share/idzebra-2.0/tab/words-icu.xml
-@dirrm share/idzebra-2.0/tab
-@dirrm share/idzebra-2.0-examples/oai-pmh/data
-@dirrm share/idzebra-2.0-examples/oai-pmh/conf
-@dirrm share/idzebra-2.0-examples/oai-pmh
-@dirrm share/idzebra-2.0-examples/marcxml
-@dirrm share/idzebra-2.0-examples/marc21
-@dirrm share/idzebra-2.0-examples/gils/records
-@dirrm share/idzebra-2.0-examples/gils
-@dirrm share/idzebra-2.0-examples
-@dirrm share/idzebra-2.0
-@dirrm share/doc/idzebra-2.0/common
-@dirrm share/doc/idzebra-2.0
-@dirrm lib/idzebra-2.0/modules
-@dirrm lib/idzebra-2.0
-@dirrm include/idzebra-2.0/idzebra
-@dirrm include/idzebra-2.0
diff --git a/net/zebra/pkg-plist b/net/zebra/pkg-plist
index 0f77897c6282..fa4de00f8e28 100644
--- a/net/zebra/pkg-plist
+++ b/net/zebra/pkg-plist
@@ -21,4 +21,3 @@ man/man8/ospfd.8.gz
man/man8/ripd.8.gz
man/man8/ripngd.8.gz
man/man8/zebra.8.gz
-@dirrm etc/zebra
diff --git a/net/zillion/pkg-plist b/net/zillion/pkg-plist
index 581de052f7d3..2f97481588e4 100644
--- a/net/zillion/pkg-plist
+++ b/net/zillion/pkg-plist
@@ -4,5 +4,3 @@ GNUstep/Local/Library/Bundles/simpleZillionJob.bundle/stamp.make
GNUstep/Local/Tools/zillion
GNUstep/Local/Tools/zillionClient
GNUstep/Local/Tools/zillionLoader
-@dirrm GNUstep/Local/Library/Bundles/simpleZillionJob.bundle/Resources
-@dirrm GNUstep/Local/Library/Bundles/simpleZillionJob.bundle