diff options
| author | pi <pi@FreeBSD.org> | 2014-08-02 04:57:30 +0000 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2014-08-02 04:57:30 +0000 |
| commit | 3774e61999391e6c3095599ed7d0b2894fa2b245 (patch) | |
| tree | 5f5a03b1fe56154d862612febe2543e86775cdb9 | |
| parent | c91d00c4c1b1cf34b3139f5778e5f74ad7a6066c (diff) | |
| download | FreeBSD-ports-3774e61999391e6c3095599ed7d0b2894fa2b245.zip FreeBSD-ports-3774e61999391e6c3095599ed7d0b2894fa2b245.tar.gz | |
net-mgmt/cricket: STAGEify, minor cleanups, add'l patch
PR: 192326
Submitted by: fullermd@over-yonder.net
| -rw-r--r-- | net-mgmt/cricket/Makefile | 32 | ||||
| -rw-r--r-- | net-mgmt/cricket/files/patch-grapher.cgi | 10 | ||||
| -rw-r--r-- | net-mgmt/cricket/pkg-plist | 4 |
3 files changed, 26 insertions, 20 deletions
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile index b894096..5348a13 100644 --- a/net-mgmt/cricket/Makefile +++ b/net-mgmt/cricket/Makefile @@ -3,7 +3,7 @@ PORTNAME= cricket PORTVERSION= 1.0.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -25,34 +25,28 @@ SUB_FILES= pkg-message USERS= cricket GROUPS= www -NO_STAGE= yes +CRICKETBASE= ${STAGEDIR}${PREFIX}/cricket + .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's,/home/cricket,${PREFIX},g' \ + ${REINPLACE_CMD} -e 's,/home/cricket,${PREFIX},g' \ ${WRKSRC}/cricket-conf.pl.sample - @${REINPLACE_CMD} -e 's,/usr/local/net/bin/ssh,/usr/bin/ssh,g' \ + ${REINPLACE_CMD} -e 's,/usr/local/net/bin/ssh,/usr/bin/ssh,g' \ ${WRKSRC}/sample-config/news-server/Defaults do-install: - @${MKDIR} -m 755 ${PREFIX}/cricket/cricket-${PORTVERSION} - @${CP} -R ${WRKSRC}/* ${PREFIX}/cricket/cricket-${PORTVERSION} - @${FIND} ${PREFIX}/cricket/cricket-${PORTVERSION} -name \*.orig -or \ + ${MKDIR} -m 755 ${CRICKETBASE}/cricket-${PORTVERSION} + ${CP} -R ${WRKSRC}/* ${CRICKETBASE}/cricket-${PORTVERSION} + ${FIND} ${CRICKETBASE}/cricket-${PORTVERSION} -name \*.orig -or \ -name \*.bak | ${XARGS} ${RM} -f - ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/cricket - @if [ -L ${PREFIX}/cricket/cricket ]; then \ - ${ECHO_MSG} "Updating ${PREFIX}/cricket/cricket symbolic link"; \ - ${RM} ${PREFIX}/cricket/cricket; \ - fi - ${LN} -s ${PREFIX}/cricket/cricket-${PORTVERSION} \ - ${PREFIX}/cricket/cricket - @if [ -f ${LOCALBASE}/cricket/compile ] ; then \ + ${LN} -s cricket-${PORTVERSION} \ + ${CRICKETBASE}/cricket + if [ -f ${LOCALBASE}/cricket/compile ] ; then \ ${ECHO_MSG} "You should migrate manually to use new cricket"; \ ${ECHO_MSG} "installation scheme."; \ fi - @${INSTALL_DATA} ${WRKSRC}/cricket-conf.pl.sample ${PREFIX}/etc/cricket-conf.pl.dist - -post-install: - @${CAT} ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/cricket-conf.pl.sample \ + ${STAGEDIR}${PREFIX}/etc/cricket-conf.pl.dist .include <bsd.port.post.mk> diff --git a/net-mgmt/cricket/files/patch-grapher.cgi b/net-mgmt/cricket/files/patch-grapher.cgi new file mode 100644 index 0000000..1bc5603 --- /dev/null +++ b/net-mgmt/cricket/files/patch-grapher.cgi @@ -0,0 +1,10 @@ +--- grapher.cgi.orig 2014-08-01 19:00:52.520583589 -0500 ++++ grapher.cgi 2014-08-01 19:01:57.223574944 -0500 +@@ -1490,6 +1490,7 @@ + # things we pick up form the target dict + my($rrd) = $targRef->{'rrd-datafile'}; + $lasttime = scalar(localtime(RRDs::last($rrd))); ++ $lasttime =~ s/:/\\:/g; + + # use the dslist to create a set of defs/cdefs + diff --git a/net-mgmt/cricket/pkg-plist b/net-mgmt/cricket/pkg-plist index 4db2b09..d588066 100644 --- a/net-mgmt/cricket/pkg-plist +++ b/net-mgmt/cricket/pkg-plist @@ -1,3 +1,5 @@ +@owner cricket +@group www cricket/cricket cricket/cricket-%%VERSION%%/CHANGES cricket/cricket-%%VERSION%%/COPYING @@ -164,4 +166,4 @@ etc/cricket-conf.pl.dist @dirrm cricket/cricket-%%VERSION%%/doc/neta-paper @dirrm cricket/cricket-%%VERSION%%/doc @dirrm cricket/cricket-%%VERSION%% -@dirrm cricket/ +@dirrmtry cricket/ |
