Cleanup plist

39 files changed, 23 insertions, 133 deletions

diff --git a/security/radiusniff/pkg-plist b/security/radiusniff/pkg-plist
index 1fe63530ecd7..4f8b61b6b44b 100644
--- a/security/radiusniff/pkg-plist
+++ b/security/radiusniff/pkg-plist
@@ -1,4 +1,3 @@
 bin/radiusniff
 %%DATADIR%%/clients
 %%DATADIR%%/dictionary
-@dirrm %%DATADIR%%
diff --git a/security/rainbowcrack/pkg-plist b/security/rainbowcrack/pkg-plist
index 646875107a9f..001914b2f5ca 100644
--- a/security/rainbowcrack/pkg-plist
+++ b/security/rainbowcrack/pkg-plist
@@ -3,4 +3,3 @@ bin/rtgen
 bin/rtdump
 bin/rtsort
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset.txt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/security/rats/pkg-plist b/security/rats/pkg-plist
index 9df49f0a0cc5..2904159f5e71 100644
--- a/security/rats/pkg-plist
+++ b/security/rats/pkg-plist
@@ -7,5 +7,3 @@ man/man1/rats.1.gz
 %%DATADIR%%/rats-python.xml
 %%DATADIR%%/rats-ruby.xml
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/security/razorback-api/pkg-plist b/security/razorback-api/pkg-plist
index 4d60086d0a65..597495f70824 100644
--- a/security/razorback-api/pkg-plist
+++ b/security/razorback-api/pkg-plist
@@ -1,6 +1,5 @@
 @sample etc/razorback/api.conf.sample
 @sample etc/razorback/magic.sample
-@dirrmtry etc/razorback
 include/razorback.h
 include/razorback/api.h
 include/razorback/block.h
@@ -72,8 +71,6 @@ include/razorback/libssh/threads.h
 include/razorback/libssh/wrapper.h
 include/razorback/libssh/pki_priv.h
 include/razorback/libssh/ecdh.h
-@dirrm include/razorback/libssh
-@dirrm include/razorback
 lib/librazorback_api.a
 lib/librazorback_api.so
 lib/librazorback_api.so.2
diff --git a/security/razorback-archiveInflate/pkg-plist b/security/razorback-archiveInflate/pkg-plist
index 6ccd884508a4..c45f1aa551f8 100644
--- a/security/razorback-archiveInflate/pkg-plist
+++ b/security/razorback-archiveInflate/pkg-plist
@@ -3,4 +3,3 @@ lib/razorback/archiveInflate.so.2.0.0
 lib/razorback/archiveInflate.so.2
 lib/razorback/archiveInflate.so
 lib/razorback/archiveInflate.a
-@dirrmtry lib/razorback
diff --git a/security/razorback-clamavNugget/pkg-plist b/security/razorback-clamavNugget/pkg-plist
index 34c24baa4ff3..f4a89216d91c 100644
--- a/security/razorback-clamavNugget/pkg-plist
+++ b/security/razorback-clamavNugget/pkg-plist
@@ -3,4 +3,3 @@ lib/razorback/clamavNugget.so.2.0.0
 lib/razorback/clamavNugget.so.2
 lib/razorback/clamavNugget.so
 lib/razorback/clamavNugget.a
-@dirrmtry lib/razorback
diff --git a/security/razorback-dispatcher/pkg-plist b/security/razorback-dispatcher/pkg-plist
index 3f670c0be1f3..5f161cab8be5 100644
--- a/security/razorback-dispatcher/pkg-plist
+++ b/security/razorback-dispatcher/pkg-plist
@@ -4,4 +4,3 @@ bin/dispatcher_safed
 share/razorback/razorback.sql
 share/razorback/razorback-data.sql
 share/razorback/truncate.sql
-@dirrmtry share/razorback
diff --git a/security/razorback-fileInject/pkg-plist b/security/razorback-fileInject/pkg-plist
index 6a95f09ceb89..353697b90425 100644
--- a/security/razorback-fileInject/pkg-plist
+++ b/security/razorback-fileInject/pkg-plist
@@ -1,3 +1,2 @@
 bin/fileInject
 etc/razorback/fileInject.conf.sample
-@dirrmtry etc/razorback
diff --git a/security/razorback-officeCat/pkg-plist b/security/razorback-officeCat/pkg-plist
index 9124eab87aff..402a60abae9c 100644
--- a/security/razorback-officeCat/pkg-plist
+++ b/security/razorback-officeCat/pkg-plist
@@ -1,12 +1,8 @@
 etc/razorback/officecat.conf.sample
-@dirrmtry etc/razorback
 lib/razorback/officeCat.so.2.0.0
 lib/razorback/officeCat.so.2
 lib/razorback/officeCat.so
 lib/razorback/officeCat.a
-@dirrmtry lib/razorback
 libexec/razorback/officeCat/officecat.exe
 libexec/razorback/officeCat/officecat.exe.so
 libexec/razorback/officeCat/officecat.exe.exe.so
-@dirrm libexec/razorback/officeCat
-@dirrmtry libexec/razorback
diff --git a/security/razorback-pdfFox/pkg-plist b/security/razorback-pdfFox/pkg-plist
index 51c8f441dfba..e1ca351fc7f2 100644
--- a/security/razorback-pdfFox/pkg-plist
+++ b/security/razorback-pdfFox/pkg-plist
@@ -3,4 +3,3 @@ lib/razorback/pdfFox.so.2.0.0
 lib/razorback/pdfFox.so.2
 lib/razorback/pdfFox.so
 lib/razorback/pdfFox.a
-@dirrmtry lib/razorback
diff --git a/security/razorback-scriptNugget/pkg-plist b/security/razorback-scriptNugget/pkg-plist
index 918a2a0c01a4..7956fb8addc9 100644
--- a/security/razorback-scriptNugget/pkg-plist
+++ b/security/razorback-scriptNugget/pkg-plist
@@ -3,7 +3,4 @@ lib/razorback/scriptNugget.so.2.0.0
 lib/razorback/scriptNugget.so.2
 lib/razorback/scriptNugget.so
 lib/razorback/scriptNugget.a
-@dirrmtry lib/razorback
 libexec/razorback/scriptNugget/test.rb
-@dirrmtry libexec/razorback/scriptNugget
-@dirrmtry libexec/razorback
diff --git a/security/razorback-swfScanner/pkg-plist b/security/razorback-swfScanner/pkg-plist
index d8e78a7dde3f..6c04cee01977 100644
--- a/security/razorback-swfScanner/pkg-plist
+++ b/security/razorback-swfScanner/pkg-plist
@@ -3,4 +3,3 @@ lib/razorback/swfScanner.so.2.0.0
 lib/razorback/swfScanner.so.2
 lib/razorback/swfScanner.so
 lib/razorback/swfScanner.a
-@dirrmtry lib/razorback
diff --git a/security/razorback-syslogNugget/pkg-plist b/security/razorback-syslogNugget/pkg-plist
index cff43599d7d2..d0c8d6d9ba68 100644
--- a/security/razorback-syslogNugget/pkg-plist
+++ b/security/razorback-syslogNugget/pkg-plist
@@ -3,4 +3,3 @@ lib/razorback/syslogNugget.so.2.0.0
 lib/razorback/syslogNugget.so.2
 lib/razorback/syslogNugget.so
 lib/razorback/syslogNugget.a
-@dirrmtry lib/razorback
diff --git a/security/razorback-virusTotal/pkg-plist b/security/razorback-virusTotal/pkg-plist
index ff4b03761f56..0960d3a4b786 100644
--- a/security/razorback-virusTotal/pkg-plist
+++ b/security/razorback-virusTotal/pkg-plist
@@ -3,4 +3,3 @@ lib/razorback/virusTotal.so.2.0.0
 lib/razorback/virusTotal.so.2
 lib/razorback/virusTotal.so
 lib/razorback/virusTotal.a
-@dirrmtry lib/razorback
diff --git a/security/razorback-yaraNugget/pkg-plist b/security/razorback-yaraNugget/pkg-plist
index 6f1c6a6d25f7..356d53066a1d 100644
--- a/security/razorback-yaraNugget/pkg-plist
+++ b/security/razorback-yaraNugget/pkg-plist
@@ -1,9 +1,7 @@
 @sample etc/razorback/yara.conf.sample
 etc/razorback/yara/banker.rules
 etc/razorback/yara/packer.rules
-@dirrmtry etc/razorback/yara
 lib/razorback/yaraNugget.so.2.0.0
 lib/razorback/yaraNugget.so.2
 lib/razorback/yaraNugget.so
 lib/razorback/yaraNugget.a
-@dirrmtry lib/razorback
diff --git a/security/revelation/pkg-plist b/security/revelation/pkg-plist
index cab048dae2a9..13e0d1098888 100644
--- a/security/revelation/pkg-plist
+++ b/security/revelation/pkg-plist
@@ -100,8 +100,3 @@ share/mime/packages/revelation.xml
 %%DATADIR%%/ui/menubar.xml
 %%DATADIR%%/ui/popup-tree.xml
 %%DATADIR%%/ui/toolbar.xml
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/revelation/datahandler
-@dirrm %%PYTHON_SITELIBDIR%%/revelation/bundle
-@dirrm %%PYTHON_SITELIBDIR%%/revelation
diff --git a/security/rkhunter/pkg-plist b/security/rkhunter/pkg-plist
index 8ab6733f1cfd..df2a5cec8607 100644
--- a/security/rkhunter/pkg-plist
+++ b/security/rkhunter/pkg-plist
@@ -34,14 +34,10 @@ var/lib/rkhunter/db/suspscan.dat
 @unexec rm -f %D/var/lib/rkhunter/db/rkhunter.dat* 2> /dev/null || true
 var/lib/rkhunter/tmp/group
 var/lib/rkhunter/tmp/passwd
-@dirrmtry etc/periodic/security
-@dirrmtry etc/periodic
-@dirrm var/lib/rkhunter/tmp
-@dirrm var/lib/rkhunter/db/signatures
-@dirrm var/lib/rkhunter/db/i18n
-@dirrm var/lib/rkhunter/db
-@dirrm var/lib/rkhunter
-@dirrmtry var/lib
-@dirrmtry var
-@dirrm lib/rkhunter/scripts
-@dirrm lib/rkhunter
+@dir(,,0750) lib/rkhunter/scripts
+@dir(,,0750) lib/rkhunter
+@dir(,,0750) var/lib/rkhunter/db/i18n
+@dir(,,0750) var/lib/rkhunter/db/signatures
+@dir(,,0750) var/lib/rkhunter/db
+@dir(,,0750) var/lib/rkhunter/tmp
+@dir(,,0750) var/lib/rkhunter
diff --git a/security/ruby-camellia/pkg-plist b/security/ruby-camellia/pkg-plist
index f7f045efc6bc..ad1ed0b00c75 100644
--- a/security/ruby-camellia/pkg-plist
+++ b/security/ruby-camellia/pkg-plist
@@ -4,6 +4,3 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/License.txt
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.txt
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/camellia-example.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-@dirrm %%RUBY_SITELIBDIR%%/camellia
diff --git a/security/ruby-tcpwrap/pkg-plist b/security/ruby-tcpwrap/pkg-plist
index f55929f77f07..4132de5ee5f1 100644
--- a/security/ruby-tcpwrap/pkg-plist
+++ b/security/ruby-tcpwrap/pkg-plist
@@ -1,9 +1,6 @@
 %%RUBY_SITEARCHLIBDIR%%/tcpwrap.so
 %%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/echod.rb
-%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/tcpwrap.html.en
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tcpwrap.html.ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/security/tclsasl/pkg-plist b/security/tclsasl/pkg-plist
index 443fb5d862a8..80b2f25e6612 100644
--- a/security/tclsasl/pkg-plist
+++ b/security/tclsasl/pkg-plist
@@ -3,4 +3,3 @@ lib/libtclsasl.so.1
 lib/libtclsasl.so.1.0.0
 lib/tclsasl/pkgIndex.tcl
 lib/tclsasl/test.tcl
-@dirrm lib/tclsasl
diff --git a/security/tinyca/pkg-plist b/security/tinyca/pkg-plist
index caaf23fca4f4..fc60c65c97d0 100644
--- a/security/tinyca/pkg-plist
+++ b/security/tinyca/pkg-plist
@@ -15,6 +15,3 @@ etc/tinyca.cnf.sample
 %%SITE_PERL%%/tinyca/REQ.pm
 %%SITE_PERL%%/tinyca/TCONFIG.pm
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/tinyca/GUI
-@dirrm %%SITE_PERL%%/tinyca
diff --git a/security/tlswrap/pkg-plist b/security/tlswrap/pkg-plist
index d7169cc44a30..320016d52c4a 100644
--- a/security/tlswrap/pkg-plist
+++ b/security/tlswrap/pkg-plist
@@ -1,3 +1,2 @@
 bin/tlswrap
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/security/tpm-tools/pkg-plist b/security/tpm-tools/pkg-plist
index b00b8cbb0acc..ac91423bc0f4 100644
--- a/security/tpm-tools/pkg-plist
+++ b/security/tpm-tools/pkg-plist
@@ -51,4 +51,3 @@ man/man8/tpm_setoperatorauth.8.gz
 man/man8/tpm_setownable.8.gz
 man/man8/tpm_setpresence.8.gz
 man/man8/tpm_takeownership.8.gz
-@dirrm include/tpm_tools
diff --git a/security/tripwire/pkg-plist b/security/tripwire/pkg-plist
index b239e62c3c5d..72ce4610fb65 100644
--- a/security/tripwire/pkg-plist
+++ b/security/tripwire/pkg-plist
@@ -13,9 +13,7 @@ sbin/siggen
 share/doc/tripwire/COPYING
 share/doc/tripwire/TRADEMARK
 share/doc/tripwire/policyguide.txt
-@dirrm share/doc/tripwire
 %%ETCDIR%%/twpol-FreeBSD.txt
-@dirrmtry %%ETCDIR%%
-@dirrmtry %%TWDB%%/report
-@dirrmtry %%TWDB%%
-
+@dir(,,0750) %%ETCDIR%%
+@dir %%TWDB%%/report
+@dir %%TWDB%%
diff --git a/security/trousers/pkg-plist b/security/trousers/pkg-plist
index 217b4fe45f87..5206c977de30 100644
--- a/security/trousers/pkg-plist
+++ b/security/trousers/pkg-plist
@@ -125,12 +125,7 @@ man/man8/tcsd.8.gz
 @mode 0600
 etc/tcsd.conf.dist
 @exec [ -f %D/etc/tcsd.conf ] || cp -p %D/etc/tcsd.conf.dist %D/etc/tcsd.conf
-@mode 0700
-@dirrmtry var/lib/tpm
 @owner
 @group
 @mode
-@dirrmtry var/lib
-@dirrmtry var
-@dirrm include/tss
-@dirrm include/trousers
+@dir(_tss,_tss,0700) var/lib/tpm
diff --git a/security/unicornscan/pkg-plist b/security/unicornscan/pkg-plist
index fcf5fbe9af50..d54349cdf0c6 100644
--- a/security/unicornscan/pkg-plist
+++ b/security/unicornscan/pkg-plist
@@ -20,10 +20,4 @@ share/unicornscan/p0f.fp
 share/unicornscan/p0fa.fp
 share/unicornscan/p0fr.fp
 share/unicornscan/port-numbers
-@exec %D/var/unicornscan/
-@dirrmtry var/unicornscan
-@dirrmtry var
-@dirrmtry share/unicornscan
-@dirrm libexec/unicornscan/modules
-@dirrm libexec/unicornscan
-@dirrmtry etc/unicornscan
+@dir var/unicornscan
diff --git a/security/vinetto/pkg-plist b/security/vinetto/pkg-plist
index ef13088274f2..2441b909ed00 100644
--- a/security/vinetto/pkg-plist
+++ b/security/vinetto/pkg-plist
@@ -9,4 +9,3 @@ bin/vinetto
 %%DATADIR%%/header
 %%DATADIR%%/huffman
 %%DATADIR%%/quantization
-@dirrm %%DATADIR%%
diff --git a/security/vnccrack/pkg-plist b/security/vnccrack/pkg-plist
index 799626d5781c..5cf54da149b9 100644
--- a/security/vnccrack/pkg-plist
+++ b/security/vnccrack/pkg-plist
@@ -1,3 +1,2 @@
 bin/vnccrack
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/vuxml/pkg-plist b/security/vuxml/pkg-plist
index d233c22929ca..2420132382fd 100644
--- a/security/vuxml/pkg-plist
+++ b/security/vuxml/pkg-plist
@@ -9,4 +9,3 @@ share/xml/dtd/vuxml/xml1.dcl
 @exec %%XMLCAT_ADD%%
 @unexec %%SGMLCAT_RM%%
 @exec %%SGMLCAT_ADD%%
-@dirrm %%dir_DTD%%
diff --git a/security/webfwlog/pkg-plist b/security/webfwlog/pkg-plist
index 3ba6b08084b9..e0e18a80d8a1 100644
--- a/security/webfwlog/pkg-plist
+++ b/security/webfwlog/pkg-plist
@@ -1,11 +1,5 @@
-@owner root
-@group %%WWWGRP%%
-@mode 4550
-bin/wfwl_syslog
-@mode 640
-@sample %%ETCDIR%%/webfwlog.conf.sample
-@mode
-@group wheel
+@(root,%%WWWGRP%%,4550) bin/wfwl_syslog
+@sample(root,%%WWWGRP%%,0640) %%ETCDIR%%/webfwlog.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/examples/basic
 %%PORTDOCS%%%%DOCSDIR%%/examples/current_count
 %%PORTDOCS%%%%DOCSDIR%%/examples/current_dport
@@ -27,9 +21,7 @@ bin/wfwl_syslog
 %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_altercol
 %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_create
 %%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_services_create
-@mode 555
-%%PORTDOCS%%%%DOCSDIR%%/mysql/setup
-@mode
+@(,,0555) %%PORTDOCS%%%%DOCSDIR%%/mysql/setup
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/README
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/pgsql_data_table.sql
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/snort_view
@@ -38,9 +30,7 @@ bin/wfwl_syslog
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_addcol
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_create
 %%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_services_create
-@mode 555
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/setup
-@mode
+@(,,0555) %%PORTDOCS%%%%DOCSDIR%%/pgsql/setup
 %%WWWDIR%%/include/config.php
 %%WWWDIR%%/include/criteria.php
 %%WWWDIR%%/include/debug.php
@@ -63,11 +53,3 @@ bin/wfwl_syslog
 %%WWWDIR%%/include/update_cache.php
 %%WWWDIR%%/index.php
 %%WWWDIR%%/style.css
-@dirrmtry %%ETCDIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/mysql/scripts
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/mysql
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/pgsql/scripts
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/pgsql
-@dirrmtry %%WWWDIR%%/include
-@dirrmtry %%WWWDIR%%
diff --git a/security/webscarab/pkg-plist b/security/webscarab/pkg-plist
index 66d9fa976779..05caf89e1af1 100644
--- a/security/webscarab/pkg-plist
+++ b/security/webscarab/pkg-plist
@@ -16,5 +16,3 @@ bin/webscarab_lite
 %%DATADIR%%/lib/openamf.jar
 %%DATADIR%%/lib/bsf-2.3.0.jar
 %%DATADIR%%/webscarab.jar
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/
diff --git a/security/webshag/pkg-plist b/security/webshag/pkg-plist
index de87b582767b..7d4a1c6b52b6 100644
--- a/security/webshag/pkg-plist
+++ b/security/webshag/pkg-plist
@@ -34,16 +34,3 @@ bin/webshag_cli
 %%DATADIR%%/nikto/db_tests
 %%DATADIR%%/nikto/db_variables
 %%DATADIR%%/proxies/proxies.txt
-@dirrmtry %%DATADIR%%/proxies
-@dirrmtry %%DATADIR%%/nikto
-@dirrmtry %%DATADIR%%/fuzzer
-@dirrmtry %%DATADIR%%/custom
-@dirrmtry %%DATADIR%%
-@dirrmtry %%PYTHON_SITELIBDIR%%/webshag/update
-@dirrmtry %%PYTHON_SITELIBDIR%%/webshag/modules
-@dirrmtry %%PYTHON_SITELIBDIR%%/webshag/gui
-@dirrmtry %%PYTHON_SITELIBDIR%%/webshag/export
-@dirrmtry %%PYTHON_SITELIBDIR%%/webshag/core
-@dirrmtry %%PYTHON_SITELIBDIR%%/webshag
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/security/whatweb/pkg-plist b/security/whatweb/pkg-plist
index 1a8e35ddf093..18d5e7f6dfaa 100644
--- a/security/whatweb/pkg-plist
+++ b/security/whatweb/pkg-plist
@@ -1776,10 +1776,3 @@ man/man1/whatweb.1.gz
 %%RUBY_SITELIBDIR%%/whatweb/plugins/zeus-cart.rb
 %%RUBY_SITELIBDIR%%/whatweb/plugins/zikula.rb
 %%RUBY_SITELIBDIR%%/whatweb/plugins/zoph.rb
-@dirrm %%RUBY_SITELIBDIR%%/whatweb/addons
-@dirrm %%RUBY_SITELIBDIR%%/whatweb/lib
-@dirrm %%RUBY_SITELIBDIR%%/whatweb/my-plugins
-@dirrm %%RUBY_SITELIBDIR%%/whatweb/plugin-development
-@dirrm %%RUBY_SITELIBDIR%%/whatweb/plugins
-@dirrm %%RUBY_SITELIBDIR%%/whatweb/plugins-disabled
-@dirrm %%RUBY_SITELIBDIR%%/whatweb
diff --git a/security/xmlsec1/pkg-plist b/security/xmlsec1/pkg-plist
index deeb54397df8..76a8e0e1d43c 100644
--- a/security/xmlsec1/pkg-plist
+++ b/security/xmlsec1/pkg-plist
@@ -226,14 +226,3 @@ share/aclocal/xmlsec1.m4
 %%PORTDOCS%%%%DOCSDIR%%/xmldsig.html
 %%PORTDOCS%%%%DOCSDIR%%/xmlenc.html
 %%PORTDOCS%%%%DOCSDIR%%/xmlsec-man.html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/api/images
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/api
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry include/xmlsec1/xmlsec/private
-@dirrmtry include/xmlsec1/xmlsec/openssl
-%%NSS%%@dirrmtry include/xmlsec1/xmlsec/nss
-%%GNUTLS%%@dirrmtry include/xmlsec1/xmlsec/gnutls
-@dirrmtry include/xmlsec1/xmlsec/gcrypt
-@dirrmtry include/xmlsec1/xmlsec
-@dirrmtry include/xmlsec1
diff --git a/security/yafic/pkg-plist b/security/yafic/pkg-plist
index 748879f2ed1f..8d5fbd971d2e 100644
--- a/security/yafic/pkg-plist
+++ b/security/yafic/pkg-plist
@@ -6,4 +6,3 @@ man/man1/yafic.1.gz
 %%CRYPTO%%man/man1/yafic-sign.1.gz
 man/man5/yafic.conf.5.gz
 %%EXAMPLESDIR%%/yafic.conf.sample
-@dirrm share/examples/yafic
diff --git a/security/yapet/Makefile b/security/yapet/Makefile
index a4c1f2615d53..e73fb1680fc3 100644
--- a/security/yapet/Makefile
+++ b/security/yapet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	yapet
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.guengel.ch/myapps/yapet/downloads/
 
diff --git a/security/yapet/pkg-plist b/security/yapet/pkg-plist
index 42301b958c84..85dccb547b9c 100644
--- a/security/yapet/pkg-plist
+++ b/security/yapet/pkg-plist
@@ -8,10 +8,15 @@ man/man5/yapet_colors.5.gz
 man/man5/yapet_config.5.gz
 share/applications/yapet.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/DESIGN
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/html/DESIGN.html
+%%PORTDOCS%%%%DOCSDIR%%/html/README.html
+%%CONVERTERS%%%%PORTDOCS%%%%DOCSDIR%%/html/csv2yapet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/yapet.html
+%%CONVERTERS%%%%PORTDOCS%%%%DOCSDIR%%/html/yapet2csv.html
 %%NLS%%share/locale/de/LC_MESSAGES/libyacurs.mo
 %%NLS%%share/locale/de/LC_MESSAGES/yapet.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/zebedee/pkg-plist b/security/zebedee/pkg-plist
index 1ce9811b5db7..5ba9ce8f5c32 100644
--- a/security/zebedee/pkg-plist
+++ b/security/zebedee/pkg-plist
@@ -15,5 +15,3 @@ man/man1/zebedee.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/ftpgw.tcl.html
 %%PORTDOCS%%%%DOCSDIR%%/zebedee.html
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/zzuf/pkg-plist b/security/zzuf/pkg-plist
index 992c304c7345..a911229f0300 100644
--- a/security/zzuf/pkg-plist
+++ b/security/zzuf/pkg-plist
@@ -5,4 +5,3 @@ lib/zzuf/libzzuf.a
 man/man1/zzcat.1.gz
 man/man1/zzuf.1.gz
 man/man3/libzzuf.3.gz
-@dirrm lib/zzuf