- Drop @dirrm* from and add empty directories to pkg-plists

Approved by:	portmgr blanket

9 files changed, 5 insertions, 180 deletions

diff --git a/security/libpwquality/pkg-plist b/security/libpwquality/pkg-plist
index 8e5dd6201296..f0ec5c926869 100644
--- a/security/libpwquality/pkg-plist
+++ b/security/libpwquality/pkg-plist
@@ -58,24 +58,3 @@ share/locale/vi/LC_MESSAGES/libpwquality.mo
 share/locale/zh_CN/LC_MESSAGES/libpwquality.mo
 share/locale/zh_TW/LC_MESSAGES/libpwquality.mo
 share/locale/zu/LC_MESSAGES/libpwquality.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/mr_IN/LC_MESSAGES
-@dirrmtry share/locale/mr_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry etc/security
diff --git a/security/mcrypt/pkg-plist b/security/mcrypt/pkg-plist
index 72d888ca0c28..19836cbb0c38 100644
--- a/security/mcrypt/pkg-plist
+++ b/security/mcrypt/pkg-plist
@@ -9,7 +9,3 @@ man/man1/mcrypt.1.gz
 %%NLS%%share/locale/el/LC_MESSAGES/mcrypt.mo
 %%NLS%%share/locale/es_AR/LC_MESSAGES/mcrypt.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/mcrypt.mo
-%%NLS%%@dirrmtry share/locale/es_AR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es_AR
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/security/monkeysphere/pkg-plist b/security/monkeysphere/pkg-plist
index ba984ae1789b..a25700f5e100 100644
--- a/security/monkeysphere/pkg-plist
+++ b/security/monkeysphere/pkg-plist
@@ -61,11 +61,3 @@ sbin/monkeysphere-host-e
 %%DATADIR%%/transitions/0.28
 %%DATADIR%%/transitions/0.28-e
 %%DATADIR%%/transitions/README.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/transitions
-@dirrmtry %%DATADIR%%/mh
-@dirrmtry %%DATADIR%%/ma
-@dirrmtry %%DATADIR%%/m
-@dirrmtry %%DATADIR%%
-@dirrmtry %%ETCDIR%%
diff --git a/security/nmapsi4/pkg-plist b/security/nmapsi4/pkg-plist
index 95796a3bc289..d7ec731debaa 100644
--- a/security/nmapsi4/pkg-plist
+++ b/security/nmapsi4/pkg-plist
@@ -12,13 +12,3 @@ share/icons/hicolor/64x64/apps/nmapsi4.png
 %%DATADIR%%/locale/nmapsi4_fr.qm
 %%DATADIR%%/locale/nmapsi4_it.qm
 %%DATADIR%%/locale/nmapsi4_ru.qm
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
diff --git a/security/obfsproxy/pkg-plist b/security/obfsproxy/pkg-plist
index da73ee2a7be6..40716074efcb 100644
--- a/security/obfsproxy/pkg-plist
+++ b/security/obfsproxy/pkg-plist
@@ -167,11 +167,3 @@ bin/obfsproxy
 %%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.py
 %%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.pyc
 %%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.pyo
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy/common
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy/managed
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy/network
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy/test/transports
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy/test
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy/transports
-@dirrmtry %%PYTHON_SITELIBDIR%%/obfsproxy
diff --git a/security/py-gnutls/pkg-plist b/security/py-gnutls/pkg-plist
index e683fddd0fa7..6ba187731fd2 100644
--- a/security/py-gnutls/pkg-plist
+++ b/security/py-gnutls/pkg-plist
@@ -38,10 +38,6 @@
 %%PYTHON_SITELIBDIR%%/gnutls/validators.py
 %%PYTHON_SITELIBDIR%%/gnutls/validators.pyc
 %%PYTHON_SITELIBDIR%%/gnutls/validators.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/gnutls/library
-@dirrm %%PYTHON_SITELIBDIR%%/gnutls/interfaces/twisted
-@dirrm %%PYTHON_SITELIBDIR%%/gnutls/interfaces
-@dirrm %%PYTHON_SITELIBDIR%%/gnutls
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/ca.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/crl.pem
@@ -55,5 +51,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twisted-client.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twisted-green-client.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twisted-server.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/certs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/security/spike-proxy/pkg-plist b/security/spike-proxy/pkg-plist
index 989e4e89c1d0..80e170ac5133 100644
--- a/security/spike-proxy/pkg-plist
+++ b/security/spike-proxy/pkg-plist
@@ -3276,13 +3276,5 @@ bin/spkproxy.sh
 %%PORTDOCS%%%%DOCSDIR%%/SpikeUsage.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/ntlm
-@dirrm %%DATADIR%%/spikeProxyUI
-@dirrm %%DATADIR%%/testVulnXml
-@dirrm %%DATADIR%%/VulnXML/DirectoryTests
-@dirrm %%DATADIR%%/VulnXML/FileTests
-@dirrm %%DATADIR%%/VulnXML/SiteTests
-@dirrm %%DATADIR%%/VulnXML/VariableTests
-@dirrm %%DATADIR%%/VulnXML
-@dirrm %%DATADIR%%
+@dir %%DATADIR%%/spikeProxyUI
+@dir %%DATADIR%%/VulnXML/VariableTests
diff --git a/security/sqlmap/pkg-plist b/security/sqlmap/pkg-plist
index b29e8c912022..4108dc1871a2 100644
--- a/security/sqlmap/pkg-plist
+++ b/security/sqlmap/pkg-plist
@@ -707,109 +707,6 @@ share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_s
 share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.vcproj
 share/sqlmap/udfhack/windows/64/lib_postgresqludf_sys/README.txt
 share/sqlmap/udfhack/windows/README.txt
-@dirrm share/sqlmap/udfhack/windows/64/lib_postgresqludf_sys
-@dirrm share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys
-@dirrm share/sqlmap/udfhack/windows/64/lib_mysqludf_sys
-@dirrm share/sqlmap/udfhack/windows/64
-@dirrm share/sqlmap/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys
-@dirrm share/sqlmap/udfhack/windows/32/lib_postgresqludf_sys
-@dirrm share/sqlmap/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys
-@dirrm share/sqlmap/udfhack/windows/32/lib_mysqludf_sys
-@dirrm share/sqlmap/udfhack/windows/32
-@dirrm share/sqlmap/udfhack/windows
-@dirrm share/sqlmap/udfhack/linux/64/lib_postgresqludf_sys
-@dirrm share/sqlmap/udfhack/linux/64/lib_mysqludf_sys
-@dirrm share/sqlmap/udfhack/linux/64
-@dirrm share/sqlmap/udfhack/linux/32/lib_postgresqludf_sys
-@dirrm share/sqlmap/udfhack/linux/32/lib_mysqludf_sys
-@dirrm share/sqlmap/udfhack/linux/32
-@dirrm share/sqlmap/udfhack/linux
-@dirrm share/sqlmap/udfhack
-@dirrm share/sqlmap/runcmd/windows/runcmd
-@dirrm share/sqlmap/runcmd/windows
-@dirrm share/sqlmap/runcmd
-@dirrm share/sqlmap/msfauxmod
-@dirrm share/sqlmap
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/xml/banner
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/xml
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64/8.4
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64/8.3
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64/8.2
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/32/8.4
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/32/8.3
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/32/8.2
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/32
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/64/8.4
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/64/8.3
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/64/8.2
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/64
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/32/8.4
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/32/8.3
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/32/8.2
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux/32
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/linux
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/windows/64
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/windows/32
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/windows
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/linux/64
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/linux/32
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql/linux
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/mysql
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/txt
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/tamper
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/shell
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/generic
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/sybase
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/sqlite
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/postgresql
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/oracle
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mysql
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/mssqlserver
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/maxdb
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/firebird
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms/access
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins/dbms
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/utils
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband/union
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/inband
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/error
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/brute
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques/blind
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/techniques
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/takeover
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/request
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/parse
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/core
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/controller
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/windows
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/macosx
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/linux
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx/doc
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib/upx
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/lib
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/xmlobject
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/xdot
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/sqlharvest
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/shutils
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/pydes
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/prettyprint
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/pagerank
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/odict
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/multipart
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/mssqlsig
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/magic
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/keepalive
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/icmpsh
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/gprof2dot
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/fcrypt
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/dbgtool
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/cloak
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra/clientform
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap/extra
-@dirrm %%PYTHON_SITELIBDIR%%/sqlmap
+@dir %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64/8.4
+@dir %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64/8.3
+@dir %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64/8.2
diff --git a/security/switzerland/pkg-plist b/security/switzerland/pkg-plist
index 09ec3fbc9ed0..742fca018a87 100644
--- a/security/switzerland/pkg-plist
+++ b/security/switzerland/pkg-plist
@@ -143,10 +143,3 @@ bin/switzerland-server
 %%PYTHON_SITELIBDIR%%/switzerland/server/__init__.py
 %%PYTHON_SITELIBDIR%%/switzerland/server/__init__.pyc
 %%PYTHON_SITELIBDIR%%/switzerland/server/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/switzerland/server
-@dirrm %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy/layers
-@dirrm %%PYTHON_SITELIBDIR%%/switzerland/lib/shrunk_scapy
-@dirrm %%PYTHON_SITELIBDIR%%/switzerland/lib
-@dirrm %%PYTHON_SITELIBDIR%%/switzerland/common
-@dirrm %%PYTHON_SITELIBDIR%%/switzerland/client
-@dirrm %%PYTHON_SITELIBDIR%%/switzerland