OSSP CVS Repository

ossp - Check-in [4915]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 4915
Date: 2004-Dec-26 16:20:00 (local)
2004-Dec-26 15:20:00 (UTC)
User:rse
Branch:
Comment: more source tree cleanups and enhancements
Tickets:
Inspections:
Files:
ossp-pkg/flow2rrd/.cvsignore      1.2 -> 1.3     1 inserted, 0 deleted
ossp-pkg/flow2rrd/AUTHORS      1.1 -> 1.2     1 inserted, 1 deleted
ossp-pkg/flow2rrd/ChangeLog      1.1 -> 1.2     1 inserted, 1 deleted
ossp-pkg/flow2rrd/INSTALL      1.1 -> 1.2     3 inserted, 3 deleted
ossp-pkg/flow2rrd/Makefile.in      1.1 -> 1.2     23 inserted, 11 deleted
ossp-pkg/flow2rrd/README      1.1 -> 1.2     1 inserted, 1 deleted
ossp-pkg/flow2rrd/THANKS      1.1 -> 1.2     1 inserted, 1 deleted
ossp-pkg/flow2rrd/TODO      1.1 -> 1.2     1 inserted, 1 deleted
ossp-pkg/flow2rrd/configure.ac      1.1 -> 1.2     24 inserted, 1 deleted
ossp-pkg/flow2rrd/devtool.conf      1.1 -> 1.2     5 inserted, 1 deleted
ossp-pkg/flow2rrd/flow2rrd.pl      1.6 -> 1.7     1 inserted, 1 deleted
ossp-pkg/flow2rrd/flow2rrd.pod      1.3 -> 1.4     2 inserted, 2 deleted
ossp-pkg/flow2rrd/.cvsignore 1.2 -> 1.3 

--- .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

ossp-pkg/flow2rrd/AUTHORS 1.1 -> 1.2 

--- 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.

ossp-pkg/flow2rrd/ChangeLog 1.1 -> 1.2 

--- 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

ossp-pkg/flow2rrd/INSTALL 1.1 -> 1.2 

--- 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 @@
   $ <prefix>/etc/rc flowtools start
 
   The Cruel Way (Manually)
-  ========================
+  ------------------------
 
   ...FIXME...

ossp-pkg/flow2rrd/Makefile.in 1.1 -> 1.2 

--- 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 <rse@engelschall.com>
 ##  Copyright (c) 2004 The OSSP Project <http://www.ossp.org/>
 ##
@@ -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.pl >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.pl >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

ossp-pkg/flow2rrd/README 1.1 -> 1.2 

--- 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

ossp-pkg/flow2rrd/THANKS 1.1 -> 1.2 

--- 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

ossp-pkg/flow2rrd/TODO 1.1 -> 1.2 

--- 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

ossp-pkg/flow2rrd/configure.ac 1.1 -> 1.2 

--- 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 <rse@engelschall.com>
 dnl ##  Copyright (c) 2004 The OSSP Project <http://www.ossp.org/>
 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

ossp-pkg/flow2rrd/devtool.conf 1.1 -> 1.2 

--- 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

ossp-pkg/flow2rrd/flow2rrd.pl 1.6 -> 1.7 

--- 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 <rse@engelschall.com>
 ##  Copyright (c) 2004 The OSSP Project <http://www.ossp.org/>
 ##

ossp-pkg/flow2rrd/flow2rrd.pod 1.3 -> 1.4 

--- 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 <rse@engelschall.com>
 ##  Copyright (c) 2004 The OSSP Project <http://www.ossp.org/>
 ##
@@ -28,7 +28,7 @@
 
 =head1 NAME
 
-B<OSSP flow2rrd> - NetFlow to Round-Robin Database (RRD)
+B<OSSP flow2rrd> - NetFlow to Round-Robin Database
 
 =head1 VERSION

CVSTrac 2.0.1