ports/182617: [patch] net/hsflowd update and add stage support

[ohauer at FreeBSD.org]

>Number:         182617
>Category:       ports
>Synopsis:       [patch] net/hsflowd update and add stage support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 03 22:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     ohauer
>Release:        FreeBSD 8.4-RELEASE-p4 amd64
>Organization:
>Environment:

>Description:
- update to 1.23.3
- add stage support

patch: http://people.freebsd.org/~ohauer/diffs/stage/stage_hsflowd.diff

>How-To-Repeat:

>Fix:
--- stage_hsflowd.diff begins here ---
Index: hsflowd/Makefile
===================================================================
--- hsflowd/Makefile	(revision 329239)
+++ hsflowd/Makefile	(working copy)
@@ -2,21 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	hsflowd
-PORTVERSION=	1.22.2
+PORTVERSION=	1.23.3
 CATEGORIES=	net
-MASTER_SITES=	SF/host-sflow/REL-1_22/ \
+MASTER_SITES=	SF/host-sflow/Latest/ \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	zi at FreeBSD.org
 COMMENT=	Agent that exports metrics using the sFlow protocol
 
-MAKE_JOBS_UNSAFE=	no
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	${PORTNAME}
 MAKE_ENV=	BINDIR=${PREFIX}/sbin INITDIR=${PREFIX}/etc/rc.d \
-		CONFDIR=${ETCDIR}
+		CONFDIR=${ETCDIR} INSTROOT=${STAGEDIR}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' \
 	    	-e '/scripts\/hsflowd /d' \
@@ -29,9 +27,4 @@
 	@${MV} ${WRKSRC}/src/FreeBSD/scripts/hsflowd.conf \
 	    	${WRKSRC}/src/FreeBSD/scripts/hsflowd.conf.sample
 
-post-install:
-	@if [ ! -f ${ETCDIR}/hsflowd.conf ]; then \
-		${CP} ${ETCDIR}/hsflowd.conf.sample ${ETCDIR}/hsflowd.conf ; \
-	fi
-
 .include <bsd.port.mk>
Index: hsflowd/distinfo
===================================================================
--- hsflowd/distinfo	(revision 329239)
+++ hsflowd/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (hsflowd-1.22.2.tar.gz) = 648806afa02cb5588dd69aba54be0d5810f56af112003a861df0aadd6c28611c
-SIZE (hsflowd-1.22.2.tar.gz) = 1841547
+SHA256 (hsflowd-1.23.3.tar.gz) = f930888a90ba0e129afd853eeb534b40c7c05b79ae61723a4c4bb8980b17d730
+SIZE (hsflowd-1.23.3.tar.gz) = 2052688
Index: hsflowd/pkg-plist
===================================================================
--- hsflowd/pkg-plist	(revision 329239)
+++ hsflowd/pkg-plist	(working copy)
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
-etc/hsflowd/hsflowd.conf.sample
+ at unexec if cmp -s %D/%%ETCDIR%%/hsflowd.conf %D/%%ETCDIR%%/hsflowd.conf.sample; then rm -f %D/%%ETCDIR%%/hsflowd.conf; fi
+%%ETCDIR%%/hsflowd.conf.sample
+ at exec if [ ! -f %D/%%ETCDIR%%/hsflowd.conf ]; then cp -p %D/%F %B/hsflowd.conf; fi
 sbin/hsflowd
- at dirrmtry etc/hsflowd
- at unexec if cmp -s %D/etc/hsflowd/hsflowd.conf %D/etc/hsflowd.conf.sample; then rm -f %D/etc/hsflowd.conf; fi
+ at dirrmtry %%ETCDIR%%
 @unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi
--- stage_hsflowd.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: