FreeBSD Bugzilla – Attachment 145236 Details for
Bug 192326
[stage][PATCH] net-mgmt/cricket: STAGEify, minor cleanups, add'l patch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
cricket.patch (text/plain), 3.34 KB, created by
fullermd
on 2014-08-02 01:54:02 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
fullermd
Created:
2014-08-02 01:54:02 UTC
Size:
3.34 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 363769) >+++ Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= cricket > PORTVERSION= 1.0.5 >-PORTREVISION= 9 >+PORTREVISION= 10 > CATEGORIES= net-mgmt > MASTER_SITES= SF > >@@ -25,34 +25,28 @@ > 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 >+ ${INSTALL_DATA} ${WRKSRC}/cricket-conf.pl.sample \ >+ ${STAGEDIR}${PREFIX}/etc/cricket-conf.pl.dist > >-post-install: >- @${CAT} ${PKGMESSAGE} >- > .include <bsd.port.post.mk> >Index: files/patch-grapher.cgi >=================================================================== >--- files/patch-grapher.cgi (revision 0) >+++ files/patch-grapher.cgi (working copy) >@@ -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 >+ > >Property changes on: files/patch-grapher.cgi >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 363769) >+++ pkg-plist (working copy) >@@ -1,3 +1,5 @@ >+@owner cricket >+@group www > cricket/cricket > cricket/cricket-%%VERSION%%/CHANGES > cricket/cricket-%%VERSION%%/COPYING >@@ -164,4 +166,4 @@ > @dirrm cricket/cricket-%%VERSION%%/doc/neta-paper > @dirrm cricket/cricket-%%VERSION%%/doc > @dirrm cricket/cricket-%%VERSION%% >-@dirrm cricket/ >+@dirrmtry cricket/
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 192326
: 145236