Index: head/databases/cassandra2/pkg-plist
===================================================================
--- head/databases/cassandra2/pkg-plist	(revision 374356)
+++ head/databases/cassandra2/pkg-plist	(revision 374357)
@@ -1,189 +1,182 @@
-@dirrm %%DATADIR%%/bin
-@dirrm %%DATADIR%%/interface
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/tools
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DATADIR%%/conf
 @sample %%DATADIR%%/conf/cassandra-rackdc.properties.sample
 @sample %%DATADIR%%/conf/cassandra-topology.properties.sample
 @sample %%DATADIR%%/conf/cassandra.yaml.sample
 @sample %%DATADIR%%/conf/commitlog_archiving.properties.sample
 @sample %%DATADIR%%/conf/cqlshrc.sample
-%%CQL%%@dirrmtry %%DATADIR%%/pylib
 %%CQL%%%%DATADIR%%/bin/cqlsh
 %%CQL%%%%DATADIR%%/lib/cassandra-driver-internal-only-2.1.1.post.zip
 %%CQL%%%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
 %%CQL%%%%DATADIR%%/lib/six-1.7.3-py2.py3-none-any.zip
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/async_insert.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/async_insert.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/meter.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/meter.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/sslhandling.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/sslhandling.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/util.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/util.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.py
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.pyc
 %%CQL%%%%DATADIR%%/pylib/setup.py
 %%CQL%%%%DATADIR%%/pylib/setup.pyc
 %%CQL%%bin/cqlsh
 %%DATADIR%%/bin/cassandra
 %%DATADIR%%/bin/cassandra-cli
 %%DATADIR%%/bin/cassandra.in.sh
 %%DATADIR%%/bin/cassandra.ps1
 %%DATADIR%%/bin/debug-cql
 %%DATADIR%%/bin/nodetool
 %%DATADIR%%/bin/repaircluster
 %%DATADIR%%/bin/source-conf.ps1
 %%DATADIR%%/bin/sstablekeys
 %%DATADIR%%/bin/sstableloader
 %%DATADIR%%/bin/sstablescrub
 %%DATADIR%%/bin/sstableupgrade
 %%DATADIR%%/bin/stop-server.ps1
 %%DATADIR%%/conf/cassandra-env.ps1
 %%DATADIR%%/conf/cassandra-env.sh
 %%DATADIR%%/conf/cassandra-topology.yaml
 %%DATADIR%%/conf/hotspot_compiler
 %%DATADIR%%/conf/logback-tools.xml
 %%DATADIR%%/conf/logback.xml
 %%DATADIR%%/conf/metrics-reporter-config-sample.yaml
 %%DATADIR%%/conf/README.txt
 %%DATADIR%%/conf/triggers/README.txt
 %%DATADIR%%/interface/cassandra.thrift
 %%DATADIR%%/lib/airline-0.6.jar
 %%DATADIR%%/lib/antlr-runtime-3.5.2.jar
 %%DATADIR%%/lib/apache-cassandra-2.1.1.jar
 %%DATADIR%%/lib/apache-cassandra-clientutil-2.1.1.jar
 %%DATADIR%%/lib/apache-cassandra-thrift-2.1.1.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
 %%DATADIR%%/lib/commons-codec-1.2.jar
 %%DATADIR%%/lib/commons-lang3-3.1.jar
 %%DATADIR%%/lib/commons-math3-3.2.jar
 %%DATADIR%%/lib/compress-lzf-0.8.4.jar
 %%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.4.jar
 %%DATADIR%%/lib/disruptor-3.0.1.jar
 %%DATADIR%%/lib/guava-16.0.jar
 %%DATADIR%%/lib/high-scale-lib-1.0.6.jar
 %%DATADIR%%/lib/jackson-core-asl-1.9.2.jar
 %%DATADIR%%/lib/jackson-mapper-asl-1.9.2.jar
 %%DATADIR%%/lib/jamm-0.2.6.jar
 %%DATADIR%%/lib/javax.inject.jar
 %%DATADIR%%/lib/jbcrypt-0.3m.jar
 %%DATADIR%%/lib/jline-1.0.jar
 %%DATADIR%%/lib/jna-4.0.0.jar
 %%DATADIR%%/lib/json-simple-1.1.jar
 %%DATADIR%%/lib/libthrift-0.9.1.jar
 %%DATADIR%%/lib/licenses/airline-0.6.txt
 %%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
 %%DATADIR%%/lib/licenses/cassandra-driver-2.1.0b1.post.txt
 %%DATADIR%%/lib/licenses/commons-cli-1.1.txt
 %%DATADIR%%/lib/licenses/commons-codec-1.2.txt
 %%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
 %%DATADIR%%/lib/licenses/commons-math3-3.2.txt
 %%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
 %%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.4.txt
 %%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
 %%DATADIR%%/lib/licenses/futures-2.1.6.txt
 %%DATADIR%%/lib/licenses/guava-16.0.txt
 %%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
 %%DATADIR%%/lib/licenses/jackson-core-asl-1.9.2.txt
 %%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.2.txt
 %%DATADIR%%/lib/licenses/jamm-0.2.6.txt
 %%DATADIR%%/lib/licenses/javax.inject.txt
 %%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
 %%DATADIR%%/lib/licenses/jline-1.0.txt
 %%DATADIR%%/lib/licenses/jna-4.0.0.txt
 %%DATADIR%%/lib/licenses/json-simple-1.1.txt
 %%DATADIR%%/lib/licenses/libthrift-0.9.1.txt
 %%DATADIR%%/lib/licenses/logback-classic-1.1.2.txt
 %%DATADIR%%/lib/licenses/logback-core-1.1.2.txt
 %%DATADIR%%/lib/licenses/lz4-1.2.0.txt
 %%DATADIR%%/lib/licenses/metrics-core-2.2.0.txt
 %%DATADIR%%/lib/licenses/netty-all-4.0.23.Final.txt
 %%DATADIR%%/lib/licenses/reporter-config-2.1.0.txt
 %%DATADIR%%/lib/licenses/six-1.7.3.txt
 %%DATADIR%%/lib/licenses/slf4j-api-1.7.2.txt
 %%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
 %%DATADIR%%/lib/licenses/snappy-java-1.0.5.txt
 %%DATADIR%%/lib/licenses/stream-2.5.2.txt
 %%DATADIR%%/lib/licenses/stringtemplate-4.0.2.txt
 %%DATADIR%%/lib/licenses/super-csv-2.1.0.txt
 %%DATADIR%%/lib/licenses/thrift-server-0.3.5.txt
 %%DATADIR%%/lib/logback-classic-1.1.2.jar
 %%DATADIR%%/lib/logback-core-1.1.2.jar
 %%DATADIR%%/lib/lz4-1.2.0.jar
 %%DATADIR%%/lib/metrics-core-2.2.0.jar
 %%DATADIR%%/lib/netty-all-4.0.23.Final.jar
 %%DATADIR%%/lib/reporter-config-2.1.0.jar
 %%DATADIR%%/lib/slf4j-api-1.7.2.jar
 %%DATADIR%%/lib/snakeyaml-1.11.jar
 %%DATADIR%%/lib/snappy-java.jar
 %%DATADIR%%/lib/stream-2.5.2.jar
 %%DATADIR%%/lib/stringtemplate-4.0.2.jar
 %%DATADIR%%/lib/super-csv-2.1.0.jar
 %%DATADIR%%/lib/thrift-server-0.3.7.jar
 %%DATADIR%%/tools/bin/cassandra-stress
 %%DATADIR%%/tools/bin/cassandra-stressd
 %%DATADIR%%/tools/bin/cassandra.in.sh
 %%DATADIR%%/tools/bin/json2sstable
 %%DATADIR%%/tools/bin/sstable2json
 %%DATADIR%%/tools/bin/sstablelevelreset
 %%DATADIR%%/tools/bin/sstablemetadata
 %%DATADIR%%/tools/bin/sstablerepairedset
 %%DATADIR%%/tools/bin/sstablesplit
 %%DATADIR%%/tools/bin/token-generator
 %%DATADIR%%/tools/cqlstress-counter-example.yaml
 %%DATADIR%%/tools/cqlstress-example.yaml
 %%DATADIR%%/tools/cqlstress-insanity-example.yaml
 %%DATADIR%%/tools/lib/cassandra-driver-core-2.0.5.jar
 %%DATADIR%%/tools/lib/netty-3.9.0.Final.jar
 %%DATADIR%%/tools/lib/stress.jar
 %%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar
 bin/cassandra
 bin/cassandra-cli
 bin/debug-cql
 bin/nodetool
 bin/sstablekeys
 bin/sstableloader
 bin/sstablescrub
 bin/sstableupgrade
 
Index: head/databases/gnatsweb4/pkg-plist
===================================================================
--- head/databases/gnatsweb4/pkg-plist	(revision 374356)
+++ head/databases/gnatsweb4/pkg-plist	(revision 374357)
@@ -1,10 +1,6 @@
 @unexec if cmp -s %D/%%ETCDIR%%/gnatsweb-site.pl.sample %D/%%ETCDIR%%/gnatsweb-site.pl.sample; then rm -f %D/%%ETCDIR%%/gnatsweb-site.pl; fi
 %%ETCDIR%%/gnatsweb-site.pl.sample
 @exec [ -f %B/gnatsweb-site.pl ] || cp %B/%f %B/gnatsweb-site.pl
 %%CGI_DIR%%/gnatsweb.pl
 %%CGI_DIR%%/gnatsweb-site.pl
 %%CGI_DIR%%/gnatsweb.html
-@dirrmtry %%CGI_DIR%%
-@dirrmtry %%ETCDIR%%
-@dirrm %%WWWDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
Index: head/databases/mdbtools/pkg-plist
===================================================================
--- head/databases/mdbtools/pkg-plist	(revision 374356)
+++ head/databases/mdbtools/pkg-plist	(revision 374357)
@@ -1,82 +1,76 @@
 %%GNOME:%%bin/gmdb2
 bin/mdb-array
 bin/mdb-export
 bin/mdb-header
 bin/mdb-hexdump
 bin/mdb-parsecsv
 bin/mdb-prop
 bin/mdb-schema
 bin/mdb-sql
 bin/mdb-tables
 bin/mdb-ver
 %%GNOME:%%include/gmdb.h
 include/mdbsql.h
 include/mdbtools.h
 include/mdbver.h
 man/man1/gmdb2.1.gz
 man/man1/mdb-array.1.gz
 man/man1/mdb-export.1.gz
 man/man1/mdb-header.1.gz
 man/man1/mdb-hexdump.1.gz
 man/man1/mdb-parsecsv.1.gz
 man/man1/mdb-prop.1.gz
 man/man1/mdb-schema.1.gz
 man/man1/mdb-sql.1.gz
 man/man1/mdb-tables.1.gz
 man/man1/mdb-ver.1.gz
 lib/libmdb.a
 lib/libmdb.so
 lib/libmdb.so.2
 lib/libmdb.so.2.0.1
 lib/libmdbodbc.a
 lib/libmdbodbc.so
 lib/libmdbodbcW.a
 lib/libmdbodbcW.so
 lib/libmdbsql.a
 lib/libmdbsql.so
 lib/libmdbsql.so.2
 lib/libmdbsql.so.2.0.0
 libdata/pkgconfig/libmdb.pc
 libdata/pkgconfig/libmdbsql.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%GNOME:%%share/gmdb/glade/COPYING
 %%GNOME:%%share/gmdb/glade/code.xpm
 %%GNOME:%%share/gmdb/glade/debug.xpm
 %%GNOME:%%share/gmdb/glade/form_big.xpm
 %%GNOME:%%share/gmdb/glade/forms.xpm
 %%GNOME:%%share/gmdb/glade/gmdb-debug.glade
 %%GNOME:%%share/gmdb/glade/gmdb-export.glade
 %%GNOME:%%share/gmdb/glade/gmdb-prefs.glade
 %%GNOME:%%share/gmdb/glade/gmdb-props.glade
 %%GNOME:%%share/gmdb/glade/gmdb-schema.glade
 %%GNOME:%%share/gmdb/glade/gmdb-sql.glade
 %%GNOME:%%share/gmdb/glade/gmdb-tabledef.glade
 %%GNOME:%%share/gmdb/glade/gmdb.glade
 %%GNOME:%%share/gmdb/glade/logo.xpm
 %%GNOME:%%share/gmdb/glade/macro_big.xpm
 %%GNOME:%%share/gmdb/glade/macros.xpm
 %%GNOME:%%share/gmdb/glade/module_big.xpm
 %%GNOME:%%share/gmdb/glade/pk.xpm
 %%GNOME:%%share/gmdb/glade/query.xpm
 %%GNOME:%%share/gmdb/glade/query_big.xpm
 %%GNOME:%%share/gmdb/glade/report_big.xpm
 %%GNOME:%%share/gmdb/glade/reports.xpm
 %%GNOME:%%share/gmdb/glade/stock_export-16.png
 %%GNOME:%%share/gmdb/glade/stock_export.png
 %%GNOME:%%share/gmdb/glade/table.xpm
 %%GNOME:%%share/gmdb/glade/table_big.xpm
 %%GNOME:%%share/gnome/help/gmdb/C/figures/gmdb2_sql_window.png
 %%GNOME:%%share/gnome/help/gmdb/C/figures/gmdb2_window.png
 %%GNOME:%%share/gnome/help/gmdb/C/gmdb.xml
 %%GNOME:%%share/gnome/help/gmdb/C/legal.xml
-%%GNOME:%%@dirrm share/gnome/help/gmdb/C/figures
-%%GNOME:%%@dirrm share/gnome/help/gmdb/C
-%%GNOME:%%@dirrm share/gnome/help/gmdb
-%%GNOME:%%@dirrm share/gmdb/glade
-%%GNOME:%%@dirrm share/gmdb
-%%PORTDOCS%%@dirrm %%DOCSDIR%%