aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/ADMsmb/pkg-plist1
-rw-r--r--security/ADMsnmp/pkg-plist2
-rw-r--r--security/aescrypt/pkg-plist1
-rw-r--r--security/afterglow/pkg-plist10
-rw-r--r--security/aide/Makefile11
-rw-r--r--security/aide/pkg-plist11
-rw-r--r--security/amap/pkg-plist3
-rw-r--r--security/amavis-stats/Makefile9
-rw-r--r--security/amavis-stats/files/patch-amavis-stats6
-rw-r--r--security/amavis-stats/pkg-plist12
-rw-r--r--security/amavisd-milter/pkg-plist11
-rw-r--r--security/apache-xml-security-c/pkg-plist13
-rw-r--r--security/apg/pkg-plist1
-rw-r--r--security/arirang/pkg-plist1
-rw-r--r--security/arm/pkg-plist13
-rw-r--r--security/arpCounterattack/pkg-plist1
-rw-r--r--security/autossh/pkg-plist1
-rw-r--r--security/axTLS/pkg-plist1
-rw-r--r--security/barnyard2/pkg-plist2
-rw-r--r--security/base/pkg-plist13
-rw-r--r--security/bdc/pkg-plist3
-rw-r--r--security/beecrypt/pkg-plist1
-rw-r--r--security/blindelephant/pkg-plist4
-rw-r--r--security/botan110/Makefile2
-rw-r--r--security/bruteforceblocker/pkg-plist1
-rw-r--r--security/bsmtrace/pkg-plist1
-rw-r--r--security/bugs/pkg-plist7
-rw-r--r--security/ccrypt/pkg-plist1
-rw-r--r--security/cfs/pkg-plist4
-rw-r--r--security/cl-md5/pkg-plist1
-rw-r--r--security/clamav-unofficial-sigs/pkg-plist2
-rw-r--r--security/clamsmtp/pkg-plist1
-rw-r--r--security/clamtk/Makefile6
-rw-r--r--security/clamtk/pkg-plist8
-rw-r--r--security/cops/pkg-plist8
-rw-r--r--security/crank/pkg-plist6
-rw-r--r--security/cryptopp/pkg-plist2
-rw-r--r--security/cryptstring/pkg-plist1
-rw-r--r--security/cyassl/pkg-plist3
-rw-r--r--security/d0_blind_id/pkg-plist1
-rw-r--r--security/ddos_scan/pkg-plist1
-rw-r--r--security/dirbuster/pkg-plist2
-rw-r--r--security/dirmngr/pkg-plist4
-rw-r--r--security/distcache/pkg-plist3
-rw-r--r--security/doorman/pkg-plist1
-rw-r--r--security/dradis/pkg-plist211
-rw-r--r--security/duo/pkg-plist11
-rw-r--r--security/easy-rsa/pkg-plist2
-rw-r--r--security/easypg/pkg-plist1
-rw-r--r--security/engine_pkcs11/pkg-plist1
-rw-r--r--security/expiretable/pkg-plist7
-rw-r--r--security/f-prot/pkg-plist7
-rw-r--r--security/fakebo/pkg-plist1
-rw-r--r--security/fbopenssl/pkg-plist1
-rw-r--r--security/fcheck/pkg-plist10
-rw-r--r--security/fpm2/pkg-plist1
-rw-r--r--security/fprint_demo/pkg-plist13
-rw-r--r--security/fragroute/pkg-plist1
-rw-r--r--security/fsh/pkg-plist1
-rw-r--r--security/fuzzdb/pkg-plist65
-rw-r--r--security/fwanalog/pkg-plist1
-rw-r--r--security/fwbuilder/pkg-plist26
-rw-r--r--security/fwknop/pkg-plist1
-rw-r--r--security/gcipher/pkg-plist8
-rw-r--r--security/gnomint/pkg-plist3
-rw-r--r--security/gnupg/pkg-plist3
-rw-r--r--security/gnupg1/pkg-plist1
-rw-r--r--security/go.crypto/pkg-plist47
-rw-r--r--security/goptlib/pkg-plist12
-rw-r--r--security/gorilla/pkg-plist16
-rw-r--r--security/gpass/pkg-plist1
-rw-r--r--security/gringotts/pkg-plist1
-rw-r--r--security/gsasl/pkg-plist2
-rw-r--r--security/gss/pkg-plist1
-rw-r--r--security/gtk-knocker/pkg-plist2
-rw-r--r--security/hackbot/pkg-plist1
-rw-r--r--security/hmap/pkg-plist2
-rw-r--r--security/honggfuzz/pkg-plist4
-rw-r--r--security/httprint/pkg-plist2
-rw-r--r--security/ike-scan/pkg-plist2
-rw-r--r--security/ike/pkg-plist4
-rw-r--r--security/ipfilter2dshield/pkg-plist1
-rw-r--r--security/ipfmeta/pkg-plist1
-rw-r--r--security/ipv6toolkit/pkg-plist1
-rw-r--r--security/isakmpd/pkg-plist1
-rw-r--r--security/jbrofuzz/pkg-plist4
-rw-r--r--security/john/pkg-plist1
87 files changed, 51 insertions, 628 deletions
diff --git a/security/ADMsmb/pkg-plist b/security/ADMsmb/pkg-plist
index 04eb9d67af8d..3f0431d1603b 100644
--- a/security/ADMsmb/pkg-plist
+++ b/security/ADMsmb/pkg-plist
@@ -1,3 +1,2 @@
bin/ADMsmb
%%DATADIR%%/README
-@dirrm %%DATADIR%%
diff --git a/security/ADMsnmp/pkg-plist b/security/ADMsnmp/pkg-plist
index 1ad8a14709e1..13ac73c0f8b8 100644
--- a/security/ADMsnmp/pkg-plist
+++ b/security/ADMsnmp/pkg-plist
@@ -1,5 +1,3 @@
bin/ADMsnmp
share/ADMsnmp/snmp.passwd
share/doc/ADMsnmp/ADMsnmp.README
-@dirrm share/doc/ADMsnmp
-@dirrm share/ADMsnmp
diff --git a/security/aescrypt/pkg-plist b/security/aescrypt/pkg-plist
index 748cdd2b5e89..21d6bc298ee9 100644
--- a/security/aescrypt/pkg-plist
+++ b/security/aescrypt/pkg-plist
@@ -3,4 +3,3 @@ bin/aesget
man/man1/aescrypt.1.gz
man/man1/aesget.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/afterglow/pkg-plist b/security/afterglow/pkg-plist
index 1a1d368903da..70da8627f1d9 100644
--- a/security/afterglow/pkg-plist
+++ b/security/afterglow/pkg-plist
@@ -43,13 +43,3 @@
%%DATADIR%%/parsers/sendmail_parser.pl
%%DATADIR%%/parsers/snortalert2csv.pl
%%DATADIR%%/parsers/tcpdump2csv.pl
-@dirrm %%DATADIR%%/parsers
-@dirrm %%DATADIR%%/loganalysis/Text
-@dirrm %%DATADIR%%/loganalysis/IP
-@dirrm %%DATADIR%%/loganalysis/Crypt
-@dirrm %%DATADIR%%/loganalysis
-@dirrm %%DATADIR%%/graph/Text
-@dirrm %%DATADIR%%/graph
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/charts
-@dirrm %%DATADIR%%
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 1fcf003e4376..22cf01c62382 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -15,8 +15,6 @@ COMMENT= Replacement and extension for Tripwire
LIB_DEPENDS= libmhash.so:${PORTSDIR}/security/mhash
USES= bison gmake
-.include <bsd.port.pre.mk>
-
USE_AUTOTOOLS= autoconf
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-mhash \
@@ -30,9 +28,8 @@ CFLAGS+= -I${LOCALBASE}/include
SUB_FILES= pkg-message
post-install:
- @${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf.sample
- @if [ ! -f ${STAGEDOIR}${PREFIX}/etc/aide.conf ]; then \
- ${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf ; \
- fi
+ ${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf.sample
+ ${MKDIR} ${STAGEDIR}/var/db/aide/databases
+ ${CHMOD} 0700 ${STAGEDIR}/var/db/aide ${STAGEDIR}/var/db/aide/databases
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/aide/pkg-plist b/security/aide/pkg-plist
index 19f967f0bf85..edd097ca6102 100644
--- a/security/aide/pkg-plist
+++ b/security/aide/pkg-plist
@@ -1,11 +1,6 @@
bin/aide
-@unexec if cmp -s %D/etc/aide.conf %D/etc/aide.conf.sample; then rm -f %D/etc/aide.conf; fi
-etc/aide.conf.sample
-@exec [ ! -f %B/aide.conf ] && cp %B/%f %B/aide.conf
+@sample etc/aide.conf.sample
man/man1/aide.1.gz
man/man5/aide.conf.5.gz
-@exec /bin/mkdir -p /var/db/aide/databases
-@exec [ -f /var/db/aide/aide.conf ] || /usr/sbin/chown root:wheel /var/db/aide
-@exec [ -f /var/db/aide/aide.conf ] || /usr/sbin/chown root:wheel /var/db/aide/databases
-@exec [ -f /var/db/aide/aide.conf ] || /bin/chmod 0700 /var/db/aide
-@exec [ -f /var/db/aide/aide.conf ] || /bin/chmod 0700 /var/db/aide/databases
+@dir(,,0700) /var/db/aide/databases
+@dir(,,0700) /var/db/aide
diff --git a/security/amap/pkg-plist b/security/amap/pkg-plist
index f3fa7c076afb..e2e6bd57f00f 100644
--- a/security/amap/pkg-plist
+++ b/security/amap/pkg-plist
@@ -9,6 +9,3 @@ include/amap/amap-inc.h
include/amap/amap-lib.h
lib/amap/amap-lib.o
man/man1/amap.1.gz
-@dirrm lib/amap
-@dirrm include/amap
-@dirrmtry etc/amap
diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile
index 5a4416be9620..db58d990ccf8 100644
--- a/security/amavis-stats/Makefile
+++ b/security/amavis-stats/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amavis-stats
PORTVERSION= 0.1.12
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= LOCAL
MASTER_SITE_SUBDIR= feld
@@ -13,8 +13,10 @@ COMMENT= Simple AMaViS statistics generator based on rrdtool
RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool
-USES= perl5
+USES= perl5 shebangfix
USE_PERL5= run
+SHEBANG_FILES= amavis-stats
+perl_CMD= ${PERL} -w
USE_PHP= pcre
NO_BUILD= yes
@@ -49,7 +51,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.endif
-post-install:
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.mk>
diff --git a/security/amavis-stats/files/patch-amavis-stats b/security/amavis-stats/files/patch-amavis-stats
index 486550ad55ff..3af94925c0ac 100644
--- a/security/amavis-stats/files/patch-amavis-stats
+++ b/security/amavis-stats/files/patch-amavis-stats
@@ -1,11 +1,5 @@
--- amavis-stats.orig Sat Mar 27 23:25:27 2004
+++ amavis-stats Mon Jul 10 22:55:19 2006
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/usr/bin/perl -w
- #
- # amavis-stats -- generate rrds from amavis log output
- #
@@ -28,6 +28,7 @@
# ########################################################################
use strict;
diff --git a/security/amavis-stats/pkg-plist b/security/amavis-stats/pkg-plist
index 64fa82681403..576eedd9864c 100644
--- a/security/amavis-stats/pkg-plist
+++ b/security/amavis-stats/pkg-plist
@@ -1,9 +1,7 @@
man/man1/amavis-stats.1.gz
sbin/amavis-stats
-www/amavis-stats/index.php
-www/amavis-stats/amavis-stats.php
-www/amavis-stats/img/.keep
-@dirrm www/amavis-stats/img
-@dirrm www/amavis-stats
-@exec /usr/sbin/chown -R %%USERS%%:%%GROUPS%% %D/www/amavis-stats
-@exec /usr/sbin/chown %%WWWOWN%%:%%WWWGRP%% %D/www/amavis-stats/img
+@(%%USERS%%,%%GROUPS%%,) www/amavis-stats/index.php
+@(%%USERS%%,%%GROUPS%%,) www/amavis-stats/amavis-stats.php
+@(%%USERS%%,%%GROUPS%%,) www/amavis-stats/img/.keep
+@dir(%%WWWOWN%%,%%WWWGRP%%,) www/amavis-stats/img
+@dir(%%USERS%%,%%GROUPS%%,) www/amavis-stats
diff --git a/security/amavisd-milter/pkg-plist b/security/amavisd-milter/pkg-plist
index beb69f02b367..a2eacc0ecbb8 100644
--- a/security/amavisd-milter/pkg-plist
+++ b/security/amavisd-milter/pkg-plist
@@ -1,11 +1,4 @@
-@unexec if service amavisd-milter status | grep -q "amavisd-milter is running"; then service amavisd-milter stop; fi
sbin/amavisd-milter
man/man8/amavisd-milter.8.gz
-@owner %%AMAVISUSER%%
-@group %%AMAVISGROUP%%
-@mode 750
-@dirrmtry %%RUNDIR%%/tmp
-@mode 755
-@dirrmtry %%RUNDIR%%
-@exec install -d -o %%AMAVISUSER%% -g %%AMAVISGROUP%% -m 755 %%RUNDIR%%
-@exec install -d -o %%AMAVISUSER%% -g %%AMAVISGROUP%% -m 750 %%RUNDIR%%/tmp
+@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%RUNDIR%%/tmp
+@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,755) %%RUNDIR%%
diff --git a/security/apache-xml-security-c/pkg-plist b/security/apache-xml-security-c/pkg-plist
index faad61525bd8..ad031407c6f8 100644
--- a/security/apache-xml-security-c/pkg-plist
+++ b/security/apache-xml-security-c/pkg-plist
@@ -162,16 +162,3 @@ lib/libxml-security-c.a
lib/libxml-security-c.so
lib/libxml-security-c.so.17
lib/libxml-security-c.so.17.0.2
-@dirrm include/xsec/xkms
-@dirrm include/xsec/xenc
-@dirrm include/xsec/utils/unixutils
-@dirrm include/xsec/utils
-@dirrm include/xsec/transformers
-@dirrm include/xsec/framework
-@dirrm include/xsec/enc/XSCrypt
-@dirrm include/xsec/enc/OpenSSL
-@dirrm include/xsec/enc/NSS
-@dirrm include/xsec/enc
-@dirrm include/xsec/dsig
-@dirrm include/xsec/canon
-@dirrm include/xsec
diff --git a/security/apg/pkg-plist b/security/apg/pkg-plist
index 8b0565da6b43..81d87dd779b0 100644
--- a/security/apg/pkg-plist
+++ b/security/apg/pkg-plist
@@ -8,4 +8,3 @@ man/man8/apgd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/pronun.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc0972.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc1750.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/arirang/pkg-plist b/security/arirang/pkg-plist
index edd12d9f26d4..b99629df9850 100644
--- a/security/arirang/pkg-plist
+++ b/security/arirang/pkg-plist
@@ -53,4 +53,3 @@ share/arirang/server11.rb
share/arirang/server11_relay.rb
share/arirang/size.rb
share/arirang/ssh.rb
-@dirrm share/arirang
diff --git a/security/arm/pkg-plist b/security/arm/pkg-plist
index 32c01683acd3..634ba9fa9f56 100644
--- a/security/arm/pkg-plist
+++ b/security/arm/pkg-plist
@@ -215,16 +215,3 @@ bin/arm
%%PYTHON_SITELIBDIR%%/arm/util/uiTools.pyc
%%PYTHON_SITELIBDIR%%/arm/util/uiTools.pyo
man/man1/arm.1.gz
-@dirrm %%PYTHON_SITELIBDIR%%/arm/TorCtl
-@dirrm %%PYTHON_SITELIBDIR%%/arm/cli/connections
-@dirrm %%PYTHON_SITELIBDIR%%/arm/cli/graphing
-@dirrm %%PYTHON_SITELIBDIR%%/arm/cli/menu
-@dirrm %%PYTHON_SITELIBDIR%%/arm/cli
-@dirrm %%PYTHON_SITELIBDIR%%/arm/gui/connections
-@dirrm %%PYTHON_SITELIBDIR%%/arm/gui/graphing
-@dirrm %%PYTHON_SITELIBDIR%%/arm/gui
-@dirrm %%PYTHON_SITELIBDIR%%/arm/resources/exitNotice
-@dirrm %%PYTHON_SITELIBDIR%%/arm/resources/torrcOverride
-@dirrm %%PYTHON_SITELIBDIR%%/arm/resources
-@dirrm %%PYTHON_SITELIBDIR%%/arm/util
-@dirrm %%PYTHON_SITELIBDIR%%/arm
diff --git a/security/arpCounterattack/pkg-plist b/security/arpCounterattack/pkg-plist
index 722bc19feafa..949c62e19484 100644
--- a/security/arpCounterattack/pkg-plist
+++ b/security/arpCounterattack/pkg-plist
@@ -1,4 +1,3 @@
sbin/arpCounterattack
@sample etc/arpCounterattack/arpCounterattack.conf.sample
etc/arpCounterattack/oui.txt
-@dirrmtry etc/arpCounterattack
diff --git a/security/autossh/pkg-plist b/security/autossh/pkg-plist
index fa819adef8bc..06e6d717e847 100644
--- a/security/autossh/pkg-plist
+++ b/security/autossh/pkg-plist
@@ -2,4 +2,3 @@ bin/autossh
man/man1/autossh.1.gz
%%EXAMPLESDIR%%/autossh.host
%%EXAMPLESDIR%%/rscreen
-@dirrm %%EXAMPLESDIR%%
diff --git a/security/axTLS/pkg-plist b/security/axTLS/pkg-plist
index 8c125e8ef6ca..17560777d305 100644
--- a/security/axTLS/pkg-plist
+++ b/security/axTLS/pkg-plist
@@ -18,4 +18,3 @@ lib/libaxtls.so.1
lib/libaxtls.so.1.2
%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/libaxtlsp.so
%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/axtlsp.pm
-@dirrm include/axTLS
diff --git a/security/barnyard2/pkg-plist b/security/barnyard2/pkg-plist
index 2a50ebe1a32b..16be9014bf89 100644
--- a/security/barnyard2/pkg-plist
+++ b/security/barnyard2/pkg-plist
@@ -16,5 +16,3 @@ etc/barnyard2.conf.sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_mysql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_oracle.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/create_postgresql
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/security/base/pkg-plist b/security/base/pkg-plist
index b68ce00e4343..3ed88005bb9c 100644
--- a/security/base/pkg-plist
+++ b/security/base/pkg-plist
@@ -6,7 +6,6 @@
%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
%%PORTDOCS%%%%DOCSDIR%%/GPL
%%PORTDOCS%%%%DOCSDIR%%/base_faq.rtf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
www/base/admin/base_roleadmin.php
www/base/admin/base_useradmin.php
www/base/admin/index.php
@@ -117,14 +116,4 @@ www/base/styles/base_black_style.css
www/base/styles/base_red_style.css
www/base/styles/base_style.css
www/base/styles/acid_style.css
-@dirrm www/base/styles
-@dirrm www/base/sql
-@dirrm www/base/setup
-@dirrm www/base/languages
-@dirrm www/base/includes/templates/default
-@dirrm www/base/includes/templates
-@dirrm www/base/includes
-@dirrm www/base/images
-@dirrm www/base/help
-@dirrm www/base/admin
-@dirrmtry www/base
+@dir www/base/includes/templates/default
diff --git a/security/bdc/pkg-plist b/security/bdc/pkg-plist
index 877e1f3b4751..5907f2d0dc2a 100644
--- a/security/bdc/pkg-plist
+++ b/security/bdc/pkg-plist
@@ -98,7 +98,4 @@ man/man1/bdc.1.gz
%%PORTDOCS%%%%DOCSDIR%%/KNOWN-ISSUES
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm bdc/Plugins
-@dirrm bdc
@unexec rmdir %D/bdc 2>/dev/null || echo "If you are permanently removing this port, you should do a \"rm -rf %D/bdc\" to remove files installed after doing an update. " | fmt
diff --git a/security/beecrypt/pkg-plist b/security/beecrypt/pkg-plist
index 173493e52cd7..e2bff335b425 100644
--- a/security/beecrypt/pkg-plist
+++ b/security/beecrypt/pkg-plist
@@ -57,4 +57,3 @@ lib/libbeecrypt.a
lib/libbeecrypt.so
lib/libbeecrypt.so.7
lib/libbeecrypt.so.7.0.0
-@dirrm include/beecrypt
diff --git a/security/blindelephant/pkg-plist b/security/blindelephant/pkg-plist
index 0daea00651df..27ccbbf04708 100644
--- a/security/blindelephant/pkg-plist
+++ b/security/blindelephant/pkg-plist
@@ -80,7 +80,3 @@ bin/blindelephant
%%PYTHON_SITELIBDIR%%/blindelephant/dbs/wordpress-plugins/wptouch.pkl
%%PYTHON_SITELIBDIR%%/blindelephant/dbs/wordpress-plugins/yet-another-related-posts-plugin.pkl
%%PYTHON_SITELIBDIR%%/blindelephant/dbs/wordpress.pkl
-@dirrm %%PYTHON_SITELIBDIR%%/blindelephant/dbs/wordpress-plugins
-@dirrm %%PYTHON_SITELIBDIR%%/blindelephant/dbs/drupal-plugins
-@dirrm %%PYTHON_SITELIBDIR%%/blindelephant/dbs
-@dirrm %%PYTHON_SITELIBDIR%%/blindelephant
diff --git a/security/botan110/Makefile b/security/botan110/Makefile
index 9c7fd2bd9b26..ac5ebcecc427 100644
--- a/security/botan110/Makefile
+++ b/security/botan110/Makefile
@@ -68,7 +68,5 @@ post-patch:
post-install:
@(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s include/botan-1.10 -not -type d) >> ${TMPPLIST}
- @${ECHO_CMD} @dirrm include/botan-1.10/botan >> ${TMPPLIST}
- @${ECHO_CMD} @dirrm include/botan-1.10 >> ${TMPPLIST}
.include <bsd.port.post.mk>
diff --git a/security/bruteforceblocker/pkg-plist b/security/bruteforceblocker/pkg-plist
index e976bc01b855..346fc0c0216c 100644
--- a/security/bruteforceblocker/pkg-plist
+++ b/security/bruteforceblocker/pkg-plist
@@ -1,6 +1,5 @@
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@sample etc/bruteforceblocker.conf.sample
sbin/bruteforceblocker
diff --git a/security/bsmtrace/pkg-plist b/security/bsmtrace/pkg-plist
index 272739a21fda..cb7505d7ca37 100644
--- a/security/bsmtrace/pkg-plist
+++ b/security/bsmtrace/pkg-plist
@@ -2,4 +2,3 @@ sbin/bsmtrace
man/man1/bsmtrace.1.gz
man/man5/bsmtrace.conf.5.gz
%%EXAMPLESDIR%%/bsmtrace.conf
-@dirrm %%EXAMPLESDIR%%
diff --git a/security/bugs/pkg-plist b/security/bugs/pkg-plist
index bc24550753c8..7d23fc0f2506 100644
--- a/security/bugs/pkg-plist
+++ b/security/bugs/pkg-plist
@@ -55,10 +55,3 @@ bugs-%%PORTVERSION%%/include/wrapper.h
%%PORTDOCS%%%%DOCSDIR%%/fulldoc/lib_hist.txt
%%PORTDOCS%%%%DOCSDIR%%/history/old_french.txt
%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/history
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/cv
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm bugs-%%PORTVERSION%%/include
-@dirrm bugs-%%PORTVERSION%%
diff --git a/security/ccrypt/pkg-plist b/security/ccrypt/pkg-plist
index 7711d8e470a4..5f91383074da 100644
--- a/security/ccrypt/pkg-plist
+++ b/security/ccrypt/pkg-plist
@@ -13,4 +13,3 @@ man/man1/ccguess.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/ccrypt.html
%%PORTDOCS%%%%DOCSDIR%%/cypfaq01.txt
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
diff --git a/security/cfs/pkg-plist b/security/cfs/pkg-plist
index a3f5e0a9d81f..e96d7e31211d 100644
--- a/security/cfs/pkg-plist
+++ b/security/cfs/pkg-plist
@@ -16,6 +16,4 @@ man/man1/cfssh.1.gz
man/man8/ccat.8.gz
man/man8/cfsd.8.gz
man/man8/cname.8.gz
-@exec install -d -o root -g wheel -m 0 %%CFSD_BOOTSTRAP%% 2>/dev/null || true
-@unexec rmdir %%CFSD_BOOTSTRAP%% 2>/dev/null || true
-@dirrm share/doc/cfs
+@dir(,,0) %%CFSD_BOOTSTRAP%%
diff --git a/security/cl-md5/pkg-plist b/security/cl-md5/pkg-plist
index d1423b52c4a0..e6f19607ce64 100644
--- a/security/cl-md5/pkg-plist
+++ b/security/cl-md5/pkg-plist
@@ -1,4 +1,3 @@
%%LIB32DIR%%/common-lisp/md5/md5.asd
%%LIB32DIR%%/common-lisp/md5/md5.lisp
%%LIB32DIR%%/common-lisp/system-registry/md5.asd
-@dirrm %%LIB32DIR%%/common-lisp/md5
diff --git a/security/clamav-unofficial-sigs/pkg-plist b/security/clamav-unofficial-sigs/pkg-plist
index f595f4736e9c..f2b408f171e7 100644
--- a/security/clamav-unofficial-sigs/pkg-plist
+++ b/security/clamav-unofficial-sigs/pkg-plist
@@ -5,8 +5,6 @@ man/man8/clamav-unofficial-sigs.8.gz
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clamav-unofficial-sigs-cron
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clamav-unofficial-sigs-logrotate
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clamd-status.sh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/security/clamsmtp/pkg-plist b/security/clamsmtp/pkg-plist
index ea7e2ad057f2..9fd9efc34d8a 100644
--- a/security/clamsmtp/pkg-plist
+++ b/security/clamsmtp/pkg-plist
@@ -4,4 +4,3 @@ man/man8/clamsmtpd.8.gz
sbin/clamsmtpd
etc/clamsmtpd.conf-sample
%%EXAMPLESDIR%%/virus_action.sh
-@dirrm %%EXAMPLESDIR%%
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index 2acc4175bd41..af1f54d23906 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -3,6 +3,7 @@
PORTNAME= clamtk
PORTVERSION= 4.45
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/ClamTk/${PORTVERSION}
@@ -23,10 +24,9 @@ RUN_DEPENDS= p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \
p5-Gtk2>=1.144:${PORTSDIR}/x11-toolkits/p5-Gtk2
NO_BUILD= yes
-USES= gettext:run perl5
+USES= gettext:run perl5 shebangfix
USE_PERL5= run
-
-MAN1= ${PORTNAME}.1
+SHEBANG_FILES= clamtk
LINGUAS= `${LS} ${WRKSRC}/po/*.mo | ${XARGS} ${BASENAME} -s .mo`
diff --git a/security/clamtk/pkg-plist b/security/clamtk/pkg-plist
index 3ceece688773..1ae71b2660e5 100644
--- a/security/clamtk/pkg-plist
+++ b/security/clamtk/pkg-plist
@@ -62,11 +62,3 @@ share/locale/zh_TW/LC_MESSAGES/clamtk.mo
share/pixmaps/clamtk.png
share/pixmaps/clamtk.xpm
share/pixmaps/clamtk-loader.gif
-@dirrmtry share/locale/nl_BE/LC_MESSAGES
-@dirrmtry share/locale/nl_BE
-@dirrmtry share/locale/fo/LC_MESSAGES
-@dirrmtry share/locale/fo
-@dirrmtry share/locale/el_GR/LC_MESSAGES
-@dirrmtry share/locale/el_GR
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%SITE_PERL%%/ClamTk
diff --git a/security/cops/pkg-plist b/security/cops/pkg-plist
index 74ab4d130d08..1129841d817c 100644
--- a/security/cops/pkg-plist
+++ b/security/cops/pkg-plist
@@ -228,11 +228,3 @@ cops/suid.stop
cops/tilde
cops/user.chk
cops/yp_pass.chk
-@dirrm cops/src
-@dirrm cops/perl
-@dirrm cops/extra_src
-@dirrm cops/extensions
-@dirrm cops/docs
-@dirrm cops/checkacct
-@dirrm cops/carp
-@dirrm cops
diff --git a/security/crank/pkg-plist b/security/crank/pkg-plist
index f425266953bf..d302fe316e02 100644
--- a/security/crank/pkg-plist
+++ b/security/crank/pkg-plist
@@ -13,8 +13,4 @@ share/crank/slft.dat
share/crank/source.xpm
share/crank/stop.xpm
share/crank/trift.dat
-@dirrm share/crank/patch
-@dirrm share/crank/scheme
-@dirrm share/crank
-@dirrm lib/crank/plugins
-@dirrm lib/crank
+@dir lib/crank/plugins
diff --git a/security/cryptopp/pkg-plist b/security/cryptopp/pkg-plist
index dc0537f4b721..b7641b350446 100644
--- a/security/cryptopp/pkg-plist
+++ b/security/cryptopp/pkg-plist
@@ -136,7 +136,5 @@ lib/libcryptopp.a
%%DYNAMIC_ENABLED%%lib/libcryptopp.so
%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%LIBVERSION%%
%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%PORTVERSION%%
-@dirrm include/cryptopp
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/License
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/cryptstring/pkg-plist b/security/cryptstring/pkg-plist
index 5d267777be16..5dcaf1ce4876 100644
--- a/security/cryptstring/pkg-plist
+++ b/security/cryptstring/pkg-plist
@@ -1,2 +1 @@
%%DATADIR%%/cs.inc.php
-@dirrm %%DATADIR%%
diff --git a/security/cyassl/pkg-plist b/security/cyassl/pkg-plist
index 38cb7dbfdb50..0c8746db0224 100644
--- a/security/cyassl/pkg-plist
+++ b/security/cyassl/pkg-plist
@@ -90,6 +90,3 @@ include/cyassl/sniffer_error.h
include/cyassl/ssl.h
include/cyassl/test.h
include/cyassl/version.h
-@dirrm include/cyassl/openssl
-@dirrm include/cyassl/ctaocrypt
-@dirrm include/cyassl
diff --git a/security/d0_blind_id/pkg-plist b/security/d0_blind_id/pkg-plist
index 17b27bc65f22..408a89945eb6 100644
--- a/security/d0_blind_id/pkg-plist
+++ b/security/d0_blind_id/pkg-plist
@@ -12,4 +12,3 @@ lib/libd0_rijndael.so.0
lib/libd0_rijndael.so.0.0.0
libdata/pkgconfig/d0_blind_id.pc
libdata/pkgconfig/d0_rijndael.pc
-@dirrmtry include/d0_blind_id
diff --git a/security/ddos_scan/pkg-plist b/security/ddos_scan/pkg-plist
index 790f0b437898..d9b2885b545d 100644
--- a/security/ddos_scan/pkg-plist
+++ b/security/ddos_scan/pkg-plist
@@ -1,3 +1,2 @@
sbin/dds
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/dirbuster/pkg-plist b/security/dirbuster/pkg-plist
index 77f517436929..68444f0e406d 100644
--- a/security/dirbuster/pkg-plist
+++ b/security/dirbuster/pkg-plist
@@ -21,5 +21,3 @@ bin/dirbuster
%%DATADIR%%/apache-user-enum-2.0.txt
%%DATADIR%%/apache-user-enum-1.0.txt
%%DATADIR%%/DirBuster-1.0-RC1.jar
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/
diff --git a/security/dirmngr/pkg-plist b/security/dirmngr/pkg-plist
index f2ba050e3cf3..c49ef0e3e546 100644
--- a/security/dirmngr/pkg-plist
+++ b/security/dirmngr/pkg-plist
@@ -57,7 +57,3 @@ man/man1/dirmngr.1.gz
%%DOCSDIR%%/examples/trusted-certs/S-TRUSTQualifiedRootCA2008-002.final.v3.509.crt
%%DOCSDIR%%/examples/trusted-certs/bnetza-10r-ca.crt
%%NLS%%share/locale/de/LC_MESSAGES/dirmngr.mo
-@dirrm %%DOCSDIR%%/examples/trusted-certs
-@dirrm %%DOCSDIR%%/examples/extra-certs
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
diff --git a/security/distcache/pkg-plist b/security/distcache/pkg-plist
index efe9cabd39f7..794f9403f578 100644
--- a/security/distcache/pkg-plist
+++ b/security/distcache/pkg-plist
@@ -40,6 +40,3 @@ man/man2/NAL_decode_uint32.2.gz
man/man8/distcache.8.gz
share/swamp/A-client.pem
share/swamp/CA.pem
-@dirrm include/distcache
-@dirrm include/libnal
-@dirrm share/swamp
diff --git a/security/doorman/pkg-plist b/security/doorman/pkg-plist
index 01186e29c9be..6a51ebfccab4 100644
--- a/security/doorman/pkg-plist
+++ b/security/doorman/pkg-plist
@@ -18,4 +18,3 @@ man/man5/doormand.cf.5.gz
man/man5/guestlist.5.gz
man/man8/doormand.8.gz
sbin/doormand
-@dirrmtry etc/doormand
diff --git a/security/dradis/pkg-plist b/security/dradis/pkg-plist
index c336d2181a67..3ecfdc770741 100644
--- a/security/dradis/pkg-plist
+++ b/security/dradis/pkg-plist
@@ -932,199 +932,18 @@ dradis/server/vendor/plugins/word_export/template.xml
dradis/server/vendor/plugins/word_export/test/word_export_test.rb
dradis/server/vendor/plugins/word_export/uninstall.rb
dradis/server/vendor/plugins/word_export/wordexport_tutorial.tar.bz2
-@dirrm dradis/server/vendor/plugins/word_export/test
-@dirrm dradis/server/vendor/plugins/word_export/lib/word_export
-@dirrm dradis/server/vendor/plugins/word_export/lib/tasks
-@dirrm dradis/server/vendor/plugins/word_export/lib
-@dirrm dradis/server/vendor/plugins/word_export
-@dirrm dradis/server/vendor/plugins/wiki_import/test/vendor/mocha-0.9.5/lib/mocha/parameter_matchers
-@dirrm dradis/server/vendor/plugins/wiki_import/test/vendor/mocha-0.9.5/lib/mocha
-@dirrm dradis/server/vendor/plugins/wiki_import/test/vendor/mocha-0.9.5/lib
-@dirrm dradis/server/vendor/plugins/wiki_import/test/vendor/mocha-0.9.5
-@dirrm dradis/server/vendor/plugins/wiki_import/test/vendor
-@dirrm dradis/server/vendor/plugins/wiki_import/test
-@dirrm dradis/server/vendor/plugins/wiki_import/lib/wiki_import
-@dirrm dradis/server/vendor/plugins/wiki_import/lib/tasks
-@dirrm dradis/server/vendor/plugins/wiki_import/lib
-@dirrm dradis/server/vendor/plugins/wiki_import/config
-@dirrm dradis/server/vendor/plugins/wiki_import
-@dirrm dradis/server/vendor/plugins/vulndb_import/test
-@dirrm dradis/server/vendor/plugins/vulndb_import/lib/vulndb_import
-@dirrm dradis/server/vendor/plugins/vulndb_import/lib/tasks
-@dirrm dradis/server/vendor/plugins/vulndb_import/lib
-@dirrm dradis/server/vendor/plugins/vulndb_import/config
-@dirrm dradis/server/vendor/plugins/vulndb_import
-@dirrm dradis/server/vendor/plugins/typhon_upload/test
-@dirrm dradis/server/vendor/plugins/typhon_upload/lib/typhon_upload
-@dirrm dradis/server/vendor/plugins/typhon_upload/lib/tasks
-@dirrm dradis/server/vendor/plugins/typhon_upload/lib
-@dirrm dradis/server/vendor/plugins/typhon_upload
-@dirrm dradis/server/vendor/plugins/restful-authentication/notes
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/trustification
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/tasks
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/test
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/spec/models
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/spec/helpers
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/spec/fixtures
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/spec/controllers
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/spec
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/features/step_definitions
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates/features
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated/templates
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators/authenticated
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/generators
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/authorization
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib/authentication
-@dirrm dradis/server/vendor/plugins/restful-authentication/lib
-@dirrm dradis/server/vendor/plugins/restful-authentication
-@dirrm dradis/server/vendor/plugins/project_management/test
-@dirrm dradis/server/vendor/plugins/project_management/lib/zip
-@dirrm dradis/server/vendor/plugins/project_management/lib/tasks
-@dirrm dradis/server/vendor/plugins/project_management/lib/project_management/upload
-@dirrm dradis/server/vendor/plugins/project_management/lib/project_management/export
-@dirrm dradis/server/vendor/plugins/project_management/lib/project_management
-@dirrm dradis/server/vendor/plugins/project_management/lib
-@dirrm dradis/server/vendor/plugins/project_management/config
-@dirrm dradis/server/vendor/plugins/project_management
-@dirrm dradis/server/vendor/plugins/osvdb_import/test
-@dirrm dradis/server/vendor/plugins/osvdb_import/lib/tasks
-@dirrm dradis/server/vendor/plugins/osvdb_import/lib/osvdb_import
-@dirrm dradis/server/vendor/plugins/osvdb_import/lib
-@dirrm dradis/server/vendor/plugins/osvdb_import/config
-@dirrm dradis/server/vendor/plugins/osvdb_import
-@dirrm dradis/server/vendor/plugins/nmap_upload/test
-@dirrm dradis/server/vendor/plugins/nmap_upload/lib/tasks
-@dirrm dradis/server/vendor/plugins/nmap_upload/lib/nmap_upload
-@dirrm dradis/server/vendor/plugins/nmap_upload/lib/nmap
-@dirrm dradis/server/vendor/plugins/nmap_upload/lib
-@dirrm dradis/server/vendor/plugins/nmap_upload
-@dirrm dradis/server/vendor/plugins/nikto_upload/test
-@dirrm dradis/server/vendor/plugins/nikto_upload/lib/tasks
-@dirrm dradis/server/vendor/plugins/nikto_upload/lib/nikto_upload
-@dirrm dradis/server/vendor/plugins/nikto_upload/lib
-@dirrm dradis/server/vendor/plugins/nikto_upload
-@dirrm dradis/server/vendor/plugins/nessus_upload/test
-@dirrm dradis/server/vendor/plugins/nessus_upload/lib/tasks
-@dirrm dradis/server/vendor/plugins/nessus_upload/lib/nessus_upload
-@dirrm dradis/server/vendor/plugins/nessus_upload/lib
-@dirrm dradis/server/vendor/plugins/nessus_upload/config
-@dirrm dradis/server/vendor/plugins/nessus_upload
-@dirrm dradis/server/vendor/plugins/html_export/test
-@dirrm dradis/server/vendor/plugins/html_export/lib/tasks
-@dirrm dradis/server/vendor/plugins/html_export/lib/html_export
-@dirrm dradis/server/vendor/plugins/html_export/lib
-@dirrm dradis/server/vendor/plugins/html_export
-@dirrm dradis/server/vendor/plugins/burp_upload/test
-@dirrm dradis/server/vendor/plugins/burp_upload/lib/tasks
-@dirrm dradis/server/vendor/plugins/burp_upload/lib/burp_upload
-@dirrm dradis/server/vendor/plugins/burp_upload/lib
-@dirrm dradis/server/vendor/plugins/burp_upload
-@dirrm dradis/server/vendor/plugins/acts_as_tree/test/fixtures
-@dirrm dradis/server/vendor/plugins/acts_as_tree/test
-@dirrm dradis/server/vendor/plugins/acts_as_tree/lib/active_record/acts
-@dirrm dradis/server/vendor/plugins/acts_as_tree/lib/active_record
-@dirrm dradis/server/vendor/plugins/acts_as_tree/lib
-@dirrm dradis/server/vendor/plugins/acts_as_tree
-@dirrm dradis/server/vendor/plugins
-@dirrm dradis/server/vendor/gems
-@dirrm dradis/server/vendor
-@dirrm dradis/server/tmp
-@dirrm dradis/server/test/unit
-@dirrm dradis/server/test/mocks/test
-@dirrm dradis/server/test/mocks/development
-@dirrm dradis/server/test/mocks
-@dirrm dradis/server/test/integration
-@dirrm dradis/server/test/functional
-@dirrm dradis/server/test/fixtures
-@dirrm dradis/server/test
-@dirrm dradis/server/script
-@dirrm dradis/server/public/stylesheets/clean
-@dirrm dradis/server/public/stylesheets
-@dirrm dradis/server/public/javascripts/ux
-@dirrm dradis/server/public/javascripts/dx
-@dirrm dradis/server/public/javascripts/adapter/ext
-@dirrm dradis/server/public/javascripts/adapter
-@dirrm dradis/server/public/javascripts
-@dirrm dradis/server/public/images/wizard
-@dirrm dradis/server/public/images/silk
-@dirrm dradis/server/public/images/mimetypes
-@dirrm dradis/server/public/images/default/window
-@dirrm dradis/server/public/images/default/tree
-@dirrm dradis/server/public/images/default/toolbar
-@dirrm dradis/server/public/images/default/tabs
-@dirrm dradis/server/public/images/default/slider
-@dirrm dradis/server/public/images/default/sizer
-@dirrm dradis/server/public/images/default/shared
-@dirrm dradis/server/public/images/default/qtip
-@dirrm dradis/server/public/images/default/progress
-@dirrm dradis/server/public/images/default/panel
-@dirrm dradis/server/public/images/default/menu
-@dirrm dradis/server/public/images/default/layout
-@dirrm dradis/server/public/images/default/grid
-@dirrm dradis/server/public/images/default/form
-@dirrm dradis/server/public/images/default/editor
-@dirrm dradis/server/public/images/default/dd
-@dirrm dradis/server/public/images/default/button
-@dirrm dradis/server/public/images/default/box
-@dirrm dradis/server/public/images/default
-@dirrm dradis/server/public/images
-@dirrm dradis/server/public
-@dirrm dradis/server/log
-@dirrm dradis/server/lib/tasks
-@dirrm dradis/server/lib/generators/upload_plugin/templates
-@dirrm dradis/server/lib/generators/upload_plugin
-@dirrm dradis/server/lib/generators/import_plugin/templates
-@dirrm dradis/server/lib/generators/import_plugin
-@dirrm dradis/server/lib/generators/export_plugin/templates
-@dirrm dradis/server/lib/generators/export_plugin
-@dirrm dradis/server/lib/generators
-@dirrm dradis/server/lib/core
-@dirrm dradis/server/lib
-@dirrm dradis/server/doc
-@dirrm dradis/server/db/migrate
-@dirrm dradis/server/db
-@dirrm dradis/server/config/ssl
-@dirrm dradis/server/config/locales
-@dirrm dradis/server/config/initializers
-@dirrm dradis/server/config/environments
-@dirrm dradis/server/config
-@dirrm dradis/server/app/views/wizard
-@dirrm dradis/server/app/views/users
-@dirrm dradis/server/app/views/upload
-@dirrm dradis/server/app/views/sessions
-@dirrm dradis/server/app/views/restful
-@dirrm dradis/server/app/views/notes
-@dirrm dradis/server/app/views/nodes
-@dirrm dradis/server/app/views/logs
-@dirrm dradis/server/app/views/layouts
-@dirrm dradis/server/app/views/json
-@dirrm dradis/server/app/views/import
-@dirrm dradis/server/app/views/home
-@dirrm dradis/server/app/views/feeds
-@dirrm dradis/server/app/views/export
-@dirrm dradis/server/app/views/configurations
-@dirrm dradis/server/app/views/categories
-@dirrm dradis/server/app/views/attachments
-@dirrm dradis/server/app/views
-@dirrm dradis/server/app/models
-@dirrm dradis/server/app/mailers
-@dirrm dradis/server/app/helpers
-@dirrm dradis/server/app/controllers
-@dirrm dradis/server/app
-@dirrm dradis/server
-@dirrm dradis
-@exec mkdir -p %D/dradis/server/vendor/gems
-@exec mkdir -p %D/dradis/server/tmp
-@exec mkdir -p %D/dradis/server/test/mocks/test
-@exec mkdir -p %D/dradis/server/test/mocks/development
-@exec mkdir -p %D/dradis/server/test/integration
-@exec mkdir -p %D/dradis/server/log
-@exec mkdir -p %D/dradis/server/app/views/users
-@exec mkdir -p %D/dradis/server/app/views/restful
-@exec mkdir -p %D/dradis/server/app/views/notes
-@exec mkdir -p %D/dradis/server/app/views/nodes
-@exec mkdir -p %D/dradis/server/app/views/import
-@exec mkdir -p %D/dradis/server/app/views/export
-@exec mkdir -p %D/dradis/server/app/views/configurations
-@exec mkdir -p %D/dradis/server/app/views/categories
-@exec mkdir -p %D/dradis/server/app/mailers
+@dir dradis/server/app/mailers
+@dir dradis/server/app/views/categories
+@dir dradis/server/app/views/configurations
+@dir dradis/server/app/views/export
+@dir dradis/server/app/views/import
+@dir dradis/server/app/views/nodes
+@dir dradis/server/app/views/notes
+@dir dradis/server/app/views/restful
+@dir dradis/server/app/views/users
+@dir dradis/server/log
+@dir dradis/server/test/integration
+@dir dradis/server/test/mocks/development
+@dir dradis/server/test/mocks/test
+@dir dradis/server/tmp
+@dir dradis/server/vendor/gems
diff --git a/security/duo/pkg-plist b/security/duo/pkg-plist
index 005db18bb8db..fe5bac8585ee 100644
--- a/security/duo/pkg-plist
+++ b/security/duo/pkg-plist
@@ -1,9 +1,5 @@
-@mode 600
-@owner sshd
-@sample etc/login_duo.conf.sample
-@owner
-@sample etc/pam_duo.conf.sample
-@mode
+@sample(sshd,,0600) etc/login_duo.conf.sample
+@sample(,,0600) etc/pam_duo.conf.sample
include/duo/duo.h
include/duo/util.h
lib/libduo.so.3.0.0
@@ -19,7 +15,4 @@ man/man8/pam_duo.8.gz
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
sbin/login_duo
-@dir lib/security
-@dir include/duo
diff --git a/security/easy-rsa/pkg-plist b/security/easy-rsa/pkg-plist
index e380006101a2..cba3ad041005 100644
--- a/security/easy-rsa/pkg-plist
+++ b/security/easy-rsa/pkg-plist
@@ -21,5 +21,3 @@ share/easy-rsa/build-key
share/easy-rsa/build-inter
share/easy-rsa/build-dh
share/easy-rsa/whichopensslcnf
-@dirrm share/easy-rsa
-@dirrm %%DOCSDIR%%
diff --git a/security/easypg/pkg-plist b/security/easypg/pkg-plist
index e99eb764aa4d..ea94aaa438b6 100644
--- a/security/easypg/pkg-plist
+++ b/security/easypg/pkg-plist
@@ -14,4 +14,3 @@
%%EMACS_SITE_LISPDIR%%/epg/epg-config.elc
%%EMACS_SITE_LISPDIR%%/epg/epg-package-info.elc
%%EMACS_SITE_LISPDIR%%/epg/epg.elc
-@dirrm %%EMACS_SITE_LISPDIR%%/epg
diff --git a/security/engine_pkcs11/pkg-plist b/security/engine_pkcs11/pkg-plist
index b35abac9fc64..b808e668dbda 100644
--- a/security/engine_pkcs11/pkg-plist
+++ b/security/engine_pkcs11/pkg-plist
@@ -1,2 +1 @@
lib/engines/engine_pkcs11.so
-@dirrmtry lib/engines
diff --git a/security/expiretable/pkg-plist b/security/expiretable/pkg-plist
index a1d5cba131ff..bc8c0592973b 100644
--- a/security/expiretable/pkg-plist
+++ b/security/expiretable/pkg-plist
@@ -1,5 +1,2 @@
-@stopdaemon expiretable
-@group bin
-sbin/expiretable
-man/man1/expiretable.1.gz
-@group
+@(,bin,) sbin/expiretable
+@(,bin,) man/man1/expiretable.1.gz
diff --git a/security/f-prot/pkg-plist b/security/f-prot/pkg-plist
index a842eec2d849..f32d1449586b 100644
--- a/security/f-prot/pkg-plist
+++ b/security/f-prot/pkg-plist
@@ -60,10 +60,3 @@ man/man8/fpupdate.8.gz
%%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/test_inst.html
%%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/todo.txt
%%PORTDOCS%%%%DOCSDIR%%/html/Helpfiles_v6/updater.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/Helpfiles_v6/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/Helpfiles_v6
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry libexec/f-prot
-@dirrmtry etc/periodic/daily
-@dirrmtry etc/periodic
diff --git a/security/fakebo/pkg-plist b/security/fakebo/pkg-plist
index 43ace0a56ffd..2d740ad1d6c4 100644
--- a/security/fakebo/pkg-plist
+++ b/security/fakebo/pkg-plist
@@ -3,4 +3,3 @@ bin/fakebo
man/man1/fakebo.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/custom.replies
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/fbopenssl/pkg-plist b/security/fbopenssl/pkg-plist
index 37c67513fc44..b121c8dfa83f 100644
--- a/security/fbopenssl/pkg-plist
+++ b/security/fbopenssl/pkg-plist
@@ -8,4 +8,3 @@ lib/libfbopenssl.a
%%PROFILE%%lib/libfbopenssl_p.a
lib/libfbopenssl.so
lib/libfbopenssl.so.0
-@dirrm include/fbopenssl
diff --git a/security/fcheck/pkg-plist b/security/fcheck/pkg-plist
index 11b3b83d446e..ffb1cfbc4d4a 100644
--- a/security/fcheck/pkg-plist
+++ b/security/fcheck/pkg-plist
@@ -1,10 +1,6 @@
-@unexec if cmp -s %D/etc/fcheck.cfg %D/etc/fcheck.cfg.sample; then rm -f %D/etc/fcheck.cfg ; fi
-etc/fcheck.cfg.sample
-@exec if [ ! -f %D/etc/fcheck.cfg ]; then cp -p %D/%F %B/fcheck.cfg; fi
-@exec mkdir -p /var/fcheck/logs
+@sample etc/fcheck.cfg.sample
sbin/fcheck
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/install
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@unexec rmdir /var/fcheck/logs
-@unexec rmdir /var/fcheck
+@dir /var/fcheck/logs
+@dir /var/fcheck
diff --git a/security/fpm2/pkg-plist b/security/fpm2/pkg-plist
index 791f1a36c4a4..841bc5aa622c 100644
--- a/security/fpm2/pkg-plist
+++ b/security/fpm2/pkg-plist
@@ -11,4 +11,3 @@ share/applications/fpm2.desktop
%%NLS%%share/locale/it/LC_MESSAGES/fpm2.mo
%%NLS%%share/locale/ru/LC_MESSAGES/fpm2.mo
share/pixmaps/fpm2/logo.png
-@dirrm share/pixmaps/fpm2
diff --git a/security/fprint_demo/pkg-plist b/security/fprint_demo/pkg-plist
index 7ebb587b969f..5f1b67f2cda2 100644
--- a/security/fprint_demo/pkg-plist
+++ b/security/fprint_demo/pkg-plist
@@ -1,20 +1,7 @@
bin/fprint_demo
share/applications/fprint_demo.desktop
share/icons/hicolor/128x128/apps/fprint_demo.png
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
share/icons/hicolor/16x16/apps/fprint_demo.png
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
share/icons/hicolor/22x22/apps/fprint_demo.png
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
share/icons/hicolor/48x48/apps/fprint_demo.png
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
share/icons/hicolor/scalable/apps/fprint_demo.svg
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share
diff --git a/security/fragroute/pkg-plist b/security/fragroute/pkg-plist
index df894cee0a28..6e1571e39062 100644
--- a/security/fragroute/pkg-plist
+++ b/security/fragroute/pkg-plist
@@ -20,4 +20,3 @@ man/man8/fragtest.8.gz
%%DATADIR%%/tcp-5
%%DATADIR%%/tcp-7
%%DATADIR%%/tcp-9
-@dirrm %%DATADIR%%
diff --git a/security/fsh/pkg-plist b/security/fsh/pkg-plist
index 0c408f276757..84cb3fbc9662 100644
--- a/security/fsh/pkg-plist
+++ b/security/fsh/pkg-plist
@@ -17,4 +17,3 @@ libexec/fcpwrap
%%DATADIR%%/fshversion.pyc
%%DATADIR%%/infshd.py
%%DATADIR%%/infshd.pyc
-@dirrm %%DATADIR%%
diff --git a/security/fuzzdb/pkg-plist b/security/fuzzdb/pkg-plist
index 20d483939907..ec0a10dc93b9 100644
--- a/security/fuzzdb/pkg-plist
+++ b/security/fuzzdb/pkg-plist
@@ -232,64 +232,7 @@
%%DATADIR%%/wordlists-user-passwd/tomcat/tomcat_mgr_default_users.txt
%%DATADIR%%/wordlists-user-passwd/unix-os/unix_passwords.txt
%%DATADIR%%/wordlists-user-passwd/unix-os/unix_users.txt
-@dirrm %%DATADIR%%/wordlists-user-passwd/unix-os
-@dirrm %%DATADIR%%/wordlists-user-passwd/tomcat
-@dirrm %%DATADIR%%/wordlists-user-passwd/postgres
-@dirrm %%DATADIR%%/wordlists-user-passwd/passwds
-@dirrm %%DATADIR%%/wordlists-user-passwd/oracle
-@dirrm %%DATADIR%%/wordlists-user-passwd/names
-@dirrm %%DATADIR%%/wordlists-user-passwd/generic-listpairs
-@dirrm %%DATADIR%%/wordlists-user-passwd/db2
-@dirrm %%DATADIR%%/wordlists-user-passwd
-@dirrm %%DATADIR%%/wordlists-misc
-@dirrm %%DATADIR%%/web-backdoors/sh
-@dirrm %%DATADIR%%/web-backdoors/servlet
-@dirrm %%DATADIR%%/web-backdoors/pl-cgi
-@dirrm %%DATADIR%%/web-backdoors/php
-@dirrm %%DATADIR%%/web-backdoors/jsp/win32
-@dirrm %%DATADIR%%/web-backdoors/jsp
-@dirrm %%DATADIR%%/web-backdoors/exe
-@dirrm %%DATADIR%%/web-backdoors/dll
-@dirrm %%DATADIR%%/web-backdoors/cfm
-@dirrm %%DATADIR%%/web-backdoors/c
-@dirrm %%DATADIR%%/web-backdoors/asp
-@dirrm %%DATADIR%%/web-backdoors
-@dirrm %%DATADIR%%/regex
-@dirrm %%DATADIR%%/attack-payloads/xss/docs.wasc-scriptmapping/images
-@dirrm %%DATADIR%%/attack-payloads/xss/docs.wasc-scriptmapping
-@dirrm %%DATADIR%%/attack-payloads/xss
-@dirrm %%DATADIR%%/attack-payloads/xpath
-@dirrm %%DATADIR%%/attack-payloads/xml
-@dirrm %%DATADIR%%/attack-payloads/sql-injection/exploit
-@dirrm %%DATADIR%%/attack-payloads/sql-injection/detect/docs
-@dirrm %%DATADIR%%/attack-payloads/sql-injection/detect
-@dirrm %%DATADIR%%/attack-payloads/sql-injection
-@dirrm %%DATADIR%%/attack-payloads/server-side-include
-@dirrm %%DATADIR%%/attack-payloads/rfi
-@dirrm %%DATADIR%%/attack-payloads/path-traversal
-@dirrm %%DATADIR%%/attack-payloads/os-dir-indexing
-@dirrm %%DATADIR%%/attack-payloads/os-cmd-execution/docs
-@dirrm %%DATADIR%%/attack-payloads/os-cmd-execution
-@dirrm %%DATADIR%%/attack-payloads/lfi
-@dirrm %%DATADIR%%/attack-payloads/ldap
-@dirrm %%DATADIR%%/attack-payloads/integer-overflow
-@dirrm %%DATADIR%%/attack-payloads/http-protocol
-@dirrm %%DATADIR%%/attack-payloads/html_fuzz
-@dirrm %%DATADIR%%/attack-payloads/format-strings
-@dirrm %%DATADIR%%/attack-payloads/file-upload
-@dirrm %%DATADIR%%/attack-payloads/disclosure-source
-@dirrm %%DATADIR%%/attack-payloads/disclosure-localpaths/unix
-@dirrm %%DATADIR%%/attack-payloads/disclosure-localpaths/microsoft
-@dirrm %%DATADIR%%/attack-payloads/disclosure-localpaths
-@dirrm %%DATADIR%%/attack-payloads/disclosure-directory/win
-@dirrm %%DATADIR%%/attack-payloads/disclosure-directory/unix
-@dirrm %%DATADIR%%/attack-payloads/disclosure-directory
-@dirrm %%DATADIR%%/attack-payloads/control-chars
-@dirrm %%DATADIR%%/attack-payloads/all-attacks
-@dirrm %%DATADIR%%/attack-payloads/BizLogic
-@dirrm %%DATADIR%%/attack-payloads
-@dirrm %%DATADIR%%/Discovery/PredictableRes/CMS
-@dirrm %%DATADIR%%/Discovery/PredictableRes
-@dirrm %%DATADIR%%/Discovery/FilenameBruteforce
-@dirrm %%DATADIR%%/Discovery
-@dirrm %%DATADIR%%
+@dir %%DATADIR%%/attack-payloads/disclosure-directory/unix
+@dir %%DATADIR%%/attack-payloads/disclosure-directory/win
+@dir %%DATADIR%%/attack-payloads/disclosure-localpaths/microsoft
+@dir %%DATADIR%%/web-backdoors/dll
diff --git a/security/fwanalog/pkg-plist b/security/fwanalog/pkg-plist
index 7f018ba38a08..a8651593148f 100644
--- a/security/fwanalog/pkg-plist
+++ b/security/fwanalog/pkg-plist
@@ -6,5 +6,4 @@ sbin/fwanalog
@sample etc/fwanalog/fwanalog.opts.sample
@sample etc/fwanalog/services.conf.sample
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo If permanently deleting this package, %D/%%ETCDIR%% must be removed manually
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 30956bdb3b08..acb43c41e7f1 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -334,29 +334,3 @@ share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_19.xslt
share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_20.xslt
share/fwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_21.xslt
share/fwbuilder-%%BUILD_VERSION%%/fwbuilder.dtd
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/platform
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/os
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/migration
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/help/en_US
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/help
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/sveasoft
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/solaris
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/secuwall
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/procurve
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/pix_os
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/pf
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/openwrt
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/openbsd
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/macosx
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/ipfw
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/ipf
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/ipcop
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/ios
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/fwsm_os
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets
-@dirrm share/fwbuilder-%%BUILD_VERSION%%
diff --git a/security/fwknop/pkg-plist b/security/fwknop/pkg-plist
index 1eac44ad1055..df1ab4969e65 100644
--- a/security/fwknop/pkg-plist
+++ b/security/fwknop/pkg-plist
@@ -9,4 +9,3 @@ lib/libfko.so.2.0.0
sbin/fwknopd
man/man8/fwknop.8.gz
man/man8/fwknopd.8.gz
-@dirrm %%ETCDIR%%
diff --git a/security/gcipher/pkg-plist b/security/gcipher/pkg-plist
index e88c7303ae1d..9f7a46a49e93 100644
--- a/security/gcipher/pkg-plist
+++ b/security/gcipher/pkg-plist
@@ -75,11 +75,3 @@ share/applications/gcipher.desktop
%%DATADIR%%/plugins/cipher/Identity.py
%%DATADIR%%/plugins/ciphergui/Identity.py
%%DATADIR%%/plugins/ciphergui/PluginCipherGUIList.py
-@dirrm %%DATADIR%%/plugins/ciphergui
-@dirrm %%DATADIR%%/plugins/cipher
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/lib/ciphergui
-@dirrm %%DATADIR%%/lib/cipher
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/gnomint/pkg-plist b/security/gnomint/pkg-plist
index 6673a2258467..fd2989cee8de 100644
--- a/security/gnomint/pkg-plist
+++ b/security/gnomint/pkg-plist
@@ -29,10 +29,7 @@ share/applications/gnomint.desktop
%%DATADIR%%/new_req_window.ui
%%DATADIR%%/preferences_dialog.ui
%%DATADIR%%/sign.png
-@dirrmtry %%DATADIR%%
share/mime/packages/gnomint.xml
-@dirrmtry share/mime/packages
-@dirrmtry share/mime
etc/gconf/schemas/gnomint.schemas
%%NLS%%share/locale/ca/LC_MESSAGES/gnomint.mo
%%NLS%%share/locale/cs/LC_MESSAGES/gnomint.mo
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index d4fc9ecc1cbb..84d4bd02de1c 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -111,7 +111,4 @@ sbin/applygnupgdefaults
%%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
-@dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples
-@dirrmtry %%DOCSDIR%%
@unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index da2780d49fd3..f77e23cbd97f 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -6,7 +6,6 @@ bin/gpgv
libexec/gnupg/gpgkeys_curl
libexec/gnupg/gpgkeys_finger
libexec/gnupg/gpgkeys_hkp
-@dirrm libexec/gnupg
man/man1/gpg-zip.1.gz
man/man1/gpg.1.gz
man/man1/gpgv.1.gz
diff --git a/security/go.crypto/pkg-plist b/security/go.crypto/pkg-plist
index 48ce3b632796..ed6fb73392d9 100644
--- a/security/go.crypto/pkg-plist
+++ b/security/go.crypto/pkg-plist
@@ -211,50 +211,3 @@
%%GO_SRCDIR%%/%%GO_PKGNAME%%/xtea/xtea_test.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/xts/xts.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/xts/xts_test.go
-@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%/nacl
-@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%/openpgp
-@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%/salsa20
-@dirrmtry %%GO_LIBDIR%%/%%GO_PKGNAME%%
-@dirrmtry %%GO_LIBDIR%%/code.google.com/p
-@dirrmtry %%GO_LIBDIR%%/code.google.com
-@dirrmtry %%GO_LIBDIR%%
-@dirrmtry share/go/pkg
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/bcrypt
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/blowfish
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/bn256
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/cast5
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/curve25519
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/hkdf
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/md4
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/box
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl/secretbox
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/nacl
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ocsp
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/armor
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/clearsign
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/elgamal
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/errors
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/packet
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp/s2k
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/openpgp
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/otr
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/pbkdf2
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/poly1305
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ripemd160
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20/salsa
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/salsa20
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/scrypt
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/sha3
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/agent
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/terminal
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/test
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh/testdata
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/ssh
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/twofish
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/xtea
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/xts
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%
-@dirrmtry %%GO_SRCDIR%%/code.google.com/p
-@dirrmtry %%GO_SRCDIR%%/code.google.com
-@dirrmtry %%GO_SRCDIR%%
-@dirrmtry share/go
diff --git a/security/goptlib/pkg-plist b/security/goptlib/pkg-plist
index 3140d7f94e35..a047be782cdc 100644
--- a/security/goptlib/pkg-plist
+++ b/security/goptlib/pkg-plist
@@ -9,15 +9,3 @@
%%GO_SRCDIR%%/%%GO_PKGNAME%%/pt_test.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/socks.go
%%GO_SRCDIR%%/%%GO_PKGNAME%%/socks_test.go
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/examples/dummy-server
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/examples/dummy-client
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%/examples
-@dirrmtry %%GO_SRCDIR%%/%%GO_PKGNAME%%
-@dirrmtry %%GO_SRCDIR%%/git.torproject.org/pluggable-transports
-@dirrmtry %%GO_SRCDIR%%/git.torproject.org
-@dirrmtry %%GO_SRCDIR%%
-@dirrmtry %%GO_LIBDIR%%/git.torproject.org/pluggable-transports
-@dirrmtry %%GO_LIBDIR%%/git.torproject.org
-@dirrmtry %%GO_LIBDIR%%
-@dirrmtry share/go/pkg
-@dirrmtry share/go
diff --git a/security/gorilla/pkg-plist b/security/gorilla/pkg-plist
index 4affe941b0a7..8c529e875d6c 100644
--- a/security/gorilla/pkg-plist
+++ b/security/gorilla/pkg-plist
@@ -83,19 +83,3 @@ lib/gorilla/twofish/twofish.tcl
lib/gorilla/twofish/twotest.tcl
lib/gorilla/twofish/pkgIndex.tcl
lib/gorilla/twofish/LICENSE.txt
-@dirrm lib/gorilla/blowfish
-@dirrm lib/gorilla/tcllib/csv
-@dirrm lib/gorilla/tcllib/md5
-@dirrm lib/gorilla/modules
-@dirrm lib/gorilla/msgs/help
-@dirrm lib/gorilla/msgs
-@dirrm lib/gorilla/pics
-@dirrm lib/gorilla/pwsafe
-@dirrm lib/gorilla/tcllib/sha1
-@dirrm lib/gorilla/twofish
-@dirrm lib/gorilla/tcllib/sha256c/%%GORILLAARCH%%
-@dirrm lib/gorilla/tcllib/sha256c
-@dirrm lib/gorilla/tcllib/tooltip
-@dirrm lib/gorilla/tcllib/uuid
-@dirrm lib/gorilla/tcllib
-@dirrm lib/gorilla
diff --git a/security/gpass/pkg-plist b/security/gpass/pkg-plist
index aa4a6f2bce57..d598125f107e 100644
--- a/security/gpass/pkg-plist
+++ b/security/gpass/pkg-plist
@@ -16,4 +16,3 @@ share/pixmaps/gpass-icon.png
%%DATADIR%%/preferences.glade
%%DATADIR%%/welcome.glade
%%DATADIR%%/window.glade
-@dirrm %%DATADIR%%
diff --git a/security/gringotts/pkg-plist b/security/gringotts/pkg-plist
index dbd47fd9683d..b7d0a62bc975 100644
--- a/security/gringotts/pkg-plist
+++ b/security/gringotts/pkg-plist
@@ -14,4 +14,3 @@ share/locale/pl/LC_MESSAGES/gringotts.mo
share/locale/ru/LC_MESSAGES/gringotts.mo
share/pixmaps/gringotts.xpm
share/pixmaps/gringotts-32.xpm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/gsasl/pkg-plist b/security/gsasl/pkg-plist
index 04887085a8ac..4d804a6d9271 100644
--- a/security/gsasl/pkg-plist
+++ b/security/gsasl/pkg-plist
@@ -181,5 +181,3 @@ man/man3/gsasl_stringprep_trace.3.gz
%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgsasl.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gsasl.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gsasl.mo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/gss/pkg-plist b/security/gss/pkg-plist
index e9ff8e3e3d84..a14ad7cc45b3 100644
--- a/security/gss/pkg-plist
+++ b/security/gss/pkg-plist
@@ -67,4 +67,3 @@ share/locale/sr/LC_MESSAGES/gss.mo
share/locale/sv/LC_MESSAGES/gss.mo
share/locale/vi/LC_MESSAGES/gss.mo
share/locale/zh_CN/LC_MESSAGES/gss.mo
-@dirrm include/gss
diff --git a/security/gtk-knocker/pkg-plist b/security/gtk-knocker/pkg-plist
index bfdde8563ab7..5056916c93fb 100644
--- a/security/gtk-knocker/pkg-plist
+++ b/security/gtk-knocker/pkg-plist
@@ -2,5 +2,3 @@ bin/gtk-knocker
share/gtk-knocker/pixmaps/knocker.xpm
share/gtk-knocker/pixmaps/knocker_ico.xpm
man/man1/gtk-knocker.1.gz
-@dirrm share/gtk-knocker/pixmaps
-@dirrm share/gtk-knocker
diff --git a/security/hackbot/pkg-plist b/security/hackbot/pkg-plist
index bd5ca9b5c957..1253b0a4dc84 100644
--- a/security/hackbot/pkg-plist
+++ b/security/hackbot/pkg-plist
@@ -3,4 +3,3 @@ man/man1/hackbot.1.gz
%%DATADIR%%/google.db
%%DATADIR%%/fingerprint.db
%%DATADIR%%/cgi.db
-@dirrm %%DATADIR%%
diff --git a/security/hmap/pkg-plist b/security/hmap/pkg-plist
index 1c80a4a763dd..2a6502fcb4a5 100644
--- a/security/hmap/pkg-plist
+++ b/security/hmap/pkg-plist
@@ -31,5 +31,3 @@ bin/hmap.py
%%DATADIR%%/thttpd.2.23beta1.freebsd.4.6.st
%%DATADIR%%/thttpd.2.23beta1.rhl.7.3
%%DATADIR%%/zope.2.6.0.solaris.8
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/honggfuzz/pkg-plist b/security/honggfuzz/pkg-plist
index 752f9e2a6a6b..20fe92009400 100644
--- a/security/honggfuzz/pkg-plist
+++ b/security/honggfuzz/pkg-plist
@@ -6,7 +6,3 @@ bin/honggfuzz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-honggfuzz-on-badcode1.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/targets/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/targets/badcode1.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/targets
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inputfiles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/externalfuzzers
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/security/httprint/pkg-plist b/security/httprint/pkg-plist
index 55b4dea9a588..677e20a1d62e 100644
--- a/security/httprint/pkg-plist
+++ b/security/httprint/pkg-plist
@@ -43,5 +43,3 @@ bin/httprint
%%DATADIR%%/images/xerver.gif
%%DATADIR%%/images/zeus.gif
%%DATADIR%%/images/zope.gif
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%
diff --git a/security/ike-scan/pkg-plist b/security/ike-scan/pkg-plist
index 3a8d0fdab2ad..690ecce34dbe 100644
--- a/security/ike-scan/pkg-plist
+++ b/security/ike-scan/pkg-plist
@@ -11,5 +11,3 @@ man/man1/psk-crack.1.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/udp-backoff-fingerprinting-paper.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/ike-scan
diff --git a/security/ike/pkg-plist b/security/ike/pkg-plist
index 1651e4e08732..4d6dad9ecdaa 100644
--- a/security/ike/pkg-plist
+++ b/security/ike/pkg-plist
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/iked.conf %D/etc/iked.conf.sample; then rm -f %D/etc/iked.conf; fi
-etc/iked.conf.sample
-@exec [ -f %D/etc/iked.conf ] || cp %D/etc/iked.conf.sample %D/etc/iked.conf
+@sample etc/iked.conf.sample
bin/ikec
sbin/iked
%%QTGUI%%bin/qikea
diff --git a/security/ipfilter2dshield/pkg-plist b/security/ipfilter2dshield/pkg-plist
index db0eab4c1368..93a8b194b3e0 100644
--- a/security/ipfilter2dshield/pkg-plist
+++ b/security/ipfilter2dshield/pkg-plist
@@ -1,3 +1,2 @@
@sample etc/ipfilter2dshield/dshield-freebsd.pl.sample
sbin/dshield-freebsd.pl
-@dirrm etc/ipfilter2dshield
diff --git a/security/ipfmeta/pkg-plist b/security/ipfmeta/pkg-plist
index f67d7f9bf7b5..4a3af9783f61 100644
--- a/security/ipfmeta/pkg-plist
+++ b/security/ipfmeta/pkg-plist
@@ -2,4 +2,3 @@ bin/ipfmeta
man/man1/ipfmeta.1.gz
%%DATADIR%%/ipf.metarules
%%DATADIR%%/ipf.objs
-@dirrm %%DATADIR%%
diff --git a/security/ipv6toolkit/pkg-plist b/security/ipv6toolkit/pkg-plist
index 2ab26c5f47a4..8304831fbfb1 100644
--- a/security/ipv6toolkit/pkg-plist
+++ b/security/ipv6toolkit/pkg-plist
@@ -34,4 +34,3 @@ man/man1/tcp6.1.gz
man/man5/ipv6toolkit.conf.5.gz
man/man7/ipv6toolkit.7.gz
%%DATADIR%%/oui.txt
-@dirrm %%DATADIR%%
diff --git a/security/isakmpd/pkg-plist b/security/isakmpd/pkg-plist
index a24c171eea25..29cde1d21a8c 100644
--- a/security/isakmpd/pkg-plist
+++ b/security/isakmpd/pkg-plist
@@ -13,4 +13,3 @@ man/man5/isakmpd.conf.5.gz
man/man5/isakmpd.policy.5.gz
man/man8/certpatch.8.gz
man/man8/isakmpd.8.gz
-@dirrm share/examples/isakmpd
diff --git a/security/jbrofuzz/pkg-plist b/security/jbrofuzz/pkg-plist
index cc5652e2d492..bb1e499784d7 100644
--- a/security/jbrofuzz/pkg-plist
+++ b/security/jbrofuzz/pkg-plist
@@ -9,7 +9,3 @@ share/java/jbrofuzz/jbrofuzz.jar
%%DATADIR%%/fuzzers/fuzzers-file-extensions.jbrf
%%DATADIR%%/fuzzers/fuzzers.jbrf
%%DATADIR%%/fuzzers/headers.jbrf
-@dirrm %%DATADIR%%/fuzzers
-@dirrm %%DATADIR%%
-@dirrm share/java/jbrofuzz
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/security/john/pkg-plist b/security/john/pkg-plist
index fdcc2a0e1669..557410507863 100644
--- a/security/john/pkg-plist
+++ b/security/john/pkg-plist
@@ -28,4 +28,3 @@ etc/john.conf.default
%%DATADIR%%/sha-dump.pl
%%DATADIR%%/sha-test.pl
%%DATADIR%%/sipdump2john.py
-@dirrm %%DATADIR%%