aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/addresses/pkg-plist33
-rw-r--r--mail/alpine/pkg-plist1
-rw-r--r--mail/amavis-logwatch/pkg-plist1
-rw-r--r--mail/annoyance-filter/pkg-plist1
-rw-r--r--mail/archivemail/pkg-plist2
-rw-r--r--mail/archiveopteryx-devel/pkg-plist5
-rw-r--r--mail/archiveopteryx/pkg-plist5
-rw-r--r--mail/ask/pkg-plist2
-rw-r--r--mail/asmail/pkg-plist5
-rw-r--r--mail/automx/pkg-plist1
-rw-r--r--mail/avenger/pkg-plist2
-rw-r--r--mail/balsa/pkg-plist34
-rw-r--r--mail/bmf/pkg-plist1
-rw-r--r--mail/cclient/pkg-plist1
-rw-r--r--mail/cone/pkg-plist2
-rw-r--r--mail/couriergraph/Makefile9
-rw-r--r--mail/couriergraph/pkg-plist2
-rw-r--r--mail/crm114/pkg-plist2
-rw-r--r--mail/davmail/pkg-plist12
-rw-r--r--mail/deforaos-mailer/pkg-plist13
-rw-r--r--mail/dkfilter/pkg-plist5
-rw-r--r--mail/dkimproxy/pkg-plist2
-rw-r--r--mail/elmo-devel/pkg-plist2
-rw-r--r--mail/elmo/pkg-plist1
-rw-r--r--mail/emil/pkg-plist1
-rw-r--r--mail/enma/pkg-plist2
-rw-r--r--mail/eps/pkg-plist1
-rw-r--r--mail/epstools/pkg-plist1
-rw-r--r--mail/ezmlm-idx/pkg-plist37
-rw-r--r--mail/ezmlm/pkg-plist1
-rw-r--r--mail/gensig/pkg-plist1
-rw-r--r--mail/getmail/pkg-plist2
-rw-r--r--mail/gld/pkg-plist1
-rw-r--r--mail/gmime2-sharp/pkg-plist3
-rw-r--r--mail/gmime2/pkg-plist2
-rw-r--r--mail/gmime24-sharp/pkg-plist3
-rw-r--r--mail/gmime24/pkg-plist2
-rw-r--r--mail/gmime26-sharp/pkg-plist4
-rw-r--r--mail/gmime26/pkg-plist2
-rw-r--r--mail/gnarwl/pkg-plist8
-rw-r--r--mail/gnome-gmail-notifier/pkg-plist3
-rw-r--r--mail/gnumail/pkg-plist62
-rw-r--r--mail/gubby/pkg-plist1
-rw-r--r--mail/im/pkg-plist5
-rw-r--r--mail/imap-uw/pkg-plist3
-rw-r--r--mail/isoqlog/pkg-plist7
-rw-r--r--mail/james/pkg-plist10
-rw-r--r--mail/jamlib/pkg-plist1
-rw-r--r--mail/junkfilter/pkg-plist2
-rw-r--r--mail/kshowmail/pkg-plist8
-rw-r--r--mail/lbdb/pkg-plist1
-rw-r--r--mail/lens/pkg-plist3
-rw-r--r--mail/libcmime/pkg-plist1
-rw-r--r--mail/libdomainkeys/pkg-plist1
-rw-r--r--mail/libesmtp/pkg-plist3
-rw-r--r--mail/libpst/pkg-plist2
-rw-r--r--mail/libspamtest/pkg-plist3
-rw-r--r--mail/libspf2/pkg-plist1
-rw-r--r--mail/libvmime/pkg-plist27
-rw-r--r--mail/mail-notification/pkg-plist5
-rw-r--r--mail/mailagent/pkg-plist12
-rw-r--r--mail/maildirsync/pkg-plist2
-rw-r--r--mail/mailfmt/pkg-plist1
-rw-r--r--mail/mailfront/pkg-plist3
-rw-r--r--mail/mailgraph/pkg-plist3
-rw-r--r--mail/mailscanner/pkg-plist26
-rw-r--r--mail/mailsync/pkg-plist2
-rw-r--r--mail/mailtray/pkg-plist2
-rw-r--r--mail/mailx/pkg-plist1
-rw-r--r--mail/mboxgrep/pkg-plist1
-rw-r--r--mail/meta1/pkg-plist2
-rw-r--r--mail/metamail/pkg-plist2
-rw-r--r--mail/mew/pkg-plist3
-rw-r--r--mail/milter-manager/pkg-plist28
-rw-r--r--mail/minimalist/pkg-plist3
-rw-r--r--mail/ml/pkg-plist1
-rw-r--r--mail/mlmmj/pkg-plist23
-rw-r--r--mail/msmtp/pkg-plist1
-rw-r--r--mail/mu/pkg-plist7
-rw-r--r--mail/mulberry/pkg-plist1
-rw-r--r--mail/mutt14/pkg-plist4
-rw-r--r--mail/noattach/pkg-plist2
-rw-r--r--mail/nohtml/pkg-plist1
-rw-r--r--mail/notmuch/pkg-plist4
-rw-r--r--mail/offlineimap/pkg-plist5
-rw-r--r--mail/opendkim/pkg-plist7
-rw-r--r--mail/opendmarc/pkg-plist2
-rw-r--r--mail/opensmtpd-devel/pkg-plist2
-rw-r--r--mail/osbf-lua/pkg-plist2
-rw-r--r--mail/pantomime/pkg-plist10
-rw-r--r--mail/perdition/pkg-plist3
-rw-r--r--mail/phpmailer/pkg-plist9
-rw-r--r--mail/phpmailer2/pkg-plist9
-rw-r--r--mail/pop3gwd/pkg-plist1
-rw-r--r--mail/pop3lite/pkg-plist4
-rw-r--r--mail/popa3d/pkg-plist1
-rw-r--r--mail/popfile/pkg-plist35
-rw-r--r--mail/popular/pkg-plist3
-rw-r--r--mail/postfix-logwatch/pkg-plist1
-rw-r--r--mail/postfix-policyd-spf-python/pkg-plist1
-rw-r--r--mail/postfix-postfwd/pkg-plist2
-rw-r--r--mail/postfixadmin/pkg-plist14
-rw-r--r--mail/prom-wl/pkg-plist7
-rw-r--r--mail/pronto/pkg-plist14
-rw-r--r--mail/py-apolicy/pkg-plist2
-rw-r--r--mail/py-ppolicy/pkg-plist1
-rw-r--r--mail/pymsgauth/pkg-plist3
-rw-r--r--mail/pysieved/pkg-plist2
-rw-r--r--mail/qconfirm/pkg-plist1
-rw-r--r--mail/qmqtool/pkg-plist1
-rw-r--r--mail/qsheff/pkg-plist5
-rw-r--r--mail/rblcheck/pkg-plist1
-rw-r--r--mail/ruby-rfilter/pkg-plist25
-rw-r--r--mail/ruby-rmail/pkg-plist28
-rw-r--r--mail/sgwi/pkg-plist2
-rw-r--r--mail/sma/pkg-plist2
-rw-r--r--mail/smtprc/pkg-plist2
-rw-r--r--mail/spamass-ixhash/pkg-plist1
-rw-r--r--mail/spamdb-curses/pkg-plist1
-rw-r--r--mail/spamguard/pkg-plist3
-rw-r--r--mail/spmfilter-clamav/pkg-plist1
-rw-r--r--mail/sqlgrey/pkg-plist1
-rw-r--r--mail/svnmailer/pkg-plist4
-rw-r--r--mail/tkrat2/pkg-plist5
-rw-r--r--mail/tlb/pkg-plist1
-rw-r--r--mail/tmda/pkg-plist23
-rw-r--r--mail/trojita/pkg-plist2
-rw-r--r--mail/up-imapproxy/pkg-plist1
-rw-r--r--mail/vexim/pkg-plist18
-rw-r--r--mail/vmailmgr/pkg-plist3
-rw-r--r--mail/vqadmin/pkg-plist6
-rw-r--r--mail/vqregister/pkg-plist3
-rw-r--r--mail/wanderlust-devel/pkg-plist8
-rw-r--r--mail/websieve/pkg-plist2
-rw-r--r--mail/xfaces/pkg-plist2
-rw-r--r--mail/xfce4-mailwatch-plugin/pkg-plist14
-rw-r--r--mail/xmailbox/pkg-plist2
137 files changed, 12 insertions, 795 deletions
diff --git a/mail/addresses/pkg-plist b/mail/addresses/pkg-plist
index b6532ff9125c..8d27e4532f01 100644
--- a/mail/addresses/pkg-plist
+++ b/mail/addresses/pkg-plist
@@ -97,7 +97,6 @@ GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/l
GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%LIBVERSION%%
GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/Current
GNUstep/Local/Library/Frameworks/Addresses.framework/libAddresses.so
-@dirrm GNUstep/Local/Library/Headers/AddressBook
GNUstep/Local/Library/Headers/AddressView
GNUstep/Local/Library/Headers/Addresses
GNUstep/Local/Library/Libraries/libAddressView.so
@@ -111,35 +110,3 @@ GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManag
GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.info
GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.info
GNUstep/Local/Library/Headers/AddressBook/AddressBook.h
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/French.lproj
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/English.lproj
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/Dutch.lproj
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources
-@dirrm GNUstep/Local/Applications/AddressManager.app
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework/Versions
-@dirrm GNUstep/Local/Library/Frameworks/Addresses.framework
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework/Versions
-@dirrm GNUstep/Local/Library/Frameworks/AddressView.framework
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/Spanish.lproj
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm
-@dirrm GNUstep/Local/Applications/AddressManager.app/Resources/German.lproj
diff --git a/mail/alpine/pkg-plist b/mail/alpine/pkg-plist
index 44ecc82d7858..5d335efb06dd 100644
--- a/mail/alpine/pkg-plist
+++ b/mail/alpine/pkg-plist
@@ -5,4 +5,3 @@ man/man1/alpine.1.gz
man/man1/rpdump.1.gz
man/man1/rpload.1.gz
@sample etc/alpine.conf.sample
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech-notes
diff --git a/mail/amavis-logwatch/pkg-plist b/mail/amavis-logwatch/pkg-plist
index 56901ad30750..4f44c7d154aa 100644
--- a/mail/amavis-logwatch/pkg-plist
+++ b/mail/amavis-logwatch/pkg-plist
@@ -1,4 +1,3 @@
%%ETCDIR%%/amavis-logwatch.conf.sample
man/man1/amavis-logwatch.1.gz
-@dirrmtry %%ETCDIR%%
bin/amavis-logwatch
diff --git a/mail/annoyance-filter/pkg-plist b/mail/annoyance-filter/pkg-plist
index c9f74c25ea6f..12e5ed2060d8 100644
--- a/mail/annoyance-filter/pkg-plist
+++ b/mail/annoyance-filter/pkg-plist
@@ -6,4 +6,3 @@ man/man1/annoyance-filter.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/annoyance-filter.pdf
%%PORTDOCS%%%%DOCSDIR%%/statlib.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/archivemail/pkg-plist b/mail/archivemail/pkg-plist
index 34061102f719..0e86ce31985a 100644
--- a/mail/archivemail/pkg-plist
+++ b/mail/archivemail/pkg-plist
@@ -7,5 +7,3 @@ man/man1/archivemail.1.gz
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/archivemail_all
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_archivemail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/archiveopteryx-devel/pkg-plist b/mail/archiveopteryx-devel/pkg-plist
index 4675590df747..b29cac2c139d 100644
--- a/mail/archiveopteryx-devel/pkg-plist
+++ b/mail/archiveopteryx-devel/pkg-plist
@@ -21,7 +21,4 @@ man/man8/recorder.8.gz
sbin/archiveopteryx
sbin/logd
sbin/recorder
-@dirrm libexec/aox/contrib
-@dirrm libexec/aox
-@dirrm libdata/aox
-@dirrm %%ETCDIR%%
+@dir %%ETCDIR%%
diff --git a/mail/archiveopteryx/pkg-plist b/mail/archiveopteryx/pkg-plist
index 4675590df747..b29cac2c139d 100644
--- a/mail/archiveopteryx/pkg-plist
+++ b/mail/archiveopteryx/pkg-plist
@@ -21,7 +21,4 @@ man/man8/recorder.8.gz
sbin/archiveopteryx
sbin/logd
sbin/recorder
-@dirrm libexec/aox/contrib
-@dirrm libexec/aox
-@dirrm libdata/aox
-@dirrm %%ETCDIR%%
+@dir %%ETCDIR%%
diff --git a/mail/ask/pkg-plist b/mail/ask/pkg-plist
index 96bdc58a46f9..fdb0e6a714fd 100644
--- a/mail/ask/pkg-plist
+++ b/mail/ask/pkg-plist
@@ -25,5 +25,3 @@ man/man1/asksetup.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_ptbr.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ignorelist.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whitelist.txt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/ask
diff --git a/mail/asmail/pkg-plist b/mail/asmail/pkg-plist
index 0c6d076a7747..bd6df58ee40f 100644
--- a/mail/asmail/pkg-plist
+++ b/mail/asmail/pkg-plist
@@ -68,8 +68,3 @@ man/man5/asmailrc.5.gz
%%DATADIR%%/sounds/drip.au
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asmailrc.sample
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%
diff --git a/mail/automx/pkg-plist b/mail/automx/pkg-plist
index 4e4eaf14bf88..d0165de62b9b 100644
--- a/mail/automx/pkg-plist
+++ b/mail/automx/pkg-plist
@@ -11,4 +11,3 @@ man/man5/automx_script.5.gz
%%PYTHON_SITELIBDIR%%/automx/config.py
%%PYTHON_SITELIBDIR%%/automx/ordereddict.py
%%PYTHON_SITELIBDIR%%/automx/view.py
-@dirrm %%PYTHON_SITELIBDIR%%/automx
diff --git a/mail/avenger/pkg-plist b/mail/avenger/pkg-plist
index c75a1d5754cc..be679996d5bb 100644
--- a/mail/avenger/pkg-plist
+++ b/mail/avenger/pkg-plist
@@ -37,5 +37,3 @@ sbin/asmtpd
%%DATADIR%%/avsendmail.m4
%%DATADIR%%/smtp-filter.pf
share/pf.os
-@dirrm %%DATADIR%%
-@dirrmtry %%ETCDIR%%
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 7e23b6938236..72a5d011d9bd 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -222,37 +222,3 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
share/pixmaps/gnome-balsa2.png
share/sounds/balsa/newmail.wav
share/sounds/balsa/startup.wav
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/icons/hicolor/48x48/mimetypes
-@dirrm share/help/sl/balsa/figures
-@dirrm share/help/sl/balsa
-@dirrmtry share/help/sl
-@dirrm share/help/fr/balsa/figures
-@dirrm share/help/fr/balsa
-@dirrmtry share/help/fr
-@dirrm share/help/es/balsa/figures
-@dirrm share/help/es/balsa
-@dirrmtry share/help/es
-@dirrm share/help/de/balsa/figures
-@dirrm share/help/de/balsa
-@dirrmtry share/help/de
-@dirrm share/help/C/balsa/figures
-@dirrm share/help/C/balsa
-@dirrmtry share/help/C
-@dirrmtry share/help
-@dirrm share/sounds/balsa
-@dirrm share/balsa/pixmaps
-@dirrm share/balsa/hicolor/16x16/apps
-@dirrm share/balsa/hicolor/16x16
-@dirrm share/balsa/hicolor/24x24/apps
-@dirrm share/balsa/hicolor/24x24
-@dirrm share/balsa/hicolor
-%%GTKSV%%@dirrm share/balsa/gtksourceview-2.0
-@dirrm share/balsa
diff --git a/mail/bmf/pkg-plist b/mail/bmf/pkg-plist
index 91f1e5f4207b..b20a589b46a7 100644
--- a/mail/bmf/pkg-plist
+++ b/mail/bmf/pkg-plist
@@ -3,4 +3,3 @@ bin/bmfconv
man/man1/bmf.1.gz
man/man1/bmfconv.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/cclient/pkg-plist b/mail/cclient/pkg-plist
index b59b5f6a522f..f948c0970bee 100644
--- a/mail/cclient/pkg-plist
+++ b/mail/cclient/pkg-plist
@@ -34,4 +34,3 @@ include/c-client/OSCFLAGS
lib/%%SHLIBNAME%%
lib/libc-client4.a
lib/libc-client4.so
-@dirrm include/c-client
diff --git a/mail/cone/pkg-plist b/mail/cone/pkg-plist
index 046943ebd253..52c3e3a3621b 100644
--- a/mail/cone/pkg-plist
+++ b/mail/cone/pkg-plist
@@ -163,5 +163,3 @@ man/man1/leaf.1.gz
%%DATADIR%%/http.handler
%%DATADIR%%/https.handler
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 3f70be9aeeba..82328554b1a0 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -3,7 +3,7 @@
PORTNAME= couriergraph
PORTVERSION= 20060202
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://www.arschkrebs.de/postfix/${PORTNAME}/
DISTNAME= ${PORTNAME}
@@ -14,8 +14,9 @@ COMMENT= RRDtool frontend for Courier statistics
RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool \
p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
-USES= perl5
+USES= perl5 shebangfix
USE_PERL5= run
+SHEBANG_FILES= couriergraph.cgi couriergraph.pl
USE_RC_SUBR= ${PORTNAME}
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -24,6 +25,8 @@ DATADIR?= /var/db/couriergraph
COURIERGRAPH_USER?= ${WWWOWN}
COURIERGRAPH_GROUP?= ${WWWGRP}
+PLIST_SUB= COURIERGRAPH_USER=${COURIERGRAPH_USER} \
+ COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP}
SUB_LIST= COURIERGRAPH_USER=${COURIERGRAPH_USER} \
COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP}
STARTUP_FILE= ${PREFIX}/etc/rc.d/couriergraph.sh
@@ -50,8 +53,6 @@ post-patch:
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin
@${MKDIR} ${STAGEDIR}${DATADIR}
- @${CHOWN} -R ${COURIERGRAPH_USER}:${COURIERGRAPH_GROUP} \
- ${STAGEDIR}${DATADIR}
${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.pl \
${STAGEDIR}${PREFIX}/sbin
${INSTALL_SCRIPT} ${WRKSRC}/couriergraph.cgi \
diff --git a/mail/couriergraph/pkg-plist b/mail/couriergraph/pkg-plist
index 50023bb6307b..9f9a457edc37 100644
--- a/mail/couriergraph/pkg-plist
+++ b/mail/couriergraph/pkg-plist
@@ -1,3 +1,3 @@
www/cgi-bin/couriergraph.cgi
sbin/couriergraph.pl
-@dirrmtry www/cgi-bin
+@dir(%%COURIERGRAPH_USER%%,%%COURIERGRAPH_GROUP%%,) %%DATADIR%%
diff --git a/mail/crm114/pkg-plist b/mail/crm114/pkg-plist
index 036637ba5e0a..fda9864d5db7 100644
--- a/mail/crm114/pkg-plist
+++ b/mail/crm114/pkg-plist
@@ -17,7 +17,6 @@ bin/osbf-util
%%PORTDOCS%%%%DOCSDIR%%/Hound_of_the_Baskervilles_first_500_lines.txt
%%PORTDOCS%%%%DOCSDIR%%/Macbeth_Act_IV.txt
%%PORTDOCS%%%%DOCSDIR%%/The_Wind_in_the_Willows_Chap_1.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reto_procmailrc.recipe
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailfilter.crm
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailfilter.cf
@@ -34,4 +33,3 @@ bin/osbf-util
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklist.mfp.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whitelist.mfp.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crm114-mode.el
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index d1a4e393a0d3..1ec665114575 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -75,15 +75,3 @@ share/applications/davmail.desktop
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/woodstox-core-asl-4.1.2.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/xercesImpl-2.8.1.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/web.xml
-@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS
-@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java
-@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj
-@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources
-@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents
-@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app
-@dirrm %%JAVASHAREDIR%%/davmail/lib
-@dirrm %%JAVASHAREDIR%%/davmail/web/WEB-INF/classes
-@dirrm %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib
-@dirrm %%JAVASHAREDIR%%/davmail/web/WEB-INF
-@dirrm %%JAVASHAREDIR%%/davmail/web
-@dirrm %%JAVASHAREDIR%%/davmail
diff --git a/mail/deforaos-mailer/pkg-plist b/mail/deforaos-mailer/pkg-plist
index 2995aefcc111..0e63f0f81ce0 100644
--- a/mail/deforaos-mailer/pkg-plist
+++ b/mail/deforaos-mailer/pkg-plist
@@ -38,16 +38,3 @@ share/icons/hicolor/48x48/apps/mailer-outbox.png
share/icons/hicolor/48x48/apps/mailer-sent.png
share/icons/hicolor/48x48/apps/mailer.png
share/locale/fr/LC_MESSAGES/Mailer.mo
-@dirrm include/Desktop/Mailer
-@dirrmtry include/Desktop
-@dirrm lib/Mailer/account
-@dirrm lib/Mailer/plugins
-@dirrm lib/Mailer
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
diff --git a/mail/dkfilter/pkg-plist b/mail/dkfilter/pkg-plist
index 191426440fad..5f78f0fd8f7a 100644
--- a/mail/dkfilter/pkg-plist
+++ b/mail/dkfilter/pkg-plist
@@ -15,8 +15,3 @@ lib/Mail/DomainKeys/Policy.pm
lib/Mail/DomainKeys/Signature.pm
lib/MySmtpProxyServer.pm
lib/MySmtpServer.pm
-@dirrm lib/Mail/DomainKeys/Key
-@dirrm lib/Mail/DomainKeys
-@dirrm lib/Mail
-@dirrm lib/MSDW/SMTP
-@dirrm lib/MSDW
diff --git a/mail/dkimproxy/pkg-plist b/mail/dkimproxy/pkg-plist
index f0f952df9a7a..0465dfc5d298 100644
--- a/mail/dkimproxy/pkg-plist
+++ b/mail/dkimproxy/pkg-plist
@@ -10,5 +10,3 @@ lib/MySmtpProxyServer.pm
lib/MySmtpServer.pm
man/man8/dkimproxy_in.8.gz
man/man8/dkimproxy_out.8.gz
-@dirrm lib/MSDW/SMTP
-@dirrm lib/MSDW
diff --git a/mail/elmo-devel/pkg-plist b/mail/elmo-devel/pkg-plist
index 1432252e7c0f..3314a18e6531 100644
--- a/mail/elmo-devel/pkg-plist
+++ b/mail/elmo-devel/pkg-plist
@@ -9,5 +9,3 @@ bin/elmoconf.pl
%%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo
man/man1/elmo.1.gz
man/man1/elmoconf.pl.1.gz
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
diff --git a/mail/elmo/pkg-plist b/mail/elmo/pkg-plist
index 2f240ffb0bc2..8fa1fd1a8934 100644
--- a/mail/elmo/pkg-plist
+++ b/mail/elmo/pkg-plist
@@ -6,4 +6,3 @@ bin/elmoconf.pl
%%NLS%%share/locale/pl/LC_MESSAGES/elmo.mo
man/man1/elmo.1.gz
man/man1/elmoconf.pl.1.gz
-@dirrm %%DATADIR%%
diff --git a/mail/emil/pkg-plist b/mail/emil/pkg-plist
index 7c9a5b058068..43383040331f 100644
--- a/mail/emil/pkg-plist
+++ b/mail/emil/pkg-plist
@@ -37,4 +37,3 @@ man/man1/emil.cf.1.gz
%%PORTDOCS%%%%DOCSDIR%%/using.html
%%PORTDOCS%%%%DOCSDIR%%/way.html
%%PORTDOCS%%%%DOCSDIR%%/why.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/enma/pkg-plist b/mail/enma/pkg-plist
index b2b1e500760a..e59b4c67ba98 100644
--- a/mail/enma/pkg-plist
+++ b/mail/enma/pkg-plist
@@ -7,5 +7,3 @@ lib/libsauth.so.0.0.0
libexec/enma
man/ja_JP.UTF-8/man1/enma.1.gz
man/man1/enma.1.gz
-@dirrmtry man/ja_JP.UTF-8/man1
-@dirrmtry man/ja_JP.UTF-8
diff --git a/mail/eps/pkg-plist b/mail/eps/pkg-plist
index ef5324fde6fb..21478bffb9fc 100644
--- a/mail/eps/pkg-plist
+++ b/mail/eps/pkg-plist
@@ -19,4 +19,3 @@ include/eps/result.h
include/eps/rfc2822.h
include/eps/unfold.h
lib/libeps.a
-@dirrm include/eps
diff --git a/mail/epstools/pkg-plist b/mail/epstools/pkg-plist
index 40ab4f383c5a..c5f169ffe088 100644
--- a/mail/epstools/pkg-plist
+++ b/mail/epstools/pkg-plist
@@ -14,4 +14,3 @@ bin/eps-qpdecode
%%EXAMPLESDIR%%/email.1
%%EXAMPLESDIR%%/email.2
%%EXAMPLESDIR%%/virus.email
-@dirrm %%EXAMPLESDIR%%
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index 3c87e5effc5b..354ed05b59ee 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -649,40 +649,3 @@ man/man5/ezmlmsubrc.5.gz
%%PORTDOCS%%%%DOCSDIR%%/README.std
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/ezmlm/sv/text
-@dirrm etc/ezmlm/sv
-@dirrm etc/ezmlm/ru/text
-@dirrm etc/ezmlm/ru
-@dirrm etc/ezmlm/pt_BR/text
-@dirrm etc/ezmlm/pt_BR
-@dirrm etc/ezmlm/pt/text
-@dirrm etc/ezmlm/pt
-@dirrm etc/ezmlm/pl/text
-@dirrm etc/ezmlm/pl
-@dirrm etc/ezmlm/nl/text
-@dirrm etc/ezmlm/nl
-@dirrm etc/ezmlm/ja/text
-@dirrm etc/ezmlm/ja
-@dirrm etc/ezmlm/it/text
-@dirrm etc/ezmlm/it
-@dirrm etc/ezmlm/id/text
-@dirrm etc/ezmlm/id
-@dirrm etc/ezmlm/hu/text
-@dirrm etc/ezmlm/hu
-@dirrm etc/ezmlm/fr/text
-@dirrm etc/ezmlm/fr
-@dirrm etc/ezmlm/es/text
-@dirrm etc/ezmlm/es
-@dirrm etc/ezmlm/en_US/text
-@dirrm etc/ezmlm/en_US
-@dirrm etc/ezmlm/de/text
-@dirrm etc/ezmlm/de
-@dirrm etc/ezmlm/da/text
-@dirrm etc/ezmlm/da
-@dirrm etc/ezmlm/cs/text
-@dirrm etc/ezmlm/cs
-@dirrm etc/ezmlm/ch_GB/text
-@dirrm etc/ezmlm/ch_GB
-@dirrmtry etc/ezmlm
-@dirrm lib/ezmlm
diff --git a/mail/ezmlm/pkg-plist b/mail/ezmlm/pkg-plist
index aa5af37f8b33..a713e68b2987 100644
--- a/mail/ezmlm/pkg-plist
+++ b/mail/ezmlm/pkg-plist
@@ -24,4 +24,3 @@ man/man5/ezmlm.5.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/gensig/pkg-plist b/mail/gensig/pkg-plist
index 8e56612c44bf..19d65b67b50d 100644
--- a/mail/gensig/pkg-plist
+++ b/mail/gensig/pkg-plist
@@ -3,4 +3,3 @@ bin/cattag
share/gensig/taglines
man/man1/cattag.1.gz
man/man1/gensig.1.gz
-@dirrm share/gensig
diff --git a/mail/getmail/pkg-plist b/mail/getmail/pkg-plist
index bd4f4c2d88d4..b2f86250e4d5 100644
--- a/mail/getmail/pkg-plist
+++ b/mail/getmail/pkg-plist
@@ -49,5 +49,3 @@ man/man1/getmail_mbox.1.gz
%%PYTHON_SITELIBDIR%%/getmailcore/utilities.pyc
%%PYTHON_SITELIBDIR%%/getmailcore/utilities.pyo
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getmailrc-examples
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/getmailcore
diff --git a/mail/gld/pkg-plist b/mail/gld/pkg-plist
index 6c1cd7d5081b..a67a02f87937 100644
--- a/mail/gld/pkg-plist
+++ b/mail/gld/pkg-plist
@@ -6,4 +6,3 @@ sbin/gld
%%PORTDOCS%%%%DOCSDIR%%/table-whitelist.sql
%%PORTDOCS%%%%DOCSDIR%%/tables.mysql
%%PORTDOCS%%%%DOCSDIR%%/tables.pgsql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/gmime2-sharp/pkg-plist b/mail/gmime2-sharp/pkg-plist
index 0eb106c94230..2737aaffa345 100644
--- a/mail/gmime2-sharp/pkg-plist
+++ b/mail/gmime2-sharp/pkg-plist
@@ -2,6 +2,3 @@ lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll
lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config
lib/mono/gmime-sharp-2.4/gmime-sharp.dll
libdata/pkgconfig/gmime-sharp-2.4.pc
-@dirrm lib/mono/gmime-sharp-2.4
-@dirrmtry lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4
-@dirrmtry lib/mono/gac/gmime-sharp
diff --git a/mail/gmime2/pkg-plist b/mail/gmime2/pkg-plist
index d8af7f58c6c3..f56f8e56dff1 100644
--- a/mail/gmime2/pkg-plist
+++ b/mail/gmime2/pkg-plist
@@ -55,5 +55,3 @@ lib/libgmime-2.0.so
lib/libgmime-2.0.so.2
lib/libgmime-2.0.so.2.2.27
libdata/pkgconfig/gmime-2.0.pc
-@dirrm include/gmime-2.0/gmime
-@dirrm include/gmime-2.0
diff --git a/mail/gmime24-sharp/pkg-plist b/mail/gmime24-sharp/pkg-plist
index 0eb106c94230..2737aaffa345 100644
--- a/mail/gmime24-sharp/pkg-plist
+++ b/mail/gmime24-sharp/pkg-plist
@@ -2,6 +2,3 @@ lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll
lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config
lib/mono/gmime-sharp-2.4/gmime-sharp.dll
libdata/pkgconfig/gmime-sharp-2.4.pc
-@dirrm lib/mono/gmime-sharp-2.4
-@dirrmtry lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4
-@dirrmtry lib/mono/gac/gmime-sharp
diff --git a/mail/gmime24/pkg-plist b/mail/gmime24/pkg-plist
index e16192231303..05f86e22c4e1 100644
--- a/mail/gmime24/pkg-plist
+++ b/mail/gmime24/pkg-plist
@@ -52,5 +52,3 @@ lib/libgmime-2.4.so
lib/libgmime-2.4.so.2
lib/libgmime-2.4.so.2.4.33
libdata/pkgconfig/gmime-2.4.pc
-@dirrm include/gmime-2.4/gmime
-@dirrm include/gmime-2.4
diff --git a/mail/gmime26-sharp/pkg-plist b/mail/gmime26-sharp/pkg-plist
index f11cb6edc631..f7c0266e7ab5 100644
--- a/mail/gmime26-sharp/pkg-plist
+++ b/mail/gmime26-sharp/pkg-plist
@@ -3,7 +3,3 @@ lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config
lib/mono/gmime-sharp-2.6/gmime-sharp.dll
libdata/pkgconfig/gmime-sharp-2.6.pc
share/gapi-2.0/gmime-api.xml
-@dirrmtry share/gapi-2.0
-@dirrm lib/mono/gmime-sharp-2.6
-@dirrmtry lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4
-@dirrmtry lib/mono/gac/gmime-sharp
diff --git a/mail/gmime26/pkg-plist b/mail/gmime26/pkg-plist
index a2eee1885c74..6f2153290f08 100644
--- a/mail/gmime26/pkg-plist
+++ b/mail/gmime26/pkg-plist
@@ -56,5 +56,3 @@ lib/libgmime-2.6.so
lib/libgmime-2.6.so.0
lib/libgmime-2.6.so.0.620.0
libdata/pkgconfig/gmime-2.6.pc
-@dirrm include/gmime-2.6/gmime
-@dirrm include/gmime-2.6
diff --git a/mail/gnarwl/pkg-plist b/mail/gnarwl/pkg-plist
index 0eff4db06cb8..bb8eb4f8b430 100644
--- a/mail/gnarwl/pkg-plist
+++ b/mail/gnarwl/pkg-plist
@@ -19,9 +19,5 @@ var/lib/gnarwl/badheaders.txt.sample
var/lib/gnarwl/blacklist.txt.sample
var/lib/gnarwl/header.txt.sample
var/lib/gnarwl/footer.txt.sample
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm var/lib/gnarwl/bin
-@dirrm var/lib/gnarwl/block
-@dirrm var/lib/gnarwl
-@dirrmtry var/lib
-@dirrmtry var
+@dir var/lib/gnarwl/bin
+@dir var/lib/gnarwl/block
diff --git a/mail/gnome-gmail-notifier/pkg-plist b/mail/gnome-gmail-notifier/pkg-plist
index 2731fe909e7a..43c14bc9d079 100644
--- a/mail/gnome-gmail-notifier/pkg-plist
+++ b/mail/gnome-gmail-notifier/pkg-plist
@@ -16,6 +16,3 @@ share/gnome-control-center/default-apps/gnome-gmail-notifier.xml
%%DATADIR%%/ggn-write.svg
share/locale/es/LC_MESSAGES/gnome-gmail-notifier.mo
share/pixmaps/gnome-gmail-notifier.svg
-@dirrm %%DATADIR%%
-@dirrmtry share/gnome-control-center/default-apps
-@dirrmtry share/gnome-control-center
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index bab9a7b9d03d..cfc68a574972 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -222,64 +222,4 @@ GNUstep/Local/Library/Libraries/libGNUMail.so
GNUstep/Local/Library/Libraries/libGNUMail.so.%%MAJORVERSION%%
GNUstep/Local/Library/Libraries/libGNUMail.so.%%VERSION%%
GNUstep/Local/Tools/GNUMail
-@dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Resources
-@dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
-@dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%
-@dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions
-@dirrm GNUstep/Local/Library/Frameworks/GNUMail.framework
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Viewing.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Sending.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Import.bundle
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Fonts.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Colors.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Advanced.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs/Resources
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail/Account.prefs
-@dirrm GNUstep/Local/Library/ApplicationSupport/GNUMail
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Turkish.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Swedish.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Spanish.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Russian.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Turkish.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Swedish.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Spanish.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Russian.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/German.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/French.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/English.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Czech.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources/Arabic.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Resources
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/German.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/French.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PreferencesWindow.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/PasswordPanel.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/NewMailboxPanel.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MessageViewWindow.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MainMenu.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailboxInspectorPanel.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/MailWindow.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/FindWindow.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/EditWindow.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/ConsoleWindow.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AddressBookPanel.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj/AboutPanel.nib
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/English.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Czech.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources/Arabic.lproj
-@dirrm GNUstep/Local/Applications/GNUMail.app/Resources
-@dirrm GNUstep/Local/Applications/GNUMail.app
+@dir GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
diff --git a/mail/gubby/pkg-plist b/mail/gubby/pkg-plist
index daf0e90e4281..77a158a0cae4 100644
--- a/mail/gubby/pkg-plist
+++ b/mail/gubby/pkg-plist
@@ -1,4 +1,3 @@
bin/gubby
man/man1/gubby.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/im/pkg-plist b/mail/im/pkg-plist
index 3723073bfd0e..2dbe18816d8f 100644
--- a/mail/im/pkg-plist
+++ b/mail/im/pkg-plist
@@ -82,8 +82,3 @@ lib/IM/Util.pm
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.sbr
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.sbr.sample1
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.sbr.sample2
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/IM
-@dirrm %%ETCDIR%%
diff --git a/mail/imap-uw/pkg-plist b/mail/imap-uw/pkg-plist
index 2ba4fa247f7f..df3240c92eb4 100644
--- a/mail/imap-uw/pkg-plist
+++ b/mail/imap-uw/pkg-plist
@@ -77,6 +77,3 @@ man/man8/imapd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5161.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5162.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/draft
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/isoqlog/pkg-plist b/mail/isoqlog/pkg-plist
index 89346df1f03d..6e6e9d162ccc 100644
--- a/mail/isoqlog/pkg-plist
+++ b/mail/isoqlog/pkg-plist
@@ -53,10 +53,3 @@ etc/isoqlog.domains-dist
%%DATADIR%%/lang/spanish
%%DATADIR%%/lang/swedish
%%DATADIR%%/lang/turkish
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/htmltemp/images
-@dirrm %%DATADIR%%/htmltemp/library
-@dirrm %%DATADIR%%/htmltemp
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%
diff --git a/mail/james/pkg-plist b/mail/james/pkg-plist
index 01d4da8c3598..c044ba790581 100644
--- a/mail/james/pkg-plist
+++ b/mail/james/pkg-plist
@@ -75,13 +75,3 @@ james2.3.1/tools/lib/spice-configkit-1.1.2.jar
james2.3.1/tools/lib/spice.LICENSE
james2.3.1/tools/lib/xsdlib-20020414.jar
james2.3.1/tools/lib/xsdlib.LICENSE
-@dirrm james2.3.1/tools/lib
-@dirrm james2.3.1/tools
-@dirrm james2.3.1/logs
-@dirrm james2.3.1/lib
-@dirrm james2.3.1/ext
-@dirrm james2.3.1/conf
-@dirrm james2.3.1/bin/lib
-@dirrm james2.3.1/bin
-@dirrm james2.3.1/apps
-@dirrm james2.3.1
diff --git a/mail/jamlib/pkg-plist b/mail/jamlib/pkg-plist
index 819e702f9d74..c1caca4e7419 100644
--- a/mail/jamlib/pkg-plist
+++ b/mail/jamlib/pkg-plist
@@ -30,4 +30,3 @@ man/man3/JAM_UnlockMB.3.gz
man/man3/JAM_WriteLastRead.3.gz
man/man3/JAM_WriteMBHeader.3.gz
man/man3/jamlib.3.gz
-@dirrm include/jamlib
diff --git a/mail/junkfilter/pkg-plist b/mail/junkfilter/pkg-plist
index 32a9013cf6b5..c5402f440ae1 100644
--- a/mail/junkfilter/pkg-plist
+++ b/mail/junkfilter/pkg-plist
@@ -31,5 +31,3 @@ etc/junkfilter/junkfilter.user-default
etc/junkfilter/junkfilter.white
etc/junkfilter/procmailrc.sample
etc/junkfilter/white
-@dirrm etc/junkfilter/domains
-@dirrm etc/junkfilter
diff --git a/mail/kshowmail/pkg-plist b/mail/kshowmail/pkg-plist
index 493ad17f7efa..a07ee803898d 100644
--- a/mail/kshowmail/pkg-plist
+++ b/mail/kshowmail/pkg-plist
@@ -53,11 +53,3 @@ share/locale/es/LC_MESSAGES/kshowmail.mo
share/locale/it/LC_MESSAGES/kshowmail.mo
share/locale/nb/LC_MESSAGES/kshowmail.mo
share/locale/nl/LC_MESSAGES/kshowmail.mo
-@dirrm share/doc/HTML/nl/kshowmail
-@dirrm share/doc/HTML/it/kshowmail
-@dirrm share/doc/HTML/es/kshowmail
-@dirrm share/doc/HTML/en/kshowmail
-@dirrm share/doc/HTML/de/kshowmail
-@dirrm share/apps/kshowmail/sounds
-@dirrm share/apps/kshowmail/pics
-@dirrm share/apps/kshowmail
diff --git a/mail/lbdb/pkg-plist b/mail/lbdb/pkg-plist
index 0c7f468debcb..b8f9457129be 100644
--- a/mail/lbdb/pkg-plist
+++ b/mail/lbdb/pkg-plist
@@ -35,4 +35,3 @@ man/man1/lbdb_dotlock.1.gz
man/man1/lbdbq.1.gz
man/man1/mutt_ldap_query.1.gz
man/man1/nodelist2lbdb.1.gz
-@dirrm libexec/lbdb
diff --git a/mail/lens/pkg-plist b/mail/lens/pkg-plist
index 73db3ce95d6d..360ebe7197d2 100644
--- a/mail/lens/pkg-plist
+++ b/mail/lens/pkg-plist
@@ -4,9 +4,6 @@ bin/lens
%%RUBY_SITELIBDIR%%/lens/maildir.rb
%%RUBY_SITELIBDIR%%/lens/message.rb
%%RUBY_SITELIBDIR%%/lens/parsedate.rb
-@dirrm %%RUBY_SITELIBDIR%%/lens
%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.commandmailrc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.lensrc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/libcmime/pkg-plist b/mail/libcmime/pkg-plist
index 8d8e874d5481..476fd8d263dd 100644
--- a/mail/libcmime/pkg-plist
+++ b/mail/libcmime/pkg-plist
@@ -13,4 +13,3 @@ lib/libcmime.so
lib/libcmime.so.0.1
lib/libcmime.so.0.1.11
libdata/pkgconfig/libcmime.pc
-@dirrm include/cmime
diff --git a/mail/libdomainkeys/pkg-plist b/mail/libdomainkeys/pkg-plist
index 16a92171b35d..3f04a03d54f6 100644
--- a/mail/libdomainkeys/pkg-plist
+++ b/mail/libdomainkeys/pkg-plist
@@ -5,4 +5,3 @@ lib/libdomainkeys.so
lib/libdomainkeys.so.%%SHLIB_MAJOR%%
%%DATADIR%%/dknewkey
%%DATADIR%%/dktest
-@dirrm %%DATADIR%%
diff --git a/mail/libesmtp/pkg-plist b/mail/libesmtp/pkg-plist
index 38c1f699ef1d..b8530a7e0563 100644
--- a/mail/libesmtp/pkg-plist
+++ b/mail/libesmtp/pkg-plist
@@ -23,6 +23,3 @@ lib/libesmtp.so.6.1.6
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mail-file.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-mail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/esmtp-plugins
diff --git a/mail/libpst/pkg-plist b/mail/libpst/pkg-plist
index 1048107c96da..76960000cbf6 100644
--- a/mail/libpst/pkg-plist
+++ b/mail/libpst/pkg-plist
@@ -19,5 +19,3 @@ man/man1/pst2dii.1.gz
man/man1/pst2ldif.1.gz
man/man1/readpst.1.gz
man/man5/outlook.pst.5.gz
-@dirrm include/libpst-4/libpst
-@dirrm include/libpst-4
diff --git a/mail/libspamtest/pkg-plist b/mail/libspamtest/pkg-plist
index eeaa8271f034..650acfdf7f77 100644
--- a/mail/libspamtest/pkg-plist
+++ b/mail/libspamtest/pkg-plist
@@ -2,6 +2,3 @@ ap-mailfilter3/lib/libspamtest.a
ap-mailfilter3/lib/libspamtest_r.a
ap-mailfilter3/include/msgstore.h
ap-mailfilter3/include/spamtest.h
-@dirrmtry ap-mailfilter3/lib
-@dirrmtry ap-mailfilter3/include
-@dirrmtry ap-mailfilter3
diff --git a/mail/libspf2/pkg-plist b/mail/libspf2/pkg-plist
index b9b198941f90..32aab1167947 100644
--- a/mail/libspf2/pkg-plist
+++ b/mail/libspf2/pkg-plist
@@ -24,4 +24,3 @@ lib/libspf2.a
lib/libspf2.so
lib/libspf2.so.2
lib/libspf2.so.2.1.0
-@dirrm include/spf2
diff --git a/mail/libvmime/pkg-plist b/mail/libvmime/pkg-plist
index c3c4475f41da..1df99e3ef8c1 100644
--- a/mail/libvmime/pkg-plist
+++ b/mail/libvmime/pkg-plist
@@ -233,30 +233,3 @@ lib/libvmime.so
lib/libvmime.so.0
lib/libvmime.so.0.0.0
libdata/pkgconfig/vmime.pc
-@dirrm include/vmime/utility/sync
-@dirrm include/vmime/utility/encoder
-@dirrm include/vmime/utility
-@dirrm include/vmime/security/sasl
-@dirrm include/vmime/security/digest/sha1
-@dirrm include/vmime/security/digest/md5
-@dirrm include/vmime/security/digest
-@dirrm include/vmime/security/cert/openssl
-@dirrm include/vmime/security/cert/gnutls
-@dirrm include/vmime/security/cert
-@dirrm include/vmime/security
-@dirrm include/vmime/platforms/windows
-@dirrm include/vmime/platforms/posix
-@dirrm include/vmime/platforms
-@dirrm include/vmime/net/tls/openssl
-@dirrm include/vmime/net/tls/gnutls
-@dirrm include/vmime/net/tls
-@dirrm include/vmime/net/smtp
-@dirrm include/vmime/net/sendmail
-@dirrm include/vmime/net/pop3
-@dirrm include/vmime/net/maildir/format
-@dirrm include/vmime/net/maildir
-@dirrm include/vmime/net/imap
-@dirrm include/vmime/net
-@dirrm include/vmime/misc
-@dirrm include/vmime/mdn
-@dirrm include/vmime
diff --git a/mail/mail-notification/pkg-plist b/mail/mail-notification/pkg-plist
index 7802559c3373..7dc4013b6554 100644
--- a/mail/mail-notification/pkg-plist
+++ b/mail/mail-notification/pkg-plist
@@ -34,8 +34,3 @@ share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
share/locale/sv/LC_MESSAGES/mail-notification.mo
%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/liborg-jylefort-mail-notification.so
%%EVOLUTION%%lib/evolution/%%EVO_VERSION%%/plugins/org-jylefort-mail-notification.eplug
-@dirrm share/omf/mail-notification
-@dirrm %%DATADIR%%
-@dirrm share/gnome/help/mail-notification/C/figures
-@dirrm share/gnome/help/mail-notification/C
-@dirrm share/gnome/help/mail-notification
diff --git a/mail/mailagent/pkg-plist b/mail/mailagent/pkg-plist
index 23e44a02eedd..a55b1a4e0146 100644
--- a/mail/mailagent/pkg-plist
+++ b/mail/mailagent/pkg-plist
@@ -75,15 +75,3 @@ man/man1/package.1.gz
%%EXAMPLESDIR%%/misc/unkit/newcmd.cf
%%EXAMPLESDIR%%/misc/unkit/rules
%%EXAMPLESDIR%%/misc/unkit/unkit.pl
-@dirrm %%EXAMPLESDIR%%/agent
-@dirrm %%EXAMPLESDIR%%/misc/unkit
-@dirrm %%EXAMPLESDIR%%/misc/shell
-@dirrm %%EXAMPLESDIR%%/misc/pbounce
-@dirrm %%EXAMPLESDIR%%/misc/news
-@dirrm %%EXAMPLESDIR%%/misc/mime
-@dirrm %%EXAMPLESDIR%%/misc/getcost
-@dirrm %%EXAMPLESDIR%%/misc/fakesend
-@dirrm %%EXAMPLESDIR%%/misc
-@dirrm %%EXAMPLESDIR%%
-@dirrm lib/mailagent/help
-@dirrm lib/mailagent
diff --git a/mail/maildirsync/pkg-plist b/mail/maildirsync/pkg-plist
index 16a264a92ed2..953ca057cbf0 100644
--- a/mail/maildirsync/pkg-plist
+++ b/mail/maildirsync/pkg-plist
@@ -10,5 +10,3 @@ man/man1/maildirsync.1.gz
%%EXAMPLESDIR%%/mailbalance/mailbalance.conf
%%EXAMPLESDIR%%/mailbalance/scoop_users.pl
%%EXAMPLESDIR%%/mailbalance/todo.txt
-@dirrm %%EXAMPLESDIR%%/mailbalance
-@dirrm %%EXAMPLESDIR%%
diff --git a/mail/mailfmt/pkg-plist b/mail/mailfmt/pkg-plist
index 553bdf753773..e67e8b719bed 100644
--- a/mail/mailfmt/pkg-plist
+++ b/mail/mailfmt/pkg-plist
@@ -1,4 +1,3 @@
bin/mailfmt
man/man1/mailfmt.1.gz
%%PORTDOCS%%%%DOCSDIR%%/mailfmt-license.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/mailfront/pkg-plist b/mail/mailfront/pkg-plist
index 03dfd19ff1d6..018be8f73385 100644
--- a/mail/mailfront/pkg-plist
+++ b/mail/mailfront/pkg-plist
@@ -64,6 +64,3 @@ libexec/mailfront/protocol-smtp.so
%%PORTDOCS%%%%DOCSDIR%%/protocol-qmtp.html
%%PORTDOCS%%%%DOCSDIR%%/protocol-smtp.html
%%PORTDOCS%%%%DOCSDIR%%/std-handle.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/mailfront
-@dirrm include/mailfront
diff --git a/mail/mailgraph/pkg-plist b/mail/mailgraph/pkg-plist
index f515cf96eb71..8172ea6ba1b1 100644
--- a/mail/mailgraph/pkg-plist
+++ b/mail/mailgraph/pkg-plist
@@ -1,6 +1,3 @@
%%CGIDIR%%/mailgraph.cgi
%%WWWROOT%%/mailgraph/mailgraph.css
sbin/mailgraph.pl
-@dirrmtry %%CGIDIR%%
-@dirrmtry %%WWWROOT%%/mailgraph
-@dirrmtry %%WWWROOT%%
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 12c09edd9039..cd79979de6ad 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -551,29 +551,3 @@ sbin/MailScanner
%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/reports/sk
-@dirrm %%DATADIR%%/reports/se
-@dirrm %%DATADIR%%/reports/ro
-@dirrm %%DATADIR%%/reports/pt_br
-@dirrm %%DATADIR%%/reports/nl
-@dirrm %%DATADIR%%/reports/it
-@dirrm %%DATADIR%%/reports/hu
-@dirrm %%DATADIR%%/reports/fr
-@dirrm %%DATADIR%%/reports/es
-@dirrm %%DATADIR%%/reports/en
-@dirrm %%DATADIR%%/reports/dk
-@dirrm %%DATADIR%%/reports/de
-@dirrm %%DATADIR%%/reports/cz
-@dirrm %%DATADIR%%/reports/cy+en
-@dirrm %%DATADIR%%/reports/ca
-@dirrm %%DATADIR%%/reports
-@dirrm %%DATADIR%%
-@dirrm libexec/MailScanner
-@dirrm lib/MailScanner/MailScanner/CustomFunctions
-@dirrm lib/MailScanner/MailScanner
-@dirrm lib/MailScanner
-@dirrmtry %%ETCDIR%%/conf.d
-@dirrmtry %%ETCDIR%%/mcp
-@dirrmtry %%ETCDIR%%/rules
-@dirrmtry %%ETCDIR%%
diff --git a/mail/mailsync/pkg-plist b/mail/mailsync/pkg-plist
index 30b9a457cd5d..7cdf032d3c27 100644
--- a/mail/mailsync/pkg-plist
+++ b/mail/mailsync/pkg-plist
@@ -12,5 +12,3 @@ man/man1/mailsync.1.gz
%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart.svg
%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart2.svg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailsync
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/mailtray/pkg-plist b/mail/mailtray/pkg-plist
index 0f6c04f01ecd..9ecd0b77489d 100644
--- a/mail/mailtray/pkg-plist
+++ b/mail/mailtray/pkg-plist
@@ -5,5 +5,3 @@ man/man1/mailtray.1.gz
%%DATADIR%%/icons/disconnect.png
%%DATADIR%%/icons/newmail.png
%%DATADIR%%/icons/nomail.png
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
diff --git a/mail/mailx/pkg-plist b/mail/mailx/pkg-plist
index 173be143356c..fb30c1f430d7 100644
--- a/mail/mailx/pkg-plist
+++ b/mail/mailx/pkg-plist
@@ -1,4 +1,3 @@
bin/mailx
share/doc/mailx/mailx-memo-2.2.8R
man/man1/mailx.1.gz
-@dirrm share/doc/mailx
diff --git a/mail/mboxgrep/pkg-plist b/mail/mboxgrep/pkg-plist
index 41ffc8b82150..b1a85fcb2526 100644
--- a/mail/mboxgrep/pkg-plist
+++ b/mail/mboxgrep/pkg-plist
@@ -4,4 +4,3 @@ man/man1/mboxgrep.1.gz
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/meta1/pkg-plist b/mail/meta1/pkg-plist
index d71e98ca1880..9924f31de8b8 100644
--- a/mail/meta1/pkg-plist
+++ b/mail/meta1/pkg-plist
@@ -84,6 +84,4 @@ sbin/statit
sbin/t-hostname
sbin/t-getgroup
sbin/tree
-@dirrm include/sm
-@dirrm lib/meta1
@exec %D/sbin/sm.setup.sh
diff --git a/mail/metamail/pkg-plist b/mail/metamail/pkg-plist
index 77656903ce71..cc6e63d8cea0 100644
--- a/mail/metamail/pkg-plist
+++ b/mail/metamail/pkg-plist
@@ -50,5 +50,3 @@ man/man1/showpartial.1.gz
man/man1/showpicture.1.gz
man/man1/splitmail.1.gz
man/man4/mailcap.4.gz
-%%X11%%@dirrmtry lib/metamail/fonts
-%%X11%%@dirrmtry lib/metamail
diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist
index dfbfafe528dc..0652d954fa87 100644
--- a/mail/mew/pkg-plist
+++ b/mail/mew/pkg-plist
@@ -203,6 +203,3 @@ man/man1/smew.1.gz
%%EMACS_SITE_LISPDIR%%/mew/mew-win32.elc
%%EMACS_SITE_LISPDIR%%/mew/mew.el
%%EMACS_SITE_LISPDIR%%/mew/mew.elc
-@dirrm %%EMACS_SITE_LISPDIR%%/mew/etc
-@dirrm %%EMACS_SITE_LISPDIR%%/mew
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/milter-manager/pkg-plist b/mail/milter-manager/pkg-plist
index c99a85178527..04abecca7f86 100644
--- a/mail/milter-manager/pkg-plist
+++ b/mail/milter-manager/pkg-plist
@@ -183,31 +183,3 @@ sbin/milter-manager
%%DATADIR%%/munin/plugins/milter_manager_memory
%%DATADIR%%/munin/plugins/postfix_processes
%%DATADIR%%/munin/plugins/sendmail_processes
-@dirrmtry etc/cron.d
-@dirrm %%ETCDIR%%/applicable-conditions
-@dirrm %%ETCDIR%%/defaults
-@dirrm %%ETCDIR%%/models
-@dirrmtry %%ETCDIR%%
-@dirrm include/milter-manager/libmilter/libmilter
-@dirrm include/milter-manager/libmilter
-@dirrm include/milter-manager/milter/client
-@dirrm include/milter-manager/milter/core
-@dirrm include/milter-manager/milter/manager
-@dirrm include/milter-manager/milter/server
-@dirrm include/milter-manager/milter
-@dirrm include/milter-manager
-@dirrm lib/milter-manager/binding/ext
-@dirrm lib/milter-manager/binding/lib/milter/client
-@dirrm lib/milter-manager/binding/lib/milter/core
-@dirrm lib/milter-manager/binding/lib/milter/manager
-@dirrm lib/milter-manager/binding/lib/milter/server
-@dirrm lib/milter-manager/binding/lib/milter
-@dirrm lib/milter-manager/binding/lib
-@dirrm lib/milter-manager/binding
-@dirrm lib/milter-manager/module/configuration
-@dirrm lib/milter-manager/module
-@dirrm lib/milter-manager
-@dirrm %%DATADIR%%/license
-@dirrm %%DATADIR%%/munin/plugins
-@dirrm %%DATADIR%%/munin
-@dirrm %%DATADIR%%
diff --git a/mail/minimalist/pkg-plist b/mail/minimalist/pkg-plist
index e16d27d8d0a6..7013c550aa85 100644
--- a/mail/minimalist/pkg-plist
+++ b/mail/minimalist/pkg-plist
@@ -11,6 +11,3 @@ share/minimalist/sample/config
share/minimalist/sample/footer
share/minimalist/sample/info
share/minimalist/virtual-domains.txt
-@dirrm share/minimalist/FAQ
-@dirrm share/minimalist/sample
-@dirrmtry share/minimalist
diff --git a/mail/ml/pkg-plist b/mail/ml/pkg-plist
index 36ee41ecc90f..7d82a63a5a6c 100644
--- a/mail/ml/pkg-plist
+++ b/mail/ml/pkg-plist
@@ -44,4 +44,3 @@ lib/X11/ml/spellcheck.help
lib/X11/ml/takeaddr.help
lib/X11/ml/tcpport.help
lib/X11/ml/viewwin.help
-@dirrm lib/X11/ml
diff --git a/mail/mlmmj/pkg-plist b/mail/mlmmj/pkg-plist
index 8b1a85c6fda2..bd5c90189de1 100644
--- a/mail/mlmmj/pkg-plist
+++ b/mail/mlmmj/pkg-plist
@@ -371,17 +371,6 @@ bin/mlmmj-unsub
%%PHPWEB%%www/mlmmj/php-user/README
%%PHPWEB%%www/mlmmj/php-user/example.html
%%PHPWEB%%www/mlmmj/php-user/mlmmj.php
-%%PHPWEB%%@dirrm www/mlmmj/php-user
-%%PHPWEB%%@dirrm www/mlmmj/php-admin/templates
-%%PHPWEB%%@dirrm www/mlmmj/php-admin/htdocs
-%%PHPWEB%%@dirrm www/mlmmj/php-admin/conf
-%%PHPWEB%%@dirrm www/mlmmj/php-admin
-%%PERLWEB%%@dirrm www/mlmmj/perl-user
-%%PERLWEB%%@dirrm www/mlmmj/perl-admin/templates
-%%PERLWEB%%@dirrm www/mlmmj/perl-admin/htdocs
-%%PERLWEB%%@dirrm www/mlmmj/perl-admin/conf
-%%PERLWEB%%@dirrm www/mlmmj/perl-admin
-%%WEB%%@dirrm www/mlmmj
man/man1/mlmmj-bounce.1.gz
man/man1/mlmmj-list.1.gz
man/man1/mlmmj-maintd.1.gz
@@ -391,15 +380,3 @@ man/man1/mlmmj-recieve.1.gz
man/man1/mlmmj-send.1.gz
man/man1/mlmmj-sub.1.gz
man/man1/mlmmj-unsub.1.gz
-@dirrm %%DATADIR%%/text.skel/cz
-@dirrm %%DATADIR%%/text.skel/da
-@dirrm %%DATADIR%%/text.skel/de
-@dirrm %%DATADIR%%/text.skel/en
-@dirrm %%DATADIR%%/text.skel/es
-@dirrm %%DATADIR%%/text.skel/fr
-@dirrm %%DATADIR%%/text.skel/it
-@dirrm %%DATADIR%%/text.skel/nl
-@dirrm %%DATADIR%%/text.skel/ru
-@dirrm %%DATADIR%%/text.skel/tr
-@dirrm %%DATADIR%%/text.skel
-@dirrm %%DATADIR%%
diff --git a/mail/msmtp/pkg-plist b/mail/msmtp/pkg-plist
index 34483b11efd0..98c3410eab29 100644
--- a/mail/msmtp/pkg-plist
+++ b/mail/msmtp/pkg-plist
@@ -4,4 +4,3 @@ man/man1/msmtp.1.gz
%%MSMTPQ%%bin/msmtpq
%%MSMTPQ%%%%DOCSDIR%%/README.msmtpq
%%NLS%%share/locale/de/LC_MESSAGES/msmtp.mo
-%%MSMTPQ%%@dirrm %%DOCSDIR%%
diff --git a/mail/mu/pkg-plist b/mail/mu/pkg-plist
index 108dfbc052ed..190b30c885f9 100644
--- a/mail/mu/pkg-plist
+++ b/mail/mu/pkg-plist
@@ -67,10 +67,3 @@ man/man5/mu-bookmarks.5.gz
%%GUILE%%%%DATADIR%%/scripts/msgs-per-month.scm
%%GUILE%%%%DATADIR%%/scripts/msgs-per-year.scm
%%GUILE%%%%DATADIR%%/scripts/msgs-per-year-month.scm
-%%GUILE%%@dirrm %%DATADIR%%/scripts
-%%GUILE%%@dirrm %%DATADIR%%
-%%GUILE%%@dirrm share/guile/site/2.0/mu
-%%GUILE%%@dirrmtry share/guile/site/2.0
-%%GUILE%%@dirrmtry share/guile/site
-%%GUILE%%@dirrmtry share/guile
-%%MU4E%%@dirrm %%EMACS_SITE_LISPDIR%%/mu4e
diff --git a/mail/mulberry/pkg-plist b/mail/mulberry/pkg-plist
index 2a1107687a1c..2633726fa6f3 100644
--- a/mail/mulberry/pkg-plist
+++ b/mail/mulberry/pkg-plist
@@ -33,7 +33,6 @@ lib/%%PORTNAME%%/Resources/UI.xml
%%PORTDOCS%%%%DOCSDIR%%/CHANGES-DEV-v4
%%PORTDOCS%%%%DOCSDIR%%/CHANGES-v4
%%PORTDOCS%%%%DOCSDIR%%/Mulberry_License
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@unexec if cmp -s %D/etc/mailcap %D/%%EXAMPLESDIR%%/mailcap; then rm -f %D/etc/mailcap; fi
%%EXAMPLESDIR%%/mailcap
@exec [ -f %D/etc/mailcap ] || cp %D/%%EXAMPLESDIR%%/mailcap %D/etc/mailcap
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index ee3ee62d7597..b08d46b04bac 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -83,7 +83,3 @@ man/man5/muttrc.5.gz
%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/iconv
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/noattach/pkg-plist b/mail/noattach/pkg-plist
index f3047b618dda..a49649ea34cf 100644
--- a/mail/noattach/pkg-plist
+++ b/mail/noattach/pkg-plist
@@ -8,8 +8,6 @@ man/man8/noattach.8.gz
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/noattach.patterns
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/noattach.patterns.johncon
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/nohtml/pkg-plist b/mail/nohtml/pkg-plist
index 254337a352ce..11c631f19d8a 100644
--- a/mail/nohtml/pkg-plist
+++ b/mail/nohtml/pkg-plist
@@ -5,4 +5,3 @@ man/man1/nohtml.1.gz
%%PORTDOCS%%share/doc/nohtml/nohtml.pdf
%%PORTDOCS%%share/doc/nohtml/nohtml.ps
%%PORTDOCS%%share/doc/nohtml/nohtml.txt
-%%PORTDOCS%%@dirrm share/doc/nohtml
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index 7895869170bd..5bb38aa1590d 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -37,7 +37,3 @@ share/emacs/site-lisp/notmuch-version.el
share/emacs/site-lisp/notmuch-wash.el
share/emacs/site-lisp/notmuch.el
share/zsh/functions/Completion/Unix/_notmuch
-@dirrmtry share/zsh/functions/Completion/Unix
-@dirrmtry share/zsh/functions/Completion
-@dirrmtry share/zsh/functions
-@dirrmtry share/zsh
diff --git a/mail/offlineimap/pkg-plist b/mail/offlineimap/pkg-plist
index eab681644849..db111e6d943c 100644
--- a/mail/offlineimap/pkg-plist
+++ b/mail/offlineimap/pkg-plist
@@ -23,7 +23,6 @@ bin/offlineimap
%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.py
%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/folder/UIDMaps.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/folder
%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.py
%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/repository/__init__.pyo
@@ -42,7 +41,6 @@ bin/offlineimap
%%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.py
%%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/repository/Maildir.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/repository
%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.py
%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/ui/__init__.pyo
@@ -64,7 +62,6 @@ bin/offlineimap
%%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.py
%%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/ui/debuglock.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/ui
%%PYTHON_SITELIBDIR%%/offlineimap/utils/__init__.py
%%PYTHON_SITELIBDIR%%/offlineimap/utils/__init__.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/utils/__init__.pyo
@@ -74,7 +71,6 @@ bin/offlineimap
%%PYTHON_SITELIBDIR%%/offlineimap/utils/stacktrace.py
%%PYTHON_SITELIBDIR%%/offlineimap/utils/stacktrace.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/utils/stacktrace.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap/utils
%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.py
%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/CustomConfig.pyo
@@ -120,4 +116,3 @@ bin/offlineimap
%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.py
%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyc
%%PYTHON_SITELIBDIR%%/offlineimap/threadutil.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/offlineimap
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index 3a9d15052d48..e50803e150e9 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -78,10 +78,3 @@ sbin/opendkim-genzone
sbin/opendkim-testadsp
sbin/opendkim-testkey
sbin/opendkim-testmsg
-%%VBR%%@dirrm include/vbr
-%%REPUTATION%%@dirrm include/ut
-%%REPUTATION%%@dirrm include/repute
-%%REPRRD%%@dirrm include/reprrd
-%%RBL%%@dirrm include/rbl
-@dirrm include/opendkim
-@dirrmtry etc/mail
diff --git a/mail/opendmarc/pkg-plist b/mail/opendmarc/pkg-plist
index fa932fea6f93..3793a37de4f9 100644
--- a/mail/opendmarc/pkg-plist
+++ b/mail/opendmarc/pkg-plist
@@ -19,5 +19,3 @@ sbin/opendmarc-import
sbin/opendmarc-importstats
sbin/opendmarc-params
sbin/opendmarc-reports
-@dirrm include/opendmarc
-@dirrmtry etc/mail
diff --git a/mail/opensmtpd-devel/pkg-plist b/mail/opensmtpd-devel/pkg-plist
index 512938b25c03..7d216935fea4 100644
--- a/mail/opensmtpd-devel/pkg-plist
+++ b/mail/opensmtpd-devel/pkg-plist
@@ -29,5 +29,3 @@ man/man5/table.5.gz
man/man5/smtpd.conf.5.gz
man/man5/forward.5.gz
man/man5/aliases.5.gz
-@dirrm libexec/opensmtpd
-@dirrmtry etc/mail
diff --git a/mail/osbf-lua/pkg-plist b/mail/osbf-lua/pkg-plist
index 5647facf26b4..21975812b4c9 100644
--- a/mail/osbf-lua/pkg-plist
+++ b/mail/osbf-lua/pkg-plist
@@ -12,7 +12,5 @@
%%SPAMFILTER%%osbf-lua/spamfilter_config.lua
%%SPAMFILTER%%osbf-lua/toer.lua
%%SPAMFILTER%%osbf-lua/train.sample
-%%SPAMFILTER%%@dirrmtry osbf-lua
lib/lua51/osbf.so
lib/lua51/libosbf.so.2.0.4
-@dirrmtry lib/lua51
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index 92faf28efc16..59f882ea511e 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -86,13 +86,3 @@ GNUstep/Local/Library/Headers/Pantomime
GNUstep/Local/Library/Libraries/libPantomime.so
GNUstep/Local/Library/Libraries/libPantomime.so.%%LIBVERSION%%
GNUstep/Local/Library/Libraries/libPantomime.so.%%VERSION%%
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/Resources/German.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/Resources/English.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/Resources
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions
-@dirrm GNUstep/Local/Library/Frameworks/Pantomime.framework
diff --git a/mail/perdition/pkg-plist b/mail/perdition/pkg-plist
index 82ec8459700f..65c2b0a7e0a8 100644
--- a/mail/perdition/pkg-plist
+++ b/mail/perdition/pkg-plist
@@ -71,6 +71,3 @@ sbin/perdition.imap4s
sbin/perdition.imaps
sbin/perdition.managesieve
%%PORTDOCS%%%%DOCSDIR%%/perdition-pam.sample
-@dirrmtry etc/perdition
-%%LDAP%%@dirrmtry etc/openldap/schema
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/phpmailer/pkg-plist b/mail/phpmailer/pkg-plist
index 753c720da00e..d3554c930255 100644
--- a/mail/phpmailer/pkg-plist
+++ b/mail/phpmailer/pkg-plist
@@ -93,12 +93,3 @@
%%DATADIR%%/test/runfakepopserver.sh
%%DATADIR%%/test/test_callback.php
%%DATADIR%%/test/testbootstrap-dist.php
-@dirrm %%DATADIR%%/test
-@dirrm %%DATADIR%%/language
-@dirrm %%DATADIR%%/extras
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/styles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scripts
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/phpmailer2/pkg-plist b/mail/phpmailer2/pkg-plist
index 02df3a21c67b..dd75063ace2d 100644
--- a/mail/phpmailer2/pkg-plist
+++ b/mail/phpmailer2/pkg-plist
@@ -65,12 +65,3 @@
%%DATADIR%%/test/phpmailer_test.php
%%DATADIR%%/test/phpunit.php
%%DATADIR%%/test/test.png
-@dirrm %%DATADIR%%/test
-@dirrm %%DATADIR%%/language
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/media
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/PHPMailer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/__filesource
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/pop3gwd/pkg-plist b/mail/pop3gwd/pkg-plist
index 6bbf1e1f1644..e78067cd44d6 100644
--- a/mail/pop3gwd/pkg-plist
+++ b/mail/pop3gwd/pkg-plist
@@ -2,4 +2,3 @@ libexec/pop3gwd
share/doc/pop3gwd-1.2/COPYING
share/doc/pop3gwd-1.2/HISTORY
share/doc/pop3gwd-1.2/README
-@dirrm share/doc/pop3gwd-1.2
diff --git a/mail/pop3lite/pkg-plist b/mail/pop3lite/pkg-plist
index f62cf77ad93e..48278ba18f1d 100644
--- a/mail/pop3lite/pkg-plist
+++ b/mail/pop3lite/pkg-plist
@@ -43,7 +43,3 @@ share/doc/pop3lite/modules/USERCONF
share/doc/pop3lite/modules/VHOST
man/man5/pop3lite.conf.5.gz
man/man8/pop3lite.8.gz
-@dirrm include/pop3lite
-@dirrm lib/pop3lite
-@dirrm share/doc/pop3lite/modules
-@dirrm share/doc/pop3lite
diff --git a/mail/popa3d/pkg-plist b/mail/popa3d/pkg-plist
index c6e422ab2d8b..8a2c3ec1bce5 100644
--- a/mail/popa3d/pkg-plist
+++ b/mail/popa3d/pkg-plist
@@ -3,4 +3,3 @@ man/man8/popa3d.8.gz
%%PORTDOCS%%%%DOCSDIR%%/DESIGN
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%SMTP_AFTER_POP3%%%%PORTDOCS%%%%DOCSDIR%%/POPAUTH
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/popfile/pkg-plist b/mail/popfile/pkg-plist
index 532353f55492..abe1eb55bd3f 100644
--- a/mail/popfile/pkg-plist
+++ b/mail/popfile/pkg-plist
@@ -177,38 +177,3 @@ sbin/popfile.sh
%%DATADIR%%/stopwords
%%DATADIR%%/v%%VERSION%%.change
%%DATADIR%%/v%%VERSION%%.change.nihongo
-@dirrm %%DATADIR%%/skins/windows
-@dirrm %%DATADIR%%/skins/white
-@dirrm %%DATADIR%%/skins/tinygrey
-@dirrm %%DATADIR%%/skins/strawberryrose
-@dirrm %%DATADIR%%/skins/smallgrey
-@dirrm %%DATADIR%%/skins/smalldefault
-@dirrm %%DATADIR%%/skins/sleet-rtl
-@dirrm %%DATADIR%%/skins/sleet
-@dirrm %%DATADIR%%/skins/simplyblue
-@dirrm %%DATADIR%%/skins/outlook
-@dirrm %%DATADIR%%/skins/osx
-@dirrm %%DATADIR%%/skins/orangecream
-@dirrm %%DATADIR%%/skins/orange
-@dirrm %%DATADIR%%/skins/oceanblue
-@dirrm %%DATADIR%%/skins/ocean
-@dirrm %%DATADIR%%/skins/lavish
-@dirrm %%DATADIR%%/skins/green
-@dirrm %%DATADIR%%/skins/glassblue
-@dirrm %%DATADIR%%/skins/default
-@dirrm %%DATADIR%%/skins/coolyellow
-@dirrm %%DATADIR%%/skins/coolorange
-@dirrm %%DATADIR%%/skins/coolmint
-@dirrm %%DATADIR%%/skins/coolgreen
-@dirrm %%DATADIR%%/skins/coolbrown
-@dirrm %%DATADIR%%/skins/coolblue
-@dirrm %%DATADIR%%/skins/blue
-@dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%/languages
-@dirrm %%DATADIR%%/UI
-@dirrm %%DATADIR%%/Services/IMAP
-@dirrm %%DATADIR%%/Services
-@dirrm %%DATADIR%%/Proxy
-@dirrm %%DATADIR%%/POPFile
-@dirrm %%DATADIR%%/Classifier
-@dirrm %%DATADIR%%
diff --git a/mail/popular/pkg-plist b/mail/popular/pkg-plist
index f046d8795209..e848e802828e 100644
--- a/mail/popular/pkg-plist
+++ b/mail/popular/pkg-plist
@@ -46,6 +46,3 @@ sbin/pcheckd
sbin/pproxy
sbin/pserv
sbin/ringd
-@dirrm include/popular
-@dirrm lib/popular
-@dirrmtry etc/popular
diff --git a/mail/postfix-logwatch/pkg-plist b/mail/postfix-logwatch/pkg-plist
index f38f32701481..60fba6cca7d2 100644
--- a/mail/postfix-logwatch/pkg-plist
+++ b/mail/postfix-logwatch/pkg-plist
@@ -1,4 +1,3 @@
@sample %%ETCDIR%%/postfix-logwatch.conf.sample
-@dirrmtry %%ETCDIR%%
bin/postfix-logwatch
man/man1/postfix-logwatch.1.gz
diff --git a/mail/postfix-policyd-spf-python/pkg-plist b/mail/postfix-policyd-spf-python/pkg-plist
index d6f2cd881cb1..3b758a88ee44 100644
--- a/mail/postfix-policyd-spf-python/pkg-plist
+++ b/mail/postfix-policyd-spf-python/pkg-plist
@@ -11,4 +11,3 @@ man/man5/policyd-spf.peruser.5.gz
%%PYTHON_SITELIBDIR%%/policydspfuser.py
%%PYTHON_SITELIBDIR%%/policydspfuser.pyo
%%PYTHON_SITELIBDIR%%/policydspfuser.pyc
-@dirrmtry %%ETCDIR%%
diff --git a/mail/postfix-postfwd/pkg-plist b/mail/postfix-postfwd/pkg-plist
index 0034b46d586f..1fc56a64777e 100644
--- a/mail/postfix-postfwd/pkg-plist
+++ b/mail/postfix-postfwd/pkg-plist
@@ -19,6 +19,4 @@ man/man8/postfwd2.8.gz
%%PORTDOCS%%%%DOCSDIR%%/versions.html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postfwd.plugins.sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/request.sample
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/mail/postfixadmin/pkg-plist b/mail/postfixadmin/pkg-plist
index b3f92ba36385..1b4cf12a50c1 100644
--- a/mail/postfixadmin/pkg-plist
+++ b/mail/postfixadmin/pkg-plist
@@ -182,17 +182,3 @@ www/postfixadmin/xmlrpc.php
%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-user-change-forward.jpg
%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-user-overview.jpg
%%PORTDOCS%%%%DOCSDIR%%/screenshots/postfixadmin-user-vacation.jpg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/screenshots
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm www/postfixadmin/ADDITIONS/cyrus
-@dirrm www/postfixadmin/ADDITIONS
-@dirrm www/postfixadmin/VIRTUAL_VACATION/tests
-@dirrm www/postfixadmin/VIRTUAL_VACATION
-@dirrm www/postfixadmin/admin
-@dirrm www/postfixadmin/css
-@dirrm www/postfixadmin/images
-@dirrm www/postfixadmin/languages
-@dirrm www/postfixadmin/model/
-@dirrm www/postfixadmin/templates
-@dirrm www/postfixadmin/users
-@dirrm www/postfixadmin
diff --git a/mail/prom-wl/pkg-plist b/mail/prom-wl/pkg-plist
index 82f06f60ac48..66522f33e2ff 100644
--- a/mail/prom-wl/pkg-plist
+++ b/mail/prom-wl/pkg-plist
@@ -6,10 +6,3 @@ lib/xemacs/site-packages/pkginfo/MANIFEST.prom-wl
%%PORTDOCS%%%%DOCSDIR%%/byte-compile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.emacs
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.procmailrc
-@dirrm lib/xemacs/site-packages/lisp/prom-wl
-@dirrmtry lib/xemacs/site-packages/lisp
-@dirrmtry lib/xemacs/site-packages/pkginfo
-@dirrmtry lib/xemacs/site-packages
-@dirrmtry lib/xemacs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/pronto/pkg-plist b/mail/pronto/pkg-plist
index c5f59204e953..a21d22d01b6c 100644
--- a/mail/pronto/pkg-plist
+++ b/mail/pronto/pkg-plist
@@ -165,16 +165,4 @@ lib/pronto/pixmaps/pro/vfolder.xpm
lib/pronto/pixmaps/splash.xpm
lib/pronto/pronto.gtkrc
lib/pronto/prontolib.pl
-@dirrm lib/pronto/pixmaps/pro
-@dirrm lib/pronto/pixmaps/penguin
-@dirrm lib/pronto/pixmaps/neon
-@dirrm lib/pronto/pixmaps/aqua
-@dirrm lib/pronto/pixmaps
-@dirrm lib/pronto/migration-scripts
-@dirrm lib/pronto/docs/images
-@dirrm lib/pronto/docs
-@dirrm lib/pronto/Prontocrypt
-@dirrm lib/pronto/Pronto/Data
-@dirrm lib/pronto/Pronto/Crypt
-@dirrm lib/pronto/Pronto
-@dirrm lib/pronto
+@dir lib/pronto/Prontocrypt
diff --git a/mail/py-apolicy/pkg-plist b/mail/py-apolicy/pkg-plist
index c39f9ffc3758..450bf8e7bdab 100644
--- a/mail/py-apolicy/pkg-plist
+++ b/mail/py-apolicy/pkg-plist
@@ -13,7 +13,5 @@
%%PYTHON_SITELIBDIR%%/apolicy/server.py
%%PYTHON_SITELIBDIR%%/apolicy/server.pyc
%%PYTHON_SITELIBDIR%%/apolicy/server.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/apolicy
etc/apolicy/main.conf
etc/apolicy/policy.conf
-@dirrmtry etc/apolicy
diff --git a/mail/py-ppolicy/pkg-plist b/mail/py-ppolicy/pkg-plist
index 4ec5b3e92825..300403b1d13e 100644
--- a/mail/py-ppolicy/pkg-plist
+++ b/mail/py-ppolicy/pkg-plist
@@ -4,6 +4,5 @@
%%PORTDOCS%%%%DOCSDIR%%/ppolicy.sql
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/TESTS
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
sbin/ppolicy.tap
etc/ppolicy.conf
diff --git a/mail/pymsgauth/pkg-plist b/mail/pymsgauth/pkg-plist
index 03c52937e725..9f4cf571c066 100644
--- a/mail/pymsgauth/pkg-plist
+++ b/mail/pymsgauth/pkg-plist
@@ -10,7 +10,4 @@ bin/pymsgauth-mail
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/pymsgauth.html
%%PORTDOCS%%%%DOCSDIR%%/pymsgauth.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pymsgauthrc-example
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%
diff --git a/mail/pysieved/pkg-plist b/mail/pysieved/pkg-plist
index fdf00ba8ef7c..077fd0c8a1f4 100644
--- a/mail/pysieved/pkg-plist
+++ b/mail/pysieved/pkg-plist
@@ -27,5 +27,3 @@ lib/pysieved/plugins/virtual.py
lib/pysieved/plugins/virtual.pyc
lib/pysieved/pysieved.py
lib/pysieved/pysieved.pyc
-@dirrm lib/pysieved/plugins
-@dirrm lib/pysieved
diff --git a/mail/qconfirm/pkg-plist b/mail/qconfirm/pkg-plist
index f0b10673a5dc..91816ff09444 100644
--- a/mail/qconfirm/pkg-plist
+++ b/mail/qconfirm/pkg-plist
@@ -44,4 +44,3 @@ man/man1/qconfirm-return.1.gz
%%PORTDOCS%%%%DOCSDIR%%/technical.html
%%PORTDOCS%%%%DOCSDIR%%/upgrade.html
%%PORTDOCS%%%%DOCSDIR%%/usedietlibc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/qmqtool/pkg-plist b/mail/qmqtool/pkg-plist
index ee3195208385..6b7c593f32b8 100644
--- a/mail/qmqtool/pkg-plist
+++ b/mail/qmqtool/pkg-plist
@@ -3,4 +3,3 @@ bin/qmqtool
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/qsheff/pkg-plist b/mail/qsheff/pkg-plist
index dadbacf9e71d..997e45e1d79d 100644
--- a/mail/qsheff/pkg-plist
+++ b/mail/qsheff/pkg-plist
@@ -29,11 +29,6 @@ bin/qsheff
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/qq-patch.diff
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/qq-custom-error-patch.diff
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/qsheff-patch.diff
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%ETCDIR%%
@unexec echo ""
@unexec echo "Type '%%PREFIX%%/etc/uninstall-wrapper.sh' to uninstall qSheff completely."
@unexec echo ""
diff --git a/mail/rblcheck/pkg-plist b/mail/rblcheck/pkg-plist
index de1490bfb11f..bc4e78b6d9c4 100644
--- a/mail/rblcheck/pkg-plist
+++ b/mail/rblcheck/pkg-plist
@@ -7,4 +7,3 @@ etc/rblcheckrc.sample
%%PORTDOCS%%share/doc/rblcheck/INSTALL
%%PORTDOCS%%share/doc/rblcheck/NEWS
%%PORTDOCS%%share/doc/rblcheck/README
-%%PORTDOCS%%@dirrm share/doc/rblcheck
diff --git a/mail/ruby-rfilter/pkg-plist b/mail/ruby-rfilter/pkg-plist
index af59e22f194c..68ffc89950c4 100644
--- a/mail/ruby-rfilter/pkg-plist
+++ b/mail/ruby-rfilter/pkg-plist
@@ -7,7 +7,6 @@ bin/rsendmail.rb
%%RUBY_SITELIBDIR%%/rfilter/keyed_mailbox.rb
%%RUBY_SITELIBDIR%%/rfilter/mta.rb
%%RUBY_SITELIBDIR%%/rfilter/tagged.rb
-@dirrm %%RUBY_SITELIBDIR%%/rfilter
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/THANKS
@@ -100,27 +99,3 @@ bin/rsendmail.rb
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/lib/rfilter
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/lib
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/bin/rsendmail_rb.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/bin/experimental-filter_rb.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/bin/experimental-deliver_rb.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/bin
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/KeyedMailbox.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent/LoggingError.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent/DeliverySuccess.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent/DeliveryReject.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent/DeliveryDefer.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent/DeliveryComplete.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent/DeliveryCommandFailure.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/DeliveryAgent
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/Deliver.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/Deliver
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter/AddressTagger.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RFilter
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Deliver.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/mail/ruby-rmail/pkg-plist b/mail/ruby-rmail/pkg-plist
index 35a9eb758679..bc654260d5e6 100644
--- a/mail/ruby-rmail/pkg-plist
+++ b/mail/ruby-rmail/pkg-plist
@@ -9,9 +9,6 @@
%%RUBY_SITELIBDIR%%/rmail/parser/pushbackreader.rb
%%RUBY_SITELIBDIR%%/rmail/serialize.rb
%%RUBY_SITELIBDIR%%/rmail/utils.rb
-@dirrm %%RUBY_SITELIBDIR%%/rmail/parser
-@dirrm %%RUBY_SITELIBDIR%%/rmail/mailbox
-@dirrm %%RUBY_SITELIBDIR%%/rmail
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NOTES
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
@@ -174,28 +171,3 @@
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/lib/rmail/parser
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/lib/rmail/mailbox
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/lib/rmail
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/lib
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/guide
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Utils.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/StreamParser.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/StreamHandler.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Serialize.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Parser
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Message.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Mailbox/MBoxReader.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Mailbox.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Mailbox
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Header.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/Parser.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Address/List.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Address.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail/Address
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/RMail
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/mail/sgwi/pkg-plist b/mail/sgwi/pkg-plist
index 7d56bcf0d7b4..208099623bf8 100644
--- a/mail/sgwi/pkg-plist
+++ b/mail/sgwi/pkg-plist
@@ -20,5 +20,3 @@ www/sgwi/license.txt
www/sgwi/main.css
www/sgwi/opt_in_out.php
www/sgwi/readme.txt
-@dirrm www/sgwi/includes
-@dirrm www/sgwi
diff --git a/mail/sma/pkg-plist b/mail/sma/pkg-plist
index 725e1d3643dd..409ddd199f86 100644
--- a/mail/sma/pkg-plist
+++ b/mail/sma/pkg-plist
@@ -5,6 +5,4 @@ man/man8/sma.8.gz
%%PORTDOCS%%%%DOCSDIR%%/HISTORY
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sma.conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/smtprc/pkg-plist b/mail/smtprc/pkg-plist
index f60142b77e56..8f90920d7bea 100644
--- a/mail/smtprc/pkg-plist
+++ b/mail/smtprc/pkg-plist
@@ -6,5 +6,3 @@ man/man1/smtprc.1.gz
%%WITHGUI%%man/man1/gsmtprc.1.gz
%%WITHGUI%%bin/gsmtprc
%%PORTDOCS%%share/doc/smtprc/README
-%%PORTDOCS%%@dirrm share/doc/smtprc
-@dirrm etc/smtprc
diff --git a/mail/spamass-ixhash/pkg-plist b/mail/spamass-ixhash/pkg-plist
index 03beaeaad813..8bc02a0292b8 100644
--- a/mail/spamass-ixhash/pkg-plist
+++ b/mail/spamass-ixhash/pkg-plist
@@ -5,4 +5,3 @@ etc/mail/spamassassin/iXhash.pm
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/WHERE_ARE_THE_OTHER_FILES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/spamdb-curses/pkg-plist b/mail/spamdb-curses/pkg-plist
index d1ede81f9e6e..10afaae3314e 100644
--- a/mail/spamdb-curses/pkg-plist
+++ b/mail/spamdb-curses/pkg-plist
@@ -5,4 +5,3 @@ bin/spamdb-curses
%%PYTHON_SITELIBDIR%%/spamdbcurses/__init__.pyc
%%PYTHON_SITELIBDIR%%/spamdbcurses/OrderedDict.pyo
%%PYTHON_SITELIBDIR%%/spamdbcurses/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/spamdbcurses
diff --git a/mail/spamguard/pkg-plist b/mail/spamguard/pkg-plist
index 5d41d32e57c8..2dc151b42e1b 100644
--- a/mail/spamguard/pkg-plist
+++ b/mail/spamguard/pkg-plist
@@ -28,6 +28,3 @@ etc/spamguard/spamguard.conf.sample
%%PORTDOCS%%%%DOCSDIR%%/tr/KURULUM-SONRASI
%%PORTDOCS%%%%DOCSDIR%%/tr/YAPILACAKLAR
%%PORTDOCS%%%%DOCSDIR%%/tr/YAZARLAR
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/spamguard
diff --git a/mail/spmfilter-clamav/pkg-plist b/mail/spmfilter-clamav/pkg-plist
index 8b4ba67b33f8..1c9bdd46df95 100644
--- a/mail/spmfilter-clamav/pkg-plist
+++ b/mail/spmfilter-clamav/pkg-plist
@@ -2,5 +2,4 @@ lib/spmfilter/libclamav.so
lib/spmfilter/libclamav.so.0.2
lib/spmfilter/libclamav.so.0.2.3
man/man1/spmfilter-clamav.1.gz
-@dirrmtry lib/spmfilter
diff --git a/mail/sqlgrey/pkg-plist b/mail/sqlgrey/pkg-plist
index 47b6844d2be9..b21253341c88 100644
--- a/mail/sqlgrey/pkg-plist
+++ b/mail/sqlgrey/pkg-plist
@@ -7,7 +7,6 @@ bin/sqlgrey-logstats.pl
man/man1/sqlgrey.1.gz
sbin/sqlgrey
sbin/update_sqlgrey_config
-@dirrmtry %%ETCDIR%%
@unexec echo "---> Please, remember to remove the database directory:"
@unexec echo " %%DATADIR%%"
@unexec echo " If you're only updating, you can leave the things as they are."
diff --git a/mail/svnmailer/pkg-plist b/mail/svnmailer/pkg-plist
index 293adc5980aa..23b4e409c81c 100644
--- a/mail/svnmailer/pkg-plist
+++ b/mail/svnmailer/pkg-plist
@@ -105,7 +105,3 @@ bin/svn-mailer
%%PYTHON_SITELIBDIR%%/svnmailer/util.pyc
%%PYTHON_SITELIBDIR%%/svnmailer/util.pyo
man/man1/svn-mailer.1.gz
-@dirrm %%PYTHON_SITELIBDIR%%/svnmailer/browser
-@dirrm %%PYTHON_SITELIBDIR%%/svnmailer/notifier
-@dirrm %%PYTHON_SITELIBDIR%%/svnmailer/settings
-@dirrm %%PYTHON_SITELIBDIR%%/svnmailer
diff --git a/mail/tkrat2/pkg-plist b/mail/tkrat2/pkg-plist
index cfbcd8cf7166..8227cc3efe57 100644
--- a/mail/tkrat2/pkg-plist
+++ b/mail/tkrat2/pkg-plist
@@ -86,8 +86,3 @@ lib/tkrat/ratatosk2.1.so
%%DATADIR%%/watcher.tcl
%%DATADIR%%/winctl.tcl
man/man1/tkrat.1.gz
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/util
-@dirrm %%DATADIR%%
-@dirrm lib/ratatosk
-@dirrm lib/tkrat
diff --git a/mail/tlb/pkg-plist b/mail/tlb/pkg-plist
index fef1c5c0af37..a4ea984b7b4b 100644
--- a/mail/tlb/pkg-plist
+++ b/mail/tlb/pkg-plist
@@ -10,4 +10,3 @@ bin/mungelist
%%PORTDOCS%%share/doc/tlb/complete.tlb
%%PORTDOCS%%share/doc/tlb/mj.tlb
%%PORTDOCS%%share/doc/tlb/simple.tlb
-%%PORTDOCS%%@dirrm share/doc/tlb
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index 7bd279f86915..be051faf525d 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -95,11 +95,6 @@ bin/tmda-sendmail
%%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/quoprimime.pyc
%%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/utils.py
%%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/utils.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email/mime
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib/email
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA/Queue
-@dirrm %%PYTHON_SITELIBDIR%%/TMDA
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/collectaddys
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/def2html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/README
@@ -123,10 +118,6 @@ bin/tmda-sendmail
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vpopmail-vdir.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vtmdarc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrapfd3.sh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda/lists
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda/filters
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%DATADIR%%/bounce_expired_dated.txt
%%DATADIR%%/bounce_fail_dated.txt
%%DATADIR%%/bounce_fail_keyword.txt
@@ -136,7 +127,6 @@ bin/tmda-sendmail
%%DATADIR%%/bounce_missing_pending.txt
%%DATADIR%%/confirm_accept.txt
%%DATADIR%%/confirm_request.txt
-@dirrm %%DATADIR%%
%%PORTDOCS%%%%DOCSDIR%%/CODENAMES
%%PORTDOCS%%%%DOCSDIR%%/CRYPTO
%%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -377,16 +367,3 @@ bin/tmda-sendmail
%%PORTDOCS%%%%DOCSDIR%%/html/TmdaI18n.html
%%PORTDOCS%%%%DOCSDIR%%/pdf/ConfigurationVariables.pdf
%%PORTDOCS%%%%DOCSDIR%%/pdf/TmdaFaq.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/WikiSandBox
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/TmdaPostfixPolicy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/TmdaFingerprint
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/TmdaFetchMailHowTo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/HelpOnTables
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/HelpOnInstalling(2f)WikiInstanceCreation
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/HelpOnInstalling(2f)BasicInstallation
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/HelpOnInstalling(2f)ApacheOnLinuxFtp
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments/HelpOnActions(2f)AttachFile
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/attachments
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/trojita/pkg-plist b/mail/trojita/pkg-plist
index 551ef64d4610..48d65625b47d 100644
--- a/mail/trojita/pkg-plist
+++ b/mail/trojita/pkg-plist
@@ -33,5 +33,3 @@ share/icons/hicolor/scalable/apps/trojita.svg
%%DATADIR%%/locale/trojita_common_x_test.qm
%%DATADIR%%/locale/trojita_common_zh_CN.qm
%%DATADIR%%/locale/trojita_common_zh_TW.qm
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%
diff --git a/mail/up-imapproxy/pkg-plist b/mail/up-imapproxy/pkg-plist
index 9018fabcf2ae..479ed7c90754 100644
--- a/mail/up-imapproxy/pkg-plist
+++ b/mail/up-imapproxy/pkg-plist
@@ -6,4 +6,3 @@ sbin/in.imapproxyd
%%PORTDOCS%%%%DOCSDIR%%/README.debian
%%PORTDOCS%%%%DOCSDIR%%/README.known_issues
%%PORTDOCS%%%%DOCSDIR%%/README.ssl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/vexim/pkg-plist b/mail/vexim/pkg-plist
index f0b37e7186c1..75e0f5660ff0 100644
--- a/mail/vexim/pkg-plist
+++ b/mail/vexim/pkg-plist
@@ -88,21 +88,3 @@ www/vexim/style.css
www/vexim/userblocksubmit.php
www/vexim/userchange.php
www/vexim/userchangesubmit.php
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/clients
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm www/vexim/locale/ro_RO/LC_MESSAGES
-@dirrm www/vexim/locale/ro_RO
-@dirrm www/vexim/locale/hu_HU/LC_MESSAGES
-@dirrm www/vexim/locale/hu_HU
-@dirrm www/vexim/locale/es_ES/LC_MESSAGES
-@dirrm www/vexim/locale/es_ES
-@dirrm www/vexim/locale/en_EN/LC_MESSAGES
-@dirrm www/vexim/locale/en_EN
-@dirrm www/vexim/locale/de_DE/LC_MESSAGES
-@dirrm www/vexim/locale/de_DE
-@dirrm www/vexim/locale
-@dirrm www/vexim/images
-@dirrm www/vexim/config
-@dirrm www/vexim
diff --git a/mail/vmailmgr/pkg-plist b/mail/vmailmgr/pkg-plist
index d66a44aba1ac..a776f567bba1 100644
--- a/mail/vmailmgr/pkg-plist
+++ b/mail/vmailmgr/pkg-plist
@@ -45,7 +45,6 @@ sbin/vmailmgrd
%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/types.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/types.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/vmailmgr/types.pyo
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/vmailmgr
man/man1/checkvpw.1.gz
man/man1/dumpvuser.1.gz
man/man1/listvdomain.1.gz
@@ -62,5 +61,3 @@ man/man1/vsetup.1.gz
man/man1/vupgrade.1.gz
man/man7/vmailmgr.7.gz
man/man8/vmailmgrd.8.gz
-@dirrmtry libexec/vmailmgr/cgi-bin
-@dirrmtry libexec/vmailmgr
diff --git a/mail/vqadmin/pkg-plist b/mail/vqadmin/pkg-plist
index 89976deb9ea1..3395435dd497 100644
--- a/mail/vqadmin/pkg-plist
+++ b/mail/vqadmin/pkg-plist
@@ -39,9 +39,3 @@ bin/vqadmin
%%CGIBINDIR%%/vqadmin/vqadmin.acl
%%CGIBINDIR%%/vqadmin/vqadmin.cgi
%%WEBDATADIR%%/images/vqadmin/vqadmin.css
-@dirrm %%CGIBINDIR%%/vqadmin/html
-@dirrm %%CGIBINDIR%%/vqadmin
-@dirrm %%WEBDATADIR%%/images/vqadmin
-@dirrm %%WEBDATADIR%%/images
-@dirrmtry %%CGIBINDIR%%
-@dirrmtry %%WEBDATADIR%%
diff --git a/mail/vqregister/pkg-plist b/mail/vqregister/pkg-plist
index c9d39e7ff087..4d15db506fdf 100644
--- a/mail/vqregister/pkg-plist
+++ b/mail/vqregister/pkg-plist
@@ -13,6 +13,3 @@
%%WWWDIR%%/vqregister.cgi
%%WWWDIR%%/vqregister.conf
%%WWWDIR%%/vqregister.email
-@dirrm %%WWWDIR%%/html
-@dirrm %%WWWDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/wanderlust-devel/pkg-plist b/mail/wanderlust-devel/pkg-plist
index f08bc11df9ad..e5c0a5f565a9 100644
--- a/mail/wanderlust-devel/pkg-plist
+++ b/mail/wanderlust-devel/pkg-plist
@@ -246,11 +246,3 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ja/dot.folders
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ja/dot.wl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ja/ja.Emacs
-@dirrm %%WL_LISPDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%WL_ICONDIR%%
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/wl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/en
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ja
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/websieve/pkg-plist b/mail/websieve/pkg-plist
index 833b5ed39592..532236b4b574 100644
--- a/mail/websieve/pkg-plist
+++ b/mail/websieve/pkg-plist
@@ -1,5 +1,3 @@
%%WWWDIR%%/websieve.pl
@sample etc/websieve/websieve.conf.sample
etc/websieve/funclib.pl
-@dirrmtry etc/websieve
-@dirrm %%WWWDIR%%
diff --git a/mail/xfaces/pkg-plist b/mail/xfaces/pkg-plist
index 69ad0fc8e5eb..f31548aab4c2 100644
--- a/mail/xfaces/pkg-plist
+++ b/mail/xfaces/pkg-plist
@@ -41,5 +41,3 @@ lib/X11/app-defaults/XFaces
%%DATADIR%%/images/www-shape.xpm
%%DATADIR%%/images/x.xpm
%%DATADIR%%/images/xconq.xpm
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%
diff --git a/mail/xfce4-mailwatch-plugin/pkg-plist b/mail/xfce4-mailwatch-plugin/pkg-plist
index fc4e6c8e2e88..1d8b2dc5f542 100644
--- a/mail/xfce4-mailwatch-plugin/pkg-plist
+++ b/mail/xfce4-mailwatch-plugin/pkg-plist
@@ -47,17 +47,3 @@ share/locale/vi/LC_MESSAGES/xfce4-mailwatch-plugin.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-mailwatch-plugin.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-mailwatch-plugin.mo
share/xfce4/panel/plugins/mailwatch.desktop
-@dirrmtry share/xfce4/panel/plugins
-@dirrmtry share/xfce4/panel
-@dirrmtry share/xfce4
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry lib/xfce4/panel/plugins
-@dirrmtry lib/xfce4/panel
-@dirrmtry lib/xfce4
diff --git a/mail/xmailbox/pkg-plist b/mail/xmailbox/pkg-plist
index 6dc441209947..b736548836fe 100644
--- a/mail/xmailbox/pkg-plist
+++ b/mail/xmailbox/pkg-plist
@@ -5,5 +5,3 @@ man/man1/xmailbox.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/dingdong.au
%%DATADIR%%/ugotmail.au
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%