From 789e4532b2889b92161627737b91208c3cee77ab Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 31 Dec 2015 15:29:22 +0000
Subject: [PATCH] net-mgmt/nfsen: port cleanup

- Add NO_ARCH
- Sort plist
- Switch to @sample
- Drop @dirrms from plist, switch to @dir where needed

This is a no-op update to the port.

PR:		205572
---
 net-mgmt/nfsen/Makefile  |  3 +-
 net-mgmt/nfsen/pkg-plist | 75 ++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 60dca98e06a2..72e2b395cae4 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -19,11 +19,12 @@ RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
 		nfdump>=0:${PORTSDIR}/net-mgmt/nfdump
 
-USES=	cpe iconv shebangfix perl5
+USES=		cpe iconv shebangfix perl5
 CPE_VENDOR=	nfsen
 CPE_PRODUCT=	nfsen
 USE_PHP=	session pcre sockets
 NO_BUILD=	yes
+NO_ARCH=	yes
 PLIST_SUB+=	PORTNAME=${PORTNAME}
 USE_RC_SUBR=	nfsen
 perl_OLD_CMD=	%%PERL%%
diff --git a/net-mgmt/nfsen/pkg-plist b/net-mgmt/nfsen/pkg-plist
index e8bd6e62b435..080cb036fbfc 100644
--- a/net-mgmt/nfsen/pkg-plist
+++ b/net-mgmt/nfsen/pkg-plist
@@ -1,3 +1,26 @@
+bin/testPlugin
+bin/nfsend
+bin/nfsen
+bin/RebuildHierarchy.pl
+@sample etc/nfsen-dist.conf etc/nfsen.conf
+libexec/%%PORTNAME%%/plugins/smily.jpg
+libexec/%%PORTNAME%%/plugins/demoplugin.pm
+libexec/%%PORTNAME%%/RRDconvertv1.pm
+libexec/%%PORTNAME%%/Notification.pm
+libexec/%%PORTNAME%%/Nfsync.pm
+libexec/%%PORTNAME%%/Nfsources.pm
+libexec/%%PORTNAME%%/Nfcomm.pm
+libexec/%%PORTNAME%%/NfSenSim.pm
+libexec/%%PORTNAME%%/NfSenRRD.pm
+libexec/%%PORTNAME%%/NfSenRC.pm
+libexec/%%PORTNAME%%/NfSen.pm
+libexec/%%PORTNAME%%/NfProfile.pm
+libexec/%%PORTNAME%%/NfConf.pm
+libexec/%%PORTNAME%%/NfAlert.pm
+libexec/%%PORTNAME%%/Lookup.pm
+libexec/%%PORTNAME%%/Log.pm
+libexec/%%PORTNAME%%/CopyRecursive.pm
+libexec/%%PORTNAME%%/AbuseWhois.pm
 %%WWWDIR%%/rrdgraph.php
 %%WWWDIR%%/profileadmin.php
 %%WWWDIR%%/process.php
@@ -51,45 +74,13 @@
 %%WWWDIR%%/colour_picker.html
 %%WWWDIR%%/colour_palette.html
 %%WWWDIR%%/alerting.php
-libexec/%%PORTNAME%%/plugins/smily.jpg
-libexec/%%PORTNAME%%/plugins/demoplugin.pm
-libexec/%%PORTNAME%%/RRDconvertv1.pm
-libexec/%%PORTNAME%%/Notification.pm
-libexec/%%PORTNAME%%/Nfsync.pm
-libexec/%%PORTNAME%%/Nfsources.pm
-libexec/%%PORTNAME%%/Nfcomm.pm
-libexec/%%PORTNAME%%/NfSenSim.pm
-libexec/%%PORTNAME%%/NfSenRRD.pm
-libexec/%%PORTNAME%%/NfSenRC.pm
-libexec/%%PORTNAME%%/NfSen.pm
-libexec/%%PORTNAME%%/NfProfile.pm
-libexec/%%PORTNAME%%/NfConf.pm
-libexec/%%PORTNAME%%/NfAlert.pm
-libexec/%%PORTNAME%%/Lookup.pm
-libexec/%%PORTNAME%%/Log.pm
-libexec/%%PORTNAME%%/CopyRecursive.pm
-libexec/%%PORTNAME%%/AbuseWhois.pm
-etc/nfsen-dist.conf
-bin/testPlugin
-bin/nfsend
-bin/nfsen
-bin/RebuildHierarchy.pl
-@unexec if cmp -s %D/etc/nfsen.conf %D/etc/nfsen-dist.conf; then rm -f %D/etc/nfsen.conf; fi
-@exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf
-@dirrmtry var/%%PORTNAME%%/run
-@dirrmtry var/%%PORTNAME%%/profiles-stat/live
-@dirrmtry var/%%PORTNAME%%/profiles-stat
-@dirrmtry var/%%PORTNAME%%/profiles-data/live
-@dirrmtry var/%%PORTNAME%%/profiles-data
-@dirrmtry var/%%PORTNAME%%/profiles/live
-@dirrmtry var/%%PORTNAME%%/profiles
-@dirrmtry var/%%PORTNAME%%/filters
-@dirrmtry var/%%PORTNAME%%
-@dirrmtry var
-@dirrmtry %%WWWDIR%%/plugins
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/icons
-@dirrm %%WWWDIR%%/css
-@dirrmtry %%WWWDIR%%
-@dirrmtry libexec/%%PORTNAME%%/plugins
-@dirrmtry libexec/%%PORTNAME%%
+@dir var/%%PORTNAME%%/run
+@dir var/%%PORTNAME%%/profiles-stat/live
+@dir var/%%PORTNAME%%/profiles-stat
+@dir var/%%PORTNAME%%/profiles-data/live
+@dir var/%%PORTNAME%%/profiles-data
+@dir var/%%PORTNAME%%/profiles/live
+@dir var/%%PORTNAME%%/profiles
+@dir var/%%PORTNAME%%/filters
+@dir var/%%PORTNAME%%
+@dir var