25 files changed, 1 insertions, 119 deletions

diff --git a/benchmarks/dbench/pkg-plist b/benchmarks/dbench/pkg-plist
index 9133fe8e64fe..af67e466eb5c 100644
--- a/benchmarks/dbench/pkg-plist
+++ b/benchmarks/dbench/pkg-plist
@@ -5,4 +5,3 @@ man/man1/dbench.1.gz
 man/man1/tbench.1.gz
 man/man1/tbench_srv.1.gz
 %%DATADIR%%/client.txt
-@dirrm %%DATADIR%%
diff --git a/benchmarks/expedite/pkg-plist b/benchmarks/expedite/pkg-plist
index 253bfad89ce5..2df4324c7f62 100644
--- a/benchmarks/expedite/pkg-plist
+++ b/benchmarks/expedite/pkg-plist
@@ -55,5 +55,3 @@ bin/expedite-cmp
 %%DATADIR%%/data/warning.png
 %%DATADIR%%/data/watch.png
 %%DATADIR%%/data/widgets.png
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
diff --git a/benchmarks/filebench/pkg-plist b/benchmarks/filebench/pkg-plist
index c092892f7006..d97087a29db2 100644
--- a/benchmarks/filebench/pkg-plist
+++ b/benchmarks/filebench/pkg-plist
@@ -44,5 +44,3 @@ bin/go_filebench
 %%DATADIR%%/workloads/videoserver.f
 %%DATADIR%%/workloads/webproxy.f
 %%DATADIR%%/workloads/webserver.f
-@dirrm %%DATADIR%%/workloads
-@dirrm %%DATADIR%%
diff --git a/benchmarks/fio/pkg-plist b/benchmarks/fio/pkg-plist
index ab5888904128..e963eb52a521 100644
--- a/benchmarks/fio/pkg-plist
+++ b/benchmarks/fio/pkg-plist
@@ -27,4 +27,3 @@ man/man1/fio_generate_plots.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface-scan.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tiobench-example.fio
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zipf.fio
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/benchmarks/gtkperf/pkg-plist b/benchmarks/gtkperf/pkg-plist
index 3667bc507576..46b313e34757 100644
--- a/benchmarks/gtkperf/pkg-plist
+++ b/benchmarks/gtkperf/pkg-plist
@@ -6,5 +6,3 @@ doc/gtkperf/INSTALL
 doc/gtkperf/README
 doc/gtkperf/TODO
 share/pixmaps/duck.png
-@dirrm doc/gtkperf
-@dirrm doc
diff --git a/benchmarks/hpl/pkg-plist b/benchmarks/hpl/pkg-plist
index 6ddb99a411f0..f7b5e496516f 100644
--- a/benchmarks/hpl/pkg-plist
+++ b/benchmarks/hpl/pkg-plist
@@ -6,7 +6,6 @@ etc/hpl/HPL.dat
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/TUNING
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 man/man3/HPL_abort.3.gz
 man/man3/HPL_all_reduce.3.gz
 man/man3/HPL_barrier.3.gz
@@ -131,4 +130,3 @@ man/man3/HPL_timer_cputime.3.gz
 man/man3/HPL_timer_walltime.3.gz
 man/man3/HPL_warn.3.gz
 man/man3/HPL_xjumpm.3.gz
-@dirrm etc/hpl
diff --git a/benchmarks/imb/pkg-plist b/benchmarks/imb/pkg-plist
index 5594b531142e..31993f2563ad 100644
--- a/benchmarks/imb/pkg-plist
+++ b/benchmarks/imb/pkg-plist
@@ -4,4 +4,3 @@ bin/IMB-MPI1
 %%PORTDOCS%%%%DOCSDIR%%/IMB_ug-3.0.pdf
 %%PORTDOCS%%%%DOCSDIR%%/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/use-of-trademark-license.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/benchmarks/iorate/pkg-plist b/benchmarks/iorate/pkg-plist
index 54856d52860a..abeeb8257362 100644
--- a/benchmarks/iorate/pkg-plist
+++ b/benchmarks/iorate/pkg-plist
@@ -21,4 +21,3 @@ man/man1/iorate.1.gz
 %%DATADIR%%/tests-fx.ior
 %%DATADIR%%/tests-var.ior
 %%DATADIR%%/tests.ior
-@dirrm %%DATADIR%%
diff --git a/benchmarks/libmicro/pkg-plist b/benchmarks/libmicro/pkg-plist
index a588d1721a35..6838c2e3ec7a 100644
--- a/benchmarks/libmicro/pkg-plist
+++ b/benchmarks/libmicro/pkg-plist
@@ -161,6 +161,3 @@ lib/libmicro/bin/time
 lib/libmicro/bin/times
 lib/libmicro/bin/write
 lib/libmicro/bin/writev
-@dirrm lib/libmicro/bin-%%ARCH%%
-@dirrm lib/libmicro/bin
-@dirrm lib/libmicro
diff --git a/benchmarks/lmbench/pkg-plist b/benchmarks/lmbench/pkg-plist
index e43c4a607284..46bc30625a62 100644
--- a/benchmarks/lmbench/pkg-plist
+++ b/benchmarks/lmbench/pkg-plist
@@ -145,8 +145,3 @@ man/man8/par_mem.8.gz
 man/man8/par_ops.8.gz
 man/man8/stream.8.gz
 man/man8/tlb.8.gz
-@dirrm lib/lmbench/results
-@dirrm lib/lmbench/scripts
-@dirrm lib/lmbench/bin/%%LMBENCH_OS%%
-@dirrm lib/lmbench/bin
-@dirrm lib/lmbench
diff --git a/benchmarks/netperf/pkg-plist b/benchmarks/netperf/pkg-plist
index ab459ff30e59..a40827188de2 100644
--- a/benchmarks/netperf/pkg-plist
+++ b/benchmarks/netperf/pkg-plist
@@ -11,4 +11,3 @@ man/man1/netserver.1.gz
 %%EXAMPLESDIR%%/tcp_stream_script
 %%EXAMPLESDIR%%/udp_rr_script
 %%EXAMPLESDIR%%/udp_stream_script
-@dirrm %%EXAMPLESDIR%%
diff --git a/benchmarks/nosqlbench/pkg-plist b/benchmarks/nosqlbench/pkg-plist
index f48b3f085eaf..b53a7cb4e7c2 100644
--- a/benchmarks/nosqlbench/pkg-plist
+++ b/benchmarks/nosqlbench/pkg-plist
@@ -1,4 +1,3 @@
 bin/nb
 %%DOCSDIR%%/README
 %%DOCSDIR%%/LICENSE
-@dirrm %%DOCSDIR%%
diff --git a/benchmarks/nuttcp/pkg-plist b/benchmarks/nuttcp/pkg-plist
index 1911d8387774..68616ec00c62 100644
--- a/benchmarks/nuttcp/pkg-plist
+++ b/benchmarks/nuttcp/pkg-plist
@@ -8,5 +8,3 @@ etc/xinetd.d/nuttcp
 etc/xinetd.d/nuttcp4
 etc/xinetd.d/nuttcp6
 man/man8/nuttcp.8.gz
-@dirrm %%DATADIR%%
-@dirrmtry etc/xinetd.d
diff --git a/benchmarks/p5-Benchmark-Forking/pkg-plist b/benchmarks/p5-Benchmark-Forking/pkg-plist
index 1f891c97e07c..74d5c57fbd1e 100644
--- a/benchmarks/p5-Benchmark-Forking/pkg-plist
+++ b/benchmarks/p5-Benchmark-Forking/pkg-plist
@@ -1,6 +1,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark/Forking/.packlist
 %%SITE_PERL%%/Benchmark/Forking.pm
 %%PERL5_MAN3%%/Benchmark::Forking.3.gz
-@dirrmtry %%SITE_PERL%%/Benchmark
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark/Forking
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark
diff --git a/benchmarks/p5-Benchmark-Stopwatch/pkg-plist b/benchmarks/p5-Benchmark-Stopwatch/pkg-plist
index d0f2028b9caf..e2c7f86d1d0e 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/pkg-plist
+++ b/benchmarks/p5-Benchmark-Stopwatch/pkg-plist
@@ -2,6 +2,3 @@
 %%SITE_PERL%%/Benchmark/Stopwatch.pm
 %%SITE_PERL%%/Benchmark/example.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark/Stopwatch/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark/Stopwatch
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Benchmark
-@dirrmtry %%SITE_PERL%%/Benchmark
diff --git a/benchmarks/phoronix-test-suite/pkg-plist b/benchmarks/phoronix-test-suite/pkg-plist
index c63792f31cfa..147a0b965add 100644
--- a/benchmarks/phoronix-test-suite/pkg-plist
+++ b/benchmarks/phoronix-test-suite/pkg-plist
@@ -418,48 +418,3 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/web-interface/web-interfaces/pts_webui_test.php
 %%DATADIR%%/pts-core/web-interface/web-interfaces/pts_webui_tests.php
 man/man1/phoronix-test-suite.1.gz
-@dirrm %%DATADIR%%/pts-core/web-interface/web-interfaces
-@dirrm %%DATADIR%%/pts-core/web-interface/js
-@dirrm %%DATADIR%%/pts-core/web-interface/html
-@dirrm %%DATADIR%%/pts-core/web-interface/assets
-@dirrm %%DATADIR%%/pts-core/web-interface
-@dirrm %%DATADIR%%/pts-core/static/xsl
-@dirrm %%DATADIR%%/pts-core/static/scripts
-@dirrm %%DATADIR%%/pts-core/static/images
-@dirrm %%DATADIR%%/pts-core/static/examples
-@dirrm %%DATADIR%%/pts-core/static/certificates
-@dirrm %%DATADIR%%/pts-core/static
-@dirrm %%DATADIR%%/pts-core/results-viewer
-@dirrm %%DATADIR%%/pts-core/phoromatic/public_html/images
-@dirrm %%DATADIR%%/pts-core/phoromatic/public_html
-@dirrm %%DATADIR%%/pts-core/phoromatic/pages
-@dirrm %%DATADIR%%/pts-core/phoromatic/communication-resources
-@dirrm %%DATADIR%%/pts-core/phoromatic
-@dirrm %%DATADIR%%/pts-core/openbenchmarking.org/schemas
-@dirrm %%DATADIR%%/pts-core/openbenchmarking.org
-@dirrm %%DATADIR%%/pts-core/objects/pts_Graph
-@dirrm %%DATADIR%%/pts-core/objects/phodevi/sensors
-@dirrm %%DATADIR%%/pts-core/objects/phodevi/parsers
-@dirrm %%DATADIR%%/pts-core/objects/phodevi/components
-@dirrm %%DATADIR%%/pts-core/objects/phodevi
-@dirrm %%DATADIR%%/pts-core/objects/nye_Xml
-@dirrm %%DATADIR%%/pts-core/objects/client/display_modes
-@dirrm %%DATADIR%%/pts-core/objects/client
-@dirrm %%DATADIR%%/pts-core/objects/bilde_renderer
-@dirrm %%DATADIR%%/pts-core/objects
-@dirrm %%DATADIR%%/pts-core/modules
-@dirrm %%DATADIR%%/pts-core/external-test-dependencies/xml/xsl
-@dirrm %%DATADIR%%/pts-core/external-test-dependencies/xml
-@dirrm %%DATADIR%%/pts-core/external-test-dependencies/scripts
-@dirrm %%DATADIR%%/pts-core/external-test-dependencies
-@dirrm %%DATADIR%%/pts-core/commands
-@dirrm %%DATADIR%%/pts-core
-@dirrm %%DATADIR%%
-%%BASH_COMPLETIONS%%@dirrmtry etc/bash_completion.d
-%%X11%%@dirrmtry share/appdata
-%%X11%%@dirrmtry share/icons/hicolor/48x48/apps
-%%X11%%@dirrmtry share/icons/hicolor/48x48
-%%X11%%@dirrmtry share/icons/hicolor/64x64/mimetypes
-%%X11%%@dirrmtry share/icons/hicolor/64x64
-%%X11%%@dirrmtry share/icons/hicolor
-%%X11%%@dirrmtry share/icons
diff --git a/benchmarks/polygraph/pkg-plist b/benchmarks/polygraph/pkg-plist
index be15f110447b..94e54c9278a0 100644
--- a/benchmarks/polygraph/pkg-plist
+++ b/benchmarks/polygraph/pkg-plist
@@ -75,6 +75,3 @@ man/man1/polygraph-server.1.gz
 man/man1/polygraph-udp2tcpd.1.gz
 man/man1/polygraph-webaxe4-ips.1.gz
 man/man7/polygraph.7.gz
-@dirrm %%DATADIR%%/workloads/include
-@dirrm %%DATADIR%%/workloads
-@dirrm %%DATADIR%%
diff --git a/benchmarks/pybench/pkg-plist b/benchmarks/pybench/pkg-plist
index 42258f3bb173..344d8789cc3a 100644
--- a/benchmarks/pybench/pkg-plist
+++ b/benchmarks/pybench/pkg-plist
@@ -66,5 +66,3 @@ bin/pybench
 %%DATADIR%%/systimes.py
 %%DATADIR%%/systimes.pyc
 %%DATADIR%%/systimes.pyo
-@dirrm %%DATADIR%%/package
-@dirrmtry %%DATADIR%%
diff --git a/benchmarks/scimark2/pkg-plist b/benchmarks/scimark2/pkg-plist
index 81d748c66586..27bbb2d5f234 100644
--- a/benchmarks/scimark2/pkg-plist
+++ b/benchmarks/scimark2/pkg-plist
@@ -30,7 +30,3 @@ bin/scimark2-java
 %%SMDIR%%/jnt/scimark2/commandline.java
 %%SMDIR%%/jnt/scimark2/kernel.class
 %%SMDIR%%/jnt/scimark2/kernel.java
-@dirrm %%SMDIR%%/jnt/scimark2
-@dirrm %%SMDIR%%/jnt/Bench
-@dirrm %%SMDIR%%/jnt
-@dirrm %%SMDIR%%
diff --git a/benchmarks/siege/pkg-plist b/benchmarks/siege/pkg-plist
index b6aed387552d..97d4b1d710a6 100644
--- a/benchmarks/siege/pkg-plist
+++ b/benchmarks/siege/pkg-plist
@@ -10,4 +10,3 @@ man/man1/siege.config.1.gz
 man/man1/siege2csv.1.gz
 man/man5/urls_txt.5.gz
 man/man7/layingsiege.7.gz
-@dirrm %%ETCDIR%%
diff --git a/benchmarks/super-smack/pkg-plist b/benchmarks/super-smack/pkg-plist
index 3be4f5222d9b..6c606c51d67d 100644
--- a/benchmarks/super-smack/pkg-plist
+++ b/benchmarks/super-smack/pkg-plist
@@ -2,5 +2,4 @@ bin/gen-data
 bin/super-smack
 %%DATADIR%%/select-key.smack
 %%DATADIR%%/update-select.smack
-@dirrm %%DATADIR%%
-@unexec rmdir /var/smack-data 2>/dev/null || true
+@dir /var/smack-data
diff --git a/benchmarks/thrulay/pkg-plist b/benchmarks/thrulay/pkg-plist
index e6c62211e8e6..582c9a02db10 100644
--- a/benchmarks/thrulay/pkg-plist
+++ b/benchmarks/thrulay/pkg-plist
@@ -8,4 +8,3 @@ lib/libthrulay.so.0
 lib/libthrulay.so.0.0.0
 man/man1/thrulay.1.gz
 man/man8/thrulayd.8.gz
-@dirrm include/thrulay
diff --git a/benchmarks/tsung/pkg-plist b/benchmarks/tsung/pkg-plist
index 795c4cca4204..2ddc88924f63 100644
--- a/benchmarks/tsung/pkg-plist
+++ b/benchmarks/tsung/pkg-plist
@@ -340,29 +340,3 @@ man/man1/tsung.1.gz
 %%DATADIR%%/tsung_plotter/pgsql.plots.en.conf
 %%DATADIR%%/tsung_plotter/pgsql.plots.fr.conf
 %%DATADIR%%/tsung_plotter/stats.conf
-@dirrm %%DATADIR%%/tsung_plotter
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/tsung/tsung_plotter
-@dirrm lib/tsung/bin
-@dirrm lib/tsung
-@dirrm lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src
-@dirrm lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/priv
-@dirrm lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include
-@dirrm lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/ebin
-@dirrm lib/erlang/lib/tsung_recorder-%%PORTVERSION%%
-@dirrm lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src
-@dirrm lib/erlang/lib/tsung_controller-%%PORTVERSION%%/priv
-@dirrm lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include
-@dirrm lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin
-@dirrm lib/erlang/lib/tsung_controller-%%PORTVERSION%%
-@dirrm lib/erlang/lib/tsung-%%PORTVERSION%%/src
-@dirrm lib/erlang/lib/tsung-%%PORTVERSION%%/priv
-@dirrm lib/erlang/lib/tsung-%%PORTVERSION%%/include
-@dirrm lib/erlang/lib/tsung-%%PORTVERSION%%/ebin
-@dirrm lib/erlang/lib/tsung-%%PORTVERSION%%
-@dirrmtry lib/erlang/lib
-@dirrmtry lib/erlang
diff --git a/benchmarks/ttcp/pkg-plist b/benchmarks/ttcp/pkg-plist
index d29275caeb34..9e771280ae35 100644
--- a/benchmarks/ttcp/pkg-plist
+++ b/benchmarks/ttcp/pkg-plist
@@ -1,4 +1,3 @@
 bin/ttcp
 man/man1/ttcp.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/benchmarks/unixbench/pkg-plist b/benchmarks/unixbench/pkg-plist
index 38c459ca3137..c665a62a0861 100644
--- a/benchmarks/unixbench/pkg-plist
+++ b/benchmarks/unixbench/pkg-plist
@@ -40,7 +40,3 @@ lib/unixbench/pgms/whetstone-double
 lib/unixbench/testdir/cctest.c
 lib/unixbench/testdir/dc.dat
 lib/unixbench/testdir/sort.src
-@dirrm lib/unixbench/testdir
-@dirrm lib/unixbench/results
-@dirrm lib/unixbench/pgms
-@dirrm lib/unixbench