Cleanup plist

42 files changed, 15 insertions, 322 deletions

diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index d55bacd223df..c7c98a332fe4 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -252,33 +252,3 @@
 %%MONOLITHIC%%share/pixmaps/amule.xpm
 %%AMULEGUI%%share/pixmaps/amulegui.xpm
 %%WXCAS%%share/pixmaps/wxcas.xpm
-%%XAS%%@dirrmtry lib/xchat/plugins
-%%XAS%%@dirrmtry lib/xchat
-@dirrmtry man/de/man1
-@dirrmtry man/de
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/hu/man1
-@dirrmtry man/hu
-@dirrmtry man/it/man1
-@dirrmtry man/it
-@dirrmtry man/ru/man1
-@dirrmtry man/ru
-@dirrmtry man/tr/man1
-@dirrmtry man/tr
-@dirrmtry man/zh_TW/man1
-@dirrmtry man/zh_TW
-@dirrmtry %%DATADIR%%/skins
-%%WEBSERVER%%@dirrmtry %%DATADIR%%/webserver/default
-%%WEBSERVER%%@dirrmtry %%DATADIR%%/webserver
-@dirrmtry %%DATADIR%%
-%%CAS%%@dirrmtry share/cas
-%%NLS%%@dirrmtry share/locale/et_EE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et_EE
-%%NLS%%@dirrmtry share/locale/it_CH/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it_CH
-%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko_KR
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/bitflu/pkg-plist b/net-p2p/bitflu/pkg-plist
index 6c0f0662e86b..3d4016133133 100644
--- a/net-p2p/bitflu/pkg-plist
+++ b/net-p2p/bitflu/pkg-plist
@@ -8,7 +8,3 @@ bin/bitflu
 %%DATADIR%%/plugins/Bitflu/30_SourcesBitTorrentKademlia.pm
 %%DATADIR%%/plugins/Bitflu/99_Cron.pm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bitflu.config
-@dirrmtry %%DATADIR%%/plugins/Bitflu
-@dirrmtry %%DATADIR%%/plugins
-@dirrmtry %%DATADIR%%
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net-p2p/bitmessage/Makefile b/net-p2p/bitmessage/Makefile
index fb3e0e55474d..86bda944dff7 100644
--- a/net-p2p/bitmessage/Makefile
+++ b/net-p2p/bitmessage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bitmessage
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	GH
 
@@ -26,7 +27,7 @@ USE_OPENSSL=	yes
 INSTALLS_ICONS=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}|' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}| ; s|share/man|man|' ${WRKSRC}/Makefile
 
 do-build:
 	@(cd ${WRKSRC} && \
diff --git a/net-p2p/bitmessage/pkg-plist b/net-p2p/bitmessage/pkg-plist
index 7c75a1ef57fe..635c420c38d1 100644
--- a/net-p2p/bitmessage/pkg-plist
+++ b/net-p2p/bitmessage/pkg-plist
@@ -1,8 +1,8 @@
 bin/pybitmessage
+man/man1/pybitmessage.1.gz
 share/applications/pybitmessage.desktop
 share/icons/hicolor/24x24/apps/pybitmessage.png
 share/icons/hicolor/scalable/apps/pybitmessage.svg
-share/man/man1/pybitmessage.1.gz
 share/pybitmessage/addresses.py
 share/pybitmessage/addresses.pyc
 share/pybitmessage/addresses.pyo
@@ -241,18 +241,3 @@ share/pybitmessage/translations/bitmessage_ru.ts
 share/pybitmessage/translations/bitmessage_zh_cn.pro
 share/pybitmessage/translations/bitmessage_zh_cn.qm
 share/pybitmessage/translations/bitmessage_zh_cn.ts
-@dir share/icons/hicolor/24x24/apps
-@dir share/icons/hicolor/24x24
-@dir share/icons/hicolor/scalable/apps
-@dir share/icons/hicolor/scalable
-@dir share/icons/hicolor
-@dir share/icons
-@dir share/man/man1
-@dir share/man
-@dir share/pybitmessage/bitmessagecurses
-@dir share/pybitmessage/bitmessageqt
-@dir share/pybitmessage/images
-@dir share/pybitmessage/pyelliptic
-@dir share/pybitmessage/socks
-@dir share/pybitmessage/translations
-@dir share/pybitmessage
diff --git a/net-p2p/bnbt/pkg-plist b/net-p2p/bnbt/pkg-plist
index 8540cf00ce69..488da65186b5 100644
--- a/net-p2p/bnbt/pkg-plist
+++ b/net-p2p/bnbt/pkg-plist
@@ -1,5 +1,4 @@
 bin/bnbt
 %%ETCDIR%%/.keep
 /var/log/bnbt/.keep
-@dirrmtry %%ETCDIR%%
-@dirrmtry /var/log/bnbt
+@dir /var/log/bnbt
diff --git a/net-p2p/btpd/pkg-plist b/net-p2p/btpd/pkg-plist
index 8c5f4f1adb63..e993bd9f6321 100644
--- a/net-p2p/btpd/pkg-plist
+++ b/net-p2p/btpd/pkg-plist
@@ -5,4 +5,3 @@ man/man1/btcli.1.gz
 man/man1/btinfo.1.gz
 man/man1/btpd.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/net-p2p/btqueue/pkg-plist b/net-p2p/btqueue/pkg-plist
index 861e52790abb..94d436c03a32 100644
--- a/net-p2p/btqueue/pkg-plist
+++ b/net-p2p/btqueue/pkg-plist
@@ -469,12 +469,3 @@ bin/btshowmetainfo.py
 %%DATADIR%%/ip2cc.db
 %%PORTDOCS%%%%DOCSDIR%%/examples/interest.xml
 %%PORTDOCS%%%%DOCSDIR%%/examples/tracker.xml
-@dirrm %%PYTHON_SITELIBDIR%%/BitCrawler
-@dirrm %%PYTHON_SITELIBDIR%%/BitQueue
-@dirrm %%PYTHON_SITELIBDIR%%/BitTornado/BT1
-@dirrm %%PYTHON_SITELIBDIR%%/BitTornado
-@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
-@dirrm %%PYTHON_SITELIBDIR%%/khashmir
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/dclib/pkg-plist b/net-p2p/dclib/pkg-plist
index b94360995e2a..0fb08e1ac96e 100644
--- a/net-p2p/dclib/pkg-plist
+++ b/net-p2p/dclib/pkg-plist
@@ -61,8 +61,5 @@ include/dclib/dcos.h
 lib/libdc.so
 lib/libdc.so.5
 lib/libdc.so.5.0.0
-@dirrmtry lib/dclib/plugin
-@dirrmtry lib/dclib
 libdata/pkgconfig/dclib.pc
-@dirrm include/dclib/core
-@dirrm include/dclib
+@dir lib/dclib/plugin
diff --git a/net-p2p/eiskaltdcpp-cli/Makefile b/net-p2p/eiskaltdcpp-cli/Makefile
index 646fea524d6b..ed5dfb87aa3d 100644
--- a/net-p2p/eiskaltdcpp-cli/Makefile
+++ b/net-p2p/eiskaltdcpp-cli/Makefile
@@ -33,8 +33,8 @@ do-install:
 		"${STAGEDIR}${PREFIX}/man/man1/"
 	@${MKDIR} "${STAGEDIR}${PREFIX}/etc/eiskaltdcpp" || true
 	@${INSTALL_DATA} "${WRKSRC}/eiskaltdcpp-cli/cli-jsonrpc-config.pl" \
-		"${STAGEDIR}${PREFIX}/etc/eiskaltdcpp/cli-jsonrpc-config.pl.dist"
+		"${STAGEDIR}${PREFIX}/etc/eiskaltdcpp/cli-jsonrpc-config.pl.sample"
 	@${INSTALL_DATA} "${WRKSRC}/eiskaltdcpp-cli/cli-xmlrpc-config.pl" \
-		"${STAGEDIR}${PREFIX}/etc/eiskaltdcpp/cli-xmlrpc-config.pl.dist"
+		"${STAGEDIR}${PREFIX}/etc/eiskaltdcpp/cli-xmlrpc-config.pl.sample"
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/eiskaltdcpp-cli/pkg-plist b/net-p2p/eiskaltdcpp-cli/pkg-plist
index ead31137934b..041527a4f3b0 100644
--- a/net-p2p/eiskaltdcpp-cli/pkg-plist
+++ b/net-p2p/eiskaltdcpp-cli/pkg-plist
@@ -1,11 +1,6 @@
 bin/eiskaltdcpp-cli-jsonrpc
 bin/eiskaltdcpp-cli-xmlrpc
+@sample etc/eiskaltdcpp/cli-jsonrpc-config.pl.sample
+@sample etc/eiskaltdcpp/cli-xmlrpc-config.pl.sample
 man/man1/eiskaltdcpp-cli-jsonrpc.1.gz
 man/man1/eiskaltdcpp-cli-xmlrpc.1.gz
-@unexec if cmp -s %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl.dist %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl; then rm -f %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl; fi
-@unexec if cmp -s %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl.dist %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl; then rm -f %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl; fi
-etc/eiskaltdcpp/cli-jsonrpc-config.pl.dist
-@exec if [ ! -f %D/etc/eiskaltdcpp/cli-jsonrpc-config.pl ] ; then cp -p %D/%F %B/cli-jsonrpc-config.pl; fi
-etc/eiskaltdcpp/cli-xmlrpc-config.pl.dist
-@exec if [ ! -f %D/etc/eiskaltdcpp/cli-xmlrpc-config.pl ] ; then cp -p %D/%F %B/cli-xmlrpc-config.pl; fi
-@dirrmtry etc/eiskaltdcpp
diff --git a/net-p2p/eiskaltdcpp-data/pkg-plist b/net-p2p/eiskaltdcpp-data/pkg-plist
index 1730170f750b..284dfb7b16d5 100644
--- a/net-p2p/eiskaltdcpp-data/pkg-plist
+++ b/net-p2p/eiskaltdcpp-data/pkg-plist
@@ -636,14 +636,3 @@ share/icons/hicolor/32x32/apps/eiskaltdcpp.png
 share/icons/hicolor/48x48/apps/eiskaltdcpp.png
 share/icons/hicolor/64x64/apps/eiskaltdcpp.png
 share/pixmaps/eiskaltdcpp.png
-%%EMOTICONS%%@dirrm %%DATADIR%%/emoticons/default
-%%EMOTICONS%%@dirrm %%DATADIR%%/emoticons/flylink
-%%EMOTICONS%%@dirrm %%DATADIR%%/emoticons/kde4
-%%EMOTICONS%%@dirrm %%DATADIR%%/emoticons/nerdcore
-%%EMOTICONS%%@dirrm %%DATADIR%%/emoticons/peerweb
-%%EMOTICONS%%@dirrm %%DATADIR%%/emoticons/radox
-%%EMOTICONS%%@dirrm %%DATADIR%%/emoticons
-%%EXAMPLES%%@dirrm %%DATADIR%%/examples
-%%LUASCRIPTS%%@dirrm %%DATADIR%%/luascripts
-%%SOUNDS%%@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%
diff --git a/net-p2p/eiskaltdcpp-gtk/pkg-plist b/net-p2p/eiskaltdcpp-gtk/pkg-plist
index af59bd686baa..0455de0a2064 100644
--- a/net-p2p/eiskaltdcpp-gtk/pkg-plist
+++ b/net-p2p/eiskaltdcpp-gtk/pkg-plist
@@ -121,24 +121,3 @@ share/locale/ru/LC_MESSAGES/eiskaltdcpp-gtk.mo
 share/locale/sk/LC_MESSAGES/eiskaltdcpp-gtk.mo
 share/locale/sr@latin/LC_MESSAGES/eiskaltdcpp-gtk.mo
 share/locale/uk/LC_MESSAGES/eiskaltdcpp-gtk.mo
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16/status
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/16x16
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/emotes
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/categories
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/status
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22/apps
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/22x22
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/128x128/apps
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor/128x128
-@dirrm share/eiskaltdcpp/gtk/icons/hicolor
-@dirrm share/eiskaltdcpp/gtk/icons
-@dirrm share/eiskaltdcpp/gtk/themes/hicolor/22x22/status
-@dirrm share/eiskaltdcpp/gtk/themes/hicolor/22x22
-@dirrm share/eiskaltdcpp/gtk/themes/hicolor/32x32/categories
-@dirrm share/eiskaltdcpp/gtk/themes/hicolor/32x32
-@dirrm share/eiskaltdcpp/gtk/themes/hicolor/16x16/status
-@dirrm share/eiskaltdcpp/gtk/themes/hicolor/16x16
-@dirrm share/eiskaltdcpp/gtk/themes/hicolor
-@dirrm share/eiskaltdcpp/gtk/themes
-@dirrm share/eiskaltdcpp/gtk/ui
-@dirrm share/eiskaltdcpp/gtk
diff --git a/net-p2p/eiskaltdcpp-lib/pkg-plist b/net-p2p/eiskaltdcpp-lib/pkg-plist
index 5f5bc55cd551..37cac99596eb 100644
--- a/net-p2p/eiskaltdcpp-lib/pkg-plist
+++ b/net-p2p/eiskaltdcpp-lib/pkg-plist
@@ -103,10 +103,6 @@ include/eiskaltdcpp/dcpp/stdinc.h
 include/eiskaltdcpp/dcpp/typedefs.h
 include/eiskaltdcpp/dcpp/version.h
 include/eiskaltdcpp/dcpp/w.h
-@dirrm include/eiskaltdcpp/dcpp
-@dirrm include/eiskaltdcpp
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
 lib/libeiskaltdcpp.so.2.2
 lib/libeiskaltdcpp.so.2
 lib/libeiskaltdcpp.so
diff --git a/net-p2p/eiskaltdcpp-qt/pkg-plist b/net-p2p/eiskaltdcpp-qt/pkg-plist
index 08b61d8f28a5..138245e09dfa 100644
--- a/net-p2p/eiskaltdcpp-qt/pkg-plist
+++ b/net-p2p/eiskaltdcpp-qt/pkg-plist
@@ -274,25 +274,3 @@ share/applications/eiskaltdcpp-qt.desktop
 %%DATADIR%%/qt/ts/sk.qm
 %%DATADIR%%/qt/ts/sr@latin.qm
 %%DATADIR%%/qt/ts/uk.qm
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/amarok_nowplay
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/clementine_nowplay
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/gnome
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/logmanager
-%%QTSCRIPT%%@dirrmtry %%DATADIR%%/qt/qtscripts/qmmp_nowplaying/qmmp_langs
-%%QTSCRIPT%%@dirrmtry %%DATADIR%%/qt/qtscripts/qmmp_nowplaying
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/tic-tac-toe/content/pics
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/tic-tac-toe/content
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/tic-tac-toe
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts/konsole
-%%QTSCRIPT%%@dirrm %%DATADIR%%/qt/qtscripts
-@dirrm %%DATADIR%%/qt/icons/appl/default
-@dirrm %%DATADIR%%/qt/icons/appl/faenza
-@dirrm %%DATADIR%%/qt/icons/appl/monochrome
-@dirrm %%DATADIR%%/qt/icons/appl
-@dirrm %%DATADIR%%/qt/icons/user/default
-@dirrm %%DATADIR%%/qt/icons/user/valknut
-@dirrm %%DATADIR%%/qt/icons/user
-@dirrm %%DATADIR%%/qt/icons
-@dirrm %%DATADIR%%/qt/ts
-@dirrm %%DATADIR%%/qt/resources
-@dirrm %%DATADIR%%/qt
diff --git a/net-p2p/gnunet-gtk/pkg-plist b/net-p2p/gnunet-gtk/pkg-plist
index 909c10e872fd..06ab7b8a7aa4 100644
--- a/net-p2p/gnunet-gtk/pkg-plist
+++ b/net-p2p/gnunet-gtk/pkg-plist
@@ -352,8 +352,3 @@ share/icons/hicolor/24x24/apps/gnunet-fs-gtk.png
 share/icons/hicolor/32x32/apps/gnunet-fs-gtk.png
 share/icons/hicolor/scalable/apps/gnunet-fs-gtk.svg
 share/icons/hicolor/scalable/status/gnunet-fs-gtk-ns-association.svg
-@dirrm %%DATADIR%%/flags
-@dirrm %%DATADIR%%/config.d
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/gnunet-gtk
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index c26f6796b672..79b274a1353c 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -445,11 +445,3 @@ man/man5/gnunet.conf.5.gz
 %%NLS%%share/locale/sv/LC_MESSAGES/gnunet.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gnunet.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnunet.mo
-@dirrm %%DATADIR%%/hellos
-@dirrm %%DATADIR%%/config.d
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/gnunet/libexec
-@dirrm lib/gnunet
-@dirrm include/gnunet
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 841a995e7a7f..3189940f8d2c 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -86,14 +86,3 @@ share/applications/gtk-gnutella.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
 share/pixmaps/gtk-gnutella.png
 share/pixmaps/gtk-gnutella.svg
-%%GUI%%@dirrmtry share/icons/hicolor/512x512/apps
-%%GUI%%@dirrmtry share/icons/hicolor/512x512
-@dirrm %%DATADIR%%/tr
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/ja
-@dirrm %%DATADIR%%/fr
-@dirrm %%DATADIR%%/en
-@dirrm %%DATADIR%%/el
-@dirrm %%DATADIR%%/%%ARCH%%-%%OPSYS%%
-@dirrm %%DATADIR%%
-@dirrmtry share/appdata
diff --git a/net-p2p/gtkhx/pkg-plist b/net-p2p/gtkhx/pkg-plist
index 94e5e6865253..83eec511f373 100644
--- a/net-p2p/gtkhx/pkg-plist
+++ b/net-p2p/gtkhx/pkg-plist
@@ -11,5 +11,3 @@ man/man1/gtkhx.1.gz
 %%DATADIR%%/sounds/part.aiff
 %%DATADIR%%/icons.rsrc
 %%NLS%%share/locale/fr/LC_MESSAGES/gtkhx.mo
-@dirrm %%DATADIR%%/sounds
-@dirrm	%%DATADIR%%
diff --git a/net-p2p/gtorrentviewer/pkg-plist b/net-p2p/gtorrentviewer/pkg-plist
index 686a2da77bad..f0e965e40988 100644
--- a/net-p2p/gtorrentviewer/pkg-plist
+++ b/net-p2p/gtorrentviewer/pkg-plist
@@ -16,5 +16,3 @@ share/GTorrentViewer/pixmaps/warning.png
 share/applications/gtorrentviewer.desktop
 share/pixmaps/gtorrentviewer.png
 share/pixmaps/gtorrentviewer.xpm
-@dirrm share/GTorrentViewer/pixmaps
-@dirrm share/GTorrentViewer
diff --git a/net-p2p/jigdo/pkg-plist b/net-p2p/jigdo/pkg-plist
index 8bbd0183bddd..7a5ebeaa49bd 100644
--- a/net-p2p/jigdo/pkg-plist
+++ b/net-p2p/jigdo/pkg-plist
@@ -15,5 +15,3 @@ share/jigdo/debian-mirrors.jigdo
 %%GUI%%share/jigdo/pixmaps/restart.png
 %%GUI%%share/jigdo/pixmaps/start.png
 %%GUI%%share/jigdo/pixmaps/stop.png
-%%GUI%%@dirrm share/jigdo/pixmaps
-@dirrm share/jigdo
diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist
index b5c5419aec95..aff3b92b41a8 100644
--- a/net-p2p/ktorrent/pkg-plist
+++ b/net-p2p/ktorrent/pkg-plist
@@ -276,27 +276,3 @@ share/locale/ug/LC_MESSAGES/ktorrent.mo
 share/locale/uk/LC_MESSAGES/ktorrent.mo
 share/locale/zh_CN/LC_MESSAGES/ktorrent.mo
 share/locale/zh_TW/LC_MESSAGES/ktorrent.mo
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrm share/doc/HTML/en/ktorrent
-@dirrm share/apps/ktorrent/www/mobile
-@dirrm share/apps/ktorrent/www/default
-@dirrm share/apps/ktorrent/www/common
-@dirrm share/apps/ktorrent/www/coldmilk
-@dirrm share/apps/ktorrent/www
-@dirrm share/apps/ktorrent/search/home
-@dirrm share/apps/ktorrent/search
-@dirrm share/apps/ktorrent/scripts/tracker_groups
-@dirrm share/apps/ktorrent/scripts/email_notifications
-@dirrm share/apps/ktorrent/scripts/auto_resume
-@dirrm share/apps/ktorrent/scripts/auto_remove
-@dirrm share/apps/ktorrent/scripts
-@dirrm share/apps/ktorrent/opensearch/thepiratebay
-@dirrm share/apps/ktorrent/opensearch/mininova
-@dirrm share/apps/ktorrent/opensearch/legittorrents
-@dirrm share/apps/ktorrent/opensearch/ktorrents
-@dirrm share/apps/ktorrent/opensearch/btjunkie
-@dirrm share/apps/ktorrent/opensearch/bittorrent
-@dirrm share/apps/ktorrent/opensearch/bitenova
-@dirrm share/apps/ktorrent/opensearch
-@dirrm share/apps/ktorrent
diff --git a/net-p2p/libbt/pkg-plist b/net-p2p/libbt/pkg-plist
index 2ed1ce96441e..a1bba9bb432e 100644
--- a/net-p2p/libbt/pkg-plist
+++ b/net-p2p/libbt/pkg-plist
@@ -15,4 +15,3 @@ include/libbt/stream.h
 include/libbt/types.h
 include/libbt/util.h
 lib/libbt.a
-@dirrm include/libbt
diff --git a/net-p2p/liberator/pkg-plist b/net-p2p/liberator/pkg-plist
index 75197217e8fb..4082e5b7d4d1 100644
--- a/net-p2p/liberator/pkg-plist
+++ b/net-p2p/liberator/pkg-plist
@@ -22,6 +22,3 @@ lib/ocaml/hlfreenet.mli
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%DATADIR%%/liber_mimetypes
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/ocaml
diff --git a/net-p2p/libktorrent/pkg-plist b/net-p2p/libktorrent/pkg-plist
index af8bb6c15830..4164c1179f72 100644
--- a/net-p2p/libktorrent/pkg-plist
+++ b/net-p2p/libktorrent/pkg-plist
@@ -243,22 +243,3 @@ share/locale/ug/LC_MESSAGES/libktorrent.mo
 share/locale/uk/LC_MESSAGES/libktorrent.mo
 share/locale/zh_CN/LC_MESSAGES/libktorrent.mo
 share/locale/zh_TW/LC_MESSAGES/libktorrent.mo
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrm include/libktorrent/utp
-@dirrm include/libktorrent/util
-@dirrm include/libktorrent/upnp
-@dirrm include/libktorrent/tracker
-@dirrm include/libktorrent/torrent
-@dirrm include/libktorrent/peer
-@dirrm include/libktorrent/net
-@dirrm include/libktorrent/mse
-@dirrm include/libktorrent/migrate
-@dirrm include/libktorrent/magnet
-@dirrm include/libktorrent/interfaces
-@dirrm include/libktorrent/download
-@dirrm include/libktorrent/diskio
-@dirrm include/libktorrent/dht
-@dirrm include/libktorrent/datachecker
-@dirrm include/libktorrent/bcodec
-@dirrm include/libktorrent
diff --git a/net-p2p/libtorrent-rasterbar/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 13844cd464fc..117923b2b1bd 100644
--- a/net-p2p/libtorrent-rasterbar/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -137,7 +137,3 @@ lib/libtorrent-rasterbar.so
 lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
 lib/libtorrent-rasterbar.so.%%SHLIB_VER%%.0.0
 libdata/pkgconfig/libtorrent-rasterbar.pc
-@dirrm include/libtorrent/aux_
-@dirrm include/libtorrent/extensions
-@dirrm include/libtorrent/kademlia
-@dirrm include/libtorrent
diff --git a/net-p2p/libtorrent/pkg-plist b/net-p2p/libtorrent/pkg-plist
index 524bbc63fb0e..2c875fb8ec6f 100644
--- a/net-p2p/libtorrent/pkg-plist
+++ b/net-p2p/libtorrent/pkg-plist
@@ -63,8 +63,3 @@ lib/libtorrent.so
 lib/libtorrent.so.18
 lib/libtorrent.so.18.0.0
 libdata/pkgconfig/libtorrent.pc
-@dirrmtry include/torrent/utils
-@dirrmtry include/torrent/peer
-@dirrmtry include/torrent/download
-@dirrmtry include/torrent/data
-@dirrmtry include/torrent
diff --git a/net-p2p/lopster/pkg-plist b/net-p2p/lopster/pkg-plist
index 91c77472208c..8265e367c956 100644
--- a/net-p2p/lopster/pkg-plist
+++ b/net-p2p/lopster/pkg-plist
@@ -41,5 +41,3 @@ bin/lopster
 %%DATADIR%%/pixmaps/transfer.xpm
 %%DATADIR%%/pixmaps/user1.xpm
 %%DATADIR%%/pixmaps/user2.xpm
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%
diff --git a/net-p2p/mldonkey/pkg-plist b/net-p2p/mldonkey/pkg-plist
index 48ed2db1463f..f294b287124b 100644
--- a/net-p2p/mldonkey/pkg-plist
+++ b/net-p2p/mldonkey/pkg-plist
@@ -6,4 +6,3 @@
 %%GUICORE%%bin/mldonkey_previewer
 %%GUICORE%%bin/mlnet+gui
 %%GUI%%bin/mlgui
-%%CORE%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net-p2p/napshare/pkg-plist b/net-p2p/napshare/pkg-plist
index bb602b5f46a3..8af0c2a40572 100644
--- a/net-p2p/napshare/pkg-plist
+++ b/net-p2p/napshare/pkg-plist
@@ -1,3 +1,2 @@
 bin/napshare
 share/napshare/NAPS-urlcache.txt
-@dirrm share/napshare
diff --git a/net-p2p/py-py2play/pkg-plist b/net-p2p/py-py2play/pkg-plist
index ff0362775353..f3f58f4543ab 100644
--- a/net-p2p/py-py2play/pkg-plist
+++ b/net-p2p/py-py2play/pkg-plist
@@ -21,6 +21,3 @@
 %%PYTHON_SITELIBDIR%%/py2play/player.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/startdemo
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/py2play
diff --git a/net-p2p/retroshare/pkg-plist b/net-p2p/retroshare/pkg-plist
index 2e16b65e360b..901862003e40 100644
--- a/net-p2p/retroshare/pkg-plist
+++ b/net-p2p/retroshare/pkg-plist
@@ -8,6 +8,3 @@ lib/retroshare/extensions/libFeedReader.so
 lib/retroshare/extensions/libFeedReader.so.1
 %%DATADIR%%/bdboot.txt
 %%DATADIR%%/retrosharelogo1.png
-@dirrm %%DATADIR%%
-@dirrm lib/retroshare/extensions
-@dirrm lib/retroshare
diff --git a/net-p2p/rtgui/pkg-plist b/net-p2p/rtgui/pkg-plist
index 2f5f5993b318..fa4c8e24e140 100644
--- a/net-p2p/rtgui/pkg-plist
+++ b/net-p2p/rtgui/pkg-plist
@@ -42,6 +42,3 @@
 %%WWWDIR%%/submodal/subModal.css
 %%WWWDIR%%/submodal/subModal.js
 %%WWWDIR%%/view.php
-@dirrm %%WWWDIR%%/submodal
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%
diff --git a/net-p2p/rtorrent/pkg-plist b/net-p2p/rtorrent/pkg-plist
index 84240a93e464..75d213b2d562 100644
--- a/net-p2p/rtorrent/pkg-plist
+++ b/net-p2p/rtorrent/pkg-plist
@@ -1,3 +1,2 @@
 bin/rtorrent
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtorrent.rc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net-p2p/squall/pkg-plist b/net-p2p/squall/pkg-plist
index be03e7cc44ab..e89c477ccb46 100644
--- a/net-p2p/squall/pkg-plist
+++ b/net-p2p/squall/pkg-plist
@@ -5,4 +5,3 @@ sbin/squirt
 %%DOCSDIR%%/draft-arcieri-peer-distributed-transfer-protocol.txt
 %%DOCSDIR%%/transactions.txt
 %%DOCSDIR%%/transfer_specification.txt
-@dirrm %%DOCSDIR%%
diff --git a/net-p2p/torrentsniff/pkg-plist b/net-p2p/torrentsniff/pkg-plist
index 3ad613bb1f47..34eefb0163ca 100644
--- a/net-p2p/torrentsniff/pkg-plist
+++ b/net-p2p/torrentsniff/pkg-plist
@@ -1,3 +1,2 @@
 bin/torrentsniff
 %%SITE_PERL%%/BitTorrent/BDecode.pm
-@dirrm %%SITE_PERL%%/BitTorrent
diff --git a/net-p2p/transmission-cli/pkg-plist b/net-p2p/transmission-cli/pkg-plist
index 78c19447d908..0246e9eb8d94 100644
--- a/net-p2p/transmission-cli/pkg-plist
+++ b/net-p2p/transmission-cli/pkg-plist
@@ -9,4 +9,3 @@ man/man1/transmission-show.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/transmission-daemon/pkg-plist b/net-p2p/transmission-daemon/pkg-plist
index 5052a8820c01..e6d038dfb5fb 100644
--- a/net-p2p/transmission-daemon/pkg-plist
+++ b/net-p2p/transmission-daemon/pkg-plist
@@ -5,6 +5,4 @@ man/man1/transmission-remote.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%ETCDIR%%/home
-@dirrmtry %%ETCDIR%%
+@dir %%ETCDIR%%/home
diff --git a/net-p2p/transmission-gtk/pkg-plist b/net-p2p/transmission-gtk/pkg-plist
index 285199868cec..c98d2602f70e 100644
--- a/net-p2p/transmission-gtk/pkg-plist
+++ b/net-p2p/transmission-gtk/pkg-plist
@@ -100,42 +100,3 @@ share/locale/vi/LC_MESSAGES/transmission-gtk.mo
 share/locale/zh_CN/LC_MESSAGES/transmission-gtk.mo
 share/locale/zh_TW/LC_MESSAGES/transmission-gtk.mo
 share/pixmaps/transmission.png
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/tl/LC_MESSAGES
-@dirrmtry share/locale/tl
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/ta_LK/LC_MESSAGES
-@dirrmtry share/locale/ta_LK
-@dirrmtry share/locale/sw/LC_MESSAGES
-@dirrmtry share/locale/sw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/gv/LC_MESSAGES
-@dirrmtry share/locale/gv
-@dirrmtry share/locale/fo/LC_MESSAGES
-@dirrmtry share/locale/fo
-@dirrmtry share/locale/fil/LC_MESSAGES
-@dirrmtry share/locale/fil
-@dirrmtry share/locale/ckb/LC_MESSAGES
-@dirrmtry share/locale/ckb
-@dirrmtry share/locale/ceb/LC_MESSAGES
-@dirrmtry share/locale/ceb
-@dirrmtry share/locale/bo/LC_MESSAGES
-@dirrmtry share/locale/bo
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/transmission-qt4/pkg-plist b/net-p2p/transmission-qt4/pkg-plist
index 078dbfe2a347..d517a255aea6 100644
--- a/net-p2p/transmission-qt4/pkg-plist
+++ b/net-p2p/transmission-qt4/pkg-plist
@@ -6,4 +6,3 @@ share/applications/transmission-qt.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README-qt4
 share/pixmaps/transmission-qt.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/uhub/pkg-plist b/net-p2p/uhub/pkg-plist
index 3430e25780e9..8f4658a2d0e8 100644
--- a/net-p2p/uhub/pkg-plist
+++ b/net-p2p/uhub/pkg-plist
@@ -1,13 +1,9 @@
 bin/uhub
 %%SQLITE%%bin/uhub-passwd
-@group uhub
-@mode 640
-@sample %%ETCDIR%%/motd.txt.sample
-@sample %%ETCDIR%%/rules.txt.sample
-@sample %%ETCDIR%%/uhub.conf.sample
-@sample %%ETCDIR%%/users.conf.sample
-@mode
-@group
+@sample(,uhub,0640) %%ETCDIR%%/motd.txt.sample
+@sample(,uhub,0640) %%ETCDIR%%/rules.txt.sample
+@sample(,uhub,0640) %%ETCDIR%%/uhub.conf.sample
+@sample(,uhub,0640) %%ETCDIR%%/users.conf.sample
 lib/uhub/mod_auth_simple.so
 %%SQLITE%%lib/uhub/mod_auth_sqlite.so
 lib/uhub/mod_chat_history.so
@@ -18,5 +14,3 @@ lib/uhub/mod_logging.so
 lib/uhub/mod_no_guest_downloads.so
 lib/uhub/mod_topic.so
 lib/uhub/mod_welcome.so
-@dirrm lib/uhub
-@dirrm %%ETCDIR%%
diff --git a/net-p2p/valknut/pkg-plist b/net-p2p/valknut/pkg-plist
index 4ead9d49cb2b..0ed95129e040 100644
--- a/net-p2p/valknut/pkg-plist
+++ b/net-p2p/valknut/pkg-plist
@@ -129,31 +129,4 @@ share/icons/hicolor/32x32/apps/valknut.png
 share/icons/hicolor/48x48/apps/valknut.png
 share/icons/hicolor/64x64/apps/valknut.png
 share/pixmaps/valknut.png
-@dirrm %%DATADIR%%/translation
-@dirrm %%DATADIR%%/sounds/default
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%/icons/user/default
-@dirrm %%DATADIR%%/icons/user
-@dirrm %%DATADIR%%/icons/emot/simple
-@dirrm %%DATADIR%%/icons/emot/default
-@dirrm %%DATADIR%%/icons/emot
-@dirrm %%DATADIR%%/icons/appl/default
-@dirrm %%DATADIR%%/icons/appl
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
+@dir %%DATADIR%%/sounds/default
diff --git a/net-p2p/verlihub/pkg-plist b/net-p2p/verlihub/pkg-plist
index bc185e77708c..135036143fef 100644
--- a/net-p2p/verlihub/pkg-plist
+++ b/net-p2p/verlihub/pkg-plist
@@ -113,7 +113,3 @@ lib/libvhapi.so.0.0.0
 %%DATADIR%%/sql/default_file_trigger.sql
 %%DATADIR%%/sql/default_pi_plug.sql
 %%DATADIR%%/sql/default_reglist.sql
-@dirrm include/verlihub
-@dirrm %%DATADIR%%/sql
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%