42 files changed, 5 insertions, 271 deletions

diff --git a/ftp/axel/pkg-plist b/ftp/axel/pkg-plist
index 87d7e15f39d4..4dcbf42c9f1b 100644
--- a/ftp/axel/pkg-plist
+++ b/ftp/axel/pkg-plist
@@ -6,5 +6,3 @@ man/zh_CN/man1/axel.1.gz
 %%NLS%%share/locale/nl/LC_MESSAGES/axel.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/axel.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/axel.mo
-@dirrmtry man/zh_CN/man1
-@dirrmtry man/zh_CN
diff --git a/ftp/bareftp/pkg-plist b/ftp/bareftp/pkg-plist
index b1eba7b2b3b6..07b17f3ac458 100644
--- a/ftp/bareftp/pkg-plist
+++ b/ftp/bareftp/pkg-plist
@@ -37,5 +37,3 @@ share/icons/hicolor/scalable/apps/bareftp.svg
 %%NLS%%share/locale/ru/LC_MESSAGES/bareftp.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/bareftp.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bareftp.mo
-@dirrm libexec/bareftp
-@dirrm lib/bareftp
diff --git a/ftp/bsdftpd-ssl/pkg-plist b/ftp/bsdftpd-ssl/pkg-plist
index 74c97704ab6e..5e2c4ce7ebf0 100644
--- a/ftp/bsdftpd-ssl/pkg-plist
+++ b/ftp/bsdftpd-ssl/pkg-plist
@@ -26,6 +26,3 @@ man/man1/ftps.1.gz
 %%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpchroot
 %%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpusers
 %%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc_conf_d.bsdftpd_ssl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cert
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/curl-hiphop/pkg-plist b/ftp/curl-hiphop/pkg-plist
index 289c6a6c8492..4d30473457b6 100644
--- a/ftp/curl-hiphop/pkg-plist
+++ b/ftp/curl-hiphop/pkg-plist
@@ -7,10 +7,5 @@
 %%HIPHOP_DIR%%/ext/include/curl/multi.h
 %%HIPHOP_DIR%%/ext/include/curl/stdcheaders.h
 %%HIPHOP_DIR%%/ext/include/curl/typecheck-gcc.h
-@dirrm %%HIPHOP_DIR%%/ext/include/curl
 %%HIPHOP_DIR%%/ext/lib/libcurl.a
 %%HIPHOP_DIR%%/ext/lib/libcurl.la
-@dirrmtry %%HIPHOP_DIR%%/ext/include
-@dirrmtry %%HIPHOP_DIR%%/ext/lib
-@dirrmtry %%HIPHOP_DIR%%/ext
-@dirrmtry %%HIPHOP_DIR%%
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index a6130dc7bbb4..066f0457e911 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -281,4 +281,3 @@ man/man3/libcurl-share.3.gz
 man/man3/libcurl-tutorial.3.gz
 man/man3/libcurl.3.gz
 share/aclocal/libcurl.m4
-@dirrm include/curl
diff --git a/ftp/curlpp/pkg-plist b/ftp/curlpp/pkg-plist
index 76fef9873c79..d21886c67376 100644
--- a/ftp/curlpp/pkg-plist
+++ b/ftp/curlpp/pkg-plist
@@ -94,10 +94,3 @@ libdata/pkgconfig/curlpp.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example22.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example23.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example24.cpp
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/utilspp/singleton
-@dirrm include/utilspp/functor
-@dirrm include/utilspp
-@dirrm include/curlpp/internal
-@dirrm include/curlpp
diff --git a/ftp/dmachine/pkg-plist b/ftp/dmachine/pkg-plist
index a864833f00e4..ccace1cb9706 100644
--- a/ftp/dmachine/pkg-plist
+++ b/ftp/dmachine/pkg-plist
@@ -3,5 +3,3 @@ share/java/classes/dmachine.jar
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/dmachine.cnf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/dmachine
diff --git a/ftp/filezilla/pkg-plist b/ftp/filezilla/pkg-plist
index 2a64cb227530..0cb1cd2ded5c 100644
--- a/ftp/filezilla/pkg-plist
+++ b/ftp/filezilla/pkg-plist
@@ -589,95 +589,3 @@ share/icons/hicolor/scalable/apps/filezilla.svg
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/filezilla.mo
 share/pixmaps/filezilla.png
-@dirrmtry %%DATADIR%%/docs
-@dirrmtry %%DATADIR%%/resources/16x16
-@dirrmtry %%DATADIR%%/resources/20x20
-@dirrmtry %%DATADIR%%/resources/24x24
-@dirrmtry %%DATADIR%%/resources/32x32
-@dirrmtry %%DATADIR%%/resources/48x48
-@dirrmtry %%DATADIR%%/resources/blukis/16x16
-@dirrmtry %%DATADIR%%/resources/blukis/32x32
-@dirrmtry %%DATADIR%%/resources/blukis/48x48
-@dirrmtry %%DATADIR%%/resources/blukis
-@dirrmtry %%DATADIR%%/resources/cyril/16x16
-@dirrmtry %%DATADIR%%/resources/cyril
-@dirrmtry %%DATADIR%%/resources/lone/16x16
-@dirrmtry %%DATADIR%%/resources/lone/32x32
-@dirrmtry %%DATADIR%%/resources/lone/48x48
-@dirrmtry %%DATADIR%%/resources/lone
-@dirrmtry %%DATADIR%%/resources/minimal/16x16
-@dirrmtry %%DATADIR%%/resources/minimal/32x32
-@dirrmtry %%DATADIR%%/resources/minimal
-@dirrmtry %%DATADIR%%/resources/opencrystal/16x16
-@dirrmtry %%DATADIR%%/resources/opencrystal/20x20
-@dirrmtry %%DATADIR%%/resources/opencrystal/24x24
-@dirrmtry %%DATADIR%%/resources/opencrystal/32x32
-@dirrmtry %%DATADIR%%/resources/opencrystal/48x48
-@dirrmtry %%DATADIR%%/resources/opencrystal
-@dirrmtry %%DATADIR%%/resources/sun/48x48
-@dirrmtry %%DATADIR%%/resources/sun
-@dirrmtry %%DATADIR%%/resources/tango/16x16
-@dirrmtry %%DATADIR%%/resources/tango/32x32
-@dirrmtry %%DATADIR%%/resources/tango/48x48
-@dirrmtry %%DATADIR%%/resources/tango
-@dirrmtry %%DATADIR%%/resources/xrc
-@dirrmtry %%DATADIR%%/resources
-@dirrmtry %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/ca_ES@valencia
-%%NLS%%@dirrmtry share/locale/ca_ES@valencia/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/co
-%%NLS%%@dirrmtry share/locale/co/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs_CZ
-%%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da_DK
-%%NLS%%@dirrmtry share/locale/da_DK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et_EE
-%%NLS%%@dirrmtry share/locale/et_EE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu_ES
-%%NLS%%@dirrmtry share/locale/eu_ES/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi_FI
-%%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl_ES
-%%NLS%%@dirrmtry share/locale/gl_ES/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/he_IL
-%%NLS%%@dirrmtry share/locale/he_IL/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu_HU
-%%NLS%%@dirrmtry share/locale/hu_HU/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja_JP
-%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kab
-%%NLS%%@dirrmtry share/locale/kab/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/km_KH
-%%NLS%%@dirrmtry share/locale/km_KH/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko_KR
-%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ky
-%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lo_LA
-%%NLS%%@dirrmtry share/locale/lo_LA/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lt_LT
-%%NLS%%@dirrmtry share/locale/lt_LT/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv_LV
-%%NLS%%@dirrmtry share/locale/lv_LV/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/mk_MK
-%%NLS%%@dirrmtry share/locale/mk_MK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb_NO
-%%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nn_NO
-%%NLS%%@dirrmtry share/locale/nn_NO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl_PL
-%%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro_RO
-%%NLS%%@dirrmtry share/locale/ro_RO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk_SK
-%%NLS%%@dirrmtry share/locale/sk_SK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl_SI
-%%NLS%%@dirrmtry share/locale/sl_SI/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/th_TH
-%%NLS%%@dirrmtry share/locale/th_TH/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk_UA
-%%NLS%%@dirrmtry share/locale/uk_UA/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/vi_VN
-%%NLS%%@dirrmtry share/locale/vi_VN/LC_MESSAGES
diff --git a/ftp/fmirror/pkg-plist b/ftp/fmirror/pkg-plist
index e81851a3e13b..62bdb36bb932 100644
--- a/ftp/fmirror/pkg-plist
+++ b/ftp/fmirror/pkg-plist
@@ -5,4 +5,3 @@ man/man1/fmirror.1.gz
 %%PORTDOCS%%share/doc/fmirror/generic.conf
 %%PORTDOCS%%share/doc/fmirror/redhat.conf
 %%PORTDOCS%%share/doc/fmirror/sample.conf
-%%PORTDOCS%%@dirrm share/doc/fmirror
diff --git a/ftp/fpc-libcurl/pkg-plist b/ftp/fpc-libcurl/pkg-plist
index ddcbc316d911..e268151bbde5 100644
--- a/ftp/fpc-libcurl/pkg-plist
+++ b/ftp/fpc-libcurl/pkg-plist
@@ -2,8 +2,3 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libcurl.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libcurl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl/libplibcurl.a
-@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/libcurl
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
-@dirrmtry lib/fpc/%%PORTVERSION%%/units
-@dirrmtry lib/fpc/%%PORTVERSION%%
-@dirrmtry lib/fpc
diff --git a/ftp/ftpcopy/pkg-plist b/ftp/ftpcopy/pkg-plist
index 3399dd9500ff..f7c834cd18e7 100644
--- a/ftp/ftpcopy/pkg-plist
+++ b/ftp/ftpcopy/pkg-plist
@@ -10,4 +10,3 @@ man/man1/ftpls.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/ftpcopy.html
 %%PORTDOCS%%%%DOCSDIR%%/ftpls.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/ftpmirror/pkg-plist b/ftp/ftpmirror/pkg-plist
index 978092cb176a..6eb7724ecc41 100644
--- a/ftp/ftpmirror/pkg-plist
+++ b/ftp/ftpmirror/pkg-plist
@@ -262,17 +262,3 @@ etc/ftpmirror.cf-sample
 %%SITE_PERL%%/%%PERL_ARCH%%/Fan/Scan.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Fan/TCP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Fan/Usage.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Attrib
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Cool
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/DIR
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/FTP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Farm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/HTTP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Loader
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/MD5
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Param
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Scan
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/TCP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan/Usage
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fan
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Fan
diff --git a/ftp/gnustep-ftp/pkg-plist b/ftp/gnustep-ftp/pkg-plist
index 4a1b91c5a00e..4d6558272fa9 100644
--- a/ftp/gnustep-ftp/pkg-plist
+++ b/ftp/gnustep-ftp/pkg-plist
@@ -11,6 +11,3 @@ GNUstep/Local/Applications/FTP.app/Resources/arrow_left.tiff
 GNUstep/Local/Applications/FTP.app/Resources/arrow_right.tiff
 GNUstep/Local/Applications/FTP.app/stamp.make
 GNUstep/Local/Tools/FTP
-@dirrmtry GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm
-@dirrmtry GNUstep/Local/Applications/FTP.app/Resources
-@dirrmtry GNUstep/Local/Applications/FTP.app
diff --git a/ftp/gwget/pkg-plist b/ftp/gwget/pkg-plist
index b75bd93fa7e5..653cd19d5629 100644
--- a/ftp/gwget/pkg-plist
+++ b/ftp/gwget/pkg-plist
@@ -57,7 +57,3 @@ share/locale/zh_TW/LC_MESSAGES/gwget.mo
 share/pixmaps/gwget.png
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrm %%DATADIR%%
-%%EPIPHANY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions
-%%EPIPHANY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%
-%%EPIPHANY%%@dirrmtry lib/epiphany
diff --git a/ftp/jftpgw/pkg-plist b/ftp/jftpgw/pkg-plist
index 7f6c6cf2d47a..a1c48c73fbe4 100644
--- a/ftp/jftpgw/pkg-plist
+++ b/ftp/jftpgw/pkg-plist
@@ -2,4 +2,3 @@ sbin/jftpgw
 man/man1/jftpgw.1.gz
 etc/jftpgw.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/config.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/mirror/pkg-plist b/ftp/mirror/pkg-plist
index 531c7a8c8271..47e1f0ba8a63 100644
--- a/ftp/mirror/pkg-plist
+++ b/ftp/mirror/pkg-plist
@@ -13,4 +13,3 @@ lib/mirror/lsparse.pl
 lib/mirror/mirror.defaults.sample
 man/man1/mirror.1.gz
 man/man1/mirror-master.1.gz
-@dirrm lib/mirror
diff --git a/ftp/ncftpd/pkg-plist b/ftp/ncftpd/pkg-plist
index 168940cc0e7e..aa7518c1e7af 100644
--- a/ftp/ncftpd/pkg-plist
+++ b/ftp/ncftpd/pkg-plist
@@ -5,4 +5,3 @@ bin/ncftpd_repquota
 bin/ncftpd_spy
 etc/ncftpd/general.cf-dist
 etc/ncftpd/domain.cf-dist
-@dirrmtry etc/ncftpd
diff --git a/ftp/omi/pkg-plist b/ftp/omi/pkg-plist
index 6a51e71bc0e8..2e3498b24fa0 100644
--- a/ftp/omi/pkg-plist
+++ b/ftp/omi/pkg-plist
@@ -3,4 +3,3 @@ bin/omi
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/BSD-COPYRIGHT
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/p5-File-Fetch/pkg-plist b/ftp/p5-File-Fetch/pkg-plist
index d0798e05648f..05059ad2bd7e 100644
--- a/ftp/p5-File-Fetch/pkg-plist
+++ b/ftp/p5-File-Fetch/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/File/Fetch.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Fetch/.packlist
 %%PERL5_MAN3%%/File::Fetch.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Fetch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
-@dirrmtry %%SITE_PERL%%/File
diff --git a/ftp/p5-Net-FTP-Common/pkg-plist b/ftp/p5-Net-FTP-Common/pkg-plist
index 88a199dc3210..d2964c4a463e 100644
--- a/ftp/p5-Net-FTP-Common/pkg-plist
+++ b/ftp/p5-Net-FTP-Common/pkg-plist
@@ -2,9 +2,4 @@
 %%SITE_PERL%%/Net/FTP/Common.pm
 %%SITE_PERL%%/Net/FTP/Common.pod
 %%PERL5_MAN3%%/Net::FTP::Common.3.gz
-@dirrmtry %%SITE_PERL%%/Net/FTP
-@dirrmtry %%SITE_PERL%%/Net
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Common/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Common
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/ftp/p5-Net-FTP-Recursive/pkg-plist b/ftp/p5-Net-FTP-Recursive/pkg-plist
index ec9a73e0b64f..b8491f881747 100644
--- a/ftp/p5-Net-FTP-Recursive/pkg-plist
+++ b/ftp/p5-Net-FTP-Recursive/pkg-plist
@@ -1,5 +1,3 @@
 %%SITE_PERL%%/Net/FTP/Recursive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Recursive/.packlist
 %%PERL5_MAN3%%/Net::FTP::Recursive.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Recursive
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP
diff --git a/ftp/p5-Net-FTPSSL/pkg-plist b/ftp/p5-Net-FTPSSL/pkg-plist
index d67a7f4f1975..6a326bb35d6a 100644
--- a/ftp/p5-Net-FTPSSL/pkg-plist
+++ b/ftp/p5-Net-FTPSSL/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Net/FTPSSL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPSSL/.packlist
 %%PERL5_MAN3%%/Net::FTPSSL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPSSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index a127044ff85a..12e445175760 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -44,12 +44,3 @@ bin/ro-ftpd.pl
 %%PERL5_MAN3%%/Net::FTPServer::RO::DirHandle.3.gz
 %%PERL5_MAN3%%/Net::FTPServer::RO::FileHandle.3.gz
 %%PERL5_MAN3%%/Net::FTPServer::RO::Server.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/Net/FTPServer/RO
-@dirrm %%SITE_PERL%%/Net/FTPServer/Proxy
-@dirrm %%SITE_PERL%%/Net/FTPServer/InMem
-@dirrm %%SITE_PERL%%/Net/FTPServer/Full
-@dirrm %%SITE_PERL%%/Net/FTPServer/DBeg1
-@dirrm %%SITE_PERL%%/Net/FTPServer
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/ftp/p5-POE-Component-Client-FTP/pkg-plist b/ftp/p5-POE-Component-Client-FTP/pkg-plist
index ef4d67841f9f..cd6770e69aeb 100644
--- a/ftp/p5-POE-Component-Client-FTP/pkg-plist
+++ b/ftp/p5-POE-Component-Client-FTP/pkg-plist
@@ -1,10 +1,3 @@
 %%SITE_PERL%%/POE/Component/Client/FTP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP/.packlist
 %%PERL5_MAN3%%/POE::Component::Client::FTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE/Component/Client
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/ftp/p5-SOAP-Transport-FTP/pkg-plist b/ftp/p5-SOAP-Transport-FTP/pkg-plist
index 1ee892dca683..bd2f3a4f30f3 100644
--- a/ftp/p5-SOAP-Transport-FTP/pkg-plist
+++ b/ftp/p5-SOAP-Transport-FTP/pkg-plist
@@ -1,8 +1,3 @@
 %%SITE_PERL%%/SOAP/Transport/FTP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/FTP/.packlist
 %%PERL5_MAN3%%/SOAP::Transport::FTP.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport/FTP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Transport
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
-@dirrmtry %%SITE_PERL%%/SOAP/Transport
-@dirrmtry %%SITE_PERL%%/SOAP
diff --git a/ftp/paraget/pkg-plist b/ftp/paraget/pkg-plist
index 5629fd0a9760..8009bda8d4d2 100644
--- a/ftp/paraget/pkg-plist
+++ b/ftp/paraget/pkg-plist
@@ -17,7 +17,4 @@ man/man1/paraget.1.gz
 %%SITE_PERL%%/Net/Paraget/Server.pm
 %%SITE_PERL%%/Net/Paraget/ServerList.pm
 %%SITE_PERL%%/Net/Paraget/ServerQueue.pm
-@dirrm %%SITE_PERL%%/Net/Paraget
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/ftp/pavuk/pkg-plist b/ftp/pavuk/pkg-plist
index 9a673269a874..6829f76a2a91 100644
--- a/ftp/pavuk/pkg-plist
+++ b/ftp/pavuk/pkg-plist
@@ -28,6 +28,3 @@ etc/pavukrc.sample
 %%DATADIR%%/icons/pavuk_64x64.xpm
 %%DATADIR%%/icons/pavuk_as_icon.xpm
 %%DATADIR%%/icons/pavuk_prg_icon.xpm
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/phpwebftp/pkg-plist b/ftp/phpwebftp/pkg-plist
index 7c5602bca9b1..8479d050f969 100644
--- a/ftp/phpwebftp/pkg-plist
+++ b/ftp/phpwebftp/pkg-plist
@@ -65,9 +65,3 @@
 %%WWWDIR%%/index.php
 %%WWWDIR%%/style/cm.css
 %%WWWDIR%%/style/index.html
-@dirrmtry %%WWWDIR%%/img
-@dirrmtry %%WWWDIR%%/include/language
-@dirrmtry %%WWWDIR%%/include
-@dirrmtry %%WWWDIR%%/style
-@dirrmtry %%WWWDIR%%/tmp
-@dirrmtry %%WWWDIR%%
diff --git a/ftp/plasma-applet-ftpmonitor/pkg-plist b/ftp/plasma-applet-ftpmonitor/pkg-plist
index 59519e2cd2c1..ace1795adcc2 100644
--- a/ftp/plasma-applet-ftpmonitor/pkg-plist
+++ b/ftp/plasma-applet-ftpmonitor/pkg-plist
@@ -5,5 +5,3 @@ share/apps/plasma/plasmoids/ftpmonitor/ftpmonitor-disconnected.png
 share/apps/plasma/plasmoids/ftpmonitor/ftpmonitor-error.png
 share/icons/hicolor/48x48/apps/ftpmonitor.png
 share/kde4/services/plasma-applet-ftpmonitor.desktop
-@dirrm share/apps/plasma/plasmoids/ftpmonitor
-@dirrm share/apps/ftpmonitor
diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
index 82fb190bee72..ba10f0ef0635 100644
--- a/ftp/proftpd/pkg-plist
+++ b/ftp/proftpd/pkg-plist
@@ -7,16 +7,9 @@ bin/ftptop
 bin/ftpwho
 bin/prxs
 etc/PROFTPD-MIB.txt
-@unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi
-etc/proftpd.conf.sample
-@exec cp -n %D/%F %B/proftpd.conf
-@unexec if cmp -s %D/etc/proftpd/dhparams.pem %D/etc/proftpd/dhparams.pem.sample; then rm -f %D/etc/proftpd/dhparams.pem; fi
-etc/proftpd/dhparams.pem.sample
-@exec cp -n %D/%F %B/dhparams.pem
-@unexec if cmp -s %D/etc/proftpd/blacklist.dat %D/etc/proftpd/blacklist.dat.sample; then rm -f %D/etc/proftpd/blacklist.dat; fi
-etc/proftpd/blacklist.dat.sample
-@exec cp -n %D/%F %B/blacklist.dat
-@exec mkdir -p %%LOCALSTATEDIR%%/proftpd
+@sample etc/proftpd.conf.sample
+@sample etc/proftpd/dhparams.pem.sample
+@sample etc/proftpd/blacklist.dat.sample
 include/proftpd/ascii.h
 include/proftpd/auth.h
 include/proftpd/bindings.h
@@ -180,20 +173,4 @@ sbin/proftpd
 %%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo
-%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja_JP/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bg_BG/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_US
-%%NLS%%@dirrmtry share/locale/ja_JP
-%%NLS%%@dirrmtry share/locale/it_IT
-%%NLS%%@dirrmtry share/locale/ru_RU
-%%NLS%%@dirrmtry share/locale/bg_BG
-%%NLS%%@dirrmtry share/locale/ko_KR
-@dirrmtry etc/proftpd
-@dirrm include/proftpd
-@dirrmtry lib/proftpd
-@dirrmtry libexec/proftpd
-@unexec rmdir %%LOCALSTATEDIR%%/proftpd 2>/dev/null || true
+@dir %%LOCALSTATEDIR%%/proftpd
diff --git a/ftp/profxp/pkg-plist b/ftp/profxp/pkg-plist
index 7d34a4d95c7e..fed23384108a 100644
--- a/ftp/profxp/pkg-plist
+++ b/ftp/profxp/pkg-plist
@@ -3,4 +3,3 @@ bin/profxp
 %%SITE_PERL%%/profxp/config.pm
 %%SITE_PERL%%/profxp/screen.pm
 %%SITE_PERL%%/profxp/tcp.pm
-@dirrm %%SITE_PERL%%/profxp
diff --git a/ftp/pureadmin/pkg-plist b/ftp/pureadmin/pkg-plist
index 5efd4e288984..b2c2e6f85d8a 100644
--- a/ftp/pureadmin/pkg-plist
+++ b/ftp/pureadmin/pkg-plist
@@ -27,4 +27,3 @@ share/pixmaps/pureadmin.png
 %%DATADIR%%/userconfig.png
 %%DATADIR%%/usericon.png
 %%DATADIR%%/usermanager.glade
-@dirrm %%DATADIR%%
diff --git a/ftp/py-ftputil/pkg-plist b/ftp/py-ftputil/pkg-plist
index 98a93a7b47f4..cb645f5793e5 100644
--- a/ftp/py-ftputil/pkg-plist
+++ b/ftp/py-ftputil/pkg-plist
@@ -31,10 +31,8 @@
 %%PYTHON_SITELIBDIR%%/ftputil/lrucache.py
 %%PYTHON_SITELIBDIR%%/ftputil/lrucache.pyc
 %%PYTHON_SITELIBDIR%%/ftputil/lrucache.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/ftputil
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/ftputil.html
 %%PORTDOCS%%%%DOCSDIR%%/ftputil.txt
 %%PORTDOCS%%%%DOCSDIR%%/ftputil_ru_utf8.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/py-pyftpdlib/pkg-plist b/ftp/py-pyftpdlib/pkg-plist
index 1c3e5728f102..d0c22de13153 100644
--- a/ftp/py-pyftpdlib/pkg-plist
+++ b/ftp/py-pyftpdlib/pkg-plist
@@ -25,6 +25,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/unix_daemon.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/unix_ftpd.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/winnt_ftpd.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/pyftpdlib/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/pyftpdlib
diff --git a/ftp/rexx-curl/pkg-plist b/ftp/rexx-curl/pkg-plist
index 53d1fc5a7b53..03ebb46287cc 100644
--- a/ftp/rexx-curl/pkg-plist
+++ b/ftp/rexx-curl/pkg-plist
@@ -11,6 +11,3 @@ lib/librexxcurl.so
 %%DATADIR%%/scp.rexx
 %%DATADIR%%/testcurl.rexx
 %%DATADIR%%/upload.rexx
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/scythia/pkg-plist b/ftp/scythia/pkg-plist
index 64793d8042d8..c3d412e653a3 100644
--- a/ftp/scythia/pkg-plist
+++ b/ftp/scythia/pkg-plist
@@ -92,11 +92,3 @@ share/pixmaps/scythia.xpm
 %%DATADIR%%/lang/english.qm
 %%DATADIR%%/lang/polish.qm
 %%DATADIR%%/lang/russian.qm
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%
-@dirrm share/icons/hicolor/128x128/apps
-@dirrm share/icons/hicolor/128x128
-@dirrm share/icons/hicolor
-@dirrm share/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/smbftpd/pkg-plist b/ftp/smbftpd/pkg-plist
index fc939aaa0a43..11b831b1225f 100644
--- a/ftp/smbftpd/pkg-plist
+++ b/ftp/smbftpd/pkg-plist
@@ -4,4 +4,3 @@ bin/smbftpd-user
 %%ETCDIR%%/smbftpd_pgsql.conf.sample
 %%ETCDIR%%/smbftpd_share.conf.sample
 sbin/smbftpd
-@dirrmtry %%ETCDIR%%
diff --git a/ftp/urlgfe/pkg-plist b/ftp/urlgfe/pkg-plist
index c5718007f904..b87fb9e90691 100644
--- a/ftp/urlgfe/pkg-plist
+++ b/ftp/urlgfe/pkg-plist
@@ -10,4 +10,3 @@ bin/urlgfe
 share/applications/urlgfe.desktop
 share/locale/zh_TW/LC_MESSAGES/urlgfe.mo
 share/pixmaps/urlgfe-icon.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/ftp/vsftpd-ext/pkg-plist b/ftp/vsftpd-ext/pkg-plist
index 584f680691b5..16ae76b02fe6 100644
--- a/ftp/vsftpd-ext/pkg-plist
+++ b/ftp/vsftpd-ext/pkg-plist
@@ -2,9 +2,7 @@ libexec/vsftpd
 man/man5/vsftpd.conf.5.gz
 man/man8/vsftpd.8.gz
 @sample etc/vsftpd.conf.sample
-@dirrmtry /var/ftp
-@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
-@dir share/vsftpd/empty
+@dir /var/ftp
 %%PORTDOCS%%%%DOCSDIR%%/AUDIT
 %%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
@@ -44,6 +42,3 @@ man/man8/vsftpd.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/IMPLEMENTATION
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/OVERVIEW
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/TRUST
-%%PORTDOCS%%@dir %%DOCSDIR%%/SECURITY
-%%PORTDOCS%%@dir %%DOCSDIR%%/EXAMPLE
-%%PORTDOCS%%@dir %%DOCSDIR%%
diff --git a/ftp/waiho/pkg-plist b/ftp/waiho/pkg-plist
index 60db222ea50e..81791b123a6d 100644
--- a/ftp/waiho/pkg-plist
+++ b/ftp/waiho/pkg-plist
@@ -10,5 +10,3 @@ GNUstep/Local/Applications/Waiho.app/Resources/Waiho.tiff
 GNUstep/Local/Applications/Waiho.app/Waiho
 GNUstep/Local/Applications/Waiho.app/stamp.make
 GNUstep/Local/Tools/Waiho
-@dirrm GNUstep/Local/Applications/Waiho.app/Resources
-@dirrm GNUstep/Local/Applications/Waiho.app
diff --git a/ftp/wxdfast/pkg-plist b/ftp/wxdfast/pkg-plist
index 27c91f95d7a1..eb8dfe01b59e 100644
--- a/ftp/wxdfast/pkg-plist
+++ b/ftp/wxdfast/pkg-plist
@@ -96,14 +96,3 @@ share/pixmaps/wxdfast.png
 %%DATADIR%%/xpm/small/wxdfast.xpm
 %%DATADIR%%/xpm/wxdfast.ico
 %%DATADIR%%/xpm/wxdfast.xpm
-@dirrm %%DATADIR%%/xpm/small
-@dirrm %%DATADIR%%/xpm/big
-@dirrm %%DATADIR%%/xpm
-@dirrm %%DATADIR%%/RipStop/toolbar
-@dirrm %%DATADIR%%/RipStop/svg
-@dirrm %%DATADIR%%/RipStop/preview
-@dirrm %%DATADIR%%/RipStop/menubar
-@dirrm %%DATADIR%%/RipStop/logo
-@dirrm %%DATADIR%%/RipStop/icon
-@dirrm %%DATADIR%%/RipStop
-@dirrm %%DATADIR%%
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index bb0ffb7ca700..05dc1c3ea31a 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -130,14 +130,3 @@ libdata/pkgconfig/wzdftpd.pc
 %%PORTDOCS%%%%DOCSDIR%%/wzd_tls.cnf
 sbin/wzdftpd
 share/aclocal/wzd.m4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/wzdftpd/modules
-@dirrm lib/wzdftpd/backends
-@dirrm lib/wzdftpd
-%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/wzdftpd
-@dirrm include/wzdftpd/libwzd-core/arch
-@dirrm include/wzdftpd/libwzd-core
-@dirrm include/wzdftpd/libwzd-base
-@dirrm include/wzdftpd/libwzd-auth
-@dirrm include/wzdftpd
-@dirrmtry %%ETCDIR%%