Date: Wed, 5 Jun 2002 23:22:21 +0100 (BST) From: Janos Mohacsi <janos.mohacsi@dante.org.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ports@FreeBSD.org, torstenb@FreeBSD.org Subject: ports/38932: Update to port: net/cricket (to version 1.0.4) Message-ID: <200206052222.g55MMLCW076720@budapest.dante.org.uk>
next in thread | raw e-mail | index | archive | help
>Number: 38932
>Category: ports
>Synopsis: Update to port: net/cricket (to version 1.0.4)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 05 15:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 4.6-RC i386
>Organization:
DANTE
>Environment:
System: FreeBSD budapest.dante.org.uk 4.6-RC FreeBSD 4.6-RC #2: Mon Jun 3 09:47:22 BST 2002 janos@budapest.dante.org.uk:/usr/src/sys/compile/BUDAPEST i386
>Description:
Her I send a diff for the port net/cricket to upgrade 1.0.4. I reorganised the
the setup a bit:
The cricket after this patch installed under:
$PREFIX/cricket/cricket-$VERSION
The port itself arranges the symbolic link according cricket installation
guide ( $PREFIX/cricket/cricket is pointing to the actual version of cricket). This setup is more accomodate for upgrade:
$PREFIX/cricket/cricket-config - the configuration files
$PREFIX/cricket/cricket-data - the monitored data
$PREFIX/cricket/cricket-logs - log files
They are not affected by upgrade, uninstall etc. It makes also easier to switch
back to the previous versions if something is not working with new version.
The port also cerates an user 'cricket' to be used to run the cricket
collectors. It is more secure, than the current setup.
The port version is currently 1.0.4 that is corresponds a beta version of
cricket. I tested this version and it seems to be working properly.
you might consider installing as port: net/cricket-devel.
Janos Mohacsi
>How-To-Repeat:
Apply this patch.
>Fix:
diff -rcN cricket.old/Makefile cricket/Makefile
*** cricket.old/Makefile Mon Sep 17 18:40:24 2001
--- cricket/Makefile Wed Jun 5 20:04:56 2002
***************
*** 2,15 ****
# Date created: 20 November 1999
# Whom: torstenb
#
! # $FreeBSD: ports/net/cricket/Makefile,v 1.8 2001/09/17 17:40:24 dwcjr Exp $
#
PORTNAME= cricket
! PORTVERSION= 1.0.2
CATEGORIES= net
! MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
! MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
--- 2,17 ----
# Date created: 20 November 1999
# Whom: torstenb
#
! # $FreeBSD$
#
PORTNAME= cricket
! PORTVERSION= 1.0.4
CATEGORIES= net
! #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
! #MASTER_SITE_SUBDIR= ${PORTNAME}
! MASTER_SITES= http://cricket.sourceforge.net/download/beta/
! DISTNAME= ${PORTNAME}-${PORTVERSION}-pre1
MAINTAINER= ports@FreeBSD.org
***************
*** 24,44 ****
SITE_PERL_ARCH= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
NO_PACKAGE= "needs customization"
USE_PERL5= yes
! SCRIPTS_ENV+= PERL5=${PERL5}
!
! do-build:
do-install:
! @${MKDIR} -m 755 ${PREFIX}/cricket
! @${CP} -R ${WRKSRC}/* ${PREFIX}/cricket
! @find ${PREFIX}/cricket -name \*.orig -or -name \*.bak | xargs ${RM} -f
post-install:
@${ECHO} ""
@${ECHO} "Cricket has been installed in ${PREFIX}/cricket. You'll find"
@${ECHO} "executables and configfiles there. Please take a look at"
@${ECHO} "http://cricket.sourceforge.net/. The documentation can"
! @${ECHO} "be found in ${PREFIX}/cricket/doc/ too."
.include <bsd.port.mk>
--- 26,61 ----
SITE_PERL_ARCH= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
NO_PACKAGE= "needs customization"
+ HAS_CONFIGURE= yes
USE_PERL5= yes
! NO_BUILD= yes
! CRICKET_USER= cricket
! CRICKET_GROUP= www
do-install:
! @${MKDIR} -m 755 ${PREFIX}/cricket/cricket-${PORTVERSION}
! @${CP} -R ${WRKSRC}/* ${PREFIX}/cricket/cricket-${PORTVERSION}
! @find ${PREFIX}/cricket/cricket-${PORTVERSION} -name \*.orig -or -name \*.bak | xargs ${RM} -f
! ${CHOWN} -R ${CRICKET_USER}:${CRICKET_GROUP} ${PREFIX}/cricket
! @if [ -L ${PREFIX}/cricket/cricket ]; then \
! ${ECHO} "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 \
! ${ECHO} "You should migrate manually to use new cricket" ; \
! ${ECHO} "installation scheme." ; \
! fi
post-install:
+ @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/cricket-conf.pl.sample >${PREFIX}/etc/cricket-conf.pl.dist
+ @${ECHO} ""
+ @${ECHO} "Sample config installed at \
+ ${PREFIX}/etc/cricket-conf.pl.dist"
@${ECHO} ""
@${ECHO} "Cricket has been installed in ${PREFIX}/cricket. You'll find"
@${ECHO} "executables and configfiles there. Please take a look at"
@${ECHO} "http://cricket.sourceforge.net/. The documentation can"
! @${ECHO} "be found in ${PREFIX}/cricket/cricket/doc/ too."
.include <bsd.port.mk>
diff -rcN cricket.old/distinfo cricket/distinfo
*** cricket.old/distinfo Fri Aug 18 21:47:18 2000
--- cricket/distinfo Wed Jun 5 16:16:44 2002
***************
*** 1 ****
! MD5 (cricket-1.0.2.tar.gz) = 7bba92c227358304a5da7757482c11a2
--- 1 ----
! MD5 (cricket-1.0.4-pre1.tar.gz) = 658c7fd004743ac9e55cb3ad9ed6624c
diff -rcN cricket.old/files/patch-aa cricket/files/patch-aa
*** cricket.old/files/patch-aa Sun Feb 13 21:00:09 2000
--- cricket/files/patch-aa Thu Jan 1 01:00:00 1970
***************
*** 1,19 ****
- *** sample-config/news-server/Defaults.orig Sat Jan 22 12:39:37 2000
- --- sample-config/news-server/Defaults Sat Jan 22 12:40:10 2000
- ***************
- *** 11,17 ****
- # you'll probably want to change this... unless you
- # have Cricket in ~/cricket and your config tree in ~/config
- util-dir = %auto-base%/../cricket/util
- ! remexec = "/usr/local/net/bin/ssh -l %user% %server%"
- user = news
- server = nntp-host
- target-type = news-server
- --- 11,17 ----
- # you'll probably want to change this... unless you
- # have Cricket in ~/cricket and your config tree in ~/config
- util-dir = %auto-base%/../cricket/util
- ! remexec = "%%PREFIX%%/bin/ssh -l %user% %server%"
- user = news
- server = nntp-host
- target-type = news-server
--- 0 ----
diff -rcN cricket.old/files/patch-ab cricket/files/patch-ab
*** cricket.old/files/patch-ab Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ab Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** util/dump-targets.orig Sun Jan 9 09:25:52 2000
- --- util/dump-targets Sun Feb 13 20:46:15 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 20,26 ****
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- }
-
- use lib "$Common::global::gInstallRoot/../lib";
- --- 20,27 ----
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! # $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- ! $Common::global::gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- use lib "$Common::global::gInstallRoot/../lib";
--- 0 ----
diff -rcN cricket.old/files/patch-ac cricket/files/patch-ac
*** cricket.old/files/patch-ac Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ac Thu Jan 1 01:00:00 1970
***************
*** 1,40 ****
- *** util/generate-statics.orig Sun Jan 9 09:29:20 2000
- --- util/generate-statics Sun Feb 13 20:47:27 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 20,30 ****
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
-
- # You need to update this to point to the URL
- # you use to access Cricket.
- ! $gBaseURL = "http://localhost/~cricket/grapher.cgi";
- }
-
- use lib "$gInstallRoot/../lib";
- --- 20,32 ----
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! # $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- ! $gInstallRoot = '%%PREFIX%%/cricket';
-
- # You need to update this to point to the URL
- # you use to access Cricket.
- ! # $gBaseURL = "http://localhost/~cricket/grapher.cgi";
- ! $gBaseURL = "http://localhost/cgi-bin/grapher.cgi";
- }
-
- use lib "$gInstallRoot/../lib";
--- 0 ----
diff -rcN cricket.old/files/patch-ad cricket/files/patch-ad
*** cricket.old/files/patch-ad Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ad Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** util/listInterfaces.orig Mon Jul 19 19:55:45 1999
- --- util/listInterfaces Sun Feb 13 20:48:15 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 20,26 ****
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
- }
-
- use lib "$gInstallRoot/lib";
- --- 20,27 ----
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! # $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
- ! $gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- use lib "$gInstallRoot/lib";
--- 0 ----
diff -rcN cricket.old/files/patch-ae cricket/files/patch-ae
*** cricket.old/files/patch-ae Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ae Thu Jan 1 01:00:00 1970
***************
*** 1,13 ****
- *** util/newsstats.orig Sat Jan 22 12:41:06 2000
- --- util/newsstats Sat Jan 22 12:41:12 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl
-
- ##
- # Get simple stats from INND with cleanfeed
- --- 1,4 ----
- ! #!%%PATHPERLBIN%%
-
- ##
- # Get simple stats from INND with cleanfeed
--- 0 ----
diff -rcN cricket.old/files/patch-af cricket/files/patch-af
*** cricket.old/files/patch-af Sun Feb 13 21:00:08 2000
--- cricket/files/patch-af Thu Jan 1 01:00:00 1970
***************
*** 1,13 ****
- *** util/pmlines.pl.orig Sat Jan 22 12:41:27 2000
- --- util/pmlines.pl Sat Jan 22 12:41:35 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl
-
- # pmlines.pl
- #
- --- 1,4 ----
- ! #!%%PATHPERLBIN%%
-
- # pmlines.pl
- #
--- 0 ----
diff -rcN cricket.old/files/patch-ag cricket/files/patch-ag
*** cricket.old/files/patch-ag Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ag Thu Jan 1 01:00:00 1970
***************
*** 1,28 ****
- *** util/rrd-dump.orig Wed Jun 16 04:28:02 1999
- --- util/rrd-dump Sun Feb 13 20:49:13 2000
- ***************
- *** 1,11 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # this is a little script to exercise RRD::File -- useful
- # when I was developing it, and possibly useful now too
-
- BEGIN {
- ! $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
- }
-
- use lib "$gInstallRoot/lib";
- --- 1,12 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # this is a little script to exercise RRD::File -- useful
- # when I was developing it, and possibly useful now too
-
- BEGIN {
- ! # $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
- ! $gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- use lib "$gInstallRoot/lib";
--- 0 ----
diff -rcN cricket.old/files/patch-ah cricket/files/patch-ah
*** cricket.old/files/patch-ah Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ah Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** util/rrd-tune.orig Mon Jan 10 06:38:41 2000
- --- util/rrd-tune Sun Feb 13 20:49:47 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 20,26 ****
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- }
-
- use lib "$gInstallRoot/../lib";
- --- 20,27 ----
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! # $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- ! $gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- use lib "$gInstallRoot/../lib";
--- 0 ----
diff -rcN cricket.old/files/patch-ai cricket/files/patch-ai
*** cricket.old/files/patch-ai Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ai Thu Jan 1 01:00:00 1970
***************
*** 1,13 ****
- *** util/test-url.orig Sat Jan 22 12:43:07 2000
- --- util/test-url Sat Jan 22 12:43:15 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # test-url: a simple script to see how fast a webserver is
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # test-url: a simple script to see how fast a webserver is
--- 0 ----
diff -rcN cricket.old/files/patch-aj cricket/files/patch-aj
*** cricket.old/files/patch-aj Sun Feb 13 21:00:08 2000
--- cricket/files/patch-aj Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** util/usrModemUsage.orig Tue Jul 20 03:02:29 1999
- --- util/usrModemUsage Sun Feb 13 20:50:34 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # usrModemUsage
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # usrModemUsage
- ***************
- *** 23,29 ****
- # modem chassis.
-
- BEGIN {
- ! $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
- }
-
- #
- --- 23,30 ----
- # modem chassis.
-
- BEGIN {
- ! # $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . "..";
- ! $gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- #
--- 0 ----
diff -rcN cricket.old/files/patch-ak cricket/files/patch-ak
*** cricket.old/files/patch-ak Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ak Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** collect-subtrees.orig Mon Jan 24 03:24:13 2000
- --- collect-subtrees Sun Feb 13 20:42:15 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 30,36 ****
- # to tell collect-subtrees where to find it.
-
- BEGIN {
- ! $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- }
-
- use Getopt::Long;
- --- 30,37 ----
- # to tell collect-subtrees where to find it.
-
- BEGIN {
- ! # $gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- ! $gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- use Getopt::Long;
--- 0 ----
diff -rcN cricket.old/files/patch-al cricket/files/patch-al
*** cricket.old/files/patch-al Sun Feb 13 21:00:08 2000
--- cricket/files/patch-al Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** collector.orig Mon Jan 10 06:37:37 2000
- --- collector Sun Feb 13 20:42:06 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 20,26 ****
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- }
-
- use lib "$Common::global::gInstallRoot/lib";
- --- 20,27 ----
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! # $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- ! $Common::global::gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- use lib "$Common::global::gInstallRoot/lib";
--- 0 ----
diff -rcN cricket.old/files/patch-am cricket/files/patch-am
*** cricket.old/files/patch-am Sun Feb 13 21:00:08 2000
--- cricket/files/patch-am Thu Jan 1 01:00:00 1970
***************
*** 1,44 ****
- *** grapher.cgi.orig Mon Jan 24 08:47:49 2000
- --- grapher.cgi Sun Feb 13 20:44:03 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 27,39 ****
- # be prepended. Special care is taken to set $HOME right,
- # even when running as user nobody (see fixHome for info).
-
- ! $Common::global::gConfigRoot = 'cricket-config'; # i.e. $HOME/config
-
- # This magic attempts to guess the install directory based
- # on how the script was called. If it fails for you, just
- # hardcode it.
-
- ! $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
-
- # cached images are stored here... there will be no more than
- # 5 minutes worth of images, so it won't take too much space.
- --- 27,41 ----
- # be prepended. Special care is taken to set $HOME right,
- # even when running as user nobody (see fixHome for info).
-
- ! # $Common::global::gConfigRoot = 'cricket-config'; # i.e. $HOME/config
- ! $Common::global::gConfigRoot = '%%PREFIX%%/cricket/cricket-config';
-
- # This magic attempts to guess the install directory based
- # on how the script was called. If it fails for you, just
- # hardcode it.
-
- ! # $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
- ! $Common::global::gInstallRoot = '%%PREFIX%%/cricket';
-
- # cached images are stored here... there will be no more than
- # 5 minutes worth of images, so it won't take too much space.
--- 0 ----
diff -rcN cricket.old/files/patch-an cricket/files/patch-an
*** cricket.old/files/patch-an Sun Feb 13 21:00:09 2000
--- cricket/files/patch-an Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** mini-graph.cgi.orig Sat Jul 10 05:17:41 1999
- --- mini-graph.cgi Sun Feb 13 20:44:34 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 24,30 ****
- # on how the script was called. If it fails for you, just
- # hardcode it.
-
- ! $gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
-
- # cached images are stored here... there will be no more than
- # 5 minutes worth of images, so it won't take too much space.
- --- 24,31 ----
- # on how the script was called. If it fails for you, just
- # hardcode it.
-
- ! # $gInstallRoot = (($0 =~ m:^(.*/):)[0] || './') . '.';
- ! $gInstallRoot = '%%PREFIX%%/cricket';
-
- # cached images are stored here... there will be no more than
- # 5 minutes worth of images, so it won't take too much space.
--- 0 ----
diff -rcN cricket.old/files/patch-ao cricket/files/patch-ao
*** cricket.old/files/patch-ao Sun Feb 13 21:00:08 2000
--- cricket/files/patch-ao Thu Jan 1 01:00:00 1970
***************
*** 1,31 ****
- *** compile.orig Fri Jul 16 08:07:25 1999
- --- compile Sun Feb 13 20:42:54 2000
- ***************
- *** 1,4 ****
- ! #!/usr/local/bin/perl -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- --- 1,4 ----
- ! #!%%PATHPERLBIN%% -w
- # -*- perl -*-
-
- # Cricket: a configuration, polling and data display wrapper for RRD files
- ***************
- *** 20,26 ****
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- }
-
- use lib "$Common::global::gInstallRoot/lib";
- --- 20,27 ----
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- BEGIN {
- ! # $Common::global::gInstallRoot = (($0 =~ m:^(.*/):)[0] || "./") . ".";
- ! $Common::global::gInstallRoot = '%%PREFIX%%/cricket';
- }
-
- use lib "$Common::global::gInstallRoot/lib";
--- 0 ----
diff -rcN cricket.old/files/patch-cricket-conf.pl.sample cricket/files/patch-cricket-conf.pl.sample
*** cricket.old/files/patch-cricket-conf.pl.sample Thu Jan 1 01:00:00 1970
--- cricket/files/patch-cricket-conf.pl.sample Wed Jun 5 19:30:43 2002
***************
*** 0 ****
--- 1,19 ----
+ *** cricket-conf.pl.sample.orig Wed Apr 10 00:28:27 2002
+ --- cricket-conf.pl.sample Wed Jun 5 19:29:38 2002
+ ***************
+ *** 13,19 ****
+ # $Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
+ package Common::global;
+
+ ! $gCricketHome = "/home/cricket";
+ $gInstallRoot = "$gCricketHome/cricket";
+ #$gConfigRoot = "$gCricketHome/cricket-config";
+
+ --- 13,19 ----
+ # $Id: cricket-conf.pl.sample,v 1.5 2002/04/09 23:28:27 driehuis Exp $
+ package Common::global;
+
+ ! $gCricketHome = "%%PREFIX%%/cricket";
+ $gInstallRoot = "$gCricketHome/cricket";
+ #$gConfigRoot = "$gCricketHome/cricket-config";
+
diff -rcN cricket.old/files/patch-sample-config::news-server::Defaults cricket/files/patch-sample-config::news-server::Defaults
*** cricket.old/files/patch-sample-config::news-server::Defaults Thu Jan 1 01:00:00 1970
--- cricket/files/patch-sample-config::news-server::Defaults Wed Jun 5 16:56:15 2002
***************
*** 0 ****
--- 1,19 ----
+ *** sample-config/news-server/Defaults.orig Thu Oct 25 00:27:29 2001
+ --- sample-config/news-server/Defaults Wed Jun 5 16:55:45 2002
+ ***************
+ *** 11,17 ****
+ # you'll probably want to change this... unless you
+ # have Cricket in ~/cricket and your config tree in ~/config
+ util-dir = %auto-base%/../cricket/util
+ ! remexec = "/usr/local/net/bin/ssh -l %user% %server%"
+ user = news
+ server = nntp-host
+ target-type = news-server
+ --- 11,17 ----
+ # you'll probably want to change this... unless you
+ # have Cricket in ~/cricket and your config tree in ~/config
+ util-dir = %auto-base%/../cricket/util
+ ! remexec = "/usr/bin/ssh -l %user% %server%"
+ user = news
+ server = nntp-host
+ target-type = news-server
diff -rcN cricket.old/pkg-plist cricket/pkg-plist
*** cricket.old/pkg-plist Fri Aug 18 21:47:18 2000
--- cricket/pkg-plist Wed Jun 5 19:24:31 2002
***************
*** 1,115 ****
! cricket/CHANGES
! cricket/COPYING
! cricket/README
! cricket/THANKS
! cricket/TODO
! cricket/VERSION
! cricket/collect-subtrees
! cricket/collector
! cricket/compile
! cricket/configure
! cricket/doc/beginner.html
! cricket/doc/gpl.html
! cricket/doc/history.html
! cricket/doc/index.html
! cricket/doc/inst-mapping.html
! cricket/doc/intro.html
! cricket/doc/modperl.html
! cricket/doc/neta-paper/fig1.gif
! cricket/doc/neta-paper/fig2.gif
! cricket/doc/neta-paper/paper.html
! cricket/doc/neta-paper/paper.ps.gz
! cricket/doc/neta-paper/peer1.gif
! cricket/doc/neta-paper/peer2.gif
! cricket/doc/neta-paper/ss.gif
! cricket/doc/new-devices.html
! cricket/doc/reference.html
! cricket/doc/tools.html
! cricket/grapher.cgi
! cricket/images/cricket-sm.gif
! cricket/images/failed.gif
! cricket/images/rrdtool.gif
! cricket/lib/Bundle/CricketPrereq.pm
! cricket/lib/Common/HandleTarget.pm
! cricket/lib/Common/Log.pm
! cricket/lib/Common/Map.pm
! cricket/lib/Common/Options.pm
! cricket/lib/Common/Util.pm
! cricket/lib/Common/Version.pm
! cricket/lib/ConfigTree/Cache.pm
! cricket/lib/ConfigTree/Node.pm
! cricket/lib/Monitor.pm
! cricket/lib/RPN.pm
! cricket/lib/RRD/File.pm
! cricket/lib/RRD/Format.pm
! cricket/lib/exec.pm
! cricket/lib/file.pm
! cricket/lib/func.pm
! cricket/lib/snmp.pm
! cricket/lib/snmpUtils.pm
! cricket/mini-graph.cgi
! cricket/sample-config/Defaults
! cricket/sample-config/atm-interfaces/Defaults
! cricket/sample-config/atm-interfaces/atm-intb-pvc/Defaults
! cricket/sample-config/atm-interfaces/atm-intb-pvc/interfaces
! cricket/sample-config/atm-interfaces/atm-rtr-uni/Defaults
! cricket/sample-config/atm-interfaces/atm-rtr-uni/interfaces
! cricket/sample-config/atm-interfaces/atm-trunks/Defaults
! cricket/sample-config/atm-interfaces/atm-trunks/interfaces
! cricket/sample-config/http-performance/Defaults
! cricket/sample-config/http-performance/urls
! cricket/sample-config/news-server/Defaults
! cricket/sample-config/news-server/targets
! cricket/sample-config/portmasters/Defaults
! cricket/sample-config/portmasters/portmasters
! cricket/sample-config/router-interfaces/Defaults
! cricket/sample-config/router-interfaces/interfaces
! cricket/sample-config/routers/Defaults
! cricket/sample-config/routers/Targets
! cricket/sample-config/routing/Defaults
! cricket/sample-config/routing/Targets
! cricket/sample-config/squid-proxy/Defaults
! cricket/sample-config/switch-ports/Defaults
! cricket/sample-config/switch-ports/switches
! cricket/sample-config/switches/Defaults
! cricket/sample-config/switches/switches
! cricket/sample-config/usr/Defaults
! cricket/sample-config/usr/targets
! cricket/subtree-sets
! cricket/util/README
! cricket/util/dump-targets
! cricket/util/generate-statics
! cricket/util/getFormat.c
! cricket/util/listInterfaces
! cricket/util/newsstats
! cricket/util/pmlines.pl
! cricket/util/relocate-perl
! cricket/util/rrd-dump
! cricket/util/rrd-tune
! cricket/util/test-url
! cricket/util/usrModemUsage
! @dirrm cricket/util
! @dirrm cricket/sample-config/usr
! @dirrm cricket/sample-config/switches
! @dirrm cricket/sample-config/switch-ports
! @dirrm cricket/sample-config/squid-proxy
! @dirrm cricket/sample-config/routing
! @dirrm cricket/sample-config/routers
! @dirrm cricket/sample-config/router-interfaces
! @dirrm cricket/sample-config/portmasters
! @dirrm cricket/sample-config/news-server
! @dirrm cricket/sample-config/http-performance
! @dirrm cricket/sample-config/atm-interfaces/atm-trunks
! @dirrm cricket/sample-config/atm-interfaces/atm-rtr-uni
! @dirrm cricket/sample-config/atm-interfaces/atm-intb-pvc
! @dirrm cricket/sample-config/atm-interfaces
! @dirrm cricket/sample-config
! @dirrm cricket/lib/RRD
! @dirrm cricket/lib/ConfigTree
! @dirrm cricket/lib/Common
! @dirrm cricket/lib/Bundle
! @dirrm cricket/lib
! @dirrm cricket/images
! @dirrm cricket/doc/neta-paper
! @dirrm cricket/doc
@dirrm cricket
--- 1,159 ----
! cricket/cricket-1.0.4/lib/Common/Options.pm
! cricket/cricket-1.0.4/lib/Common/Log.pm
! cricket/cricket-1.0.4/lib/Common/Map.pm
! cricket/cricket-1.0.4/lib/Common/HandleTarget.pm
! cricket/cricket-1.0.4/lib/Common/Util.pm
! cricket/cricket-1.0.4/lib/Common/Version.pm
! cricket/cricket-1.0.4/lib/Common/global.pm
! cricket/cricket-1.0.4/lib/Bundle/CricketPrereq.pm
! cricket/cricket-1.0.4/lib/RRD/File.pm
! cricket/cricket-1.0.4/lib/RRD/Format.pm
! cricket/cricket-1.0.4/lib/ConfigTree/Cache.pm
! cricket/cricket-1.0.4/lib/ConfigTree/Node.pm
! cricket/cricket-1.0.4/lib/alternate/net-snmp/snmpUtils.pm
! cricket/cricket-1.0.4/lib/Monitor.pm
! cricket/cricket-1.0.4/lib/func.pm
! cricket/cricket-1.0.4/lib/perfmon.pm
! cricket/cricket-1.0.4/lib/snmp.pm
! cricket/cricket-1.0.4/lib/snmpUtils.pm
! cricket/cricket-1.0.4/lib/sql.pm
! cricket/cricket-1.0.4/lib/sqlUtils.pm
! cricket/cricket-1.0.4/lib/wbem.pm
! cricket/cricket-1.0.4/lib/field.pm
! cricket/cricket-1.0.4/lib/exec.pm
! cricket/cricket-1.0.4/lib/RPN.pm
! cricket/cricket-1.0.4/lib/file.pm
! cricket/cricket-1.0.4/images/cricket-sm.gif
! cricket/cricket-1.0.4/images/failed.gif
! cricket/cricket-1.0.4/images/rrdtool.gif
! cricket/cricket-1.0.4/sample-config/routers/Defaults
! cricket/cricket-1.0.4/sample-config/routers/Targets
! cricket/cricket-1.0.4/sample-config/wbem/Defaults
! cricket/cricket-1.0.4/sample-config/wbem/targets
! cricket/cricket-1.0.4/sample-config/http-performance/Defaults
! cricket/cricket-1.0.4/sample-config/http-performance/urls
! cricket/cricket-1.0.4/sample-config/news-server/Defaults
! cricket/cricket-1.0.4/sample-config/news-server/targets
! cricket/cricket-1.0.4/sample-config/perfmon/Defaults
! cricket/cricket-1.0.4/sample-config/perfmon/targets
! cricket/cricket-1.0.4/sample-config/portmasters/Defaults
! cricket/cricket-1.0.4/sample-config/portmasters/portmasters
! cricket/cricket-1.0.4/sample-config/router-interfaces/Defaults
! cricket/cricket-1.0.4/sample-config/router-interfaces/interfaces
! cricket/cricket-1.0.4/sample-config/usr/Defaults
! cricket/cricket-1.0.4/sample-config/usr/targets
! cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-intb-pvc/Defaults
! cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-intb-pvc/interfaces
! cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-rtr-uni/Defaults
! cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-rtr-uni/interfaces
! cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-trunks/Defaults
! cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-trunks/interfaces
! cricket/cricket-1.0.4/sample-config/atm-interfaces/Defaults
! cricket/cricket-1.0.4/sample-config/squid-proxy/Defaults
! cricket/cricket-1.0.4/sample-config/subtree-times/Defaults
! cricket/cricket-1.0.4/sample-config/subtree-times/targets
! cricket/cricket-1.0.4/sample-config/switch-ports/Defaults
! cricket/cricket-1.0.4/sample-config/switch-ports/switches
! cricket/cricket-1.0.4/sample-config/switches/Defaults
! cricket/cricket-1.0.4/sample-config/switches/switches
! cricket/cricket-1.0.4/sample-config/systemperf/Defaults
! cricket/cricket-1.0.4/sample-config/routing/Defaults
! cricket/cricket-1.0.4/sample-config/routing/Targets
! cricket/cricket-1.0.4/sample-config/Defaults
! cricket/cricket-1.0.4/doc/neta-paper/paper.ps.gz
! cricket/cricket-1.0.4/doc/neta-paper/fig2.gif
! cricket/cricket-1.0.4/doc/neta-paper/paper.html
! cricket/cricket-1.0.4/doc/neta-paper/fig1.gif
! cricket/cricket-1.0.4/doc/neta-paper/peer1.gif
! cricket/cricket-1.0.4/doc/neta-paper/peer2.gif
! cricket/cricket-1.0.4/doc/neta-paper/ss.gif
! cricket/cricket-1.0.4/doc/beginner.html
! cricket/cricket-1.0.4/doc/copytosql.html
! cricket/cricket-1.0.4/doc/cricket.sql
! cricket/cricket-1.0.4/doc/gpl.html
! cricket/cricket-1.0.4/doc/history.html
! cricket/cricket-1.0.4/doc/index.html
! cricket/cricket-1.0.4/doc/inst-mapping.html
! cricket/cricket-1.0.4/doc/intro.html
! cricket/cricket-1.0.4/doc/modperl.html
! cricket/cricket-1.0.4/doc/monitor-thresholds.html
! cricket/cricket-1.0.4/doc/new-devices.html
! cricket/cricket-1.0.4/doc/perfmon.html
! cricket/cricket-1.0.4/doc/reference.html
! cricket/cricket-1.0.4/doc/tools.html
! cricket/cricket-1.0.4/doc/win2kw1.gif
! cricket/cricket-1.0.4/doc/win2kwmi.html
! cricket/cricket-1.0.4/util/LeanODBC/LeanODBC.pm
! cricket/cricket-1.0.4/util/LeanODBC/LeanODBC.xs
! cricket/cricket-1.0.4/util/LeanODBC/Makefile.PL
! cricket/cricket-1.0.4/util/LeanODBC/README
! cricket/cricket-1.0.4/util/LeanODBC/stripsql.h
! cricket/cricket-1.0.4/util/LeanODBC/test.pl
! cricket/cricket-1.0.4/util/README
! cricket/cricket-1.0.4/util/README.listInterfaces
! cricket/cricket-1.0.4/util/dump-targets
! cricket/cricket-1.0.4/util/generate-statics
! cricket/cricket-1.0.4/util/get-collector-stats
! cricket/cricket-1.0.4/util/listInterfaces
! cricket/cricket-1.0.4/util/newsstats
! cricket/cricket-1.0.4/util/perfInfo.pl
! cricket/cricket-1.0.4/util/pmlines.pl
! cricket/cricket-1.0.4/util/relocate-perl
! cricket/cricket-1.0.4/util/rrd-dump
! cricket/cricket-1.0.4/util/rrd-tune
! cricket/cricket-1.0.4/util/run-subtree
! cricket/cricket-1.0.4/util/systemPerfConf.pl
! cricket/cricket-1.0.4/util/test-url
! cricket/cricket-1.0.4/util/testwbem.pl
! cricket/cricket-1.0.4/util/getFormat.c
! cricket/cricket-1.0.4/util/usrModemUsage
! cricket/cricket-1.0.4/cricket-conf.pl.sample
! cricket/cricket-1.0.4/configure
! cricket/cricket-1.0.4/compile
! cricket/cricket-1.0.4/collector
! cricket/cricket-1.0.4/collect-subtrees
! cricket/cricket-1.0.4/VERSION
! cricket/cricket-1.0.4/TODO
! cricket/cricket-1.0.4/THANKS
! cricket/cricket-1.0.4/README
! cricket/cricket-1.0.4/DEV-INFO
! cricket/cricket-1.0.4/COPYING
! cricket/cricket-1.0.4/CHANGES
! cricket/cricket-1.0.4/subtree-sets
! cricket/cricket-1.0.4/mini-graph.cgi
! cricket/cricket-1.0.4/grapher.cgi
! cricket/cricket
! etc/cricket-conf.pl.dist
! @dirrm cricket/cricket-1.0.4/lib/Common
! @dirrm cricket/cricket-1.0.4/lib/Bundle
! @dirrm cricket/cricket-1.0.4/lib/RRD
! @dirrm cricket/cricket-1.0.4/lib/ConfigTree
! @dirrm cricket/cricket-1.0.4/lib/alternate/net-snmp
! @dirrm cricket/cricket-1.0.4/lib/alternate
! @dirrm cricket/cricket-1.0.4/lib
! @dirrm cricket/cricket-1.0.4/images
! @dirrm cricket/cricket-1.0.4/sample-config/routers
! @dirrm cricket/cricket-1.0.4/sample-config/wbem
! @dirrm cricket/cricket-1.0.4/sample-config/http-performance
! @dirrm cricket/cricket-1.0.4/sample-config/news-server
! @dirrm cricket/cricket-1.0.4/sample-config/perfmon
! @dirrm cricket/cricket-1.0.4/sample-config/portmasters
! @dirrm cricket/cricket-1.0.4/sample-config/router-interfaces
! @dirrm cricket/cricket-1.0.4/sample-config/usr
! @dirrm cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-intb-pvc
! @dirrm cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-rtr-uni
! @dirrm cricket/cricket-1.0.4/sample-config/atm-interfaces/atm-trunks
! @dirrm cricket/cricket-1.0.4/sample-config/atm-interfaces
! @dirrm cricket/cricket-1.0.4/sample-config/squid-proxy
! @dirrm cricket/cricket-1.0.4/sample-config/subtree-times
! @dirrm cricket/cricket-1.0.4/sample-config/switch-ports
! @dirrm cricket/cricket-1.0.4/sample-config/switches
! @dirrm cricket/cricket-1.0.4/sample-config/systemperf
! @dirrm cricket/cricket-1.0.4/sample-config/routing
! @dirrm cricket/cricket-1.0.4/sample-config
! @dirrm cricket/cricket-1.0.4/doc/neta-paper
! @dirrm cricket/cricket-1.0.4/doc
! @dirrm cricket/cricket-1.0.4/util/LeanODBC
! @dirrm cricket/cricket-1.0.4/util
! @dirrm cricket/cricket-1.0.4
@dirrm cricket
diff -rcN cricket.old/scripts/configure cricket/scripts/configure
*** cricket.old/scripts/configure Sun Feb 13 21:00:08 2000
--- cricket/scripts/configure Thu Jan 1 01:00:00 1970
***************
*** 1,23 ****
- #!/bin/sh
- #
- # $FreeBSD: ports/net/cricket/scripts/configure,v 1.1.1.1 2000/02/13 21:00:08 torstenb Exp $
- echo var set to ${PERL5} >/tmp/debug1
-
- FILES_PERLPATH="util/dump-targets util/generate-statics util/listInterfaces \
- compile util/newsstats util/pmlines.pl util/rrd-dump util/rrd-tune \
- util/test-url util/usrModemUsage collect-subtrees collector \
- grapher.cgi mini-graph.cgi"
- FILES_PREFIX="sample-config/news-server/Defaults collect-subtrees collector \
- compile grapher.cgi mini-graph.cgi util/dump-targets \
- util/generate-statics util/listInterfaces util/rrd-dump \
- util/rrd-tune util/usrModemUsage"
-
- for f in $FILES_PERLPATH ; do
- mv ${WRKSRC}/${f} ${WRKSRC}/$f.bak && sed <${WRKSRC}/${f}.bak \
- s+%%PATHPERLBIN%%+${PERL5}+g >${WRKSRC}/${f}
- done
-
- for f in $FILES_PREFIX ; do
- mv ${WRKSRC}/${f} ${WRKSRC}/$f.bak && sed <${WRKSRC}/${f}.bak \
- s+%%PREFIX%%+${PREFIX}+g >${WRKSRC}/${f}
- done
--- 0 ----
diff -rcN cricket.old/scripts/pre-install cricket/scripts/pre-install
*** cricket.old/scripts/pre-install Thu Jan 1 01:00:00 1970
--- cricket/scripts/pre-install Wed Jun 5 18:04:37 2002
***************
*** 0 ****
--- 1,20 ----
+ #!/bin/sh
+ # $FreeBSD$
+ #
+
+ USER=cricket
+ #group selected to be www since the webserver has to be able to serve it
+ GROUP=www
+
+ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+ if pw useradd ${USER} -g ${GROUP} -h - \
+ -s "/sbin/nologin" -d "${PREFIX}/cricket" \
+ -c "Cricket Monitoring Owner"; \
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+ fi
+ exit 0
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206052222.g55MMLCW076720>