66 files changed, 0 insertions, 684 deletions

diff --git a/astro/astrometry/pkg-plist b/astro/astrometry/pkg-plist
index 40d6849051b4..f11c4c0f83f3 100644
--- a/astro/astrometry/pkg-plist
+++ b/astro/astrometry/pkg-plist
@@ -257,20 +257,3 @@ astrometry/lib/python/astrometry/util/w3c_validator.py
 astrometry/lib/python/astrometry/util/yanny.py
 astrometry/ups/astrometry_net.cfg.template
 astrometry/ups/astrometry_net.table
-@dirrm astrometry/ups
-@dirrm astrometry/lib/python/astrometry/util
-@dirrm astrometry/lib/python/astrometry/sdss
-@dirrm astrometry/lib/python/astrometry/libkd
-@dirrm astrometry/lib/python/astrometry/catalogs
-@dirrm astrometry/lib/python/astrometry/blind
-@dirrm astrometry/lib/python/astrometry
-@dirrm astrometry/lib/python
-@dirrm astrometry/lib
-@dirrm astrometry/include/astrometry
-@dirrm astrometry/include
-@dirrm astrometry/examples
-@dirrm astrometry/etc
-@dirrm astrometry/doc
-@dirrm astrometry/data
-@dirrm astrometry/bin
-@dirrm astrometry
diff --git a/astro/celestia/pkg-plist b/astro/celestia/pkg-plist
index 0969b7e6fd2b..2e93661f1dec 100644
--- a/astro/celestia/pkg-plist
+++ b/astro/celestia/pkg-plist
@@ -555,30 +555,3 @@ share/locale/zh_CN/LC_MESSAGES/celestia_constellations.mo
 share/locale/zh_TW/LC_MESSAGES/celestia.mo
 share/locale/zh_TW/LC_MESSAGES/celestia_constellations.mo
 share/pixmaps/celestia.png
-@dirrm share/celestia/textures/medres
-@dirrm share/celestia/textures/lores
-@dirrm share/celestia/textures/hires
-@dirrm share/celestia/textures
-@dirrm share/celestia/splash
-@dirrm share/celestia/shaders
-@dirrm share/celestia/scripts
-@dirrm share/celestia/models
-@dirrm share/celestia/fonts
-@dirrm share/celestia/extras-standard/mir/models
-@dirrm share/celestia/extras-standard/mir
-@dirrm share/celestia/extras-standard/iss/textures/medres
-@dirrm share/celestia/extras-standard/iss/textures
-@dirrm share/celestia/extras-standard/iss/models
-@dirrm share/celestia/extras-standard/iss
-@dirrm share/celestia/extras-standard/hubble/models
-@dirrm share/celestia/extras-standard/hubble
-@dirrm share/celestia/extras-standard/galileo/models
-@dirrm share/celestia/extras-standard/galileo/data
-@dirrm share/celestia/extras-standard/galileo
-@dirrm share/celestia/extras-standard/cassini/models
-@dirrm share/celestia/extras-standard/cassini/data
-@dirrm share/celestia/extras-standard/cassini
-@dirrm share/celestia/extras-standard
-@dirrm share/celestia/extras
-@dirrm share/celestia/data
-@dirrm share/celestia
diff --git a/astro/ephem/pkg-plist b/astro/ephem/pkg-plist
index 44970e8ec72a..5b026f7f6f41 100644
--- a/astro/ephem/pkg-plist
+++ b/astro/ephem/pkg-plist
@@ -2,4 +2,3 @@ bin/ephem
 %%DATADIR%%/Man.txt
 @sample %%DATADIR%%/ephem.cfg.sample
 @sample %%DATADIR%%/ephem.db.sample
-@dirrm %%DATADIR%%
diff --git a/astro/foxtrotgps/pkg-plist b/astro/foxtrotgps/pkg-plist
index c64d37dcb10a..96d7a586f52a 100644
--- a/astro/foxtrotgps/pkg-plist
+++ b/astro/foxtrotgps/pkg-plist
@@ -36,30 +36,3 @@ share/pixmaps/foxtrotgps-photo.png
 share/pixmaps/foxtrotgps-poi.png
 share/pixmaps/foxtrotgps-wp.png
 share/pixmaps/foxtrotgps.png
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/ru
-@dirrmtry share/locale/nl/LC_MESSAGES
-@dirrmtry share/locale/nl
-@dirrmtry share/locale/hu/LC_MESSAGES
-@dirrmtry share/locale/hu
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/bg/LC_MESSAGES
-@dirrmtry share/locale/bg
-@dirrmtry share/locale/ja/LC_MESSAGES
-@dirrmtry share/locale/ja
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale
diff --git a/astro/garmindev/pkg-plist b/astro/garmindev/pkg-plist
index 95f2f1708585..41fae5d933bb 100644
--- a/astro/garmindev/pkg-plist
+++ b/astro/garmindev/pkg-plist
@@ -28,5 +28,3 @@ lib/qlandkartegt/libQuest.so
 lib/qlandkartegt/libRino120.so
 lib/qlandkartegt/libgarmin.a
 lib/qlandkartegt/libwhatGarmin.so
-@dirrm lib/qlandkartegt
-@dirrm include/garmin
diff --git a/astro/gkrellmoon2/pkg-plist b/astro/gkrellmoon2/pkg-plist
index e68afdac222d..eaabc728367e 100644
--- a/astro/gkrellmoon2/pkg-plist
+++ b/astro/gkrellmoon2/pkg-plist
@@ -1,3 +1,2 @@
 libexec/gkrellm2/plugins/gkrellmoon.so
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/gmapcatcher/pkg-plist b/astro/gmapcatcher/pkg-plist
index 4d2f117f7a1c..5767899c5872 100644
--- a/astro/gmapcatcher/pkg-plist
+++ b/astro/gmapcatcher/pkg-plist
@@ -2,4 +2,3 @@ bin/mapcatcher
 bin/mapdownloader
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/changelog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/google-earth/pkg-plist b/astro/google-earth/pkg-plist
index 179d0ff78559..ae1481464356 100644
--- a/astro/google-earth/pkg-plist
+++ b/astro/google-earth/pkg-plist
@@ -561,310 +561,6 @@ bin/googleearth
 %%DATADIR%%/shaders/watersurface.vs_2_0
 share/applications/googleearth.desktop
 share/mime/packages/googleearth-mimetypes.xml
-@dirrm %%DATADIR%%/bin
-@dirrm %%DATADIR%%/desktop_icons/consumer
-@dirrm %%DATADIR%%/desktop_icons/ec
-@dirrm %%DATADIR%%/desktop_icons/pro
-@dirrm %%DATADIR%%/desktop_icons
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%/linux/xdg
-@dirrm %%DATADIR%%/linux
-@dirrm %%DATADIR%%/plugins/imageformats
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/resources/ad.country
-@dirrm %%DATADIR%%/resources/ae.country
-@dirrm %%DATADIR%%/resources/af.country
-@dirrm %%DATADIR%%/resources/ag.country
-@dirrm %%DATADIR%%/resources/ai.country
-@dirrm %%DATADIR%%/resources/al.country
-@dirrm %%DATADIR%%/resources/am.country
-@dirrm %%DATADIR%%/resources/an.country
-@dirrm %%DATADIR%%/resources/ao.country
-@dirrm %%DATADIR%%/resources/aq.country
-@dirrm %%DATADIR%%/resources/ar.country
-@dirrm %%DATADIR%%/resources/ar.locale
-@dirrm %%DATADIR%%/resources/as.country
-@dirrm %%DATADIR%%/resources/at.country
-@dirrm %%DATADIR%%/resources/au.country
-@dirrm %%DATADIR%%/resources/aw.country
-@dirrm %%DATADIR%%/resources/ax.country
-@dirrm %%DATADIR%%/resources/az.country
-@dirrm %%DATADIR%%/resources/ba.country
-@dirrm %%DATADIR%%/resources/bb.country
-@dirrm %%DATADIR%%/resources/bd.country
-@dirrm %%DATADIR%%/resources/be.country
-@dirrm %%DATADIR%%/resources/bf.country
-@dirrm %%DATADIR%%/resources/bg.country
-@dirrm %%DATADIR%%/resources/bg.locale
-@dirrm %%DATADIR%%/resources/bh.country
-@dirrm %%DATADIR%%/resources/bi.country
-@dirrm %%DATADIR%%/resources/bj.country
-@dirrm %%DATADIR%%/resources/bm.country
-@dirrm %%DATADIR%%/resources/bn.country
-@dirrm %%DATADIR%%/resources/bo.country
-@dirrm %%DATADIR%%/resources/br.country
-@dirrm %%DATADIR%%/resources/bs.country
-@dirrm %%DATADIR%%/resources/bt.country
-@dirrm %%DATADIR%%/resources/bv.country
-@dirrm %%DATADIR%%/resources/bw.country
-@dirrm %%DATADIR%%/resources/by.country
-@dirrm %%DATADIR%%/resources/bz.country
-@dirrm %%DATADIR%%/resources/ca.country
-@dirrm %%DATADIR%%/resources/ca.locale
-@dirrm %%DATADIR%%/resources/cc.country
-@dirrm %%DATADIR%%/resources/cd.country
-@dirrm %%DATADIR%%/resources/cf.country
-@dirrm %%DATADIR%%/resources/cg.country
-@dirrm %%DATADIR%%/resources/ch.country
-@dirrm %%DATADIR%%/resources/ci.country
-@dirrm %%DATADIR%%/resources/ck.country
-@dirrm %%DATADIR%%/resources/cl.country
-@dirrm %%DATADIR%%/resources/cm.country
-@dirrm %%DATADIR%%/resources/cn.country
-@dirrm %%DATADIR%%/resources/co.country
-@dirrm %%DATADIR%%/resources/cr.country
-@dirrm %%DATADIR%%/resources/cs.country
-@dirrm %%DATADIR%%/resources/cs.locale
-@dirrm %%DATADIR%%/resources/cu.country
-@dirrm %%DATADIR%%/resources/cv.country
-@dirrm %%DATADIR%%/resources/cx.country
-@dirrm %%DATADIR%%/resources/cy.country
-@dirrm %%DATADIR%%/resources/cz.country
-@dirrm %%DATADIR%%/resources/da.locale
-@dirrm %%DATADIR%%/resources/de.country
-@dirrm %%DATADIR%%/resources/de.locale
-@dirrm %%DATADIR%%/resources/dj.country
-@dirrm %%DATADIR%%/resources/dk.country
-@dirrm %%DATADIR%%/resources/dm.country
-@dirrm %%DATADIR%%/resources/do.country
-@dirrm %%DATADIR%%/resources/dz.country
-@dirrm %%DATADIR%%/resources/ec.country
-@dirrm %%DATADIR%%/resources/ee.country
-@dirrm %%DATADIR%%/resources/eg.country
-@dirrm %%DATADIR%%/resources/eh.country
-@dirrm %%DATADIR%%/resources/el.locale
-@dirrm %%DATADIR%%/resources/en.locale
-@dirrm %%DATADIR%%/resources/er.country
-@dirrm %%DATADIR%%/resources/es-419.locale
-@dirrm %%DATADIR%%/resources/es.country
-@dirrm %%DATADIR%%/resources/es.locale
-@dirrm %%DATADIR%%/resources/et.country
-@dirrm %%DATADIR%%/resources/fi.country
-@dirrm %%DATADIR%%/resources/fi.locale
-@dirrm %%DATADIR%%/resources/fil.locale
-@dirrm %%DATADIR%%/resources/fj.country
-@dirrm %%DATADIR%%/resources/fk.country
-@dirrm %%DATADIR%%/resources/flightsim/aircraft
-@dirrm %%DATADIR%%/resources/flightsim/controller
-@dirrm %%DATADIR%%/resources/flightsim/hud
-@dirrm %%DATADIR%%/resources/flightsim/keyboard
-@dirrm %%DATADIR%%/resources/flightsim/planet
-@dirrm %%DATADIR%%/resources/flightsim
-@dirrm %%DATADIR%%/resources/fm.country
-@dirrm %%DATADIR%%/resources/fo.country
-@dirrm %%DATADIR%%/resources/fr.country
-@dirrm %%DATADIR%%/resources/fr.locale
-@dirrm %%DATADIR%%/resources/ga.country
-@dirrm %%DATADIR%%/resources/gb.country
-@dirrm %%DATADIR%%/resources/gd.country
-@dirrm %%DATADIR%%/resources/ge.country
-@dirrm %%DATADIR%%/resources/gf.country
-@dirrm %%DATADIR%%/resources/gg.country
-@dirrm %%DATADIR%%/resources/gh.country
-@dirrm %%DATADIR%%/resources/gi.country
-@dirrm %%DATADIR%%/resources/gl.country
-@dirrm %%DATADIR%%/resources/gm.country
-@dirrm %%DATADIR%%/resources/gn.country
-@dirrm %%DATADIR%%/resources/gp.country
-@dirrm %%DATADIR%%/resources/gq.country
-@dirrm %%DATADIR%%/resources/gr.country
-@dirrm %%DATADIR%%/resources/gs.country
-@dirrm %%DATADIR%%/resources/gt.country
-@dirrm %%DATADIR%%/resources/gu.country
-@dirrm %%DATADIR%%/resources/gw.country
-@dirrm %%DATADIR%%/resources/gy.country
-@dirrm %%DATADIR%%/resources/he.locale
-@dirrm %%DATADIR%%/resources/hi.locale
-@dirrm %%DATADIR%%/resources/hk.country
-@dirrm %%DATADIR%%/resources/hm.country
-@dirrm %%DATADIR%%/resources/hn.country
-@dirrm %%DATADIR%%/resources/hr.country
-@dirrm %%DATADIR%%/resources/hr.locale
-@dirrm %%DATADIR%%/resources/ht.country
-@dirrm %%DATADIR%%/resources/hu.country
-@dirrm %%DATADIR%%/resources/hu.locale
-@dirrm %%DATADIR%%/resources/id.country
-@dirrm %%DATADIR%%/resources/id.locale
-@dirrm %%DATADIR%%/resources/ie.country
-@dirrm %%DATADIR%%/resources/il.country
-@dirrm %%DATADIR%%/resources/im.country
-@dirrm %%DATADIR%%/resources/in.country
-@dirrm %%DATADIR%%/resources/io.country
-@dirrm %%DATADIR%%/resources/iq.country
-@dirrm %%DATADIR%%/resources/ir.country
-@dirrm %%DATADIR%%/resources/is.country
-@dirrm %%DATADIR%%/resources/it.country
-@dirrm %%DATADIR%%/resources/it.locale
-@dirrm %%DATADIR%%/resources/ja.locale
-@dirrm %%DATADIR%%/resources/je.country
-@dirrm %%DATADIR%%/resources/jm.country
-@dirrm %%DATADIR%%/resources/jo.country
-@dirrm %%DATADIR%%/resources/jp.country
-@dirrm %%DATADIR%%/resources/ke.country
-@dirrm %%DATADIR%%/resources/kg.country
-@dirrm %%DATADIR%%/resources/kh.country
-@dirrm %%DATADIR%%/resources/ki.country
-@dirrm %%DATADIR%%/resources/km.country
-@dirrm %%DATADIR%%/resources/kn.country
-@dirrm %%DATADIR%%/resources/ko.locale
-@dirrm %%DATADIR%%/resources/kp.country
-@dirrm %%DATADIR%%/resources/kr.country
-@dirrm %%DATADIR%%/resources/kw.country
-@dirrm %%DATADIR%%/resources/ky.country
-@dirrm %%DATADIR%%/resources/kz.country
-@dirrm %%DATADIR%%/resources/la.country
-@dirrm %%DATADIR%%/resources/lb.country
-@dirrm %%DATADIR%%/resources/lc.country
-@dirrm %%DATADIR%%/resources/li.country
-@dirrm %%DATADIR%%/resources/lk.country
-@dirrm %%DATADIR%%/resources/lr.country
-@dirrm %%DATADIR%%/resources/ls.country
-@dirrm %%DATADIR%%/resources/lt.country
-@dirrm %%DATADIR%%/resources/lt.locale
-@dirrm %%DATADIR%%/resources/lu.country
-@dirrm %%DATADIR%%/resources/lv.country
-@dirrm %%DATADIR%%/resources/lv.locale
-@dirrm %%DATADIR%%/resources/ly.country
-@dirrm %%DATADIR%%/resources/ma.country
-@dirrm %%DATADIR%%/resources/mc.country
-@dirrm %%DATADIR%%/resources/md.country
-@dirrm %%DATADIR%%/resources/me.country
-@dirrm %%DATADIR%%/resources/mg.country
-@dirrm %%DATADIR%%/resources/mh.country
-@dirrm %%DATADIR%%/resources/mk.country
-@dirrm %%DATADIR%%/resources/ml.country
-@dirrm %%DATADIR%%/resources/mm.country
-@dirrm %%DATADIR%%/resources/mn.country
-@dirrm %%DATADIR%%/resources/mo.country
-@dirrm %%DATADIR%%/resources/mp.country
-@dirrm %%DATADIR%%/resources/mq.country
-@dirrm %%DATADIR%%/resources/mr.country
-@dirrm %%DATADIR%%/resources/ms.country
-@dirrm %%DATADIR%%/resources/mt.country
-@dirrm %%DATADIR%%/resources/mu.country
-@dirrm %%DATADIR%%/resources/mv.country
-@dirrm %%DATADIR%%/resources/mw.country
-@dirrm %%DATADIR%%/resources/mx.country
-@dirrm %%DATADIR%%/resources/my.country
-@dirrm %%DATADIR%%/resources/mz.country
-@dirrm %%DATADIR%%/resources/na.country
-@dirrm %%DATADIR%%/resources/nc.country
-@dirrm %%DATADIR%%/resources/ne.country
-@dirrm %%DATADIR%%/resources/nf.country
-@dirrm %%DATADIR%%/resources/ng.country
-@dirrm %%DATADIR%%/resources/ni.country
-@dirrm %%DATADIR%%/resources/nl.country
-@dirrm %%DATADIR%%/resources/nl.locale
-@dirrm %%DATADIR%%/resources/no.country
-@dirrm %%DATADIR%%/resources/no.locale
-@dirrm %%DATADIR%%/resources/np.country
-@dirrm %%DATADIR%%/resources/nr.country
-@dirrm %%DATADIR%%/resources/nu.country
-@dirrm %%DATADIR%%/resources/nz.country
-@dirrm %%DATADIR%%/resources/om.country
-@dirrm %%DATADIR%%/resources/pa.country
-@dirrm %%DATADIR%%/resources/pe.country
-@dirrm %%DATADIR%%/resources/pf.country
-@dirrm %%DATADIR%%/resources/pg.country
-@dirrm %%DATADIR%%/resources/ph.country
-@dirrm %%DATADIR%%/resources/pk.country
-@dirrm %%DATADIR%%/resources/pl.country
-@dirrm %%DATADIR%%/resources/pl.locale
-@dirrm %%DATADIR%%/resources/pm.country
-@dirrm %%DATADIR%%/resources/pn.country
-@dirrm %%DATADIR%%/resources/pr.country
-@dirrm %%DATADIR%%/resources/ps.country
-@dirrm %%DATADIR%%/resources/pt-PT.locale
-@dirrm %%DATADIR%%/resources/pt.country
-@dirrm %%DATADIR%%/resources/pt.locale
-@dirrm %%DATADIR%%/resources/pw.country
-@dirrm %%DATADIR%%/resources/py.country
-@dirrm %%DATADIR%%/resources/qa.country
-@dirrm %%DATADIR%%/resources/re.country
-@dirrm %%DATADIR%%/resources/ro.country
-@dirrm %%DATADIR%%/resources/ro.locale
-@dirrm %%DATADIR%%/resources/rs.country
-@dirrm %%DATADIR%%/resources/ru.country
-@dirrm %%DATADIR%%/resources/ru.locale
-@dirrm %%DATADIR%%/resources/rw.country
-@dirrm %%DATADIR%%/resources/sa.country
-@dirrm %%DATADIR%%/resources/sb.country
-@dirrm %%DATADIR%%/resources/sc.country
-@dirrm %%DATADIR%%/resources/sd.country
-@dirrm %%DATADIR%%/resources/se.country
-@dirrm %%DATADIR%%/resources/sg.country
-@dirrm %%DATADIR%%/resources/sh.country
-@dirrm %%DATADIR%%/resources/si.country
-@dirrm %%DATADIR%%/resources/sj.country
-@dirrm %%DATADIR%%/resources/sk.country
-@dirrm %%DATADIR%%/resources/sk.locale
-@dirrm %%DATADIR%%/resources/sl.country
-@dirrm %%DATADIR%%/resources/sl.locale
-@dirrm %%DATADIR%%/resources/sm.country
-@dirrm %%DATADIR%%/resources/sn.country
-@dirrm %%DATADIR%%/resources/so.country
-@dirrm %%DATADIR%%/resources/sr.country
-@dirrm %%DATADIR%%/resources/sr.locale
-@dirrm %%DATADIR%%/resources/st.country
-@dirrm %%DATADIR%%/resources/sv.country
-@dirrm %%DATADIR%%/resources/sv.locale
-@dirrm %%DATADIR%%/resources/sy.country
-@dirrm %%DATADIR%%/resources/sz.country
-@dirrm %%DATADIR%%/resources/tc.country
-@dirrm %%DATADIR%%/resources/td.country
-@dirrm %%DATADIR%%/resources/tf.country
-@dirrm %%DATADIR%%/resources/tg.country
-@dirrm %%DATADIR%%/resources/th.country
-@dirrm %%DATADIR%%/resources/th.locale
-@dirrm %%DATADIR%%/resources/tj.country
-@dirrm %%DATADIR%%/resources/tk.country
-@dirrm %%DATADIR%%/resources/tl.country
-@dirrm %%DATADIR%%/resources/tm.country
-@dirrm %%DATADIR%%/resources/tn.country
-@dirrm %%DATADIR%%/resources/to.country
-@dirrm %%DATADIR%%/resources/tr.country
-@dirrm %%DATADIR%%/resources/tr.locale
-@dirrm %%DATADIR%%/resources/tt.country
-@dirrm %%DATADIR%%/resources/tv.country
-@dirrm %%DATADIR%%/resources/tw.country
-@dirrm %%DATADIR%%/resources/tz.country
-@dirrm %%DATADIR%%/resources/ua.country
-@dirrm %%DATADIR%%/resources/ug.country
-@dirrm %%DATADIR%%/resources/uk.locale
-@dirrm %%DATADIR%%/resources/um.country
-@dirrm %%DATADIR%%/resources/us.country
-@dirrm %%DATADIR%%/resources/uy.country
-@dirrm %%DATADIR%%/resources/uz.country
-@dirrm %%DATADIR%%/resources/va.country
-@dirrm %%DATADIR%%/resources/vc.country
-@dirrm %%DATADIR%%/resources/ve.country
-@dirrm %%DATADIR%%/resources/vg.country
-@dirrm %%DATADIR%%/resources/vi.country
-@dirrm %%DATADIR%%/resources/vi.locale
-@dirrm %%DATADIR%%/resources/vn.country
-@dirrm %%DATADIR%%/resources/vu.country
-@dirrm %%DATADIR%%/resources/wf.country
-@dirrm %%DATADIR%%/resources/ws.country
-@dirrm %%DATADIR%%/resources/ye.country
-@dirrm %%DATADIR%%/resources/yt.country
-@dirrm %%DATADIR%%/resources/za.country
-@dirrm %%DATADIR%%/resources/zh-Hans.locale
-@dirrm %%DATADIR%%/resources/zh-Hant.locale
-@dirrm %%DATADIR%%/resources/zm.country
-@dirrm %%DATADIR%%/resources/zw.country
-@dirrm %%DATADIR%%/resources
-@dirrm %%DATADIR%%/shaders
-@dirrm %%DATADIR%%
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true
diff --git a/astro/gpsd/pkg-plist b/astro/gpsd/pkg-plist
index d6ea25146510..85e51f425bdc 100644
--- a/astro/gpsd/pkg-plist
+++ b/astro/gpsd/pkg-plist
@@ -66,9 +66,6 @@ man/man8/gpsinit.8.gz
 %%PYTHON_SITELIBDIR%%/gps/misc.pyc
 %%PYTHON_SITELIBDIR%%/gps/misc.pyo
 %%PYTHON_SITELIBDIR%%/gps/packet.so
-@dirrm %%PYTHON_SITELIBDIR%%/gps
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
 %%QTBIND%%libdata/pkgconfig/Qgpsmm.pc
 libdata/pkgconfig/libgps.pc
 libdata/pkgconfig/libgpsd.pc
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index eff95190c34b..102a58695044 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -64,6 +64,3 @@ share/applications/gpsdrive.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/gpsdrive.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gpsdrive.mo
 share/pixmaps/gpsicon.png
-%%NLS%%@dirrmtry share/locale/gr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gr
-@dirrm %%DATADIR%%
diff --git a/astro/gpsman/pkg-plist b/astro/gpsman/pkg-plist
index 354054cabd38..c66c8bf63403 100644
--- a/astro/gpsman/pkg-plist
+++ b/astro/gpsman/pkg-plist
@@ -339,7 +339,3 @@ bin/gpsman
 %%GPSMANDIR%%/util/shape2quadr.tcl
 %%GPSMANDIR%%/util/wpsinfull.tcl
 man/man1/gpsman.1.gz
-@dirrm %%GPSMANDIR%%/util
-@dirrm %%GPSMANDIR%%/gmsrc/gmicons
-@dirrm %%GPSMANDIR%%/gmsrc
-@dirrm %%GPSMANDIR%%
diff --git a/astro/libgal/pkg-plist b/astro/libgal/pkg-plist
index 9d035b63d8f6..c82fc566554b 100644
--- a/astro/libgal/pkg-plist
+++ b/astro/libgal/pkg-plist
@@ -336,4 +336,3 @@ lib/libgal.so
 lib/libgal.so.0
 lib/libgal.so.0.0.4
 %%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
diff --git a/astro/libkgeomap/pkg-plist b/astro/libkgeomap/pkg-plist
index 8dde1b93636b..60eb4340f2f1 100644
--- a/astro/libkgeomap/pkg-plist
+++ b/astro/libkgeomap/pkg-plist
@@ -51,5 +51,3 @@ share/apps/libkgeomap/marker-ffff00-selected.png
 share/apps/libkgeomap/marker-ffff00-someselected.png
 share/apps/libkgeomap/marker-ffff00.png
 share/apps/libkgeomap/marker-icon-16x16.png
-@dirrm share/apps/libkgeomap
-@dirrm include/libkgeomap
diff --git a/astro/libnova/pkg-plist b/astro/libnova/pkg-plist
index 02ec8bde133e..204e23f52da8 100644
--- a/astro/libnova/pkg-plist
+++ b/astro/libnova/pkg-plist
@@ -38,4 +38,3 @@ lib/libnova-0.15.so.0
 lib/libnova-0.15.so.0.0.0
 lib/libnova.a
 lib/libnova.so
-@dirrm include/libnova/
diff --git a/astro/libroadnav/pkg-plist b/astro/libroadnav/pkg-plist
index 423f1cce81bd..a1df6b196196 100644
--- a/astro/libroadnav/pkg-plist
+++ b/astro/libroadnav/pkg-plist
@@ -47,4 +47,3 @@ include/libroadnav/UnitConversion.h
 include/libroadnav/Zip.h
 include/libroadnav/wxAntiAliasedDC.h
 lib/libroadnav.a
-@dirrm include/libroadnav
diff --git a/astro/merkaartor/pkg-plist b/astro/merkaartor/pkg-plist
index 2d0fe6b62ab8..5308b80682cb 100644
--- a/astro/merkaartor/pkg-plist
+++ b/astro/merkaartor/pkg-plist
@@ -29,13 +29,3 @@ share/icons/hicolor/48x48/apps/merkaartor.png
 %%NLS%%%%DATADIR%%/translations/merkaartor_et.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_hr.qm
 %%NLS%%%%DATADIR%%/translations/merkaartor_hu.qm
-%%NLS%%@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm lib/merkaartor/plugins/styles
-@dirrm lib/merkaartor/plugins/background
-@dirrm lib/merkaartor/plugins
-@dirrm lib/merkaartor
diff --git a/astro/nightfall/pkg-plist b/astro/nightfall/pkg-plist
index 6654bbe42802..a9b6103f7e60 100644
--- a/astro/nightfall/pkg-plist
+++ b/astro/nightfall/pkg-plist
@@ -92,16 +92,3 @@ share/locale/it/LC_MESSAGES/nightfall.mo
 %%DATADIR%%/pixmaps/stars_256.jpg
 %%GNOME%%share/omf/nightfall/nightfall-C.omf
 %%GNOME%%share/omf/nightfall/nightfall-de.omf
-%%GNOME%%@dirrm share/omf/nightfall
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/doc/de/edu
-@dirrm %%DATADIR%%/doc/de
-@dirrm %%DATADIR%%/doc/C/edu
-@dirrm %%DATADIR%%/doc/C
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/cfg
-@dirrm %%DATADIR%%
-%%GNOME%%@dirrm share/gnome/help/nightfall/de
-%%GNOME%%@dirrm share/gnome/help/nightfall/C
-%%GNOME%%@dirrm share/gnome/help/nightfall
diff --git a/astro/openuniverse/pkg-plist b/astro/openuniverse/pkg-plist
index e867b37209fb..9d32eb45b661 100644
--- a/astro/openuniverse/pkg-plist
+++ b/astro/openuniverse/pkg-plist
@@ -108,10 +108,3 @@ bin/openuniverse
 %%DATADIR%%/textures/uranus.jpg
 %%DATADIR%%/textures/venus.jpg
 %%DATADIR%%/textures/wingtop.jpg
-@dirrm %%DATADIR%%/textures
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/conf
-@dirrm %%DATADIR%%/3dmodels
-@dirrm %%DATADIR%%
diff --git a/astro/p5-Astro-ADS/pkg-plist b/astro/p5-Astro-ADS/pkg-plist
index a7f69d73d05e..95661addc647 100644
--- a/astro/p5-Astro-ADS/pkg-plist
+++ b/astro/p5-Astro-ADS/pkg-plist
@@ -9,8 +9,3 @@ bin/adsquery
 %%PERL5_MAN3%%/Astro::ADS::Result.3.gz
 %%PERL5_MAN3%%/Astro::ADS::Result::Paper.3.gz
 man/man1/adsquery.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/ADS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrm %%SITE_PERL%%/Astro/ADS/Result
-@dirrm %%SITE_PERL%%/Astro/ADS
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Catalog/pkg-plist b/astro/p5-Astro-Catalog/pkg-plist
index 2ecd3c087e6c..80c707a9ce00 100644
--- a/astro/p5-Astro-Catalog/pkg-plist
+++ b/astro/p5-Astro-Catalog/pkg-plist
@@ -76,11 +76,3 @@ etc/sss.cfg.sample
 %%SITE_PERL%%/Astro/Catalog/Transport/REST.pm
 %%SITE_PERL%%/Astro/Catalog/Transport/WebService.pm
 %%SITE_PERL%%/Tk/AstroCatalog.pm
-@dirrmtry %%SITE_PERL%%/Tk
-@dirrm %%SITE_PERL%%/Astro/Catalog/Transport
-@dirrm %%SITE_PERL%%/Astro/Catalog/Star
-@dirrm %%SITE_PERL%%/Astro/Catalog/Query
-@dirrm %%SITE_PERL%%/Astro/Catalog/Item
-@dirrm %%SITE_PERL%%/Astro/Catalog/IO
-@dirrm %%SITE_PERL%%/Astro/Catalog
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Constants/pkg-plist b/astro/p5-Astro-Constants/pkg-plist
index 9b19c0b1334e..d7252da4354f 100644
--- a/astro/p5-Astro-Constants/pkg-plist
+++ b/astro/p5-Astro-Constants/pkg-plist
@@ -3,7 +3,3 @@
 %%SITE_PERL%%/Astro/Constants/MKS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Constants/.packlist
 %%PERL5_MAN3%%/Astro::Constants.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Constants
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro/Constants
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Coords/pkg-plist b/astro/p5-Astro-Coords/pkg-plist
index 5bd6e3fcbaaa..17454a1892f4 100644
--- a/astro/p5-Astro-Coords/pkg-plist
+++ b/astro/p5-Astro-Coords/pkg-plist
@@ -18,6 +18,3 @@
 %%PERL5_MAN3%%/Astro::Coords::Interpolated.3.gz
 %%PERL5_MAN3%%/Astro::Coords::Offset.3.gz
 %%PERL5_MAN3%%/Astro::Coords::Planet.3.gz
-@dirrmtry %%SITE_PERL%%/Astro/Coords/Angle
-@dirrmtry %%SITE_PERL%%/Astro/Coords
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-DSS/pkg-plist b/astro/p5-Astro-DSS/pkg-plist
index d724cc51703f..bac23bc592eb 100644
--- a/astro/p5-Astro-DSS/pkg-plist
+++ b/astro/p5-Astro-DSS/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Astro/DSS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/DSS/.packlist
 %%PERL5_MAN3%%/Astro::DSS.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/DSS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-FITS-CFITSIO/pkg-plist b/astro/p5-Astro-FITS-CFITSIO/pkg-plist
index b866a661646b..d105d666aa1d 100644
--- a/astro/p5-Astro-FITS-CFITSIO/pkg-plist
+++ b/astro/p5-Astro-FITS-CFITSIO/pkg-plist
@@ -3,8 +3,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/CFITSIO/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/CFITSIO/CFITSIO.so
 %%PERL5_MAN3%%/Astro::FITS::CFITSIO.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/CFITSIO
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Astro/FITS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Astro
diff --git a/astro/p5-Astro-FITS-Header/pkg-plist b/astro/p5-Astro-FITS-Header/pkg-plist
index e68524ab8581..eaacd5245054 100644
--- a/astro/p5-Astro-FITS-Header/pkg-plist
+++ b/astro/p5-Astro-FITS-Header/pkg-plist
@@ -10,6 +10,3 @@
 %%SITE_PERL%%/Astro/FITS/Header/GSD.pm
 %%SITE_PERL%%/Astro/FITS/Header/Item.pm
 %%SITE_PERL%%/Astro/FITS/Header/NDF.pm
-@dirrm %%SITE_PERL%%/Astro/FITS/Header
-@dirrmtry %%SITE_PERL%%/Astro/FITS
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Flux/pkg-plist b/astro/p5-Astro-Flux/pkg-plist
index 4652c517abb3..42c6a9dde824 100644
--- a/astro/p5-Astro-Flux/pkg-plist
+++ b/astro/p5-Astro-Flux/pkg-plist
@@ -5,6 +5,3 @@
 %%PERL5_MAN3%%/Astro::Flux.3.gz
 %%PERL5_MAN3%%/Astro::FluxColor.3.gz
 %%PERL5_MAN3%%/Astro::Fluxes.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Flux
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Hipparcos/pkg-plist b/astro/p5-Astro-Hipparcos/pkg-plist
index 34cf62865f13..d12cbac062c0 100644
--- a/astro/p5-Astro-Hipparcos/pkg-plist
+++ b/astro/p5-Astro-Hipparcos/pkg-plist
@@ -4,7 +4,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Hipparcos/.packlist
 %%PERL5_MAN3%%/Astro::Hipparcos.3.gz
 %%PERL5_MAN3%%/Astro::Hipparcos::Record.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Astro/Hipparcos
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Astro
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Hipparcos
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
diff --git a/astro/p5-Astro-MoonPhase/pkg-plist b/astro/p5-Astro-MoonPhase/pkg-plist
index 9af904604ed7..3c11efadd289 100644
--- a/astro/p5-Astro-MoonPhase/pkg-plist
+++ b/astro/p5-Astro-MoonPhase/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Astro/MoonPhase.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/MoonPhase/.packlist
 %%PERL5_MAN3%%/Astro::MoonPhase.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/MoonPhase
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-PAL/pkg-plist b/astro/p5-Astro-PAL/pkg-plist
index 001ae2e01819..e9a2e7160b45 100644
--- a/astro/p5-Astro-PAL/pkg-plist
+++ b/astro/p5-Astro-PAL/pkg-plist
@@ -3,6 +3,3 @@ bin/stime
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/PAL/PAL.so
 %%PERL5_MAN3%%/Astro::PAL.3.gz
 man/man1/stime.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/PAL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Astro
diff --git a/astro/p5-Astro-SIMBAD-Client/pkg-plist b/astro/p5-Astro-SIMBAD-Client/pkg-plist
index 6bfb14205a20..f0647eb1cfb2 100644
--- a/astro/p5-Astro-SIMBAD-Client/pkg-plist
+++ b/astro/p5-Astro-SIMBAD-Client/pkg-plist
@@ -4,9 +4,3 @@ bin/simbadc
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD/Client/.packlist
 %%PERL5_MAN3%%/Astro::SIMBAD::Client.3.gz
 man/man1/simbadc.1.gz
-@dirrm %%SITE_PERL%%/Astro/SIMBAD/Client
-@dirrm %%SITE_PERL%%/Astro/SIMBAD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD/Client
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-SIMBAD/pkg-plist b/astro/p5-Astro-SIMBAD/pkg-plist
index f2b46d90ca61..2b3af627bc4a 100644
--- a/astro/p5-Astro-SIMBAD/pkg-plist
+++ b/astro/p5-Astro-SIMBAD/pkg-plist
@@ -7,9 +7,3 @@
 %%PERL5_MAN3%%/Astro::SIMBAD::Query.3.gz
 %%PERL5_MAN3%%/Astro::SIMBAD::Result.3.gz
 %%PERL5_MAN3%%/Astro::SIMBAD::Result::Object.3.gz
-@dirrm %%SITE_PERL%%/Astro/SIMBAD/Result
-@dirrm %%SITE_PERL%%/Astro/SIMBAD
-@dirrm %%SITE_PERL%%/Astro
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-SpaceTrack/pkg-plist b/astro/p5-Astro-SpaceTrack/pkg-plist
index cd94872e27aa..12edf8305bb7 100644
--- a/astro/p5-Astro-SpaceTrack/pkg-plist
+++ b/astro/p5-Astro-SpaceTrack/pkg-plist
@@ -5,7 +5,3 @@ bin/SpaceTrack
 %%PERL5_MAN3%%/Astro::SpaceTrack.3.gz
 %%PERL5_MAN3%%/Astro::SpaceTrack::BulkData.3.gz
 man/man1/SpaceTrack.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SpaceTrack
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro/SpaceTrack
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-SunTime/pkg-plist b/astro/p5-Astro-SunTime/pkg-plist
index f4d5e7cae908..36760d99235c 100644
--- a/astro/p5-Astro-SunTime/pkg-plist
+++ b/astro/p5-Astro-SunTime/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Astro/SunTime.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Sunrise/pkg-plist b/astro/p5-Astro-Sunrise/pkg-plist
index 477aa08213d9..95bd17625e9d 100644
--- a/astro/p5-Astro-Sunrise/pkg-plist
+++ b/astro/p5-Astro-Sunrise/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Sunrise/.packlist
 %%SITE_PERL%%/Astro/Sunrise.pm
 %%PERL5_MAN3%%/Astro::Sunrise.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Sunrise
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Telescope/pkg-plist b/astro/p5-Astro-Telescope/pkg-plist
index c7851ffdd60f..5994f7be230b 100644
--- a/astro/p5-Astro-Telescope/pkg-plist
+++ b/astro/p5-Astro-Telescope/pkg-plist
@@ -1,5 +1,3 @@
 %%SITE_PERL%%/Astro/Telescope.pm
 %%SITE_PERL%%/Astro/Telescope/MPC.pm
 %%PERL5_MAN3%%/Astro::Telescope.3.gz
-@dirrmtry %%SITE_PERL%%/Astro/Telescope
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-WaveBand/pkg-plist b/astro/p5-Astro-WaveBand/pkg-plist
index d134a750adb6..ed63b295161b 100644
--- a/astro/p5-Astro-WaveBand/pkg-plist
+++ b/astro/p5-Astro-WaveBand/pkg-plist
@@ -1,3 +1,2 @@
 %%SITE_PERL%%/Astro/WaveBand.pm
 %%PERL5_MAN3%%/Astro::WaveBand.3.gz
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-satpass/pkg-plist b/astro/p5-Astro-satpass/pkg-plist
index ac4b661a0c69..7cca310fdd09 100644
--- a/astro/p5-Astro-satpass/pkg-plist
+++ b/astro/p5-Astro-satpass/pkg-plist
@@ -21,10 +21,3 @@ bin/satpass
 %%SITE_PERL%%/Astro/Coord/ECI/Utils.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Coord/ECI/.packlist
 man/man1/satpass.1.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Coord/ECI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Coord
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
-@dirrm %%SITE_PERL%%/Astro/Coord/ECI/TLE
-@dirrm %%SITE_PERL%%/Astro/Coord/ECI
-@dirrm %%SITE_PERL%%/Astro/Coord
-@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro/pkg-plist b/astro/p5-Astro/pkg-plist
index 9801dc45dad1..ad1f6ee6f84e 100644
--- a/astro/p5-Astro/pkg-plist
+++ b/astro/p5-Astro/pkg-plist
@@ -5,5 +5,3 @@
 %%PERL5_MAN3%%/Astro::Coord.3.gz
 %%PERL5_MAN3%%/Astro::Misc.3.gz
 %%PERL5_MAN3%%/Astro::Time.3.gz
-@dirrmtry %%SITE_PERL%%/Astro
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
diff --git a/astro/p5-GPS-Babel/pkg-plist b/astro/p5-GPS-Babel/pkg-plist
index ea4e54d3c6bd..3e6d98a0348f 100644
--- a/astro/p5-GPS-Babel/pkg-plist
+++ b/astro/p5-GPS-Babel/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/GPS::Babel.3.gz
 %%SITE_PERL%%/GPS/Babel.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/Babel/.packlist
-@dirrmtry %%SITE_PERL%%/GPS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/Babel
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS
diff --git a/astro/p5-GPS-OID/pkg-plist b/astro/p5-GPS-OID/pkg-plist
index 83f4e471d93f..c9d87c6fccff 100644
--- a/astro/p5-GPS-OID/pkg-plist
+++ b/astro/p5-GPS-OID/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/GPS::OID.3.gz
 %%SITE_PERL%%/GPS/OID.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/OID/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/OID
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS
-@dirrmtry %%SITE_PERL%%/GPS
diff --git a/astro/p5-Geo-METAR/pkg-plist b/astro/p5-Geo-METAR/pkg-plist
index c45709d1d214..5e5c8cc76841 100644
--- a/astro/p5-Geo-METAR/pkg-plist
+++ b/astro/p5-Geo-METAR/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/Geo::METAR.3.gz
 %%SITE_PERL%%/Geo/METAR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/astro/p5-Misc-Quality/pkg-plist b/astro/p5-Misc-Quality/pkg-plist
index 30873e2cd690..4a0183b77123 100644
--- a/astro/p5-Misc-Quality/pkg-plist
+++ b/astro/p5-Misc-Quality/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Misc/Quality.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Misc/Quality/.packlist
 %%PERL5_MAN3%%/Misc::Quality.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Misc/Quality
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Misc
-@dirrmtry %%SITE_PERL%%/Misc
diff --git a/astro/p5-Starlink-AST/pkg-plist b/astro/p5-Starlink-AST/pkg-plist
index 3ec1b6ed9895..ca086a43cbcc 100644
--- a/astro/p5-Starlink-AST/pkg-plist
+++ b/astro/p5-Starlink-AST/pkg-plist
@@ -7,7 +7,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST/PGPLOT.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST/PLplot.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Starlink/AST
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Starlink
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Starlink/AST
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Starlink
diff --git a/astro/p5-Weather-Underground/pkg-plist b/astro/p5-Weather-Underground/pkg-plist
index 65e0736c6373..6720dcecb59b 100644
--- a/astro/p5-Weather-Underground/pkg-plist
+++ b/astro/p5-Weather-Underground/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/Weather/Underground.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Weather/Underground/.packlist
 %%PERL5_MAN3%%/Weather::Underground.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Weather/Underground
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Weather
-@dirrmtry %%SITE_PERL%%/Weather
diff --git a/astro/p5-ZConf-Weather/pkg-plist b/astro/p5-ZConf-Weather/pkg-plist
index 11eccd49273e..651d6a938f34 100644
--- a/astro/p5-ZConf-Weather/pkg-plist
+++ b/astro/p5-ZConf-Weather/pkg-plist
@@ -2,7 +2,3 @@ bin/zcweather
 %%SITE_PERL%%/ZConf/Weather.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Weather/.packlist
 %%PERL5_MAN3%%/ZConf::Weather.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf/Weather
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ZConf
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%/ZConf
diff --git a/astro/planets/pkg-plist b/astro/planets/pkg-plist
index 9251ea31bf5d..4421172c3041 100644
--- a/astro/planets/pkg-plist
+++ b/astro/planets/pkg-plist
@@ -2,4 +2,3 @@ bin/planets
 man/man1/planets.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/KEYBINDINGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/getting_started.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/pp3/pkg-plist b/astro/pp3/pkg-plist
index 709b4a71dd62..87bdbba9e7ae 100644
--- a/astro/pp3/pkg-plist
+++ b/astro/pp3/pkg-plist
@@ -99,6 +99,3 @@ bin/pp3
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wiki.tex
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/ptiger/pkg-plist b/astro/ptiger/pkg-plist
index b743d75ef646..7b92f8c6bcc6 100644
--- a/astro/ptiger/pkg-plist
+++ b/astro/ptiger/pkg-plist
@@ -67,10 +67,3 @@ bin/ptiger
 %%DATADIR%%/src/pkgIndex.tcl
 %%DATADIR%%/src/plus.bm
 %%DATADIR%%/src/us_census.tcl
-@dirrm %%DATADIR%%/lines/highways
-@dirrm %%DATADIR%%/lines/states
-@dirrm %%DATADIR%%/lines/world
-@dirrm %%DATADIR%%/lines
-@dirrm %%DATADIR%%/places
-@dirrm %%DATADIR%%/src
-@dirrm %%DATADIR%%
diff --git a/astro/qlandkartegt/pkg-plist b/astro/qlandkartegt/pkg-plist
index 2347b0de523c..a0aad2f705b9 100644
--- a/astro/qlandkartegt/pkg-plist
+++ b/astro/qlandkartegt/pkg-plist
@@ -14,5 +14,3 @@ share/pixmaps/qlandkartegt.png
 %%DATADIR%%/translations/qlandkartegt_it_IT.qm
 %%DATADIR%%/translations/qlandkartegt_nl.qm
 %%DATADIR%%/translations/qlandkartegt_ru.qm
-@dirrm %%DATADIR%%/translations
-@dirrmtry %%DATADIR%%
diff --git a/astro/roadnav/pkg-plist b/astro/roadnav/pkg-plist
index cd2d671d737e..bcee8f040546 100644
--- a/astro/roadnav/pkg-plist
+++ b/astro/roadnav/pkg-plist
@@ -142,7 +142,3 @@ share/pixmaps/roadnav.png
 %%DATADIR%%/skins/Default-Night/zoomout2.png
 %%DATADIR%%/states.tdf
 %%DATADIR%%/zips.tdf
-@dirrm %%DATADIR%%/skins/Default-Night
-@dirrm %%DATADIR%%/skins/Default-Day
-@dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%
diff --git a/astro/sextractor/pkg-plist b/astro/sextractor/pkg-plist
index 84118cee3170..4e2486752f3d 100644
--- a/astro/sextractor/pkg-plist
+++ b/astro/sextractor/pkg-plist
@@ -1,4 +1,3 @@
 bin/sex
 man/man1/sex.1.gz
 man/manx/sex.x.gz
-@dirrmtry man/manx
diff --git a/astro/sky2000/pkg-plist b/astro/sky2000/pkg-plist
index 0eaa2d7e50d2..beab4bb8aba3 100644
--- a/astro/sky2000/pkg-plist
+++ b/astro/sky2000/pkg-plist
@@ -14,6 +14,3 @@
 %%DATADIR%%/catalogs/sky2000/sky2000-m7.noc
 %%DATADIR%%/catalogs/sky2000/sky2000-m8.noc
 %%DATADIR%%/catalogs/sky2000/sky2000-m9.noc
-@dirrm %%DATADIR%%/catalogs/sky2000
-@dirrm %%DATADIR%%/catalogs
-@dirrmtry %%DATADIR%%
diff --git a/astro/sscalc/pkg-plist b/astro/sscalc/pkg-plist
index 155366d63d02..3ef566f86eb7 100644
--- a/astro/sscalc/pkg-plist
+++ b/astro/sscalc/pkg-plist
@@ -2,4 +2,3 @@ bin/sscalc
 man/man1/sscalc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/cities.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/starplot/pkg-plist b/astro/starplot/pkg-plist
index 00b34e7bc10e..0f9f79dde56b 100644
--- a/astro/starplot/pkg-plist
+++ b/astro/starplot/pkg-plist
@@ -60,9 +60,3 @@ share/locale/es/LC_MESSAGES/starplot.mo
 share/pixmaps/starplot32x32.xpm
 %%DATADIR%%/sample.stars
 %%DATADIR%%/test.stars
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/parfiles
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/astro/stellarium-qt4/pkg-plist b/astro/stellarium-qt4/pkg-plist
index 4bd1d46149d2..c0d2e0a94fbb 100644
--- a/astro/stellarium-qt4/pkg-plist
+++ b/astro/stellarium-qt4/pkg-plist
@@ -824,43 +824,6 @@ man/man1/stellarium.1.gz
 %%DATADIR%%/textures/uranus.png
 %%DATADIR%%/textures/uranus_rings.png
 %%DATADIR%%/textures/venus.png
-@dirrm %%DATADIR%%/textures
-@dirrm %%DATADIR%%/stars/default
-@dirrm %%DATADIR%%/stars
-@dirrm %%DATADIR%%/skycultures/western
-@dirrm %%DATADIR%%/skycultures/tupi
-@dirrm %%DATADIR%%/skycultures/tongan
-@dirrm %%DATADIR%%/skycultures/sami
-@dirrm %%DATADIR%%/skycultures/polynesian
-@dirrm %%DATADIR%%/skycultures/norse
-@dirrm %%DATADIR%%/skycultures/navajo
-@dirrm %%DATADIR%%/skycultures/maori
-@dirrm %%DATADIR%%/skycultures/lakota
-@dirrm %%DATADIR%%/skycultures/korean
-@dirrm %%DATADIR%%/skycultures/inuit
-@dirrm %%DATADIR%%/skycultures/indian
-@dirrm %%DATADIR%%/skycultures/egyptian
-@dirrm %%DATADIR%%/skycultures/chinese
-@dirrm %%DATADIR%%/skycultures/aztec
-@dirrm %%DATADIR%%/skycultures/arabic
-@dirrm %%DATADIR%%/skycultures
-%%SCRIPTS%%@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/nebulae/default
-@dirrm %%DATADIR%%/nebulae
-@dirrm %%DATADIR%%/landscapes/uranus
-@dirrm %%DATADIR%%/landscapes/trees
-@dirrm %%DATADIR%%/landscapes/saturn
-@dirrm %%DATADIR%%/landscapes/ocean
-@dirrm %%DATADIR%%/landscapes/neptune
-@dirrm %%DATADIR%%/landscapes/moon
-@dirrm %%DATADIR%%/landscapes/mars
-@dirrm %%DATADIR%%/landscapes/jupiter
-@dirrm %%DATADIR%%/landscapes/hurricane
-@dirrm %%DATADIR%%/landscapes/guereins
-@dirrm %%DATADIR%%/landscapes/garching
-@dirrm %%DATADIR%%/landscapes
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
 share/applications/stellarium.desktop
 share/icons/hicolor/16x16/apps/stellarium.png
 share/icons/hicolor/32x32/apps/stellarium.png
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index b456b9dc6497..d58ced3db90d 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -1186,49 +1186,3 @@ share/pixmaps/stellarium.xpm
 %%DATADIR%%/translations/stellarium/zh_HK.qm
 %%DATADIR%%/translations/stellarium/zh_TW.qm
 %%DATADIR%%/translations/stellarium/zu.qm
-@dirrm %%DATADIR%%/translations/stellarium
-@dirrm %%DATADIR%%/translations/stellarium-skycultures
-@dirrm %%DATADIR%%/translations
-@dirrm %%DATADIR%%/textures
-@dirrm %%DATADIR%%/stars/default
-@dirrm %%DATADIR%%/stars
-@dirrm %%DATADIR%%/skycultures/western
-@dirrm %%DATADIR%%/skycultures/tupi
-@dirrm %%DATADIR%%/skycultures/tongan
-@dirrm %%DATADIR%%/skycultures/sami
-@dirrm %%DATADIR%%/skycultures/romanian
-@dirrm %%DATADIR%%/skycultures/polynesian
-@dirrm %%DATADIR%%/skycultures/norse
-@dirrm %%DATADIR%%/skycultures/navajo
-@dirrm %%DATADIR%%/skycultures/maori
-@dirrm %%DATADIR%%/skycultures/lakota
-@dirrm %%DATADIR%%/skycultures/korean
-@dirrm %%DATADIR%%/skycultures/inuit
-@dirrm %%DATADIR%%/skycultures/indian
-@dirrm %%DATADIR%%/skycultures/egyptian
-@dirrm %%DATADIR%%/skycultures/chinese
-@dirrm %%DATADIR%%/skycultures/aztec
-@dirrm %%DATADIR%%/skycultures/arabic
-@dirrm %%DATADIR%%/skycultures
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/nebulae/default
-@dirrm %%DATADIR%%/nebulae
-@dirrm %%DATADIR%%/landscapes/uranus
-@dirrm %%DATADIR%%/landscapes/trees
-@dirrm %%DATADIR%%/landscapes/saturn
-@dirrm %%DATADIR%%/landscapes/ocean
-@dirrm %%DATADIR%%/landscapes/neptune
-@dirrm %%DATADIR%%/landscapes/moon
-@dirrm %%DATADIR%%/landscapes/mars
-@dirrm %%DATADIR%%/landscapes/jupiter
-@dirrm %%DATADIR%%/landscapes/hurricane
-@dirrm %%DATADIR%%/landscapes/guereins
-@dirrm %%DATADIR%%/landscapes/grossmugl
-@dirrm %%DATADIR%%/landscapes/geneva
-@dirrm %%DATADIR%%/landscapes/garching
-@dirrm %%DATADIR%%/landscapes
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/512x512/apps
-@dirrmtry share/icons/hicolor/512x512
-@dirrmtry share/appdata
diff --git a/astro/sunclock/pkg-plist b/astro/sunclock/pkg-plist
index 4d7928df40bb..ed21d771d893 100644
--- a/astro/sunclock/pkg-plist
+++ b/astro/sunclock/pkg-plist
@@ -17,8 +17,3 @@ man/man1/sunclock.1.gz
 %%DATADIR%%/i18n/Sunclock.no
 %%DATADIR%%/i18n/Sunclock.pl
 %%DATADIR%%/i18n/Sunclock.sv
-@dirrm %%DATADIR%%/i18n
-@dirrm %%DATADIR%%/editkit
-@dirrm %%DATADIR%%/earthmaps/vmf
-@dirrm %%DATADIR%%/earthmaps
-@dirrm %%DATADIR%%
diff --git a/astro/swe/pkg-plist b/astro/swe/pkg-plist
index 4e336ac9bbe1..d94e617c8a42 100644
--- a/astro/swe/pkg-plist
+++ b/astro/swe/pkg-plist
@@ -15,5 +15,3 @@ lib/libswe.a
 %%PORTDOCS%%%%DOCSDIR%%/swephprg.pdf
 %%PORTDOCS%%%%DOCSDIR%%/swisseph.htm
 %%PORTDOCS%%%%DOCSDIR%%/swisseph.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/swe
diff --git a/astro/tclgeomap/pkg-plist b/astro/tclgeomap/pkg-plist
index b66069824c83..5a99c81bae65 100644
--- a/astro/tclgeomap/pkg-plist
+++ b/astro/tclgeomap/pkg-plist
@@ -19,5 +19,3 @@ include/tclgeomap/tclgeomap.h
 include/tclgeomap/tclgeomapInt.h
 lib/tclgeomap/pkgIndex.tcl
 lib/tclgeomap/tclgeomap_procs.tcl
-@dirrm include/tclgeomap
-@dirrm lib/tclgeomap
diff --git a/astro/tkgeomap/pkg-plist b/astro/tkgeomap/pkg-plist
index 2b194b7a0a10..ab0b752fcbfd 100644
--- a/astro/tkgeomap/pkg-plist
+++ b/astro/tkgeomap/pkg-plist
@@ -9,5 +9,3 @@ man/mann/igeomap.n.gz
 man/mann/tkgeomap.n.gz
 man/mann/tkgeomap_procs.n.gz
 man/mann/wdgeomap.n.gz
-@dirrm include/tkgeomap
-@dirrm lib/tkgeomap
diff --git a/astro/viking/pkg-plist b/astro/viking/pkg-plist
index c6af97c09b9b..addfaa7588fd 100644
--- a/astro/viking/pkg-plist
+++ b/astro/viking/pkg-plist
@@ -67,12 +67,3 @@ share/pixmaps/viking.png
 %%DATADIR%%/external_tools.xml
 %%DATADIR%%/goto_tools.xml
 %%DATADIR%%/maps.xml
-@dirrm %%DATADIR%%
-@dirrm share/omf/viking
-%%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/jv
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-@dirrm share/gnome/help/viking/C/figures
-@dirrm share/gnome/help/viking/C
-@dirrm share/gnome/help/viking
diff --git a/astro/wcslib/pkg-plist b/astro/wcslib/pkg-plist
index 1c2c39b648ec..7343bf9407cf 100644
--- a/astro/wcslib/pkg-plist
+++ b/astro/wcslib/pkg-plist
@@ -333,6 +333,3 @@ man/man1/fitshdr.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/wcsutil_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/wcsutil_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/wcslib.pdf
-@dirrmtry include/wcslib-%%VERSION%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/astro/xephem/pkg-plist b/astro/xephem/pkg-plist
index 5dca498ca189..1d10754bedc1 100644
--- a/astro/xephem/pkg-plist
+++ b/astro/xephem/pkg-plist
@@ -167,12 +167,3 @@ lib/X11/xephem/help/png/wcssolver.png
 lib/X11/xephem/help/xephem.html
 lib/X11/xephem/lo/lodb.xml
 man/man1/xephem.1.gz
-@dirrm lib/X11/xephem/lo
-@dirrm lib/X11/xephem/help/png
-@dirrm lib/X11/xephem/help
-@dirrm lib/X11/xephem/gallery
-@dirrm lib/X11/xephem/fits
-@dirrm lib/X11/xephem/fifos
-@dirrm lib/X11/xephem/catalogs
-@dirrm lib/X11/xephem/auxil
-@dirrm lib/X11/xephem
diff --git a/astro/xglobe/pkg-plist b/astro/xglobe/pkg-plist
index b7248102df5e..9e52682fc720 100644
--- a/astro/xglobe/pkg-plist
+++ b/astro/xglobe/pkg-plist
@@ -1,4 +1,3 @@
 bin/xglobe
 %%DATADIR%%/map.bmp
 %%DATADIR%%/xglobe-markers
-@dirrm %%DATADIR%%
diff --git a/astro/xplanet/pkg-plist b/astro/xplanet/pkg-plist
index 9c0135777fd2..26bd0f85ba34 100644
--- a/astro/xplanet/pkg-plist
+++ b/astro/xplanet/pkg-plist
@@ -47,15 +47,3 @@ man/man1/xplanet.1.gz
 %%DATADIR%%/spice/voyager
 %%DATADIR%%/spice/voyager.krn
 %%DATADIR%%/stars/BSC
-@dirrmtry %%DATADIR%%/stars
-@dirrmtry %%DATADIR%%/spice
-@dirrmtry %%DATADIR%%/scattering
-@dirrmtry %%DATADIR%%/satellites
-@dirrmtry %%DATADIR%%/origin
-@dirrmtry %%DATADIR%%/markers
-@dirrmtry %%DATADIR%%/images
-@dirrmtry %%DATADIR%%/fonts
-@dirrmtry %%DATADIR%%/ephemeris
-@dirrmtry %%DATADIR%%/config
-@dirrmtry %%DATADIR%%/arcs
-@dirrmtry %%DATADIR%%
diff --git a/astro/xtide/pkg-plist b/astro/xtide/pkg-plist
index 384ce1dfff00..dc3389913cc0 100644
--- a/astro/xtide/pkg-plist
+++ b/astro/xtide/pkg-plist
@@ -11,8 +11,6 @@ man/man8/xttpd.8.gz
 %%WVS%%%%DATADIR%%/wvs/wvs3.dat
 %%WVS%%%%DATADIR%%/wvs/wvs43.dat
 %%WVS%%%%DATADIR%%/wvs/wvsfull.dat
-%%WVS%%@dirrm %%DATADIR%%/wvs
-@dirrm %%DATADIR%%
 @unexec if cmp -s %D/etc/xtide.conf %D/etc/xtide.conf.example ; then rm -f %D/etc/xtide.conf ; fi
 etc/xtide.conf.example
 @exec if [ ! -f %D/etc/xtide.conf ]; then cp -p %D/%F %B/xtide.conf; fi