Bug 182617 - [patch] net/hsflowd update and add stage support
Summary: [patch] net/hsflowd update and add stage support
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ryan Steinmetz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-03 23:20 UTC by Olli Hauer
Modified: 2013-10-14 01:20 UTC (History)
0 users

See Also:


Attachments
stage_hsflowd.diff (2.29 KB, patch)
2013-10-03 23:20 UTC, Olli Hauer
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Olli Hauer freebsd_committer 2013-10-03 23:20:00 UTC
- update to 1.23.3
- add stage support

patch: http://people.freebsd.org/~ohauer/diffs/stage/stage_hsflowd.diff
Comment 1 Edwin Groothuis freebsd_committer 2013-10-03 23:20:13 UTC
Responsible Changed
From-To: freebsd-ports-bugs->zi

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Ryan Steinmetz freebsd_committer freebsd_triage 2013-10-14 01:15:13 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer 2013-10-14 01:15:19 UTC
Author: zi
Date: Mon Oct 14 00:15:06 2013
New Revision: 330270
URL: http://svnweb.freebsd.org/changeset/ports/330270

Log:
  - Update to 1.23.3
  - Add STAGE support
  
  PR:		ports/182617
  Submitted by:	ohauer@FreeBSD.org

Modified:
  head/net/hsflowd/Makefile
  head/net/hsflowd/distinfo
  head/net/hsflowd/pkg-plist

Modified: head/net/hsflowd/Makefile
==============================================================================
--- head/net/hsflowd/Makefile	Mon Oct 14 00:13:53 2013	(r330269)
+++ head/net/hsflowd/Makefile	Mon Oct 14 00:15:06 2013	(r330270)
@@ -2,21 +2,21 @@
 # $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@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}
+
+MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' \
 	    	-e '/scripts\/hsflowd /d' \
@@ -29,9 +29,4 @@ post-patch:
 	@${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>

Modified: head/net/hsflowd/distinfo
==============================================================================
--- head/net/hsflowd/distinfo	Mon Oct 14 00:13:53 2013	(r330269)
+++ head/net/hsflowd/distinfo	Mon Oct 14 00:15:06 2013	(r330270)
@@ -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

Modified: head/net/hsflowd/pkg-plist
==============================================================================
--- head/net/hsflowd/pkg-plist	Mon Oct 14 00:13:53 2013	(r330269)
+++ head/net/hsflowd/pkg-plist	Mon Oct 14 00:15:06 2013	(r330270)
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
-etc/hsflowd/hsflowd.conf.sample
+@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
+@exec if [ ! -f %D/%%ETCDIR%%/hsflowd.conf ]; then cp -p %D/%F %B/hsflowd.conf; fi
 sbin/hsflowd
-@dirrmtry etc/hsflowd
-@unexec if cmp -s %D/etc/hsflowd/hsflowd.conf %D/etc/hsflowd.conf.sample; then rm -f %D/etc/hsflowd.conf; fi
+@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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"