Update of /cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/database
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22860/10.2-gcc3.3/unstable/main/finkinfo/database
Modified Files:
rrdtool.info rrdtool.patch
Log Message:
validate fixes
Index: rrdtool.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/database/rrdtool.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rrdtool.patch 13 Oct 2003 21:14:42 -0000 1.2
+++ rrdtool.patch 19 Jul 2004 21:12:04 -0000 1.3
@@ -1,186 +1,24 @@
-diff -uNr rrdtool-1.0.45/contrib/trytime/trytime.c
rrdtool-1.0.45-new/contrib/trytime/trytime.c
---- rrdtool-1.0.45/contrib/trytime/trytime.c Tue Feb 26 05:21:19 2002
-+++ rrdtool-1.0.45-new/contrib/trytime/trytime.c Sat Sep 6 16:58:03 2003
-@@ -27,7 +27,7 @@
- time_t start_tmp, end_tmp, Now = time(NULL);
- char tim_b[200];
-
-- struct time_value start_tv, end_tv;
-+ struct rrd_time_value start_tv, end_tv;
- char *parsetime_error = NULL;
-
- /* default values */
-diff -uNr rrdtool-1.0.45/src/Makefile.in rrdtool-1.0.45-new/src/Makefile.in
---- rrdtool-1.0.45/src/Makefile.in Mon Jul 21 14:28:06 2003
-+++ rrdtool-1.0.45-new/src/Makefile.in Sat Sep 6 15:38:06 2003
-@@ -124,7 +124,7 @@
+diff -uNr rrdtool-1.0.48/src/Makefile.in rrdtool-1.0.48-new/src/Makefile.in
+--- rrdtool-1.0.48/src/Makefile.in 2004-04-06 17:30:25.000000000 -0400
++++ rrdtool-1.0.48-new/src/Makefile.in 2004-07-19 14:58:15.000000000 -0400
+@@ -235,7 +235,7 @@
librrd_private_la_SOURCES = $(RRD_C_FILES)
librrd_la_LIBADD = $(RRD_LIBS)
-librrd_la_LDFLAGS = -version-info 0:0:0
-+librrd_la_LDFLAGS = -version-info 1:45
++librrd_la_LDFLAGS = -version-info 1:48
include_HEADERS = rrd.h
-diff -uNr rrdtool-1.0.45/src/parsetime.c rrdtool-1.0.45-new/src/parsetime.c
---- rrdtool-1.0.45/src/parsetime.c Mon Jul 21 14:24:54 2003
-+++ rrdtool-1.0.45-new/src/parsetime.c Sat Sep 6 16:58:21 2003
-@@ -472,7 +472,7 @@
- * It allso applies those m-guessing euristics.
- */
- static char *
--plus_minus(struct time_value *ptv, int doop)
-+plus_minus(struct rrd_time_value *ptv, int doop)
- {
- static int op = PLUS;
- static int prev_multiplier = -1;
-@@ -552,7 +552,7 @@
- * tod() computes the time of day (TIME-OF-DAY-SPEC)
- */
- static char *
--tod(struct time_value *ptv)
-+tod(struct rrd_time_value *ptv)
- {
- int hour, minute = 0;
- int tlen;
-@@ -628,7 +628,7 @@
- * assign_date() assigns a date, adjusting year as appropriate
- */
- static char *
--assign_date(struct time_value *ptv, long mday, long mon, long year)
-+assign_date(struct rrd_time_value *ptv, long mday, long mon, long year)
- {
- if (year > 138) {
- if (year > 1970)
-@@ -656,7 +656,7 @@
- * day() picks apart DAY-SPEC-[12]
- */
- static char *
--day(struct time_value *ptv)
-+day(struct rrd_time_value *ptv)
- {
- long mday=0, wday, mon, year = ptv->tm.tm_year;
- int tlen;
-@@ -773,7 +773,7 @@
-
- /*
- * parsetime() is the external interface that takes tspec, parses
-- * it and puts the result in the time_value structure *ptv.
-+ * it and puts the result in the rrd_time_value structure *ptv.
- * It can return either absolute times (these are ensured to be
- * correct) or relative time references that are expected to be
- * added to some absolute time value and then normalized by
-@@ -781,7 +781,7 @@
- * the pointer to the error message in the case of problems
- */
- char *
--parsetime(char *tspec, struct time_value *ptv)
-+parsetime(char *tspec, struct rrd_time_value *ptv)
- {
- time_t now = time(NULL);
- int hr = 0;
-@@ -908,8 +908,8 @@
- } /* parsetime */
-
-
--int proc_start_end (struct time_value *start_tv,
-- struct time_value *end_tv,
-+int proc_start_end (struct rrd_time_value *start_tv,
-+ struct rrd_time_value *end_tv,
- time_t *start,
- time_t *end){
- if (start_tv->type == RELATIVE_TO_END_TIME && /* same as the line above */
-diff -uNr rrdtool-1.0.45/src/rrd.h rrdtool-1.0.45-new/src/rrd.h
---- rrdtool-1.0.45/src/rrd.h Mon Jul 21 14:24:54 2003
-+++ rrdtool-1.0.45-new/src/rrd.h Sat Sep 6 16:57:07 2003
-@@ -47,16 +47,16 @@
-
- #define TIME_OK NULL
-
--struct time_value {
-+struct rrd_time_value {
- timetype type;
- long offset;
- struct tm tm;
- };
-
--char *parsetime(char *spec, struct time_value *ptv);
-+char *parsetime(char *spec, struct rrd_time_value *ptv);
- /* END parsetime.h */
-
--int proc_start_end (struct time_value *, struct time_value *, time_t *, time_t *);
-+int proc_start_end (struct rrd_time_value *, struct rrd_time_value *, time_t *,
time_t *);
-
- /* HELPER FUNCTIONS */
- void rrd_set_error(char *,...);
-diff -uNr rrdtool-1.0.45/src/rrd_cgi.c rrdtool-1.0.45-new/src/rrd_cgi.c
---- rrdtool-1.0.45/src/rrd_cgi.c Mon Jul 21 14:24:55 2003
-+++ rrdtool-1.0.45-new/src/rrd_cgi.c Sat Sep 6 16:56:42 2003
-@@ -240,7 +240,7 @@
- * */
- #define MAX_STRFTIME_SIZE 256
- char* printstrftime(long argc, char **args){
-- struct time_value start_tv, end_tv;
-+ struct rrd_time_value start_tv, end_tv;
- char *parsetime_error = NULL;
- char formatted[MAX_STRFTIME_SIZE];
- struct tm *the_tm;
-diff -uNr rrdtool-1.0.45/src/rrd_create.c rrdtool-1.0.45-new/src/rrd_create.c
---- rrdtool-1.0.45/src/rrd_create.c Mon Jul 21 14:24:55 2003
-+++ rrdtool-1.0.45-new/src/rrd_create.c Sat Sep 6 16:56:29 2003
-@@ -13,7 +13,7 @@
- rrd_t rrd;
- long i,long_tmp;
- time_t last_up;
-- struct time_value last_up_tv;
-+ struct rrd_time_value last_up_tv;
- char *parsetime_error = NULL;
-
- /* init last_up */
-diff -uNr rrdtool-1.0.45/src/rrd_fetch.c rrdtool-1.0.45-new/src/rrd_fetch.c
---- rrdtool-1.0.45/src/rrd_fetch.c Mon Jul 21 14:24:55 2003
-+++ rrdtool-1.0.45-new/src/rrd_fetch.c Sat Sep 6 16:56:18 2003
-@@ -31,7 +31,7 @@
- time_t start_tmp=0, end_tmp=0;
- enum cf_en cf_idx;
-
-- struct time_value start_tv, end_tv;
-+ struct rrd_time_value start_tv, end_tv;
- char *parsetime_error = NULL;
+diff -uNr rrdtool-1.0.48/tcl/Makefile.in rrdtool-1.0.48-new/tcl/Makefile.in
+--- rrdtool-1.0.48/tcl/Makefile.in 2004-04-06 17:30:25.000000000 -0400
++++ rrdtool-1.0.48-new/tcl/Makefile.in 2004-07-19 15:01:19.000000000 -0400
+@@ -320,7 +320,7 @@
- /* init start and end time */
-diff -uNr rrdtool-1.0.45/src/rrd_graph.c rrdtool-1.0.45-new/src/rrd_graph.c
---- rrdtool-1.0.45/src/rrd_graph.c Mon Jul 21 14:24:56 2003
-+++ rrdtool-1.0.45-new/src/rrd_graph.c Sat Sep 6 16:56:05 2003
-@@ -2806,7 +2806,7 @@
- unsigned int col_red,col_green,col_blue;
- long scancount;
- int linepass = 0; /* stack can only follow directly after LINE* AREA or STACK */
-- struct time_value start_tv, end_tv;
-+ struct rrd_time_value start_tv, end_tv;
- char *parsetime_error = NULL;
- int stroff;
-diff -uNr rrdtool-1.0.45/src/rrd_xport.c rrdtool-1.0.45-new/src/rrd_xport.c
---- rrdtool-1.0.45/src/rrd_xport.c Mon Jul 21 14:24:57 2003
-+++ rrdtool-1.0.45-new/src/rrd_xport.c Sat Sep 6 16:55:48 2003
-@@ -45,7 +45,7 @@
- time_t start_tmp=0,end_tmp=0;
- char symname[100];
- long scancount;
-- struct time_value start_tv, end_tv;
-+ struct rrd_time_value start_tv, end_tv;
- char *parsetime_error = NULL;
+ @[EMAIL PROTECTED](TCL_LIB_FILE): tclrrd.o
[EMAIL PROTECTED]@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm
$(TCL_LIB_SPEC)
[EMAIL PROTECTED]@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -ltcl
-lm $(TCL_LIB_SPEC)
- parsetime("end-24h", &start_tv);
-diff -uNr rrdtool-1.0.45/tcl/Makefile.in rrdtool-1.0.45-new/tcl/Makefile.in
---- rrdtool-1.0.45/tcl/Makefile.in Mon Jul 21 14:28:10 2003
-+++ rrdtool-1.0.45-new/tcl/Makefile.in Sat Sep 6 15:38:06 2003
-@@ -89,6 +89,7 @@
- TCL_SHLIB_LD = @TCL_SHLIB_LD@
- TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
- TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
-+TCL_LIB_FILE = tclrrd.$(VERSION)$(TCL_SHLIB_SUFFIX)
- TCL_PACKAGE_PATH = $(DESTDIR)@TCL_PACKAGE_PATH@
- TCL_LIB_FILE = tclrrd.$(VERSION)$(TCL_SHLIB_SUFFIX)
- TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
+ @[EMAIL PROTECTED]: tclrrd.c
+ @COMP_TCL_TRUE@ $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) $(AM_CPPFLAGS)
-c $< -DVERSION=\"$(VERSION)\"
Index: rrdtool.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/database/rrdtool.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rrdtool.info 10 Nov 2003 00:55:54 -0000 1.4
+++ rrdtool.info 19 Jul 2004 21:12:01 -0000 1.5
@@ -1,18 +1,19 @@
Package: rrdtool
-Version: 1.0.45
-Revision: 2
-Depends: %N-shlibs (= %v-%r)
+Version: 1.0.48
+Revision: 1
+Conflicts: %N-bin
+Replaces: %N-bin
+Depends: %N-shlibs (>= %v-%r)
BuildDepends: tcltk, tcltk-dev, dlcompat-dev
-UpdateConfigGuessInDirs: config
-UpdateLibtoolInDirs: config
+BuildDependsOnly: true
Patch: %n.patch
-Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/%n-%v.tar.gz
-Source-MD5: 64086fc7f1ca28c069ee5104f85d7a8c
+Source: http://people.ee.ethz.ch/~oetiker/webtools/%n/pub/%n-%v.tar.gz
+Source-MD5: b38a3b04d2540f2f2bf4ca072b8eb229
NoSetLDFLAGS: true
+SetCPPFLAGS: -fno-common
CompileScript: <<
#!/bin/sh
chmod 755 %p/lib/tclConfig.sh
- perl -pi -e 's,-flat_namespace -undefined suppress,-multiply_defined suppress,g'
config/ltconfig
./configure --prefix=%p --enable-shared --with-tcllib=%p/lib --mandir=%p/share/man
make || make
<<
@@ -21,39 +22,27 @@
make site-tcl-install DESTDIR="%d" TCL_PACKAGE_PATH='%i/lib'
ranlib "%i/lib/librrd.a"
touch "%i/share/doc/rrdtool/.turd"
+ rm -rf %i/lib/perl %i/share/man/man1/RRDp.1 %i/share/man/man1/RRDs.1
<<
SplitOff: <<
Package: %N-shlibs
- Suggests: %N-bin
+ Suggests: %N
Description: Fixed-size "round-robin" database storage shared libraries
Files: lib/librrd.%v.dylib lib/librrd.1.dylib
Shlibs: %p/lib/librrd.1.dylib 2.0.0 %n (>= 1.0.39-1)
<<
SplitOff2: <<
- Package: %N-bin
+ Package: %N-dev
Description: Utilities for round-robin databases
- Depends: %N-shlibs (= %v-%r)
- Files: bin
+ BuildDependsOnly: true
+ Depends: %N (>= %v-%r)
+ Replaces: %N (<< 1.0.48-1)
+ Files: include lib/*.a lib/*.la lib/librrd.dylib
<<
SplitOff3: <<
- Package: %N-perl
- Description: Placeholder for versioned PostgreSQL Perl packages
- Depends: %N-pm560
- Enhances: %N-shlibs
- Files: share/doc/rrdtool/.turd
-<<
-SplitOff4: <<
- Package: %N-pm560
- Description: Perl scripting module for round-robin databases (perl 5.6.0)
- Depends: %N-shlibs
- Enhances: %N-shlibs
- Replaces: %N-perl (<< %v-%r)
- Files: lib/perl share/man/man1/RRDp.1 share/man/man1/RRDs.1
-<<
-SplitOff5: <<
Package: %N-tcl
Description: TCL scripting module for round-robin databases
- Depends: %N-shlibs (= %v-%r), tcltk-shlibs
+ Depends: %N-shlibs (>= %v-%r), tcltk-shlibs
Enhances: %N-shlibs
Files: lib/tclrrd.%v lib/tclrrd.%v.dylib
<<
@@ -75,3 +64,4 @@
<<
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+Homepage: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
