Index: ossp-pkg/flow2rrd/.cvsignore RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/.cvsignore,v rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/.cvsignore,v' 2>/dev/null --- .cvsignore 2004/12/26 13:12:42 1.2 +++ .cvsignore 2004/12/26 15:20:00 1.3 @@ -1,4 +1,5 @@ Makefile +configure flow2rrd flow2rrd.1 shtool Index: ossp-pkg/flow2rrd/AUTHORS RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/AUTHORS,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/AUTHORS,v' 2>/dev/null --- AUTHORS 2004/12/26 13:10:39 1.1 +++ AUTHORS 2004/12/26 15:20:00 1.2 @@ -4,7 +4,7 @@ |_||_|_| | |_| |___) |__) | __/ | _| | (_) \ V V / / __/| | | | | (_| | |_|_|_| \___/|____/____/|_| |_| |_|\___/ \_/\_/ |_____|_| |_| \__,_| - OSSP flow2rrd - NetFlow to Round-Robin Database (RRD) + OSSP flow2rrd - NetFlow to Round-Robin Database This is a list of authors who have written or edited parts of the OSSP flow2rrd sources. Index: ossp-pkg/flow2rrd/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/ChangeLog,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/ChangeLog,v' 2>/dev/null --- ChangeLog 2004/12/26 13:10:39 1.1 +++ ChangeLog 2004/12/26 15:20:00 1.2 @@ -4,7 +4,7 @@ |_||_|_| | |_| |___) |__) | __/ | _| | (_) \ V V / / __/| | | | | (_| | |_|_|_| \___/|____/____/|_| |_| |_|\___/ \_/\_/ |_____|_| |_| \__,_| - OSSP flow2rrd - NetFlow to Round-Robin Database (RRD) + OSSP flow2rrd - NetFlow to Round-Robin Database ChangeLog Index: ossp-pkg/flow2rrd/INSTALL RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/INSTALL,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/INSTALL,v' 2>/dev/null --- INSTALL 2004/12/26 13:10:39 1.1 +++ INSTALL 2004/12/26 15:20:00 1.2 @@ -4,12 +4,12 @@ |_||_|_| | |_| |___) |__) | __/ | _| | (_) \ V V / / __/| | | | | (_| | |_|_|_| \___/|____/____/|_| |_| |_|\___/ \_/\_/ |_____|_| |_| \__,_| - OSSP flow2rrd - NetFlow to Round-Robin Database (RRD) + OSSP flow2rrd - NetFlow to Round-Robin Database INSTALL The Convenient Way (with OpenPKG) - ================================= + --------------------------------- Just install the OpenPKG "flow2rrd" packages and its dependencies and you are done. @@ -24,7 +24,7 @@ $ /etc/rc flowtools start The Cruel Way (Manually) - ======================== + ------------------------ ...FIXME... Index: ossp-pkg/flow2rrd/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/Makefile.in,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/Makefile.in,v' 2>/dev/null --- Makefile.in 2004/12/26 13:10:39 1.1 +++ Makefile.in 2004/12/26 15:20:00 1.2 @@ -1,5 +1,5 @@ ## -## OSSP flow2rrd -- NetFlow to Round-Robin Database (RRD) +## OSSP flow2rrd -- NetFlow to Round-Robin Database ## Copyright (c) 2004 Ralf S. Engelschall ## Copyright (c) 2004 The OSSP Project ## @@ -31,6 +31,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ +sysconfdir = @sysconfdir@ libdir = @libdir@ includedir = @includedir@ mandir = @mandir@ @@ -43,10 +44,21 @@ PERL = @PERL@ POD2MAN = @POD2MAN@ -# default target +# default targets all: flow2rrd flow2rrd.1 +# generate program +flow2rrd: flow2rrd.pl + @echo "generating: flow2rrd <-- flow2rrd.pl"; \ + V=`$(SHTOOL) version -l txt -d long VERSION`; \ + sed -e "s;@PERL\@;$(PERL);g" \ + -e "s;@POD2MAN\@;$(POD2MAN);g" \ + -e "s;@VERSION\@;$$V;g" \ + flow2rrd && chmod a+x flow2rrd + +# generate manual page flow2rrd.1: flow2rrd.pod + @echo "generating: flow2rrd.1 <-- flow2rrd.pod"; \ V1=`$(SHTOOL) version -l txt -d short VERSION`; \ V2=`$(SHTOOL) version -l txt -d long VERSION`; \ D=`$(SHTOOL) version -l txt -d long VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \ @@ -55,25 +67,25 @@ --release="$$D" --date="OSSP flow2rrd $$V1" flow2rrd.pod | \ sed -e "s;FLOW2RRD_VERSION_STR;$$V2;" >flow2rrd.1 -flow2rrd: flow2rrd.pl - sed -e 's;@PERL@;$(PERL);g' \ - -e 's;@POD2MAN@;$(POD2MAN);g' \ - flow2rrd - # perform installation procedure install: $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 - $(SHTOOL) install -c -m 755 flow2rrd $(DESTDIR)$(bindir)/flow2rrd - $(SHTOOL) install -c -m 644 flow2rrd.1 $(DESTDIR)$(mandir)/man1/flow2rrd.1 + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(sysconfdir) + $(SHTOOL) install -c -m 755 flow2rrd $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 flow2rrd.1 $(DESTDIR)$(mandir)/man1/ + $(SHTOOL) install -c -m 644 flow2rrd.cfg $(DESTDIR)$(sysconfdir)/ # perform uninstallation procedure uninstall: - -$(RM) $(DESTDIR)$(mandir)/bin/flow2rrd + -$(RM) $(DESTDIR)$(bindir)/flow2rrd -$(RM) $(DESTDIR)$(mandir)/man1/flow2rrd.1 - -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) + -$(RM) $(DESTDIR)$(sysconfdir)/flow2rrd.cfg -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE) + -$(RMDIR) $(DESTDIR)$(sysconfdir) >/dev/null 2>&1 || $(TRUE) -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE) # perform build clean up procedure Index: ossp-pkg/flow2rrd/README RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/README,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/README,v' 2>/dev/null --- README 2004/12/26 13:10:39 1.1 +++ README 2004/12/26 15:20:00 1.2 @@ -4,7 +4,7 @@ |_||_|_| | |_| |___) |__) | __/ | _| | (_) \ V V / / __/| | | | | (_| | |_|_|_| \___/|____/____/|_| |_| |_|\___/ \_/\_/ |_____|_| |_| \__,_| - OSSP flow2rrd - NetFlow to Round-Robin Database (RRD) + OSSP flow2rrd - NetFlow to Round-Robin Database Version 0.1.0 (XX-Oct-2004) ABSTRACT Index: ossp-pkg/flow2rrd/THANKS RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/THANKS,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/THANKS,v' 2>/dev/null --- THANKS 2004/12/26 13:10:39 1.1 +++ THANKS 2004/12/26 15:20:00 1.2 @@ -4,7 +4,7 @@ |_||_|_| | |_| |___) |__) | __/ | _| | (_) \ V V / / __/| | | | | (_| | |_|_|_| \___/|____/____/|_| |_| |_|\___/ \_/\_/ |_____|_| |_| \__,_| - OSSP flow2rrd - NetFlow to Round-Robin Database (RRD) + OSSP flow2rrd - NetFlow to Round-Robin Database THANKS Index: ossp-pkg/flow2rrd/TODO RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/TODO,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/TODO,v' 2>/dev/null --- TODO 2004/12/26 13:10:39 1.1 +++ TODO 2004/12/26 15:20:00 1.2 @@ -4,7 +4,7 @@ |_||_|_| | |_| |___) |__) | __/ | _| | (_) \ V V / / __/| | | | | (_| | |_|_|_| \___/|____/____/|_| |_| |_|\___/ \_/\_/ |_____|_| |_| \__,_| - OSSP flow2rrd - NetFlow to Round-Robin Database (RRD) + OSSP flow2rrd - NetFlow to Round-Robin Database - color themes still hardcoded!? - implement "*" number Index: ossp-pkg/flow2rrd/configure.ac RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/configure.ac,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/configure.ac,v' 2>/dev/null --- configure.ac 2004/12/26 13:12:42 1.1 +++ configure.ac 2004/12/26 15:20:00 1.2 @@ -1,5 +1,5 @@ dnl ## -dnl ## OSSP flow2rrd -- NetFlow to Round-Robin Database (RRD) +dnl ## OSSP flow2rrd -- NetFlow to Round-Robin Database dnl ## Copyright (c) 2004 Ralf S. Engelschall dnl ## Copyright (c) 2004 The OSSP Project dnl ## @@ -37,6 +37,29 @@ AC_PREFIX_DEFAULT(/usr/local) AC_SET_MAKE +AC_PATH_PROGS(PERL, perl5 perl, NA) +AC_PATH_PROGS(POD2MAN, pod2man, NA) + +AC_MSG_CHECKING(for perl program to use) +AC_ARG_WITH([perl], + AC_HELP_STRING([--with-perl=PATH], [force the use of a particular perl program]), + PERL="$withval") +if test ".$PERL" = .NA; then + AC_MSG_ERROR([program 'perl' not found]) +fi +AC_MSG_RESULT($PERL) +AC_SUBST(PERL) + +AC_MSG_CHECKING(for pod2man program to use) +AC_ARG_WITH([pod2man], + AC_HELP_STRING([--with-pod2man=PATH], [force the use of a particular pod2man program]), + POD2MAN="$withval") +if test ".$POD2MAN" = .NA; then + POD2MAN=`echo $PERL | sed -e 's;/perl5*$;/pod2man;'` +fi +AC_MSG_RESULT($POD2MAN) +AC_SUBST(POD2MAN) + AC_CONFIG_FILES(Makefile) AC_OUTPUT Index: ossp-pkg/flow2rrd/devtool.conf RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/devtool.conf,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/devtool.conf,v' 2>/dev/null --- devtool.conf 2004/12/26 13:10:39 1.1 +++ devtool.conf 2004/12/26 15:20:00 1.2 @@ -11,7 +11,11 @@ @autoclean shtool %configure - ./configure --prefix=/tmp/flow2rrd "$@" + ./configure \ + --prefix=/tmp/flow2rrd \ + --with-perl=/usr/opkg/bin/perl \ + --with-pod2man=/usr/opkg/bin/pod2man \ + "$@" %version ./shtool version -l txt -n "OSSP flow2rrd" -e VERSION Index: ossp-pkg/flow2rrd/flow2rrd.pl RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pl,v rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pl,v' 2>/dev/null --- flow2rrd.pl 2004/12/26 13:10:39 1.6 +++ flow2rrd.pl 2004/12/26 15:20:00 1.7 @@ -1,6 +1,6 @@ #!@PERL@ ## -## OSSP flow2rrd -- NetFlow to Round-Robin Database (RRD) +## OSSP flow2rrd -- NetFlow to Round-Robin Database ## Copyright (c) 2004 Ralf S. Engelschall ## Copyright (c) 2004 The OSSP Project ## Index: ossp-pkg/flow2rrd/flow2rrd.pod RCS File: /v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pod,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/flow2rrd/flow2rrd.pod,v' 2>/dev/null --- flow2rrd.pod 2004/12/26 13:10:39 1.3 +++ flow2rrd.pod 2004/12/26 15:20:00 1.4 @@ -1,5 +1,5 @@ ## -## OSSP flow2rrd -- NetFlow to Round-Robin Database (RRD) +## OSSP flow2rrd -- NetFlow to Round-Robin Database ## Copyright (c) 2004 Ralf S. Engelschall ## Copyright (c) 2004 The OSSP Project ## @@ -28,7 +28,7 @@ =head1 NAME -B - NetFlow to Round-Robin Database (RRD) +B - NetFlow to Round-Robin Database =head1 VERSION