6 files changed, 22 insertions, 18 deletions

diff --git a/net-mgmt/nfsen-devel/Makefile b/net-mgmt/nfsen-devel/Makefile
index 478412ee4f0e..dc5b6ba7d466 100644
--- a/net-mgmt/nfsen-devel/Makefile
+++ b/net-mgmt/nfsen-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nfsen
-PORTVERSION=	1.2
+PORTVERSION=	1.2.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://nfsen.sourceforge.net/
@@ -30,21 +30,20 @@ PLIST_SUB+=	PORTNAME=${PORTNAME}
 
 pre-everything::
 .if ${PERL_LEVEL} < 500600
-IGNORE=	This backage requires at least perl 5.6.0
+IGNORE=		requires at least perl 5.6.0
 .endif
 
 do-configure:
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \
 		${WRKSRC}/etc/nfsen-dist.conf
 	${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' ${WRKSRC}/install.pl
+	${RM} ${WRKSRC}/etc/nfsen-dist.conf.*
 
 do-install:
 	${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live
 	cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf
+	${INSTALL_SCRIPT} ${WRKSRC}/install.pl ${PREFIX}/bin/nfsen-reconfigure
 	@${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary profiles ";
-	@${ECHO_MSG} "Then run 'make reconfigure' to correctly setup profile files";
-
-reconfigure:
-	cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${LOCALBASE}/etc/nfsen.conf
+	@${ECHO_MSG} "Then run 'nfsen-reconfigure ${LOCALBASE}/etc/nfsen.conf' to correctly setup profile files";
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/nfsen-devel/distinfo b/net-mgmt/nfsen-devel/distinfo
index 93c5651ca62c..38da4e5ce623 100644
--- a/net-mgmt/nfsen-devel/distinfo
+++ b/net-mgmt/nfsen-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (nfsen-1.2.tar.gz) = 3130b5735244660213ab3b14e769584b
-SIZE (nfsen-1.2.tar.gz) = 3330324
+MD5 (nfsen-1.2.2.tar.gz) = 26bbb94766ef70f1e350004cc671b2d7
+SHA256 (nfsen-1.2.2.tar.gz) = 6a9a4d31cb5fe7592656f16c3390fae0c3845283c2b47c938f07665fa7fa52a2
+SIZE (nfsen-1.2.2.tar.gz) = 3331005
diff --git a/net-mgmt/nfsen-devel/pkg-plist b/net-mgmt/nfsen-devel/pkg-plist
index d389246bbf28..8d36389bb8f1 100644
--- a/net-mgmt/nfsen-devel/pkg-plist
+++ b/net-mgmt/nfsen-devel/pkg-plist
@@ -1,11 +1,13 @@
 bin/nfsen
+bin/nfsen-reconfigure
 bin/nfsen-run
 bin/nfsen.rc
 bin/pid_check.pl
 bin/testPlugin
+@unexec if cmp -s %D/etc/nfsen.conf %D/etc/nfsen-dist.conf; then rm -f %D/etc/nfsen.conf; fi
 etc/nfsen-dist.conf
-etc/nfsen-dist.conf.orig
 @exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf
+etc/nfsen-shell-param
 libexec/%%PORTNAME%%/GenGraph.pl
 libexec/%%PORTNAME%%/Log.pm
 libexec/%%PORTNAME%%/NfConf.pm
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index 478412ee4f0e..dc5b6ba7d466 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nfsen
-PORTVERSION=	1.2
+PORTVERSION=	1.2.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://nfsen.sourceforge.net/
@@ -30,21 +30,20 @@ PLIST_SUB+=	PORTNAME=${PORTNAME}
 
 pre-everything::
 .if ${PERL_LEVEL} < 500600
-IGNORE=	This backage requires at least perl 5.6.0
+IGNORE=		requires at least perl 5.6.0
 .endif
 
 do-configure:
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \
 		${WRKSRC}/etc/nfsen-dist.conf
 	${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' ${WRKSRC}/install.pl
+	${RM} ${WRKSRC}/etc/nfsen-dist.conf.*
 
 do-install:
 	${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live
 	cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf
+	${INSTALL_SCRIPT} ${WRKSRC}/install.pl ${PREFIX}/bin/nfsen-reconfigure
 	@${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary profiles ";
-	@${ECHO_MSG} "Then run 'make reconfigure' to correctly setup profile files";
-
-reconfigure:
-	cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${LOCALBASE}/etc/nfsen.conf
+	@${ECHO_MSG} "Then run 'nfsen-reconfigure ${LOCALBASE}/etc/nfsen.conf' to correctly setup profile files";
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/nfsen/distinfo b/net-mgmt/nfsen/distinfo
index 93c5651ca62c..38da4e5ce623 100644
--- a/net-mgmt/nfsen/distinfo
+++ b/net-mgmt/nfsen/distinfo
@@ -1,2 +1,3 @@
-MD5 (nfsen-1.2.tar.gz) = 3130b5735244660213ab3b14e769584b
-SIZE (nfsen-1.2.tar.gz) = 3330324
+MD5 (nfsen-1.2.2.tar.gz) = 26bbb94766ef70f1e350004cc671b2d7
+SHA256 (nfsen-1.2.2.tar.gz) = 6a9a4d31cb5fe7592656f16c3390fae0c3845283c2b47c938f07665fa7fa52a2
+SIZE (nfsen-1.2.2.tar.gz) = 3331005
diff --git a/net-mgmt/nfsen/pkg-plist b/net-mgmt/nfsen/pkg-plist
index d389246bbf28..8d36389bb8f1 100644
--- a/net-mgmt/nfsen/pkg-plist
+++ b/net-mgmt/nfsen/pkg-plist
@@ -1,11 +1,13 @@
 bin/nfsen
+bin/nfsen-reconfigure
 bin/nfsen-run
 bin/nfsen.rc
 bin/pid_check.pl
 bin/testPlugin
+@unexec if cmp -s %D/etc/nfsen.conf %D/etc/nfsen-dist.conf; then rm -f %D/etc/nfsen.conf; fi
 etc/nfsen-dist.conf
-etc/nfsen-dist.conf.orig
 @exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf
+etc/nfsen-shell-param
 libexec/%%PORTNAME%%/GenGraph.pl
 libexec/%%PORTNAME%%/Log.pm
 libexec/%%PORTNAME%%/NfConf.pm