Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/database
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/common/main/finkinfo/database
Modified Files:
rrdtool.info rrdtool.patch
Removed Files:
rrdtool2.info rrdtool2.patch
Log Message:
commiting some stuff that went to unstable
Index: rrdtool.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/database/rrdtool.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rrdtool.patch 27 Aug 2004 01:45:16 -0000 1.5
+++ rrdtool.patch 5 Jun 2005 15:09:10 -0000 1.6
@@ -1,33 +1,24 @@
---- rrdtool-1.0.49/configure Tue Apr 6 17:30:38 2004
-+++ rrdtool-1.0.49-new/configure Wed Jul 21 16:09:43 2004
-@@ -18840,7 +18840,7 @@
-
- if test x$local_libpng = xyes
- then
-- PNG_LINK=-lpng
-+ PNG_LINK="[EMAIL PROTECTED]@/lib -lpng"
-
- else
- PNG_LIB_DIR=libpng-1.0.9
---- rrdtool-1.0.49/src/Makefile.in Tue Apr 6 17:30:25 2004
-+++ rrdtool-1.0.49-new/src/Makefile.in Wed Jul 21 16:08:56 2004
-@@ -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:49
-
- include_HEADERS = rrd.h
-
---- rrdtool-1.0.49/tcl/Makefile.in Tue Apr 6 17:30:25 2004
-+++ rrdtool-1.0.49-new/tcl/Makefile.in Wed Jul 21 16:08:56 2004
-@@ -320,7 +320,7 @@
+diff -uNr rrdtool-1.2.9/bindings/Makefile.in
rrdtool-1.2.9-new/bindings/Makefile.in
+--- rrdtool-1.2.9/bindings/Makefile.in 2005-05-28 09:03:21.000000000 -0400
++++ rrdtool-1.2.9-new/bindings/Makefile.in 2005-06-04 12:57:25.000000000
-0400
+@@ -200,7 +200,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = tcl python
++SUBDIRS = tcl
+ # the following files are not mentioned in any other Makefile
+ EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL
perl-piped/RRDp.pm perl-piped/t/base.t \
+ perl-shared/ntmake.pl perl-shared/MANIFEST perl-shared/README
perl-shared/Makefile.PL perl-shared/RRDs.pm perl-shared/RRDs.xs
perl-shared/t/base.t
+diff -uNr rrdtool-1.2.9/bindings/tcl/Makefile.in
rrdtool-1.2.9-new/bindings/tcl/Makefile.in
+--- rrdtool-1.2.9/bindings/tcl/Makefile.in 2005-05-28 09:03:22.000000000
-0400
++++ rrdtool-1.2.9-new/bindings/tcl/Makefile.in 2005-06-04 12:58:19.000000000
-0400
+@@ -361,7 +361,7 @@
- @[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)
+ @[EMAIL PROTECTED](TCL_SHLIB_SUFFIX): tclrrd.o
[EMAIL PROTECTED]@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd
[EMAIL PROTECTED]@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd -ltcl
- @[EMAIL PROTECTED]: tclrrd.c
- @COMP_TCL_TRUE@ $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES)
$(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"
+ @[EMAIL PROTECTED]: tclrrd.c
+ @BUILD_TCL_TRUE@ $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
$(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\"
--- rrdtool2.info DELETED ---
Index: rrdtool.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/database/rrdtool.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rrdtool.info 27 May 2005 13:59:31 -0000 1.12
+++ rrdtool.info 5 Jun 2005 15:09:10 -0000 1.13
@@ -1,29 +1,32 @@
Package: rrdtool
-Version: 1.0.49
-Revision: 2
-Conflicts: %N-bin, rrdtool2
-Replaces: %N-bin, rrdtool2
-Depends: %N-shlibs (>= %v-%r)
-BuildConflicts: rrdtool2-dev
-BuildDepends: libpng3, tcltk, tcltk-dev, perl580-core | perl581-core |
perl584-core | perl585-core
+Version: 1.2.9
+Revision: 1
+Conflicts: %N-bin
+Replaces: %N-bin
+Depends: librrd2-shlibs (>= %v-%r)
+BuildDepends: cgilib (>= 0.5-2), freetype219, libart2, libpng3, tcltk,
tcltk-dev, perl580-core | perl581-core | perl584-core | perl586-core
BuildDependsOnly: true
-PatchScript: sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1
-Source: http://people.ee.ethz.ch/~oetiker/webtools/%n/pub/%n-%v.tar.gz
-Source-MD5: fbe492dbf3d68abb1d86c2322e7ed44a
+Source:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%v.tar.gz
+Source-MD5: 6e358356336317974665b3f4b97ec790
+Patch: %n.patch
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
NoSetLDFLAGS: true
-SetCPPFLAGS: -fno-common
+SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
+ConfigureParams: --enable-shared --with-tcllib=%p/lib --mandir=%p/share/man
--enable-local-libpng --enable-local-zlib --disable-perl --disable-python
CompileScript: <<
#!/bin/sh -ex
- export lt_cv_sys_max_cmd_len=65536
+ export PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
lt_cv_sys_max_cmd_len=65536
for file in %p/bin/perl5.8* /usr/bin/perl5.8*; do
[ -z "$PERLBIN" ] && [ -f "$file" ] && PERLBIN="$file"
done
[ -z "$PERLBIN" ] && exit 1
export ac_cv_path_PERL=no
+ export LIBS="-L`pwd`/src -L`pwd`/src/.libs -L%p/lib"
chmod 755 %p/lib/tclConfig.sh
- ./configure --prefix=%p --enable-shared --with-tcllib=%p/lib
--mandir=%p/share/man --enable-local-libpng --enable-local-zlib
+ ./configure %c
perl -pi.bak -e "s,pod2man,$PERLBIN /usr/bin/pod2man,g" doc/Makefile
make POD2MAN_EXE="$PERLBIN /usr/bin/pod2man"
<<
@@ -33,34 +36,38 @@
make install DESTDIR="%d" examplesdir="%p/share/doc/%n/examples"
idocdir="%p/share/doc/%n/doc" ihtmldir="%p/share/doc/%n/html"
contribdir="%p/share/doc/%n/contrib"
make site-tcl-install DESTDIR="%d" TCL_PACKAGE_PATH='%i/lib'
ranlib "%i/lib/librrd.a"
- touch "%i/share/doc/rrdtool/.turd"
+ touch "%i/share/doc/%n/.turd"
rm -rf %i/lib/perl %i/share/man/man1/RRDp.1 %i/share/man/man1/RRDs.1
<<
SplitOff: <<
- Package: %N-shlibs
+ Package: librrd2-shlibs
Suggests: %N
Description: Fixed-size "round-robin" database storage shared libraries
- Depends: libpng3-shlibs
- Files: lib/librrd.%v.dylib lib/librrd.1.dylib
- Shlibs: %p/lib/librrd.1.dylib 2.0.0 %n (>= 1.0.39-1)
+ Depends: cgilib-shlibs (>= 0.5-2), freetype219-shlibs, libart2-shlibs,
libpng3-shlibs, rrdtool-fonts
+ Files: lib/librrd*.*.dylib
+ Shlibs: <<
+ %p/lib/librrd.2.dylib 3.0.0 librrd2-shlibs (>= 1.2.8-1)
+ %p/lib/librrd_th.2.dylib 3.0.0 librrd2-shlibs (>= 1.2.8-1)
+ <<
<<
SplitOff2: <<
+ Package: %N-fonts
+ Description: Fonts for RRDTool PNG rendering
+ Files: share/rrdtool/fonts
+<<
+SplitOff3: <<
Package: %N-dev
Description: Utilities for round-robin databases
BuildDependsOnly: true
Depends: %N (>= %v-%r)
- Conflicts: rrdtool2-dev
- Replaces: %N (<< 1.0.48-1), rrdtool2-dev
- Files: include lib/*.a lib/*.la lib/librrd.dylib
+ Files: include lib/*.a lib/*.la lib/librrd.dylib lib/librrd_th.dylib
<<
-SplitOff3: <<
+SplitOff4: <<
Package: %N-tcl
Description: TCL scripting module for round-robin databases
- Depends: %N-shlibs (>= %v-%r), tcltk-shlibs
- Enhances: %N-shlibs
- Conflicts: rrdtool2-tcl
- Replaces: rrdtool2-tcl
- Files: lib/tclrrd.%v lib/tclrrd.%v.dylib
+ Depends: librrd2-shlibs (>= %v-%r), tcltk-shlibs
+ Enhances: librrd2-shlibs
+ Files: lib/tclrrd%v lib/tclrrd%v.dylib
<<
DocFiles: CHANGES CONTRIBUTORS COPYING COPYRIGHT NT-BUILD-TIPS.txt README TODO
Description: Fixed-size "round-robin" database storage
@@ -72,12 +79,6 @@
via simple wrapper scripts (from shell or Perl) or via frontends that poll
network devices and put a friendly user interface on it.
<<
-DescPort: <<
-Had to do a lot of fiddling with libtool options to get it to build as a shared
-library. Also had to patch gifsize.c to fix a duplicate symbol conflict.
-Without the libtool/autoconf updates, it does not understand doing shared libs
-on OSX.
-<<
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
--- rrdtool2.patch DELETED ---
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
