Index: head/x11-fonts/alef/pkg-plist
===================================================================
--- head/x11-fonts/alef/pkg-plist	(revision 378113)
+++ head/x11-fonts/alef/pkg-plist	(revision 378114)
@@ -1,5 +1,4 @@
 %%FONTSDIR%%/Alef-Bold.ttf
 %%FONTSDIR%%/Alef-Regular.ttf
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/fonts.scale
-@dirrmtry %%FONTSDIR%%
Index: head/x11-fonts/alegreya-sans/pkg-plist
===================================================================
--- head/x11-fonts/alegreya-sans/pkg-plist	(revision 378113)
+++ head/x11-fonts/alegreya-sans/pkg-plist	(revision 378114)
@@ -1,29 +1,28 @@
 lib/X11/fonts/alegreya-sans/AlegreyaSans-Black.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-BlackItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-Bold.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-BoldItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-ExtraBold.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-ExtraBoldItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-Italic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-Light.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-LightItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-Medium.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-MediumItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-Regular.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-Thin.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSans-ThinItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Black.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-BlackItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Bold.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-BoldItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-ExtraBold.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-ExtraBoldItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Italic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Light.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-LightItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Medium.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-MediumItalic.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Regular.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-Thin.otf
 lib/X11/fonts/alegreya-sans/AlegreyaSansSC-ThinItalic.otf
-@dirrm lib/X11/fonts/alegreya-sans
Index: head/x11-fonts/artwiz-aleczapka/pkg-plist
===================================================================
--- head/x11-fonts/artwiz-aleczapka/pkg-plist	(revision 378113)
+++ head/x11-fonts/artwiz-aleczapka/pkg-plist	(revision 378114)
@@ -1,21 +1,20 @@
 lib/X11/fonts/artwiz-aleczapka-en/anorexia.pcf
 lib/X11/fonts/artwiz-aleczapka-en/aqui.pcf
 lib/X11/fonts/artwiz-aleczapka-en/cure.pcf
 lib/X11/fonts/artwiz-aleczapka-en/cursor.pcf
 lib/X11/fonts/artwiz-aleczapka-en/drift.pcf
 lib/X11/fonts/artwiz-aleczapka-en/edges.pcf
 lib/X11/fonts/artwiz-aleczapka-en/fkp.pcf
 lib/X11/fonts/artwiz-aleczapka-en/gelly.pcf
 lib/X11/fonts/artwiz-aleczapka-en/glisp-bold.pcf
 lib/X11/fonts/artwiz-aleczapka-en/glisp.pcf
 lib/X11/fonts/artwiz-aleczapka-en/kates.pcf
 lib/X11/fonts/artwiz-aleczapka-en/lime.pcf
 lib/X11/fonts/artwiz-aleczapka-en/mints-mild.pcf
 lib/X11/fonts/artwiz-aleczapka-en/mints-strong.pcf
 lib/X11/fonts/artwiz-aleczapka-en/nu.pcf
 lib/X11/fonts/artwiz-aleczapka-en/smoothansi.pcf
 lib/X11/fonts/artwiz-aleczapka-en/snap.pcf
 lib/X11/fonts/artwiz-aleczapka-en/fonts.alias
 lib/X11/fonts/artwiz-aleczapka-en/fonts.cache-1
 lib/X11/fonts/artwiz-aleczapka-en/fonts.dir
-@dirrm lib/X11/fonts/artwiz-aleczapka-en
Index: head/x11-fonts/artwiz-fonts/pkg-plist
===================================================================
--- head/x11-fonts/artwiz-fonts/pkg-plist	(revision 378113)
+++ head/x11-fonts/artwiz-fonts/pkg-plist	(revision 378114)
@@ -1,16 +1,15 @@
 lib/X11/fonts/artwiz-fonts/anorexia.pcf.gz
 lib/X11/fonts/artwiz-fonts/aqui.pcf.gz
 lib/X11/fonts/artwiz-fonts/cure.pcf.gz
 lib/X11/fonts/artwiz-fonts/cursor.pcf.gz
 lib/X11/fonts/artwiz-fonts/drift.pcf.gz
 lib/X11/fonts/artwiz-fonts/edges.pcf.gz
 lib/X11/fonts/artwiz-fonts/gelly.pcf.gz
 lib/X11/fonts/artwiz-fonts/glisp-bold.pcf.gz
 lib/X11/fonts/artwiz-fonts/glisp.pcf.gz
 lib/X11/fonts/artwiz-fonts/lime.pcf.gz
 lib/X11/fonts/artwiz-fonts/mints-mild.pcf.gz
 lib/X11/fonts/artwiz-fonts/mints-strong.pcf.gz
 lib/X11/fonts/artwiz-fonts/nu.pcf.gz
 lib/X11/fonts/artwiz-fonts/snap.pcf.gz
 lib/X11/fonts/artwiz-fonts/fonts.dir
-@dirrm lib/X11/fonts/artwiz-fonts
Index: head/x11-fonts/bitter/pkg-plist
===================================================================
--- head/x11-fonts/bitter/pkg-plist	(revision 378113)
+++ head/x11-fonts/bitter/pkg-plist	(revision 378114)
@@ -1,5 +1,4 @@
 lib/X11/fonts/bitter/Bitter-Bold.otf
 lib/X11/fonts/bitter/Bitter-BoldItalic.otf
 lib/X11/fonts/bitter/Bitter-Italic.otf
 lib/X11/fonts/bitter/Bitter-Regular.otf
-@dirrm lib/X11/fonts/bitter
Index: head/x11-fonts/clearsans/pkg-plist
===================================================================
--- head/x11-fonts/clearsans/pkg-plist	(revision 378113)
+++ head/x11-fonts/clearsans/pkg-plist	(revision 378114)
@@ -1,9 +1,8 @@
 lib/X11/fonts/clearsans/ClearSans-Bold.ttf
 lib/X11/fonts/clearsans/ClearSans-BoldItalic.ttf
 lib/X11/fonts/clearsans/ClearSans-Italic.ttf
 lib/X11/fonts/clearsans/ClearSans-Light.ttf
 lib/X11/fonts/clearsans/ClearSans-Medium.ttf
 lib/X11/fonts/clearsans/ClearSans-MediumItalic.ttf
 lib/X11/fonts/clearsans/ClearSans-Regular.ttf
 lib/X11/fonts/clearsans/ClearSans-Thin.ttf
-@dirrm lib/X11/fonts/clearsans
Index: head/x11-fonts/comfortaa-ttf/pkg-plist
===================================================================
--- head/x11-fonts/comfortaa-ttf/pkg-plist	(revision 378113)
+++ head/x11-fonts/comfortaa-ttf/pkg-plist	(revision 378114)
@@ -1,4 +1,3 @@
 %%FONTDIR%%/Comfortaa-Bold.ttf
 %%FONTDIR%%/Comfortaa-Light.ttf
 %%FONTDIR%%/Comfortaa-Regular.ttf
-@dirrm %%FONTDIR%%
Index: head/x11-fonts/consolamono-ttf/pkg-plist
===================================================================
--- head/x11-fonts/consolamono-ttf/pkg-plist	(revision 378113)
+++ head/x11-fonts/consolamono-ttf/pkg-plist	(revision 378114)
@@ -1,3 +1,2 @@
 %%FONTDIR%%/ConsolaMono.ttf
 %%FONTDIR%%/ConsolaMono-Bold.ttf
-@dirrm %%FONTDIR%%
Index: head/x11-fonts/cyr-rfx/pkg-plist
===================================================================
--- head/x11-fonts/cyr-rfx/pkg-plist	(revision 378113)
+++ head/x11-fonts/cyr-rfx/pkg-plist	(revision 378114)
@@ -1,133 +1,132 @@
 %%INST_DIR%%/courB08o.pcf.gz
 %%INST_DIR%%/courB10o.pcf.gz
 %%INST_DIR%%/courB12o.pcf.gz
 %%INST_DIR%%/courB14o.pcf.gz
 %%INST_DIR%%/courB18o.pcf.gz
 %%INST_DIR%%/courB24o.pcf.gz
 %%INST_DIR%%/courBO08o.pcf.gz
 %%INST_DIR%%/courBO10o.pcf.gz
 %%INST_DIR%%/courBO12o.pcf.gz
 %%INST_DIR%%/courBO14o.pcf.gz
 %%INST_DIR%%/courBO18o.pcf.gz
 %%INST_DIR%%/courBO24o.pcf.gz
 %%INST_DIR%%/courO08o.pcf.gz
 %%INST_DIR%%/courO10o.pcf.gz
 %%INST_DIR%%/courO12o.pcf.gz
 %%INST_DIR%%/courO14o.pcf.gz
 %%INST_DIR%%/courO18o.pcf.gz
 %%INST_DIR%%/courO24o.pcf.gz
 %%INST_DIR%%/courR08o.pcf.gz
 %%INST_DIR%%/courR10o.pcf.gz
 %%INST_DIR%%/courR12o.pcf.gz
 %%INST_DIR%%/courR14o.pcf.gz
 %%INST_DIR%%/courR18o.pcf.gz
 %%INST_DIR%%/courR24o.pcf.gz
 %%INST_DIR%%/helvB08o.pcf.gz
 %%INST_DIR%%/helvB10o.pcf.gz
 %%INST_DIR%%/helvB12o.pcf.gz
 %%INST_DIR%%/helvB14o.pcf.gz
 %%INST_DIR%%/helvB18o.pcf.gz
 %%INST_DIR%%/helvB24o.pcf.gz
 %%INST_DIR%%/helvBO08o.pcf.gz
 %%INST_DIR%%/helvBO10o.pcf.gz
 %%INST_DIR%%/helvBO12o.pcf.gz
 %%INST_DIR%%/helvBO14o.pcf.gz
 %%INST_DIR%%/helvBO18o.pcf.gz
 %%INST_DIR%%/helvBO24o.pcf.gz
 %%INST_DIR%%/helvO08o.pcf.gz
 %%INST_DIR%%/helvO10o.pcf.gz
 %%INST_DIR%%/helvO12o.pcf.gz
 %%INST_DIR%%/helvO14o.pcf.gz
 %%INST_DIR%%/helvO18o.pcf.gz
 %%INST_DIR%%/helvO24o.pcf.gz
 %%INST_DIR%%/helvR08o.pcf.gz
 %%INST_DIR%%/helvR10o.pcf.gz
 %%INST_DIR%%/helvR12o.pcf.gz
 %%INST_DIR%%/helvR14o.pcf.gz
 %%INST_DIR%%/helvR18o.pcf.gz
 %%INST_DIR%%/helvR24o.pcf.gz
 %%INST_DIR%%/luBIS08o.pcf.gz
 %%INST_DIR%%/luBIS10o.pcf.gz
 %%INST_DIR%%/luBIS12o.pcf.gz
 %%INST_DIR%%/luBIS14o.pcf.gz
 %%INST_DIR%%/luBIS18o.pcf.gz
 %%INST_DIR%%/luBIS19o.pcf.gz
 %%INST_DIR%%/luBIS24o.pcf.gz
 %%INST_DIR%%/luBS08o.pcf.gz
 %%INST_DIR%%/luBS10o.pcf.gz
 %%INST_DIR%%/luBS12o.pcf.gz
 %%INST_DIR%%/luBS14o.pcf.gz
 %%INST_DIR%%/luBS18o.pcf.gz
 %%INST_DIR%%/luBS19o.pcf.gz
 %%INST_DIR%%/luBS24o.pcf.gz
 %%INST_DIR%%/luIS08o.pcf.gz
 %%INST_DIR%%/luIS10o.pcf.gz
 %%INST_DIR%%/luIS12o.pcf.gz
 %%INST_DIR%%/luIS14o.pcf.gz
 %%INST_DIR%%/luIS18o.pcf.gz
 %%INST_DIR%%/luIS19o.pcf.gz
 %%INST_DIR%%/luIS24o.pcf.gz
 %%INST_DIR%%/luRS08o.pcf.gz
 %%INST_DIR%%/luRS10o.pcf.gz
 %%INST_DIR%%/luRS12o.pcf.gz
 %%INST_DIR%%/luRS14o.pcf.gz
 %%INST_DIR%%/luRS18o.pcf.gz
 %%INST_DIR%%/luRS19o.pcf.gz
 %%INST_DIR%%/luRS24o.pcf.gz
 %%INST_DIR%%/lutBS08o.pcf.gz
 %%INST_DIR%%/lutBS10o.pcf.gz
 %%INST_DIR%%/lutBS12o.pcf.gz
 %%INST_DIR%%/lutBS14o.pcf.gz
 %%INST_DIR%%/lutBS18o.pcf.gz
 %%INST_DIR%%/lutBS19o.pcf.gz
 %%INST_DIR%%/lutBS24o.pcf.gz
 %%INST_DIR%%/lutRS08o.pcf.gz
 %%INST_DIR%%/lutRS10o.pcf.gz
 %%INST_DIR%%/lutRS12o.pcf.gz
 %%INST_DIR%%/lutRS14o.pcf.gz
 %%INST_DIR%%/lutRS18o.pcf.gz
 %%INST_DIR%%/lutRS19o.pcf.gz
 %%INST_DIR%%/lutRS24o.pcf.gz
 %%INST_DIR%%/timB08o.pcf.gz
 %%INST_DIR%%/timB10o.pcf.gz
 %%INST_DIR%%/timB12o.pcf.gz
 %%INST_DIR%%/timB14o.pcf.gz
 %%INST_DIR%%/timB18o.pcf.gz
 %%INST_DIR%%/timB24o.pcf.gz
 %%INST_DIR%%/timBI08o.pcf.gz
 %%INST_DIR%%/timBI10o.pcf.gz
 %%INST_DIR%%/timBI12o.pcf.gz
 %%INST_DIR%%/timBI14o.pcf.gz
 %%INST_DIR%%/timBI18o.pcf.gz
 %%INST_DIR%%/timBI24o.pcf.gz
 %%INST_DIR%%/timI08o.pcf.gz
 %%INST_DIR%%/timI10o.pcf.gz
 %%INST_DIR%%/timI12o.pcf.gz
 %%INST_DIR%%/timI14o.pcf.gz
 %%INST_DIR%%/timI18o.pcf.gz
 %%INST_DIR%%/timI24o.pcf.gz
 %%INST_DIR%%/timR08o.pcf.gz
 %%INST_DIR%%/timR10o.pcf.gz
 %%INST_DIR%%/timR12o.pcf.gz
 %%INST_DIR%%/timR14o.pcf.gz
 %%INST_DIR%%/timR18o.pcf.gz
 %%INST_DIR%%/timR24o.pcf.gz
 %%INST_DIR%%/10x20o.pcf.gz
 %%INST_DIR%%/12x24o.pcf.gz
 %%INST_DIR%%/5x7o.pcf.gz
 %%INST_DIR%%/6x10o.pcf.gz
 %%INST_DIR%%/6x13Bo.pcf.gz
 %%INST_DIR%%/6x13o.pcf.gz
 %%INST_DIR%%/7x13Bo.pcf.gz
 %%INST_DIR%%/7x13o.pcf.gz
 %%INST_DIR%%/7x14Bo.pcf.gz
 %%INST_DIR%%/7x14o.pcf.gz
 %%INST_DIR%%/8x13Bo.pcf.gz
 %%INST_DIR%%/8x13o.pcf.gz
 %%INST_DIR%%/8x16o.pcf.gz
 %%INST_DIR%%/9x15Bo.pcf.gz
 %%INST_DIR%%/9x15o.pcf.gz
 %%INST_DIR%%/fonts.alias
 %%INST_DIR%%/fonts.dir
 %%INST_DIR%%/nil2o.pcf.gz
-@dirrm %%INST_DIR%%
Index: head/x11-fonts/dina/pkg-plist
===================================================================
--- head/x11-fonts/dina/pkg-plist	(revision 378113)
+++ head/x11-fonts/dina/pkg-plist	(revision 378114)
@@ -1,14 +1,13 @@
 %%FONTDIR%%/Dina_i400-10.pcf.gz
 %%FONTDIR%%/Dina_i400-8.pcf.gz
 %%FONTDIR%%/Dina_i400-9.pcf.gz
 %%FONTDIR%%/Dina_i700-10.pcf.gz
 %%FONTDIR%%/Dina_i700-8.pcf.gz
 %%FONTDIR%%/Dina_i700-9.pcf.gz
 %%FONTDIR%%/Dina_r400-10.pcf.gz
 %%FONTDIR%%/Dina_r400-6.pcf.gz
 %%FONTDIR%%/Dina_r400-8.pcf.gz
 %%FONTDIR%%/Dina_r400-9.pcf.gz
 %%FONTDIR%%/Dina_r700-10.pcf.gz
 %%FONTDIR%%/Dina_r700-8.pcf.gz
 %%FONTDIR%%/Dina_r700-9.pcf.gz
-@dirrm %%FONTDIR%%
Index: head/x11-fonts/fantasque-sans-mono/pkg-plist
===================================================================
--- head/x11-fonts/fantasque-sans-mono/pkg-plist	(revision 378113)
+++ head/x11-fonts/fantasque-sans-mono/pkg-plist	(revision 378114)
@@ -1,7 +1,5 @@
 lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-Bold.otf
 lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-BoldItalic.otf
 lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-RegItalic.otf
 lib/X11/fonts/fantasque-sans-mono/FantasqueSansMono-Regular.otf
-@dirrm lib/X11/fonts/fantasque-sans-mono
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: head/x11-fonts/farsifonts/pkg-plist
===================================================================
--- head/x11-fonts/farsifonts/pkg-plist	(revision 378113)
+++ head/x11-fonts/farsifonts/pkg-plist	(revision 378114)
@@ -1,12 +1,11 @@
 %%FONTSDIR%%/elham.ttf
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/homa.ttf
 %%FONTSDIR%%/koodak.ttf
 %%FONTSDIR%%/nazli.ttf
 %%FONTSDIR%%/nazlib.ttf
 %%FONTSDIR%%/roya.ttf
 %%FONTSDIR%%/royab.ttf
 %%FONTSDIR%%/terafik.ttf
 %%FONTSDIR%%/terafikb.ttf
 %%FONTSDIR%%/titr.ttf
-@dirrm %%FONTSDIR%%
Index: head/x11-fonts/font-bh-ttf/pkg-plist
===================================================================
--- head/x11-fonts/font-bh-ttf/pkg-plist	(revision 378113)
+++ head/x11-fonts/font-bh-ttf/pkg-plist	(revision 378114)
@@ -1,17 +1,14 @@
 etc/fonts/conf.avail/42-luxi-mono.conf
 etc/fonts/conf.d/42-luxi-mono.conf
 lib/X11/fonts/TTF/luximb.ttf
 lib/X11/fonts/TTF/luximbi.ttf
 lib/X11/fonts/TTF/luximr.ttf
 lib/X11/fonts/TTF/luximri.ttf
 lib/X11/fonts/TTF/luxirb.ttf
 lib/X11/fonts/TTF/luxirbi.ttf
 lib/X11/fonts/TTF/luxirr.ttf
 lib/X11/fonts/TTF/luxirri.ttf
 lib/X11/fonts/TTF/luxisb.ttf
 lib/X11/fonts/TTF/luxisbi.ttf
 lib/X11/fonts/TTF/luxisr.ttf
 lib/X11/fonts/TTF/luxisri.ttf
-@dirrmtry etc/fonts/conf.d
-@dirrmtry etc/fonts/conf.avail
-@dirrmtry etc/fonts
Index: head/x11-fonts/font-manager/pkg-plist
===================================================================
--- head/x11-fonts/font-manager/pkg-plist	(revision 378113)
+++ head/x11-fonts/font-manager/pkg-plist	(revision 378114)
@@ -1,9 +1,8 @@
 bin/font-manager
 bin/font-sampler
 lib/font-manager/fontutils.so
 share/applications/font-manager.desktop
 share/applications/font-sampler.desktop
 %%NLS%%share/locale/it/LC_MESSAGES/font-manager.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/font-manager.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/font-manager.mo
-@dirrm lib/font-manager
Index: head/x11-fonts/fontcacheproto/pkg-plist
===================================================================
--- head/x11-fonts/fontcacheproto/pkg-plist	(revision 378113)
+++ head/x11-fonts/fontcacheproto/pkg-plist	(revision 378114)
@@ -1,5 +1,4 @@
 include/X11/extensions/fontcache.h
 include/X11/extensions/fontcacheP.h
 include/X11/extensions/fontcachstr.h
 libdata/pkgconfig/fontcacheproto.pc
-@dirrmtry include/X11/extensions
Index: head/x11-fonts/fontsproto/pkg-plist
===================================================================
--- head/x11-fonts/fontsproto/pkg-plist	(revision 378113)
+++ head/x11-fonts/fontsproto/pkg-plist	(revision 378114)
@@ -1,10 +1,8 @@
 %%DOCSDIR%%/fsproto.xml
 include/X11/fonts/FS.h
 include/X11/fonts/FSproto.h
 include/X11/fonts/font.h
 include/X11/fonts/fontproto.h
 include/X11/fonts/fontstruct.h
 include/X11/fonts/fsmasks.h
 libdata/pkgconfig/fontsproto.pc
-@dirrmtry include/X11/fonts
-@dirrm %%DOCSDIR%%
Index: head/x11-fonts/gnu-unifont-ttf/pkg-plist
===================================================================
--- head/x11-fonts/gnu-unifont-ttf/pkg-plist	(revision 378113)
+++ head/x11-fonts/gnu-unifont-ttf/pkg-plist	(revision 378114)
@@ -1,7 +1,6 @@
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/fonts.scale
 %%FONTSDIR%%/unifont.ttf
 %%FONTSDIR%%/unifont_csur.ttf
 %%FONTSDIR%%/unifont_upper.ttf
 %%FONTSDIR%%/unifont_upper_csur.ttf
-@dirrm %%FONTSDIR%%
Index: head/x11-fonts/gohufont/pkg-plist
===================================================================
--- head/x11-fonts/gohufont/pkg-plist	(revision 378113)
+++ head/x11-fonts/gohufont/pkg-plist	(revision 378114)
@@ -1,9 +1,8 @@
 %%FONTDIR%%/gohufont-11.pcf.gz
 %%FONTDIR%%/gohufont-11b.pcf.gz
 %%FONTDIR%%/gohufont-14.pcf.gz
 %%FONTDIR%%/gohufont-14b.pcf.gz
 %%FONTDIR%%/gohufont-uni-11.pcf.gz
 %%FONTDIR%%/gohufont-uni-11b.pcf.gz
 %%FONTDIR%%/gohufont-uni-14.pcf.gz
 %%FONTDIR%%/gohufont-uni-14b.pcf.gz
-@dirrm %%FONTDIR%%
Index: head/x11-fonts/hanazono-fonts-ttf/pkg-plist
===================================================================
--- head/x11-fonts/hanazono-fonts-ttf/pkg-plist	(revision 378113)
+++ head/x11-fonts/hanazono-fonts-ttf/pkg-plist	(revision 378114)
@@ -1,5 +1,4 @@
 %%FONTDIR%%/HanaMinA.ttf
 %%FONTDIR%%/HanaMinB.ttf
 %%FONTDIR%%/fonts.dir
 %%FONTDIR%%/fonts.scale
-@dirrm %%FONTDIR%%
Index: head/x11-fonts/indic-ttf/pkg-plist
===================================================================
--- head/x11-fonts/indic-ttf/pkg-plist	(revision 378113)
+++ head/x11-fonts/indic-ttf/pkg-plist	(revision 378114)
@@ -1,86 +1,85 @@
 %%BENGALI%%%%CONFAVAILDIR%%/90-ttf-bengali-fonts.conf
 %%DEVANAGARI%%%%CONFAVAILDIR%%/90-ttf-devanagari-fonts.conf
 %%GUJARATI%%%%CONFAVAILDIR%%/90-ttf-gujarati-fonts.conf
 %%KANNADA%%%%CONFAVAILDIR%%/90-ttf-kannada-fonts.conf
 %%MALAYALAM%%%%CONFAVAILDIR%%/90-ttf-malayalam-fonts.conf
 %%ORIYA%%%%CONFAVAILDIR%%/90-ttf-oriya-fonts.conf
 %%PUNJABI%%%%CONFAVAILDIR%%/90-ttf-punjabi-fonts.conf
 %%TAMIL%%%%CONFAVAILDIR%%/90-ttf-tamil-fonts.conf
 %%TELUGU%%%%CONFAVAILDIR%%/90-ttf-telugu-fonts.conf
 %%BENGALI%%%%FONTSDIR%%/bengali/JamrulNormal.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/LikhanNormal.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/MuktiNarrow.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/MuktiNarrowBold.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/ani.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/lohit_as.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/lohit_bn.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/mitra.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/ttf-bengali-fonts.copyright
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/Samyak-Devanagari.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/Sarai_07.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/chandas1-2.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/gargi.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/kalimati.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_hi.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_kok.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_ks.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_mai.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_mr.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_ne.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_sd.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/nakula.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/sahadeva.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/samanata.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/ttf-devanagari-fonts.copyright
 %%GUJARATI%%%%FONTSDIR%%/gujarati/Rekha.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/Samyak-Gujarati.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/aakar-medium.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/lohit_gu.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa-Bold.1.1.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa-Medium-0.5.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/ttf-gujarati-fonts.copyright
 %%KANNADA%%%%FONTSDIR%%/kannada/Kedage-b.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Kedage-i.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Kedage-n.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Kedage-t.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Malige-b.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Malige-i.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Malige-n.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Malige-t.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/lohit_kn.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/ttf-kannada-fonts.copyright
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/AnjaliOldLipi.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/Dyuthi3.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/Kalyani121.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/Meera_04.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/Rachana_04.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/RaghuMalayalamSans2.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/Samyak-Malayalam.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/lohit_ml.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/suruma2.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/ttf-malayalam-fonts.copyright
 %%ORIYA%%%%FONTSDIR%%/oriya/Samyak-Oriya.ttf
 %%ORIYA%%%%FONTSDIR%%/oriya/lohit_or.ttf
 %%ORIYA%%%%FONTSDIR%%/oriya/ttf-oriya-fonts.copyright
 %%ORIYA%%%%FONTSDIR%%/oriya/utkal.ttf
 %%PUNJABI%%%%FONTSDIR%%/punjabi/Saab.ttf
 %%PUNJABI%%%%FONTSDIR%%/punjabi/lohit_pa.ttf
 %%PUNJABI%%%%FONTSDIR%%/punjabi/ttf-punjabi-fonts.copyright
 %%TAMIL%%%%FONTSDIR%%/tamil/Samyak-Tamil.ttf
 %%TAMIL%%%%FONTSDIR%%/tamil/lohit_ta.ttf
 %%TAMIL%%%%FONTSDIR%%/tamil/ttf-tamil-fonts.copyright
 %%TELUGU%%%%FONTSDIR%%/telugu/Pothana2000.ttf
 %%TELUGU%%%%FONTSDIR%%/telugu/Vemana.ttf
 %%TELUGU%%%%FONTSDIR%%/telugu/lohit_te.ttf
 %%TELUGU%%%%FONTSDIR%%/telugu/ttf-telugu-fonts.copyright
 %%TELUGU%%@fcfontsdir %%FONTSDIR%%/telugu
 %%TAMIL%%@fcfontsdir %%FONTSDIR%%/tamil
 %%PUNJABI%%@fcfontsdir %%FONTSDIR%%/punjabi
 %%ORIYA%%@fcfontsdir %%FONTSDIR%%/oriya
 %%MALAYALAM%%@fcfontsdir %%FONTSDIR%%/malayalam
 %%KANNADA%%@fcfontsdir %%FONTSDIR%%/kannada
 %%GUJARATI%%@fcfontsdir %%FONTSDIR%%/gujarati
 %%DEVANAGARI%%@fcfontsdir %%FONTSDIR%%/devanagari
 %%BENGALI%%@fcfontsdir %%FONTSDIR%%/bengali
-@dirrm %%FONTSDIR%%
Index: head/x11-fonts/isabella/pkg-plist
===================================================================
--- head/x11-fonts/isabella/pkg-plist	(revision 378113)
+++ head/x11-fonts/isabella/pkg-plist	(revision 378114)
@@ -1,4 +1,3 @@
 %%FONTDIR%%/Isabella.ttf
 @fontsdir %%FONTDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: head/x11-fonts/libFS/pkg-plist
===================================================================
--- head/x11-fonts/libFS/pkg-plist	(revision 378113)
+++ head/x11-fonts/libFS/pkg-plist	(revision 378114)
@@ -1,10 +1,8 @@
 %%DOCSDIR%%/FSlib.txt
 include/X11/fonts/FSlib.h
 lib/libFS.a
 lib/libFS.la
 lib/libFS.so
 lib/libFS.so.6
 lib/libFS.so.6.0.0
 libdata/pkgconfig/libfs.pc
-@dirrmtry include/X11/fonts
-@dirrm %%DOCSDIR%%
Index: head/x11-fonts/libXfont/pkg-plist
===================================================================
--- head/x11-fonts/libXfont/pkg-plist	(revision 378113)
+++ head/x11-fonts/libXfont/pkg-plist	(revision 378114)
@@ -1,22 +1,21 @@
 include/X11/fonts/bdfint.h
 include/X11/fonts/bitmap.h
 include/X11/fonts/bufio.h
 include/X11/fonts/fntfil.h
 include/X11/fonts/fntfilio.h
 include/X11/fonts/fntfilst.h
 include/X11/fonts/fontconf.h
 include/X11/fonts/fontencc.h
 include/X11/fonts/fontmisc.h
 include/X11/fonts/fontshow.h
 include/X11/fonts/fontutil.h
 include/X11/fonts/fontxlfd.h
 include/X11/fonts/ft.h
 include/X11/fonts/ftfuncs.h
 include/X11/fonts/pcf.h
 lib/libXfont.a
 lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 lib/libXfont.so.1.4.1
 libdata/pkgconfig/xfont.pc
-@dirrmtry include/X11/fonts
Index: head/x11-fonts/libXft/pkg-plist
===================================================================
--- head/x11-fonts/libXft/pkg-plist	(revision 378113)
+++ head/x11-fonts/libXft/pkg-plist	(revision 378114)
@@ -1,11 +1,10 @@
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
 lib/libXft.a
 lib/libXft.la
 lib/libXft.so
 lib/libXft.so.2
 lib/libXft.so.2.3.2
 libdata/pkgconfig/xft.pc
 man/man3/Xft.3.gz
-@dirrm include/X11/Xft
Index: head/x11-fonts/libfontenc/pkg-plist
===================================================================
--- head/x11-fonts/libfontenc/pkg-plist	(revision 378113)
+++ head/x11-fonts/libfontenc/pkg-plist	(revision 378114)
@@ -1,8 +1,7 @@
 include/X11/fonts/fontenc.h
 lib/libfontenc.a
 lib/libfontenc.la
 lib/libfontenc.so
 lib/libfontenc.so.1
 lib/libfontenc.so.1.0.0
 libdata/pkgconfig/fontenc.pc
-@dirrmtry include/X11/fonts
Index: head/x11-fonts/nexfontsel/pkg-plist
===================================================================
--- head/x11-fonts/nexfontsel/pkg-plist	(revision 378113)
+++ head/x11-fonts/nexfontsel/pkg-plist	(revision 378114)
@@ -1,6 +1,4 @@
 bin/nexfontsel
 lib/X11/app-defaults/NeXFontSel
 lib/X11/ja_JP.eucJP/app-defaults/NeXFontSel
 man/man1/nexfontsel.1.gz
-@dirrmtry lib/X11/ja_JP.eucJP/app-defaults
-@dirrmtry lib/X11/ja_JP.eucJP
Index: head/x11-fonts/profont/pkg-plist
===================================================================
--- head/x11-fonts/profont/pkg-plist	(revision 378113)
+++ head/x11-fonts/profont/pkg-plist	(revision 378114)
@@ -1,10 +1,9 @@
 %%FONTDIR%%/fonts.dir
 %%FONTDIR%%/fonts.scale
 %%FONTDIR%%/ProFont_r400-10.pcf.gz
 %%FONTDIR%%/ProFont_r400-11.pcf.gz
 %%FONTDIR%%/ProFont_r400-12.pcf.gz
 %%FONTDIR%%/ProFont_r400-15.pcf.gz
 %%FONTDIR%%/ProFont_r400-17.pcf.gz
 %%FONTDIR%%/ProFont_r400-22.pcf.gz
 %%FONTDIR%%/ProFont_r400-29.pcf.gz
-@dirrm %%FONTDIR%%
Index: head/x11-fonts/py-bdflib/pkg-plist
===================================================================
--- head/x11-fonts/py-bdflib/pkg-plist	(revision 378113)
+++ head/x11-fonts/py-bdflib/pkg-plist	(revision 378114)
@@ -1,45 +1,43 @@
 bin/bdflib-embolden
 bin/bdflib-fill
 bin/bdflib-merge
 bin/bdflib-passthrough
 %%PYTHON_SITELIBDIR%%/bdflib/__init__.py
 %%PYTHON_SITELIBDIR%%/bdflib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/effects.py
 %%PYTHON_SITELIBDIR%%/bdflib/effects.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/effects.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/glyph_combining.py
 %%PYTHON_SITELIBDIR%%/bdflib/glyph_combining.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/glyph_combining.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/model.py
 %%PYTHON_SITELIBDIR%%/bdflib/model.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/model.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/reader.py
 %%PYTHON_SITELIBDIR%%/bdflib/reader.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/reader.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/test/__init__.py
 %%PYTHON_SITELIBDIR%%/bdflib/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/test/__init__.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_effects.py
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_effects.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_effects.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_glyph_combining.py
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_glyph_combining.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_glyph_combining.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_model.py
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_model.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_model.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_reader.py
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_reader.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_reader.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_writer.py
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_writer.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/test/test_writer.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/util.py
 %%PYTHON_SITELIBDIR%%/bdflib/util.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/util.pyo
 %%PYTHON_SITELIBDIR%%/bdflib/writer.py
 %%PYTHON_SITELIBDIR%%/bdflib/writer.pyc
 %%PYTHON_SITELIBDIR%%/bdflib/writer.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/bdflib/test
-@dirrm %%PYTHON_SITELIBDIR%%/bdflib
Index: head/x11-fonts/tkfont/pkg-plist
===================================================================
--- head/x11-fonts/tkfont/pkg-plist	(revision 378113)
+++ head/x11-fonts/tkfont/pkg-plist	(revision 378114)
@@ -1,11 +1,10 @@
 bin/tkfont
 lib/tkfont/COPYING
 lib/tkfont/README
 lib/tkfont/HelpText.txt
 lib/tkfont/FontTypes.txt
 lib/tkfont/FontDirs.txt
 lib/tkfont/FileMenu.txt
 lib/tkfont/Bugs.txt
 lib/tkfont/FindFont
 lib/tkfont/WhatsNew.txt
-@dirrm lib/tkfont
Index: head/x11-fonts/vollkorn-ttf/pkg-plist
===================================================================
--- head/x11-fonts/vollkorn-ttf/pkg-plist	(revision 378113)
+++ head/x11-fonts/vollkorn-ttf/pkg-plist	(revision 378114)
@@ -1,12 +1,10 @@
 %%FONTDIR%%/Vollkorn-Bold.ttf
 %%FONTDIR%%/Vollkorn-BoldItalic.ttf
 %%FONTDIR%%/Vollkorn-Italic.ttf
 %%FONTDIR%%/Vollkorn-Medium.ttf
 %%FONTDIR%%/Vollkorn-MediumItalic.ttf
 %%FONTDIR%%/Vollkorn-Regular.ttf
 %%FONTDIR%%/Vollkorn-Semibold.ttf
 %%FONTDIR%%/Vollkorn-SemiboldItalic.ttf
-@dirrm %%FONTDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/Fontlog.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: head/x11-fonts/wqy/pkg-plist
===================================================================
--- head/x11-fonts/wqy/pkg-plist	(revision 378113)
+++ head/x11-fonts/wqy/pkg-plist	(revision 378114)
@@ -1,15 +1,12 @@
 %%CONFAVAILDIR%%/85-wqy.conf
 %%CONFDDIR%%/85-wqy.conf
 %%FONTSDIR%%/wenquanyi_10pt.pcf
 %%FONTSDIR%%/wenquanyi_11pt.pcf
 %%FONTSDIR%%/wenquanyi_12pt.pcf
 %%FONTSDIR%%/wenquanyi_13px.pcf
 %%FONTSDIR%%/wenquanyi_9pt.pcf
 %%FONTSDIR%%/wqy-unibit.pcf
 %%FONTSDIR%%/wqy-zenhei.ttc
 %%FONTSDIR%%/wqy-microhei-lite.ttc
 %%FONTSDIR%%/wqy-microhei.ttc
 @fcfontsdir %%FONTSDIR%%
-@dirrmtry %%CONFAVAILDIR%%
-@dirrmtry %%CONFDDIR%%
-@dirrmtry etc/fonts
Index: head/x11-fonts/xf86bigfontproto/pkg-plist
===================================================================
--- head/x11-fonts/xf86bigfontproto/pkg-plist	(revision 378113)
+++ head/x11-fonts/xf86bigfontproto/pkg-plist	(revision 378114)
@@ -1,5 +1,4 @@
 include/X11/extensions/xf86bigfont.h
 include/X11/extensions/xf86bigfproto.h
 include/X11/extensions/xf86bigfstr.h
 libdata/pkgconfig/xf86bigfontproto.pc
-@dirrmtry include/X11/extensions
Index: head/x11-fonts/xfontsel/pkg-plist
===================================================================
--- head/x11-fonts/xfontsel/pkg-plist	(revision 378113)
+++ head/x11-fonts/xfontsel/pkg-plist	(revision 378114)
@@ -1,5 +1,3 @@
 bin/xfontsel
 man/man1/xfontsel.1.gz
 share/X11/app-defaults/XFontSel
-@dirrmtry share/X11/app-defaults
-@dirrmtry share/X11
Index: head/x11-fonts/xorg-fonts/pkg-plist
===================================================================
--- head/x11-fonts/xorg-fonts/pkg-plist	(revision 378113)
+++ head/x11-fonts/xorg-fonts/pkg-plist	(revision 378114)
@@ -1,2 +1 @@
 libdata/xorg/fonts
-@dirrmtry libdata/xorg