From efc5cc0e55b0607e16a998ff198471b29121691a Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 24 Nov 2014 22:35:08 +0000
Subject: Cleanup plist

---
 net-mgmt/TkTopNetFlows/Makefile        |   5 +-
 net-mgmt/TkTopNetFlows/pkg-plist       |   1 -
 net-mgmt/ap-utils/pkg-plist            |   1 -
 net-mgmt/arpwatch/pkg-plist            |   2 +-
 net-mgmt/arts++/pkg-plist              |   2 -
 net-mgmt/bpft/pkg-plist                |   4 +-
 net-mgmt/bsnmp-ucd/pkg-plist           |   1 -
 net-mgmt/cdpr/pkg-plist                |   2 -
 net-mgmt/centreon-clib/pkg-plist       |   9 --
 net-mgmt/check_multi/pkg-plist         |   3 -
 net-mgmt/chillispot/pkg-plist          |   1 -
 net-mgmt/ciscoconf/pkg-plist           |   3 +-
 net-mgmt/confregdecode/pkg-plist       |   2 -
 net-mgmt/coovachilli/pkg-plist         |   3 -
 net-mgmt/devmon-templates/pkg-plist    | 271 +--------------------------------
 net-mgmt/devmon/pkg-plist              |   5 -
 net-mgmt/docsis/pkg-plist              |   2 -
 net-mgmt/etherape/pkg-plist            |   7 -
 net-mgmt/flow-tools/pkg-plist          |   2 -
 net-mgmt/gsnmp/pkg-plist               |   1 -
 net-mgmt/guifi-snpservices/pkg-plist   |   8 -
 net-mgmt/hawk/pkg-plist                |   4 -
 net-mgmt/ipaudit/pkg-plist             |   1 -
 net-mgmt/ipplan/pkg-plist              |  71 +--------
 net-mgmt/jnettop/pkg-plist             |   1 -
 net-mgmt/lanmap/pkg-plist              |   6 +-
 net-mgmt/lg/pkg-plist                  |   3 -
 net-mgmt/libsmi/pkg-plist              |  15 +-
 net-mgmt/nbtscan/pkg-plist             |   1 -
 net-mgmt/ndoutils/pkg-plist            |  11 --
 net-mgmt/ndpmon/pkg-plist              |   6 -
 net-mgmt/netdisco-mibs/pkg-plist       |  45 ------
 net-mgmt/netustad/pkg-plist            |   6 -
 net-mgmt/nsca/pkg-plist                |   2 -
 net-mgmt/nsca27/pkg-plist              |   2 -
 net-mgmt/observium/Makefile            |   7 +-
 net-mgmt/observium/pkg-plist           | 192 +----------------------
 net-mgmt/p0f2/pkg-plist                |   1 -
 net-mgmt/pads/pkg-plist                |   1 -
 net-mgmt/pmacct/pkg-plist              |   3 -
 net-mgmt/py-pyang/pkg-plist            |   8 -
 net-mgmt/qkismet/pkg-plist             |   2 -
 net-mgmt/routers2-extensions/pkg-plist |   1 -
 net-mgmt/routers2-extras/pkg-plist     |   2 -
 net-mgmt/rrdbot/pkg-plist              |   4 +-
 net-mgmt/send/pkg-plist                |   1 -
 net-mgmt/sendip/pkg-plist              |   1 -
 net-mgmt/snmp4nagios/pkg-plist         |   1 -
 net-mgmt/snmptt/pkg-plist              |   2 -
 net-mgmt/statsd/pkg-plist              |   3 -
 net-mgmt/sx/pkg-plist                  |  28 +---
 net-mgmt/sysmon/pkg-plist              |   1 -
 net-mgmt/victorops-nagios/pkg-plist    |   4 -
 net-mgmt/vidalia/pkg-plist             |  14 --
 net-mgmt/wdiag/pkg-plist               |   1 -
 net-mgmt/weathermap/pkg-plist          |   2 -
 net-mgmt/whatmask/pkg-plist            |   1 -
 net-mgmt/wmi-client/pkg-plist          |   5 -
 58 files changed, 28 insertions(+), 766 deletions(-)

diff --git a/net-mgmt/TkTopNetFlows/Makefile b/net-mgmt/TkTopNetFlows/Makefile
index 8087b058a4d4..de3ba4a1ecbb 100644
--- a/net-mgmt/TkTopNetFlows/Makefile
+++ b/net-mgmt/TkTopNetFlows/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TkTopNetFlows
 PORTVERSION=	0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://vfom.narod.ru/download/
 
@@ -17,7 +17,8 @@ LIB_DEPENDS+=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt \
 RUN_DEPENDS=	flowdumper:${PORTSDIR}/net-mgmt/p5-Cflow
 
 NO_BUILD=	yes
-USES=		perl5 tk:85
+USES=		perl5 shebangfix tk:85
+SHEBANG_FILES=	flow_Server.pl view_definitions.pl.example
 PORTDOCS=	*
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
diff --git a/net-mgmt/TkTopNetFlows/pkg-plist b/net-mgmt/TkTopNetFlows/pkg-plist
index 9f0a6c973f0e..be1770f84926 100644
--- a/net-mgmt/TkTopNetFlows/pkg-plist
+++ b/net-mgmt/TkTopNetFlows/pkg-plist
@@ -4,4 +4,3 @@ bin/TkTopNetFlowsHist.tcl
 etc/view_definitions.pl.example
 etc/rc.d/flow_Server.sh
 lib/TkTopNetFlows-%%PORTVERSION%%/TkTopNetFlows_lib.tcl
-@dirrm lib/TkTopNetFlows-%%PORTVERSION%%
diff --git a/net-mgmt/ap-utils/pkg-plist b/net-mgmt/ap-utils/pkg-plist
index 8609d1ea9cbb..85eb9a699466 100644
--- a/net-mgmt/ap-utils/pkg-plist
+++ b/net-mgmt/ap-utils/pkg-plist
@@ -14,4 +14,3 @@ sbin/ap-trapd
 %%PORTDOCS%%%%DOCSDIR%%/Ovislink-HOWTO.html
 %%PORTDOCS%%%%DOCSDIR%%/HARDWARE-NOTES
 %%PORTDOCS%%%%DOCSDIR%%/README.ap-gl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/arpwatch/pkg-plist b/net-mgmt/arpwatch/pkg-plist
index 3ff0bc9759e6..9e14d2765c56 100644
--- a/net-mgmt/arpwatch/pkg-plist
+++ b/net-mgmt/arpwatch/pkg-plist
@@ -12,4 +12,4 @@ sbin/arpsnmp
 sbin/arpwatch
 @unexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
 @exec test -f %D/arpwatch/arp.dat || touch %D/arpwatch/arp.dat
-@dirrm(,operator,0755) arpwatch
+@dir(,operator,0755) arpwatch
diff --git a/net-mgmt/arts++/pkg-plist b/net-mgmt/arts++/pkg-plist
index 2a26ffa8e8ef..a5aa0ee57b50 100644
--- a/net-mgmt/arts++/pkg-plist
+++ b/net-mgmt/arts++/pkg-plist
@@ -120,5 +120,3 @@ man/manl/artstos.l.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/artsplusplus-3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/artsplusplus-4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/artsplusplus.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/bpft/pkg-plist b/net-mgmt/bpft/pkg-plist
index c4b2d8f71f5c..11ca6cbd6e9f 100644
--- a/net-mgmt/bpft/pkg-plist
+++ b/net-mgmt/bpft/pkg-plist
@@ -14,6 +14,4 @@ sbin/trafd
 sbin/trafstatd
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WhatsNew
-@dirrmtry var/bpft
-@dirrmtry var
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dir var/bpft
diff --git a/net-mgmt/bsnmp-ucd/pkg-plist b/net-mgmt/bsnmp-ucd/pkg-plist
index cf7054f4e62f..ec17f9285821 100644
--- a/net-mgmt/bsnmp-ucd/pkg-plist
+++ b/net-mgmt/bsnmp-ucd/pkg-plist
@@ -2,4 +2,3 @@ lib/snmp_ucd.so
 lib/snmp_ucd.so.1
 man/man8/bsnmp-ucd.8.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/snmpd.config.sample
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net-mgmt/cdpr/pkg-plist b/net-mgmt/cdpr/pkg-plist
index 3a2431b99217..fb86e4a9ebb5 100644
--- a/net-mgmt/cdpr/pkg-plist
+++ b/net-mgmt/cdpr/pkg-plist
@@ -4,5 +4,3 @@ bin/cdpr
 %%DATADIR%%/cdpr.conf
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.cdprs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/net-mgmt/centreon-clib/pkg-plist b/net-mgmt/centreon-clib/pkg-plist
index ae6e89d2e61c..fa3e6119e0c0 100644
--- a/net-mgmt/centreon-clib/pkg-plist
+++ b/net-mgmt/centreon-clib/pkg-plist
@@ -62,12 +62,3 @@ include/centreon/com/centreon/misc/get_options.hh
 include/centreon/com/centreon/misc/stringifier.hh
 lib/libcentreon_clib.so
 libdata/pkgconfig/centreon-clib.pc
-@dirrm include/centreon/com/centreon/misc
-@dirrm include/centreon/com/centreon/logging
-@dirrm include/centreon/com/centreon/io
-@dirrm include/centreon/com/centreon/exceptions
-@dirrm include/centreon/com/centreon/concurrency
-@dirrm include/centreon/com/centreon/clib
-@dirrm include/centreon/com/centreon
-@dirrm include/centreon/com
-@dirrm include/centreon
diff --git a/net-mgmt/check_multi/pkg-plist b/net-mgmt/check_multi/pkg-plist
index 7b06ad68adac..c4e5d7dd73cd 100644
--- a/net-mgmt/check_multi/pkg-plist
+++ b/net-mgmt/check_multi/pkg-plist
@@ -5,6 +5,3 @@ libexec/nagios/check_multi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cluster_example/download_my-plugin.cmd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cluster_example/download_sourceforge.cmd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify_service_html
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cluster_example
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry libexec/nagios
diff --git a/net-mgmt/chillispot/pkg-plist b/net-mgmt/chillispot/pkg-plist
index 8761e10981b7..fd21118d63e6 100644
--- a/net-mgmt/chillispot/pkg-plist
+++ b/net-mgmt/chillispot/pkg-plist
@@ -8,4 +8,3 @@ man/man8/chilli.8.gz
 %%DATADIR%%/pf.conf.sample
 %%DATADIR%%/ipfw-config.sample
 %%DATADIR%%/installguide.txt
-@dirrm %%DATADIR%%
diff --git a/net-mgmt/ciscoconf/pkg-plist b/net-mgmt/ciscoconf/pkg-plist
index 8faa3bafe6a5..45cf27f93d93 100644
--- a/net-mgmt/ciscoconf/pkg-plist
+++ b/net-mgmt/ciscoconf/pkg-plist
@@ -2,5 +2,4 @@ bin/ciscoconfd
 bin/ciscoconfr
 man/man8/ciscoconfd.8.gz
 man/man8/ciscoconfr.8.gz
-@dirrm share/cisco/RCS
-@dirrm share/cisco
+@dir share/cisco/RCS
diff --git a/net-mgmt/confregdecode/pkg-plist b/net-mgmt/confregdecode/pkg-plist
index 703848467a98..68c9b464ce4d 100644
--- a/net-mgmt/confregdecode/pkg-plist
+++ b/net-mgmt/confregdecode/pkg-plist
@@ -2,5 +2,3 @@ bin/confregdecode
 %%DATADIR%%/confregdecode.jar
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/ConfregDecode.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
diff --git a/net-mgmt/coovachilli/pkg-plist b/net-mgmt/coovachilli/pkg-plist
index 0468b3d24ddf..618f24506b8b 100644
--- a/net-mgmt/coovachilli/pkg-plist
+++ b/net-mgmt/coovachilli/pkg-plist
@@ -37,9 +37,6 @@ sbin/chilli_query
 sbin/chilli_radconfig
 sbin/chilli_response
 sbin/test_radius
-@dirrm www/chilli
-@dirrm etc/chilli
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ipfw-config.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.conf.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pf.conf.sample
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net-mgmt/devmon-templates/pkg-plist b/net-mgmt/devmon-templates/pkg-plist
index 1f6d16f0d9c8..ae37b14c1780 100644
--- a/net-mgmt/devmon-templates/pkg-plist
+++ b/net-mgmt/devmon-templates/pkg-plist
@@ -1225,273 +1225,4 @@ devmon/templates/apc-9205/power/exceptions
 devmon/templates/apc-9205/README
 devmon/templates/REQUIREMENTS
 devmon/templates/README
-@dirrmtry devmon/templates/pware-xups/power
-@dirrmtry devmon/templates/pware-xups
-@dirrmtry devmon/templates/pware-best/power
-@dirrmtry devmon/templates/pware-best
-@dirrmtry devmon/templates/powerware-9170/power
-@dirrmtry devmon/templates/powerware-9170
-@dirrmtry devmon/templates/netapp-misc/volume
-@dirrmtry devmon/templates/netapp-misc/status
-@dirrmtry devmon/templates/netapp-misc/quota
-@dirrmtry devmon/templates/netapp-misc/netapptemp
-@dirrmtry devmon/templates/netapp-misc/if_load
-@dirrmtry devmon/templates/netapp-misc/cluster
-@dirrmtry devmon/templates/netapp-misc
-@dirrmtry devmon/templates/linux-openwrt/memory
-@dirrmtry devmon/templates/linux-openwrt/if_load
-@dirrmtry devmon/templates/linux-openwrt/disk
-@dirrmtry devmon/templates/linux-openwrt
-@dirrmtry devmon/templates/ibm-rsa2/temp
-@dirrmtry devmon/templates/ibm-rsa2/status
-@dirrmtry devmon/templates/ibm-rsa2/fans
-@dirrmtry devmon/templates/ibm-rsa2
-@dirrmtry devmon/templates/f5-bigip/vip
-@dirrmtry devmon/templates/f5-bigip/pool
-@dirrmtry devmon/templates/f5-bigip/memory
-@dirrmtry devmon/templates/f5-bigip/if_load
-@dirrmtry devmon/templates/f5-bigip/fan
-@dirrmtry devmon/templates/f5-bigip/cpu
-@dirrmtry devmon/templates/f5-bigip/connects
-@dirrmtry devmon/templates/f5-bigip/cluster
-@dirrmtry devmon/templates/f5-bigip-lite/if_load
-@dirrmtry devmon/templates/f5-bigip-lite/fan
-@dirrmtry devmon/templates/f5-bigip-lite/connects
-@dirrmtry devmon/templates/f5-bigip-lite/cluster
-@dirrmtry devmon/templates/f5-bigip-lite/.test
-@dirrmtry devmon/templates/f5-bigip-lite
-@dirrmtry devmon/templates/f5-bigip
-@dirrmtry devmon/templates/dell-poweredge/temp
-@dirrmtry devmon/templates/dell-poweredge/raid
-@dirrmtry devmon/templates/dell-poweredge/power
-@dirrmtry devmon/templates/dell-poweredge/fans
-@dirrmtry devmon/templates/dell-poweredge
-@dirrmtry devmon/templates/dell-perc/raid
-@dirrmtry devmon/templates/dell-perc
-@dirrmtry devmon/templates/compaq-server/temp
-@dirrmtry devmon/templates/compaq-server/raid
-@dirrmtry devmon/templates/compaq-server/power
-@dirrmtry devmon/templates/compaq-server/log
-@dirrmtry devmon/templates/compaq-server/fans
-@dirrmtry devmon/templates/compaq-server
-@dirrmtry devmon/templates/cisco-pix/memory
-@dirrmtry devmon/templates/cisco-pix/cpu
-@dirrmtry devmon/templates/cisco-pix/connects
-@dirrmtry devmon/templates/cisco-pix
-@dirrmtry devmon/templates/cisco-msfc2/memory
-@dirrmtry devmon/templates/cisco-msfc2/if_stat
-@dirrmtry devmon/templates/cisco-msfc2/if_load
-@dirrmtry devmon/templates/cisco-msfc2/if_err
-@dirrmtry devmon/templates/cisco-msfc2/if_dsc
-@dirrmtry devmon/templates/cisco-msfc2/if_col
-@dirrmtry devmon/templates/cisco-msfc2/cpu
-@dirrmtry devmon/templates/cisco-msfc2
-@dirrmtry devmon/templates/cisco-asa/serial
-@dirrmtry devmon/templates/cisco-asa/memory
-@dirrmtry devmon/templates/cisco-asa/if_stat
-@dirrmtry devmon/templates/cisco-asa/if_load
-@dirrmtry devmon/templates/cisco-asa/if_err
-@dirrmtry devmon/templates/cisco-asa/if_dsc
-@dirrmtry devmon/templates/cisco-asa/cpu
-@dirrmtry devmon/templates/cisco-asa/connects
-@dirrmtry devmon/templates/cisco-asa/cluster
-@dirrmtry devmon/templates/cisco-asa
-@dirrmtry devmon/templates/cisco-7206/serial
-@dirrmtry devmon/templates/cisco-7206/power
-@dirrmtry devmon/templates/cisco-7206/memory
-@dirrmtry devmon/templates/cisco-7206/if_stat
-@dirrmtry devmon/templates/cisco-7206/if_load
-@dirrmtry devmon/templates/cisco-7206/if_err
-@dirrmtry devmon/templates/cisco-7206/if_dsc
-@dirrmtry devmon/templates/cisco-7206/if_col
-@dirrmtry devmon/templates/cisco-7206/cpu
-@dirrmtry devmon/templates/cisco-7206
-@dirrmtry devmon/templates/cisco-6509/temp
-@dirrmtry devmon/templates/cisco-6509/serial
-@dirrmtry devmon/templates/cisco-6509/power
-@dirrmtry devmon/templates/cisco-6509/memory
-@dirrmtry devmon/templates/cisco-6509/if_stat
-@dirrmtry devmon/templates/cisco-6509/if_load
-@dirrmtry devmon/templates/cisco-6509/if_err
-@dirrmtry devmon/templates/cisco-6509/if_dsc
-@dirrmtry devmon/templates/cisco-6509/if_col
-@dirrmtry devmon/templates/cisco-6509/fans
-@dirrmtry devmon/templates/cisco-6509/cpu
-@dirrmtry devmon/templates/cisco-6509
-@dirrmtry devmon/templates/cisco-6506/serial
-@dirrmtry devmon/templates/cisco-6506/power
-@dirrmtry devmon/templates/cisco-6506/memory
-@dirrmtry devmon/templates/cisco-6506/if_stat
-@dirrmtry devmon/templates/cisco-6506/if_load
-@dirrmtry devmon/templates/cisco-6506/if_err
-@dirrmtry devmon/templates/cisco-6506/if_dsc
-@dirrmtry devmon/templates/cisco-6506/fans
-@dirrmtry devmon/templates/cisco-6506/cpu
-@dirrmtry devmon/templates/cisco-6506
-@dirrmtry devmon/templates/cisco-5500/serial
-@dirrmtry devmon/templates/cisco-5500/power
-@dirrmtry devmon/templates/cisco-5500/memory
-@dirrmtry devmon/templates/cisco-5500/if_stat
-@dirrmtry devmon/templates/cisco-5500/if_load
-@dirrmtry devmon/templates/cisco-5500/if_err
-@dirrmtry devmon/templates/cisco-5500/if_dsc
-@dirrmtry devmon/templates/cisco-5500/fans
-@dirrmtry devmon/templates/cisco-5500/cpu
-@dirrmtry devmon/templates/cisco-5500
-@dirrmtry devmon/templates/cisco-4500/serial
-@dirrmtry devmon/templates/cisco-4500/power
-@dirrmtry devmon/templates/cisco-4500/memory
-@dirrmtry devmon/templates/cisco-4500/if_stat
-@dirrmtry devmon/templates/cisco-4500/if_load
-@dirrmtry devmon/templates/cisco-4500/if_err
-@dirrmtry devmon/templates/cisco-4500/if_dsc
-@dirrmtry devmon/templates/cisco-4500/if_col
-@dirrmtry devmon/templates/cisco-4500/fans
-@dirrmtry devmon/templates/cisco-4500/cpu
-@dirrmtry devmon/templates/cisco-4500
-@dirrmtry devmon/templates/cisco-3750/serial
-@dirrmtry devmon/templates/cisco-3750/power
-@dirrmtry devmon/templates/cisco-3750/memory
-@dirrmtry devmon/templates/cisco-3750/if_stat
-@dirrmtry devmon/templates/cisco-3750/if_load
-@dirrmtry devmon/templates/cisco-3750/if_err
-@dirrmtry devmon/templates/cisco-3750/if_dsc
-@dirrmtry devmon/templates/cisco-3750/if_col
-@dirrmtry devmon/templates/cisco-3750/fans
-@dirrmtry devmon/templates/cisco-3750/cpu
-@dirrmtry devmon/templates/cisco-3750
-@dirrmtry devmon/templates/cisco-3725/power
-@dirrmtry devmon/templates/cisco-3725/if_stat
-@dirrmtry devmon/templates/cisco-3725/if_load
-@dirrmtry devmon/templates/cisco-3725/if_err
-@dirrmtry devmon/templates/cisco-3725/if_dsc
-@dirrmtry devmon/templates/cisco-3725/if_col
-@dirrmtry devmon/templates/cisco-3725/fans
-@dirrmtry devmon/templates/cisco-3725/cpu
-@dirrmtry devmon/templates/cisco-3725
-@dirrmtry devmon/templates/cisco-3640/memory
-@dirrmtry devmon/templates/cisco-3640/if_stat
-@dirrmtry devmon/templates/cisco-3640/if_load
-@dirrmtry devmon/templates/cisco-3640/if_err
-@dirrmtry devmon/templates/cisco-3640/if_dsc
-@dirrmtry devmon/templates/cisco-3640/if_col
-@dirrmtry devmon/templates/cisco-3640/cpu
-@dirrmtry devmon/templates/cisco-3640
-@dirrmtry devmon/templates/cisco-3550/serial
-@dirrmtry devmon/templates/cisco-3550/power
-@dirrmtry devmon/templates/cisco-3550/memory
-@dirrmtry devmon/templates/cisco-3550/if_stat
-@dirrmtry devmon/templates/cisco-3550/if_load
-@dirrmtry devmon/templates/cisco-3550/if_err
-@dirrmtry devmon/templates/cisco-3550/if_dsc
-@dirrmtry devmon/templates/cisco-3550/if_col
-@dirrmtry devmon/templates/cisco-3550/fans
-@dirrmtry devmon/templates/cisco-3550/cpu
-@dirrmtry devmon/templates/cisco-3550
-@dirrmtry devmon/templates/cisco-3500/serial
-@dirrmtry devmon/templates/cisco-3500/memory
-@dirrmtry devmon/templates/cisco-3500/if_stat
-@dirrmtry devmon/templates/cisco-3500/if_load
-@dirrmtry devmon/templates/cisco-3500/if_err
-@dirrmtry devmon/templates/cisco-3500/if_dsc
-@dirrmtry devmon/templates/cisco-3500/if_col
-@dirrmtry devmon/templates/cisco-3500/cpu
-@dirrmtry devmon/templates/cisco-3500
-@dirrmtry devmon/templates/cisco-2970/serial
-@dirrmtry devmon/templates/cisco-2970/power
-@dirrmtry devmon/templates/cisco-2970/memory
-@dirrmtry devmon/templates/cisco-2970/if_stat
-@dirrmtry devmon/templates/cisco-2970/if_load
-@dirrmtry devmon/templates/cisco-2970/if_err
-@dirrmtry devmon/templates/cisco-2970/if_dsc
-@dirrmtry devmon/templates/cisco-2970/if_col
-@dirrmtry devmon/templates/cisco-2970/fans
-@dirrmtry devmon/templates/cisco-2970/cpu
-@dirrmtry devmon/templates/cisco-2970
-@dirrmtry devmon/templates/cisco-2960/serial
-@dirrmtry devmon/templates/cisco-2960/power
-@dirrmtry devmon/templates/cisco-2960/memory
-@dirrmtry devmon/templates/cisco-2960/if_stat
-@dirrmtry devmon/templates/cisco-2960/if_load
-@dirrmtry devmon/templates/cisco-2960/if_err
-@dirrmtry devmon/templates/cisco-2960/if_dsc
-@dirrmtry devmon/templates/cisco-2960/if_col
-@dirrmtry devmon/templates/cisco-2960/fans
-@dirrmtry devmon/templates/cisco-2960/cpu
-@dirrmtry devmon/templates/cisco-2960
-@dirrmtry devmon/templates/cisco-2950/serial
-@dirrmtry devmon/templates/cisco-2950/power
-@dirrmtry devmon/templates/cisco-2950/memory
-@dirrmtry devmon/templates/cisco-2950/if_stat
-@dirrmtry devmon/templates/cisco-2950/if_load
-@dirrmtry devmon/templates/cisco-2950/if_err
-@dirrmtry devmon/templates/cisco-2950/if_dsc
-@dirrmtry devmon/templates/cisco-2950/if_col
-@dirrmtry devmon/templates/cisco-2950/fans
-@dirrmtry devmon/templates/cisco-2950/cpu
-@dirrmtry devmon/templates/cisco-2950
-@dirrmtry devmon/templates/cisco-2900/serial
-@dirrmtry devmon/templates/cisco-2900/memory
-@dirrmtry devmon/templates/cisco-2900/if_stat
-@dirrmtry devmon/templates/cisco-2900/if_load
-@dirrmtry devmon/templates/cisco-2900/if_err
-@dirrmtry devmon/templates/cisco-2900/if_dsc
-@dirrmtry devmon/templates/cisco-2900/if_col
-@dirrmtry devmon/templates/cisco-2900/cpu
-@dirrmtry devmon/templates/cisco-2900
-@dirrmtry devmon/templates/cisco-2811/if_stat
-@dirrmtry devmon/templates/cisco-2811/if_load
-@dirrmtry devmon/templates/cisco-2811/if_err
-@dirrmtry devmon/templates/cisco-2811/if_dsc
-@dirrmtry devmon/templates/cisco-2811/fans
-@dirrmtry devmon/templates/cisco-2811/cpu
-@dirrmtry devmon/templates/cisco-2811
-@dirrmtry devmon/templates/cisco-2801/serial
-@dirrmtry devmon/templates/cisco-2801/memory
-@dirrmtry devmon/templates/cisco-2801/if_stat
-@dirrmtry devmon/templates/cisco-2801/if_load
-@dirrmtry devmon/templates/cisco-2801/if_err
-@dirrmtry devmon/templates/cisco-2801/if_dsc
-@dirrmtry devmon/templates/cisco-2801/if_col
-@dirrmtry devmon/templates/cisco-2801/fans
-@dirrmtry devmon/templates/cisco-2801/cpu
-@dirrmtry devmon/templates/cisco-2801
-@dirrmtry devmon/templates/cisco-2600/power
-@dirrmtry devmon/templates/cisco-2600/if_stat
-@dirrmtry devmon/templates/cisco-2600/if_load
-@dirrmtry devmon/templates/cisco-2600/if_err
-@dirrmtry devmon/templates/cisco-2600/if_dsc
-@dirrmtry devmon/templates/cisco-2600/if_col
-@dirrmtry devmon/templates/cisco-2600/cpu
-@dirrmtry devmon/templates/cisco-2600
-@dirrmtry devmon/templates/cisco-1841/serial
-@dirrmtry devmon/templates/cisco-1841/if_stat
-@dirrmtry devmon/templates/cisco-1841/if_load
-@dirrmtry devmon/templates/cisco-1841/if_err
-@dirrmtry devmon/templates/cisco-1841/if_dsc
-@dirrmtry devmon/templates/cisco-1841/if_col
-@dirrmtry devmon/templates/cisco-1841/fans
-@dirrmtry devmon/templates/cisco-1841/cpu
-@dirrmtry devmon/templates/cisco-1841
-@dirrmtry devmon/templates/cisco-1700/memory
-@dirrmtry devmon/templates/cisco-1700/if_stat
-@dirrmtry devmon/templates/cisco-1700/if_load
-@dirrmtry devmon/templates/cisco-1700/if_err
-@dirrmtry devmon/templates/cisco-1700/if_dsc
-@dirrmtry devmon/templates/cisco-1700/if_col
-@dirrmtry devmon/templates/cisco-1700
-@dirrmtry devmon/templates/aruba-5000/devices
-@dirrmtry devmon/templates/aruba-5000/cpu
-@dirrmtry devmon/templates/aruba-5000/aps
-@dirrmtry devmon/templates/aruba-5000
-@dirrmtry devmon/templates/apc-9619/power
-@dirrmtry devmon/templates/apc-9619/env
-@dirrmtry devmon/templates/apc-9619
-@dirrmtry devmon/templates/apc-9617/power
-@dirrmtry devmon/templates/apc-9617
-@dirrmtry devmon/templates/apc-9606/power
-@dirrmtry devmon/templates/apc-9606
-@dirrmtry devmon/templates/apc-9205/power
-@dirrmtry devmon/templates/apc-9205
-@dirrmtry devmon/templates
-@dirrmtry devmon
+@dir devmon/templates/f5-bigip-lite/.test
diff --git a/net-mgmt/devmon/pkg-plist b/net-mgmt/devmon/pkg-plist
index 974f864fe46f..418e11a702e7 100644
--- a/net-mgmt/devmon/pkg-plist
+++ b/net-mgmt/devmon/pkg-plist
@@ -23,8 +23,3 @@ devmon/devmon
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-@dirrm devmon/modules
-@dirrmtry devmon
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/extras
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/docsis/pkg-plist b/net-mgmt/docsis/pkg-plist
index 8febeddfde4a..2d9fe2d41548 100644
--- a/net-mgmt/docsis/pkg-plist
+++ b/net-mgmt/docsis/pkg-plist
@@ -63,5 +63,3 @@ bin/docsis
 %%MIBS%%/PKTC-SIG-MIB
 %%MIBS%%/RMON2-MIB
 %%MIBS%%/TOKEN-RING-RMON-MIB
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index 8e885c54bdef..211053f9ea7c 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -39,10 +39,3 @@ share/locale/sv/LC_MESSAGES/etherape.mo
 share/locale/tr/LC_MESSAGES/etherape.mo
 share/omf/etherape/etherape-C.omf
 share/pixmaps/etherape.png
-@dirrm share/omf/etherape
-@dirrm share/gnome/help/etherape/C/figures
-@dirrm share/gnome/help/etherape/C
-@dirrm share/gnome/help/etherape
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%
-@dirrm %%ETCDIR%%
diff --git a/net-mgmt/flow-tools/pkg-plist b/net-mgmt/flow-tools/pkg-plist
index 0e1ce93584b0..c25a6999dc49 100644
--- a/net-mgmt/flow-tools/pkg-plist
+++ b/net-mgmt/flow-tools/pkg-plist
@@ -65,5 +65,3 @@ man/man1/flow-rpt2rrd.1.gz
 %%DATADIR%%/ip-type.sym
 %%DATADIR%%/tag.sym
 %%DATADIR%%/tcp-port.sym
-@dirrm %%DATADIR%%
-@dirrm etc/flow-tools
diff --git a/net-mgmt/gsnmp/pkg-plist b/net-mgmt/gsnmp/pkg-plist
index 00f6a3dd6b75..3b7f07dc6cc8 100644
--- a/net-mgmt/gsnmp/pkg-plist
+++ b/net-mgmt/gsnmp/pkg-plist
@@ -15,4 +15,3 @@ lib/libgsnmp.so.0.0.0
 libdata/pkgconfig/gsnmp.pc
 share/aclocal/gsnmp.m4
 man/man1/gsnmp-get.1.gz
-@dirrm include/gsnmp
diff --git a/net-mgmt/guifi-snpservices/pkg-plist b/net-mgmt/guifi-snpservices/pkg-plist
index f994d032ae0b..054cde472ced 100644
--- a/net-mgmt/guifi-snpservices/pkg-plist
+++ b/net-mgmt/guifi-snpservices/pkg-plist
@@ -53,11 +53,3 @@
 %%WWWDIR%%/tools/guinux/config.php.guinux
 %%WWWDIR%%/tools/guinux/snpconfig.pl
 %%WWWDIR%%/tools/guinux/snpservices.conf
-@dirrmtry %%WWWDIR%%/tools/guinux
-@dirrmtry %%WWWDIR%%/tools
-@dirrmtry %%WWWDIR%%/services
-@dirrmtry %%WWWDIR%%/misc
-@dirrmtry %%WWWDIR%%/graphs
-@dirrmtry %%WWWDIR%%/debian
-@dirrmtry %%WWWDIR%%/common
-@dirrmtry %%WWWDIR%%
diff --git a/net-mgmt/hawk/pkg-plist b/net-mgmt/hawk/pkg-plist
index ead3f7ea4b4c..b2a4922a3152 100644
--- a/net-mgmt/hawk/pkg-plist
+++ b/net-mgmt/hawk/pkg-plist
@@ -14,7 +14,3 @@ sbin/hawk
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/create_hawk_db.sql
 %%PORTDOCS%%%%DOCSDIR%%/create_hawk_user.sql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry %%ETCDIR%%
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%
diff --git a/net-mgmt/ipaudit/pkg-plist b/net-mgmt/ipaudit/pkg-plist
index 89ab399a06cb..6ff993ad1470 100644
--- a/net-mgmt/ipaudit/pkg-plist
+++ b/net-mgmt/ipaudit/pkg-plist
@@ -6,4 +6,3 @@ man/man1/ipaudit.1.gz
 man/man1/ipstrings.1.gz
 man/man1/total.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/ipplan/pkg-plist b/net-mgmt/ipplan/pkg-plist
index 9d2937540cc8..3ef918a3ffa8 100644
--- a/net-mgmt/ipplan/pkg-plist
+++ b/net-mgmt/ipplan/pkg-plist
@@ -557,71 +557,8 @@
 %%WWWDIR%%/INSTALL
 %%WWWDIR%%/CONTRIBUTORS
 %%WWWDIR%%/CHANGELOG
-@dirrm %%WWWDIR%%/user/Net/DNS/RR
-@dirrm %%WWWDIR%%/user/Net/DNS
-@dirrm %%WWWDIR%%/user/Net
-@dirrm %%WWWDIR%%/user
-@dirrm %%WWWDIR%%/themes/img_red_grey
-@dirrm %%WWWDIR%%/themes
-@dirrm %%WWWDIR%%/templates/display
-@dirrm %%WWWDIR%%/templates
-@dirrm %%WWWDIR%%/menus/templates
-@dirrm %%WWWDIR%%/menus/menuimages
-@dirrm %%WWWDIR%%/menus/menuicons
-@dirrm %%WWWDIR%%/menus/libjs
-@dirrm %%WWWDIR%%/menus/lib
-@dirrm %%WWWDIR%%/menus/images
-@dirrm %%WWWDIR%%/menus/THEMES
-@dirrm %%WWWDIR%%/menus/PATCHES/ONCLICK
-@dirrm %%WWWDIR%%/menus/PATCHES/ICONS_I18N
-@dirrm %%WWWDIR%%/menus/PATCHES/FIXEDMENU
-@dirrm %%WWWDIR%%/menus/PATCHES
-@dirrm %%WWWDIR%%/menus/LOGOS
-@dirrm %%WWWDIR%%/menus/DUMPS
-@dirrm %%WWWDIR%%/menus
-@dirrm %%WWWDIR%%/locale/ru/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/ru
-@dirrm %%WWWDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/pt_BR
-@dirrm %%WWWDIR%%/locale/pt/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/pt
-@dirrm %%WWWDIR%%/locale/no/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/no
-@dirrm %%WWWDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/ja_JP
-@dirrm %%WWWDIR%%/locale/it/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/it
-@dirrm %%WWWDIR%%/locale/fr/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/fr
-@dirrm %%WWWDIR%%/locale/es/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/es
-@dirrm %%WWWDIR%%/locale/de/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/de
-@dirrm %%WWWDIR%%/locale/bg/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/bg
-@dirrm %%WWWDIR%%/locale
-@dirrm %%WWWDIR%%/layout
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/contrib
-@dirrm %%WWWDIR%%/adodb/xsl
-@dirrm %%WWWDIR%%/adodb/tests
-@dirrm %%WWWDIR%%/adodb/session/old
-@dirrm %%WWWDIR%%/adodb/session
-@dirrm %%WWWDIR%%/adodb/perf
-@dirrm %%WWWDIR%%/adodb/pear/Auth/Container
-@dirrm %%WWWDIR%%/adodb/pear/Auth
-@dirrm %%WWWDIR%%/adodb/pear
-@dirrm %%WWWDIR%%/adodb/lang
-@dirrm %%WWWDIR%%/adodb/drivers
-@dirrm %%WWWDIR%%/adodb/docs
-@dirrm %%WWWDIR%%/adodb/datadict
-@dirrm %%WWWDIR%%/adodb/cute_icons_for_site
-@dirrm %%WWWDIR%%/adodb/contrib
-@dirrm %%WWWDIR%%/adodb
-@dirrm %%WWWDIR%%/admin
-@dirrmtry %%WWWDIR%%
-@dirrmtry /var/spool/ipplan/uploads
-@dirrmtry /var/spool/ipplan/exportdns
-@dirrmtry /var/spool/ipplan/dhcpexport
-@dirrmtry /var/spool/ipplan
 @unexec cmp -s %D/%%WWWDIR%%/config.php.sample %D/%%WWWDIR%%/config.php && rm -f %D/%%WWWDIR%%/config.php || true
+@dir /var/spool/ipplan/dhcpexport
+@dir /var/spool/ipplan/exportdns
+@dir /var/spool/ipplan/uploads
+@dir /var/spool/ipplan
diff --git a/net-mgmt/jnettop/pkg-plist b/net-mgmt/jnettop/pkg-plist
index 1643d4741d4b..56e2a95968ad 100644
--- a/net-mgmt/jnettop/pkg-plist
+++ b/net-mgmt/jnettop/pkg-plist
@@ -1,4 +1,3 @@
 bin/jnettop
 %%DATADIR%%/jnettop-lookup-nmb
 man/man8/jnettop.8.gz
-@dirrmtry %%DATADIR%%
diff --git a/net-mgmt/lanmap/pkg-plist b/net-mgmt/lanmap/pkg-plist
index 5203d4aedda6..82108886c377 100644
--- a/net-mgmt/lanmap/pkg-plist
+++ b/net-mgmt/lanmap/pkg-plist
@@ -21,8 +21,4 @@ bin/lanmap
 %%DATADIR%%/graph/img/switch.gif
 %%DATADIR%%/graph/img/switch.png
 %%DATADIR%%/graph/lanmap.header
-@dirrm %%DATADIR%%/graph/img
-@dirrm %%DATADIR%%/graph
-@dirrm %%DATADIR%%/data/graph
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
+@dir %%DATADIR%%/data/graph
diff --git a/net-mgmt/lg/pkg-plist b/net-mgmt/lg/pkg-plist
index b3d61c1dcdf4..a010370e11e0 100644
--- a/net-mgmt/lg/pkg-plist
+++ b/net-mgmt/lg/pkg-plist
@@ -8,6 +8,3 @@
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/lg.cgi
 %%WWWDIR%%/lg.conf
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%
-@dirrmtry %%WWWDIR%%
diff --git a/net-mgmt/libsmi/pkg-plist b/net-mgmt/libsmi/pkg-plist
index 20bb94418f20..786a980adbd0 100644
--- a/net-mgmt/libsmi/pkg-plist
+++ b/net-mgmt/libsmi/pkg-plist
@@ -372,14 +372,7 @@ man/man3/smi_node.3.gz
 man/man3/smi_render.3.gz
 man/man3/smi_type.3.gz
 man/man3/smi_util.3.gz
-@dirrmtry share/smi/pibs/tubs
-@dirrmtry share/smi/pibs/site
-@dirrmtry share/smi/pibs/ietf
-@dirrmtry share/smi/pibs
-@dirrmtry share/smi/mibs/tubs
-@dirrmtry share/smi/mibs/site
-@dirrmtry share/smi/mibs/irtf
-@dirrmtry share/smi/mibs/ietf
-@dirrmtry share/smi/mibs/iana
-@dirrmtry share/smi/mibs
-@dirrmtry share/smi
+@dir share/smi/mibs/site
+@dir share/smi/pibs/ietf
+@dir share/smi/pibs/site
+@dir share/smi/pibs/tubs
diff --git a/net-mgmt/nbtscan/pkg-plist b/net-mgmt/nbtscan/pkg-plist
index 3f84db2b2214..f60f6e8a6f14 100644
--- a/net-mgmt/nbtscan/pkg-plist
+++ b/net-mgmt/nbtscan/pkg-plist
@@ -1,3 +1,2 @@
 bin/nbtscan
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/ndoutils/pkg-plist b/net-mgmt/ndoutils/pkg-plist
index 149c30f27ad5..931b4a7134f6 100644
--- a/net-mgmt/ndoutils/pkg-plist
+++ b/net-mgmt/ndoutils/pkg-plist
@@ -127,14 +127,3 @@ etc/nagios/ndoutils.cfg-sample
 %%DATADIR%%/queries/timed_event_queue.sql
 %%DATADIR%%/queries/timed_events.sql
 %%DATADIR%%/upgradedb
-@dirrm %%DATADIR%%/queries
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/en-en/ent
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/en-en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/xsl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/en-en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/ndpmon/pkg-plist b/net-mgmt/ndpmon/pkg-plist
index 097ea4e9cac4..1aab6c85ea54 100644
--- a/net-mgmt/ndpmon/pkg-plist
+++ b/net-mgmt/ndpmon/pkg-plist
@@ -10,9 +10,3 @@ man/man8/ndpmon.8.gz
 %%MACRESOLV%%%%DATADIR%%/plugins/mac_resolv/wka.tmpl
 %%MACRESOLV%%%%DATADIR%%/plugins/mac_resolv/manuf
 var/ndpmon/neighbor_list.xml
-@dirrmtry var/ndpmon
-@dirrmtry var
-%%MACRESOLV%%@dirrmtry %%DATADIR%%/plugins/mac_resolv
-%%MACRESOLV%%@dirrmtry %%DATADIR%%/plugins
-@dirrmtry %%DATADIR%%
-@dirrmtry %%ETCDIR%%
diff --git a/net-mgmt/netdisco-mibs/pkg-plist b/net-mgmt/netdisco-mibs/pkg-plist
index d8302aeb35b2..8c35a33219d0 100644
--- a/net-mgmt/netdisco-mibs/pkg-plist
+++ b/net-mgmt/netdisco-mibs/pkg-plist
@@ -3069,48 +3069,3 @@
 %%DATADIR%%/xirrus/XIRRUS-MIB.txt
 %%DATADIR%%/mkindex
 %%DATADIR%%/mib_index.txt
-@dirrmtry %%DATADIR%%/3com
-@dirrmtry %%DATADIR%%/allied
-@dirrmtry %%DATADIR%%/alcatel
-@dirrmtry %%DATADIR%%/apc
-@dirrmtry %%DATADIR%%/arista
-@dirrmtry %%DATADIR%%/aruba
-@dirrmtry %%DATADIR%%/asante
-@dirrmtry %%DATADIR%%/avaya
-@dirrmtry %%DATADIR%%/bluecoat
-@dirrmtry %%DATADIR%%/bluesocket
-@dirrmtry %%DATADIR%%/cabletron
-@dirrmtry %%DATADIR%%/checkpoint
-@dirrmtry %%DATADIR%%/cisco
-@dirrmtry %%DATADIR%%/citrix
-@dirrmtry %%DATADIR%%/colubris
-@dirrmtry %%DATADIR%%/cyclades
-@dirrmtry %%DATADIR%%/d-link
-@dirrmtry %%DATADIR%%/dell
-@dirrmtry %%DATADIR%%/enterasys
-@dirrmtry %%DATADIR%%/extreme
-@dirrmtry %%DATADIR%%/extricom
-@dirrmtry %%DATADIR%%/f5
-@dirrmtry %%DATADIR%%/force10
-@dirrmtry %%DATADIR%%/foundry
-@dirrmtry %%DATADIR%%/huawei
-@dirrmtry %%DATADIR%%/h3c
-@dirrmtry %%DATADIR%%/hp
-@dirrmtry %%DATADIR%%/ibm
-@dirrmtry %%DATADIR%%/juniper
-@dirrmtry %%DATADIR%%/lantronix
-@dirrmtry %%DATADIR%%/mikrotik
-@dirrmtry %%DATADIR%%/net-snmp
-@dirrmtry %%DATADIR%%/netgear
-@dirrmtry %%DATADIR%%/netscreen
-@dirrmtry %%DATADIR%%/nortel
-@dirrmtry %%DATADIR%%/packetfront
-@dirrmtry %%DATADIR%%/pica8
-@dirrmtry %%DATADIR%%/rad
-@dirrmtry %%DATADIR%%/rfc
-@dirrmtry %%DATADIR%%/riverbed
-@dirrmtry %%DATADIR%%/ruckus
-@dirrmtry %%DATADIR%%/sonicwall
-@dirrmtry %%DATADIR%%/trapeze
-@dirrmtry %%DATADIR%%/xirrus
-@dirrmtry %%DATADIR%%
diff --git a/net-mgmt/netustad/pkg-plist b/net-mgmt/netustad/pkg-plist
index 17b50752cc41..0ebc866fcf02 100644
--- a/net-mgmt/netustad/pkg-plist
+++ b/net-mgmt/netustad/pkg-plist
@@ -83,9 +83,3 @@ share/locale/tr/LC_MESSAGES/netustad.mo
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
-@dirrm etc/netustad
-@dirrm %%DATADIR%%/script/images
-@dirrm %%DATADIR%%/script
-@dirrm %%DATADIR%%/cert
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/nsca/pkg-plist b/net-mgmt/nsca/pkg-plist
index 130541f7a400..e2cad25f8bda 100644
--- a/net-mgmt/nsca/pkg-plist
+++ b/net-mgmt/nsca/pkg-plist
@@ -2,9 +2,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/LEGAL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%SERVER%%etc/nagios/nsca.cfg-sample
 %%SERVER%%sbin/nsca
 %%CLIENT%%etc/nagios/send_nsca.cfg-sample
 %%CLIENT%%sbin/send_nsca
-@dirrmtry etc/nagios
diff --git a/net-mgmt/nsca27/pkg-plist b/net-mgmt/nsca27/pkg-plist
index 130541f7a400..e2cad25f8bda 100644
--- a/net-mgmt/nsca27/pkg-plist
+++ b/net-mgmt/nsca27/pkg-plist
@@ -2,9 +2,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/LEGAL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%SERVER%%etc/nagios/nsca.cfg-sample
 %%SERVER%%sbin/nsca
 %%CLIENT%%etc/nagios/send_nsca.cfg-sample
 %%CLIENT%%sbin/send_nsca
-@dirrmtry etc/nagios
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
index d81197ac5277..302a64aa13ed 100644
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	observium
 PORTVERSION=	0.14.4.5229
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.observium.org/
 DISTNAME=	${PORTNAME}-community-latest
@@ -77,7 +77,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
 .endfor
 	# Create empty rrd dir writable by www
-	@${INSTALL} -d -o www -g www ${STAGEDIR}/${WWWDIR}/rrd
+	@${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd
 	# Files in scripts dir should be executable
 	@${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \;
 
@@ -94,7 +94,4 @@ do-install:
 .endfor
 .endif
 
-post-install:
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/observium/pkg-plist b/net-mgmt/observium/pkg-plist
index c4806574d524..a73b4adbf6a1 100644
--- a/net-mgmt/observium/pkg-plist
+++ b/net-mgmt/observium/pkg-plist
@@ -7416,193 +7416,5 @@
 %%WWWDIR%%/update/131.sql
 %%WWWDIR%%/update/132.sql
 %%WWWDIR%%/update/133.sql
-@dirrmtry %%WWWDIR%%/html/css/font-awesome/font
-@dirrmtry %%WWWDIR%%/html/css/font-awesome/less
-@dirrmtry %%WWWDIR%%/html/css/font-awesome
-@dirrmtry %%WWWDIR%%/html/css
-@dirrmtry %%WWWDIR%%/html/images/16
-@dirrmtry %%WWWDIR%%/html/images/devices
-@dirrmtry %%WWWDIR%%/html/images/icons/greyscale
-@dirrmtry %%WWWDIR%%/html/images/icons/overview
-@dirrmtry %%WWWDIR%%/html/images/icons
-@dirrmtry %%WWWDIR%%/html/images/mapclusterer
-@dirrmtry %%WWWDIR%%/html/images/os
-@dirrmtry %%WWWDIR%%/html/images
-@dirrmtry %%WWWDIR%%/html/img
-@dirrmtry %%WWWDIR%%/html/includes/api
-@dirrmtry %%WWWDIR%%/html/includes/authentication
-@dirrmtry %%WWWDIR%%/html/includes/collectd
-@dirrmtry %%WWWDIR%%/html/includes/graphs/accesspoints
-@dirrmtry %%WWWDIR%%/html/includes/graphs/application
-@dirrmtry %%WWWDIR%%/html/includes/graphs/atmvp
-@dirrmtry %%WWWDIR%%/html/includes/graphs/bgp
-@dirrmtry %%WWWDIR%%/html/includes/graphs/bill
-@dirrmtry %%WWWDIR%%/html/includes/graphs/c6kxbar
-@dirrmtry %%WWWDIR%%/html/includes/graphs/cefswitching
-@dirrmtry %%WWWDIR%%/html/includes/graphs/customer
-@dirrmtry %%WWWDIR%%/html/includes/graphs/device
-@dirrmtry %%WWWDIR%%/html/includes/graphs/diskio
-@dirrmtry %%WWWDIR%%/html/includes/graphs/global
-@dirrmtry %%WWWDIR%%/html/includes/graphs/ipsectunnel
-@dirrmtry %%WWWDIR%%/html/includes/graphs/location
-@dirrmtry %%WWWDIR%%/html/includes/graphs/macaccounting
-@dirrmtry %%WWWDIR%%/html/includes/graphs/mempool
-@dirrmtry %%WWWDIR%%/html/includes/graphs/multiport
-@dirrmtry %%WWWDIR%%/html/includes/graphs/munin
-@dirrmtry %%WWWDIR%%/html/includes/graphs/netscalersvc
-@dirrmtry %%WWWDIR%%/html/includes/graphs/netscalervsvr
-@dirrmtry %%WWWDIR%%/html/includes/graphs/port
-@dirrmtry %%WWWDIR%%/html/includes/graphs/processor
-@dirrmtry %%WWWDIR%%/html/includes/graphs/rserver
-@dirrmtry %%WWWDIR%%/html/includes/graphs/sensor
-@dirrmtry %%WWWDIR%%/html/includes/graphs/service
-@dirrmtry %%WWWDIR%%/html/includes/graphs/smokeping
-@dirrmtry %%WWWDIR%%/html/includes/graphs/storage
-@dirrmtry %%WWWDIR%%/html/includes/graphs/toner
-@dirrmtry %%WWWDIR%%/html/includes/graphs/vserver
-@dirrmtry %%WWWDIR%%/html/includes/graphs
-@dirrmtry %%WWWDIR%%/html/includes/print
-@dirrmtry %%WWWDIR%%/html/includes
-@dirrmtry %%WWWDIR%%/html/js/google
-@dirrmtry %%WWWDIR%%/html/js/jqplot/plugins
-@dirrmtry %%WWWDIR%%/html/js/jqplot
-@dirrmtry %%WWWDIR%%/html/js
-@dirrmtry %%WWWDIR%%/html/pages/api
-@dirrmtry %%WWWDIR%%/html/pages/apps
-@dirrmtry %%WWWDIR%%/html/pages/bill
-@dirrmtry %%WWWDIR%%/html/pages/bills
-@dirrmtry %%WWWDIR%%/html/pages/device/apps/mssql
-@dirrmtry %%WWWDIR%%/html/pages/device/apps
-@dirrmtry %%WWWDIR%%/html/pages/device/edit
-@dirrmtry %%WWWDIR%%/html/pages/device/graphs
-@dirrmtry %%WWWDIR%%/html/pages/device/health
-@dirrmtry %%WWWDIR%%/html/pages/device/loadbalancer
-@dirrmtry %%WWWDIR%%/html/pages/device/logs
-@dirrmtry %%WWWDIR%%/html/pages/device/overview
-@dirrmtry %%WWWDIR%%/html/pages/device/port
-@dirrmtry %%WWWDIR%%/html/pages/device/ports
-@dirrmtry %%WWWDIR%%/html/pages/device/routing
-@dirrmtry %%WWWDIR%%/html/pages/device
-@dirrmtry %%WWWDIR%%/html/pages/devices
-@dirrmtry %%WWWDIR%%/html/pages/edituser
-@dirrmtry %%WWWDIR%%/html/pages/front
-@dirrmtry %%WWWDIR%%/html/pages/health
-@dirrmtry %%WWWDIR%%/html/pages/ports
-@dirrmtry %%WWWDIR%%/html/pages/routing
-@dirrmtry %%WWWDIR%%/html/pages/search
-@dirrmtry %%WWWDIR%%/html/pages
-@dirrmtry %%WWWDIR%%/html
-@dirrmtry %%WWWDIR%%/includes/debug
-@dirrmtry %%WWWDIR%%/includes/definitions
-@dirrmtry %%WWWDIR%%/includes/discovery/discovery-protocols
-@dirrmtry %%WWWDIR%%/includes/discovery/inventory
-@dirrmtry %%WWWDIR%%/includes/discovery/mempools
-@dirrmtry %%WWWDIR%%/includes/discovery/os
-@dirrmtry %%WWWDIR%%/includes/discovery/processors
-@dirrmtry %%WWWDIR%%/includes/discovery/sensors
-@dirrmtry %%WWWDIR%%/includes/discovery/storage
-@dirrmtry %%WWWDIR%%/includes/discovery/vlans
-@dirrmtry %%WWWDIR%%/includes/discovery
-@dirrmtry %%WWWDIR%%/includes/pear/Console
-@dirrmtry %%WWWDIR%%/includes/pear/Mail/Mail
-@dirrmtry %%WWWDIR%%/includes/pear/Mail
-@dirrmtry %%WWWDIR%%/includes/pear/Net
-@dirrmtry %%WWWDIR%%/includes/pear
-@dirrmtry %%WWWDIR%%/includes/polling/applications
-@dirrmtry %%WWWDIR%%/includes/polling/mempools
-@dirrmtry %%WWWDIR%%/includes/polling/os
-@dirrmtry %%WWWDIR%%/includes/polling/processors
-@dirrmtry %%WWWDIR%%/includes/polling/storage
-@dirrmtry %%WWWDIR%%/includes/polling/unix-agent
-@dirrmtry %%WWWDIR%%/includes/polling
-@dirrmtry %%WWWDIR%%/includes/services/dns
-@dirrmtry %%WWWDIR%%/includes/services/ftp
-@dirrmtry %%WWWDIR%%/includes/services/http
-@dirrmtry %%WWWDIR%%/includes/services/imap
-@dirrmtry %%WWWDIR%%/includes/services/mysql
-@dirrmtry %%WWWDIR%%/includes/services/pop
-@dirrmtry %%WWWDIR%%/includes/services/simap
-@dirrmtry %%WWWDIR%%/includes/services/smtp
-@dirrmtry %%WWWDIR%%/includes/services/spop
-@dirrmtry %%WWWDIR%%/includes/services/ssh
-@dirrmtry %%WWWDIR%%/includes/services/telnet
-@dirrmtry %%WWWDIR%%/includes/services
-@dirrmtry %%WWWDIR%%/includes/snmptrap
-@dirrmtry %%WWWDIR%%/includes/update
-@dirrmtry %%WWWDIR%%/includes
-@dirrmtry %%WWWDIR%%/mibs/a3com
-@dirrmtry %%WWWDIR%%/mibs/acme
-@dirrmtry %%WWWDIR%%/mibs/akcp
-@dirrmtry %%WWWDIR%%/mibs/allied
-@dirrmtry %%WWWDIR%%/mibs/aos
-@dirrmtry %%WWWDIR%%/mibs/apc
-@dirrmtry %%WWWDIR%%/mibs/arista
-@dirrmtry %%WWWDIR%%/mibs/aruba
-@dirrmtry %%WWWDIR%%/mibs/asante
-@dirrmtry %%WWWDIR%%/mibs/audiocodes
-@dirrmtry %%WWWDIR%%/mibs/avtech
-@dirrmtry %%WWWDIR%%/mibs/bluecoat
-@dirrmtry %%WWWDIR%%/mibs/bluesocket
-@dirrmtry %%WWWDIR%%/mibs/bti
-@dirrmtry %%WWWDIR%%/mibs/cabletron
-@dirrmtry %%WWWDIR%%/mibs/calix
-@dirrmtry %%WWWDIR%%/mibs/checkpoint
-@dirrmtry %%WWWDIR%%/mibs/ciena
-@dirrmtry %%WWWDIR%%/mibs/cisco
-@dirrmtry %%WWWDIR%%/mibs/ciscosb
-@dirrmtry %%WWWDIR%%/mibs/citrix
-@dirrmtry %%WWWDIR%%/mibs/colubris
-@dirrmtry %%WWWDIR%%/mibs/cyclades
-@dirrmtry %%WWWDIR%%/mibs/d-link
-@dirrmtry %%WWWDIR%%/mibs/dell
-@dirrmtry %%WWWDIR%%/mibs/enterasys
-@dirrmtry %%WWWDIR%%/mibs/equallogic
-@dirrmtry %%WWWDIR%%/mibs/extreme
-@dirrmtry %%WWWDIR%%/mibs/extricom
-@dirrmtry %%WWWDIR%%/mibs/f5
-@dirrmtry %%WWWDIR%%/mibs/force10
-@dirrmtry %%WWWDIR%%/mibs/foundry
-@dirrmtry %%WWWDIR%%/mibs/geist
-@dirrmtry %%WWWDIR%%/mibs/gude
-@dirrmtry %%WWWDIR%%/mibs/h3c
-@dirrmtry %%WWWDIR%%/mibs/hh3c
-@dirrmtry %%WWWDIR%%/mibs/hp
-@dirrmtry %%WWWDIR%%/mibs/huawei
-@dirrmtry %%WWWDIR%%/mibs/juniper
-@dirrmtry %%WWWDIR%%/mibs/junos
-@dirrmtry %%WWWDIR%%/mibs/junose/broken
-@dirrmtry %%WWWDIR%%/mibs/junose
-@dirrmtry %%WWWDIR%%/mibs/korenix-netjet
-@dirrmtry %%WWWDIR%%/mibs/kyocera
-@dirrmtry %%WWWDIR%%/mibs/lantronix
-@dirrmtry %%WWWDIR%%/mibs/mikrotik
-@dirrmtry %%WWWDIR%%/mibs/net-snmp
-@dirrmtry %%WWWDIR%%/mibs/netapp
-@dirrmtry %%WWWDIR%%/mibs/netgear
-@dirrmtry %%WWWDIR%%/mibs/netscreen
-@dirrmtry %%WWWDIR%%/mibs/nortel
-@dirrmtry %%WWWDIR%%/mibs/packetfront
-@dirrmtry %%WWWDIR%%/mibs/papouch
-@dirrmtry %%WWWDIR%%/mibs/rad
-@dirrmtry %%WWWDIR%%/mibs/radlan
-@dirrmtry %%WWWDIR%%/mibs/rfc
-@dirrmtry %%WWWDIR%%/mibs/riverbed
-@dirrmtry %%WWWDIR%%/mibs/ruckus
-@dirrmtry %%WWWDIR%%/mibs/senao
-@dirrmtry %%WWWDIR%%/mibs/sonicwall
-@dirrmtry %%WWWDIR%%/mibs/synology
-@dirrmtry %%WWWDIR%%/mibs/trapeze
-@dirrmtry %%WWWDIR%%/mibs/ubiquiti
-@dirrmtry %%WWWDIR%%/mibs/vmware
-@dirrmtry %%WWWDIR%%/mibs/watchguard
-@dirrmtry %%WWWDIR%%/mibs/wwp
-@dirrmtry %%WWWDIR%%/mibs/xirrus
-@dirrmtry %%WWWDIR%%/mibs/zyxel
-@dirrmtry %%WWWDIR%%/mibs
-@dirrmtry %%WWWDIR%%/rrd
-@dirrmtry %%WWWDIR%%/scripts/agent-local/munin-scripts
-@dirrmtry %%WWWDIR%%/scripts/agent-local
-@dirrmtry %%WWWDIR%%/scripts/watchmaillog
-@dirrmtry %%WWWDIR%%/scripts
-@dirrmtry %%WWWDIR%%/update
-@dirrmtry %%WWWDIR%%
+@dir(www,www,) %%WWWDIR%%/rrd
+@dir %%WWWDIR%%/scripts/agent-local/munin-scripts
diff --git a/net-mgmt/p0f2/pkg-plist b/net-mgmt/p0f2/pkg-plist
index cab5ec684af2..87b65303dfa3 100644
--- a/net-mgmt/p0f2/pkg-plist
+++ b/net-mgmt/p0f2/pkg-plist
@@ -9,4 +9,3 @@ etc/p0f/p0fa.fp
 etc/p0f/p0fo.fp
 etc/p0f/p0fr.fp
 man/man1/p0f.1.gz
-@dirrmtry etc/p0f
diff --git a/net-mgmt/pads/pkg-plist b/net-mgmt/pads/pkg-plist
index a763eeff0ce3..0b086b6729e5 100644
--- a/net-mgmt/pads/pkg-plist
+++ b/net-mgmt/pads/pkg-plist
@@ -12,4 +12,3 @@ etc/pads.conf
 man/man8/pads-report.8.gz
 man/man8/pads.8.gz
 man/man8/pads.conf.8.gz
-@dirrm %%DATADIR%%
diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist
index 1ab7d57dd63d..c3a2103900ff 100644
--- a/net-mgmt/pmacct/pkg-plist
+++ b/net-mgmt/pmacct/pkg-plist
@@ -49,7 +49,6 @@ sbin/uacctd
 %%DATADIR%%/pmacct-create-table_v7.sqlite3
 %%DATADIR%%/pmacct-create-table_v8.sqlite3
 %%DATADIR%%/pmacct-grant-db.mysql
-@dirrmtry %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -87,5 +86,3 @@ sbin/uacctd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrdtool-example.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampling.map.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tee_receivers.lst.example
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/py-pyang/pkg-plist b/net-mgmt/py-pyang/pkg-plist
index 1bf1e1d5d6d6..0d895f904d81 100644
--- a/net-mgmt/py-pyang/pkg-plist
+++ b/net-mgmt/py-pyang/pkg-plist
@@ -126,11 +126,3 @@ man/man1/yang2dsdl.1.gz
 %%DATADIR%%/xslt/jsonxsl-templates.xsl
 %%DATADIR%%/xslt/svrl2text.xsl
 %%DATADIR%%/xslt/yin2yang.xsl
-@dirrm %%DATADIR%%/xslt
-@dirrm %%DATADIR%%/schema
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/pyang/translators
-@dirrm %%PYTHON_SITELIBDIR%%/pyang/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/pyang
diff --git a/net-mgmt/qkismet/pkg-plist b/net-mgmt/qkismet/pkg-plist
index bb4959ef5432..6215d59a114a 100644
--- a/net-mgmt/qkismet/pkg-plist
+++ b/net-mgmt/qkismet/pkg-plist
@@ -18,5 +18,3 @@ share/qkismet/img/network-workgroup.png
 share/qkismet/img/text-x-generic.png
 share/qkismet/img/utilities-system-monitor.png
 share/qkismet/img/view-filter.png
-@dirrm share/qkismet/img
-@dirrm share/qkismet/
diff --git a/net-mgmt/routers2-extensions/pkg-plist b/net-mgmt/routers2-extensions/pkg-plist
index 914aa70bbfe5..23b2d5c17a24 100644
--- a/net-mgmt/routers2-extensions/pkg-plist
+++ b/net-mgmt/routers2-extensions/pkg-plist
@@ -6,4 +6,3 @@ www/routers2/extensions/routingtable.cgi
 www/routers2/extensions/showcfg.cgi
 www/routers2/extensions/tonagios.cgi
 www/routers2/extensions/trend.cgi
-@dirrm www/routers2/extensions
diff --git a/net-mgmt/routers2-extras/pkg-plist b/net-mgmt/routers2-extras/pkg-plist
index b47af469c635..2166c9173746 100644
--- a/net-mgmt/routers2-extras/pkg-plist
+++ b/net-mgmt/routers2-extras/pkg-plist
@@ -25,5 +25,3 @@ www/routers2/extras/templates/template-mrtg-ping
 www/routers2/extras/templates/template-mrtg-pnsclient
 www/routers2/extras/winalert.conf
 www/routers2/extras/winalert.pl
-@dirrm www/routers2/extras/templates
-@dirrm www/routers2/extras
diff --git a/net-mgmt/rrdbot/pkg-plist b/net-mgmt/rrdbot/pkg-plist
index 9e005343dcfe..9c3fc243f7f0 100644
--- a/net-mgmt/rrdbot/pkg-plist
+++ b/net-mgmt/rrdbot/pkg-plist
@@ -60,6 +60,4 @@ man/man1/rrdbot-get.1.gz
 man/man5/rrdbot.conf.5.gz
 man/man8/rrdbot-create.8.gz
 man/man8/rrdbotd.8.gz
-@dirrm %%DATADIR%%/mib
-@dirrm %%DATADIR%%
-@dirrmtry etc/rrdbot
+@dir %%ETCDIR%%
diff --git a/net-mgmt/send/pkg-plist b/net-mgmt/send/pkg-plist
index f1a2654ac412..0cbc82930494 100644
--- a/net-mgmt/send/pkg-plist
+++ b/net-mgmt/send/pkg-plist
@@ -5,4 +5,3 @@ etc/sendd/sendd.conf-dist
 etc/sendd/params.conf-dist
 etc/sendd/ipext.conf-dist
 etc/sendd/ipext_verify.conf-dist
-@dirrmtry etc/sendd
diff --git a/net-mgmt/sendip/pkg-plist b/net-mgmt/sendip/pkg-plist
index d804c6838b95..ef18244cbeaf 100644
--- a/net-mgmt/sendip/pkg-plist
+++ b/net-mgmt/sendip/pkg-plist
@@ -9,4 +9,3 @@ lib/sendip/ripng.so
 lib/sendip/tcp.so
 lib/sendip/udp.so
 man/man1/sendip.1.gz
-@dirrmtry lib/sendip
diff --git a/net-mgmt/snmp4nagios/pkg-plist b/net-mgmt/snmp4nagios/pkg-plist
index 76ea83115f14..7be255b1ffae 100644
--- a/net-mgmt/snmp4nagios/pkg-plist
+++ b/net-mgmt/snmp4nagios/pkg-plist
@@ -55,4 +55,3 @@ libexec/nagios/check_ups_output
 libexec/nagios/check_ups_outputs
 libexec/nagios/check_winf_cpuusage
 libexec/nagios/check_winf_mem
-@dirrmtry libexec/nagios
diff --git a/net-mgmt/snmptt/pkg-plist b/net-mgmt/snmptt/pkg-plist
index 4b95e8c11592..0794e9b7cf9b 100644
--- a/net-mgmt/snmptt/pkg-plist
+++ b/net-mgmt/snmptt/pkg-plist
@@ -11,5 +11,3 @@ sbin/snmptthandler
 %%DOCSDIR%%/snmptt.html
 %%DOCSDIR%%/snmpttconvert.html
 %%DOCSDIR%%/snmpttconvertmib.html
-@dirrm %%DOCSDIR%%
-@dirrm etc/snmp
diff --git a/net-mgmt/statsd/pkg-plist b/net-mgmt/statsd/pkg-plist
index 980e97d9249f..3c2362d2d9b0 100644
--- a/net-mgmt/statsd/pkg-plist
+++ b/net-mgmt/statsd/pkg-plist
@@ -14,6 +14,3 @@
 @unexec if cmp -s %D/etc/statsd.js.sample %D/etc/statsd.js; then rm -f %D/etc/statsd.js; fi
 etc/statsd.js.sample
 @exec [ -f %B/statsd.js ] || cp %B/%f %B/statsd.js
-@dirrmtry %%DATADIR%%/lib
-@dirrmtry %%DATADIR%%/backends
-@dirrmtry %%DATADIR%%
diff --git a/net-mgmt/sx/pkg-plist b/net-mgmt/sx/pkg-plist
index ebeaf7d6ecb2..fd5b272f4b77 100644
--- a/net-mgmt/sx/pkg-plist
+++ b/net-mgmt/sx/pkg-plist
@@ -31,24 +31,10 @@ sbin/sxreport-server
 %%SXSERVER%%sbin/sxserver
 %%SXSERVER%%sbin/sxsetup
 %%SXSERVER%%%%PORTDOCS%%%%DOCSDIR%%/logrotate.d/sxserver
-%%SXSERVER%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/logrotate.d
-%%SXSERVER%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-%%SXSERVER%%@dirrmtry %%ETCDIR%%/sxserver/errors
-%%SXSERVER%%@dirrmtry %%ETCDIR%%/sxserver
-%%SXSERVER%%@dirrmtry %%ETCDIR%%
-@dirrm lib/sxclient
-%%SXSERVER%%@dirrmtry sxserver/lib/sxserver
-%%SXSERVER%%@dirrmtry sxserver/lib
-%%SXSERVER%%@dirrmtry sxserver/log/sxserver
-%%SXSERVER%%@dirrmtry sxserver/log
-%%SXSERVER%%@dirrmtry sxserver/run/sxserver
-%%SXSERVER%%@dirrmtry sxserver/run
-%%SXSERVER%%@dirrmtry sxserver/sxserver
-%%SXSERVER%%@dirrmtry sxserver
-%%SXCLIENT%%@dirrmtry var/lib/sxserver
-%%SXCLIENT%%@dirrmtry var/lib
-%%SXCLIENT%%@dirrmtry var/log/sxserver
-%%SXCLIENT%%@dirrmtry var/log
-%%SXCLIENT%%@dirrmtry var/run/sxserver
-%%SXCLIENT%%@dirrmtry var/run
-%%SXCLIENT%%@dirrmtry var
+%%SXSERVER%%@dir sxserver/lib/sxserver
+%%SXSERVER%%@dir sxserver/log/sxserver
+%%SXSERVER%%@dir sxserver/run/sxserver
+%%SXSERVER%%@dir sxserver/sxserver
+%%SXCLIENT%%@dir var/lib/sxserver
+%%SXCLIENT%%@dir var/log/sxserver
+%%SXCLIENT%%@dir var/run/sxserver
diff --git a/net-mgmt/sysmon/pkg-plist b/net-mgmt/sysmon/pkg-plist
index 423c5e1772fb..4e6c893b00e1 100644
--- a/net-mgmt/sysmon/pkg-plist
+++ b/net-mgmt/sysmon/pkg-plist
@@ -14,4 +14,3 @@ man/man8/sysmon.man.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/sysmon.conf.man.html
 %%PORTDOCS%%%%DOCSDIR%%/sysmon.jpg
 %%PORTDOCS%%%%DOCSDIR%%/sysmon.man.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/victorops-nagios/pkg-plist b/net-mgmt/victorops-nagios/pkg-plist
index 243882034b80..de9c84b979e5 100644
--- a/net-mgmt/victorops-nagios/pkg-plist
+++ b/net-mgmt/victorops-nagios/pkg-plist
@@ -16,7 +16,3 @@ libexec/victorops/stop_forwarder
 libexec/victorops/support_collect.sh
 libexec/victorops/url_encode.sed
 libexec/victorops/utils
-@dirrmtry etc/nagios
-@dirrmtry libexec/victorops
-@dirrmtry etc/periodic/daily
-@dirrmtry etc/periodic
diff --git a/net-mgmt/vidalia/pkg-plist b/net-mgmt/vidalia/pkg-plist
index 61dde36472b2..b8fdda3e8a48 100644
--- a/net-mgmt/vidalia/pkg-plist
+++ b/net-mgmt/vidalia/pkg-plist
@@ -6,17 +6,3 @@ share/icons/hicolor/22x22/apps/vidalia.png
 share/icons/hicolor/32x32/apps/vidalia.png
 share/icons/hicolor/48x48/apps/vidalia.png
 share/icons/hicolor/64x64/apps/vidalia.png
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
diff --git a/net-mgmt/wdiag/pkg-plist b/net-mgmt/wdiag/pkg-plist
index b2e1ecada10d..c1524cbcbfcb 100644
--- a/net-mgmt/wdiag/pkg-plist
+++ b/net-mgmt/wdiag/pkg-plist
@@ -2,4 +2,3 @@ bin/wstart
 bin/wstop
 bin/westell
 %%EXAMPLESDIR%%/wdiag.conf
-@dirrm %%EXAMPLESDIR%%
diff --git a/net-mgmt/weathermap/pkg-plist b/net-mgmt/weathermap/pkg-plist
index 2b095e04b53b..cf12a2de71b8 100644
--- a/net-mgmt/weathermap/pkg-plist
+++ b/net-mgmt/weathermap/pkg-plist
@@ -6,5 +6,3 @@ bin/weathermap
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/weathermap-background.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/weathermap-overlib.html
 @sample etc/weathermap/weathermap.conf.sample
-@dirrmtry etc/weathermap
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net-mgmt/whatmask/pkg-plist b/net-mgmt/whatmask/pkg-plist
index 9058f9442a76..2f7ff00191f3 100644
--- a/net-mgmt/whatmask/pkg-plist
+++ b/net-mgmt/whatmask/pkg-plist
@@ -3,4 +3,3 @@ man/man1/whatmask.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/wmi-client/pkg-plist b/net-mgmt/wmi-client/pkg-plist
index ba2b8558ed39..a77322f56b6a 100644
--- a/net-mgmt/wmi-client/pkg-plist
+++ b/net-mgmt/wmi-client/pkg-plist
@@ -24,8 +24,3 @@ bin/wmic
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/callback.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/reactor.py
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/wbem
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/twisted
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/test
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba/rpc
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/pysamba
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0