Author: ranger
Date: Wed Apr 8 23:37:19 2009
New Revision: 1482
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1482&repname=user%3a+ranger>
Log:
rrd updates
Added:
trunk/experimental/10.4/main/finkinfo/database/rrdtool-1.2.30-1.info
trunk/experimental/10.4/main/finkinfo/database/rrdtool-java.info
trunk/experimental/10.4/main/finkinfo/database/rrdtool.info
trunk/experimental/common/main/finkinfo/database/rrdtool-1.2.30-1.info
- copied unchanged from r1479,
trunk/experimental/common/main/finkinfo/database/rrdtool.info
Modified:
trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info
trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.patch
trunk/experimental/common/main/finkinfo/database/rrdtool-java.info
trunk/experimental/common/main/finkinfo/database/rrdtool.info
trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info
trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.patch
trunk/experimental/common/main/finkinfo/libs/qt4-mac.info
trunk/experimental/common/main/finkinfo/x11/qt4-x11.info
trunk/experimental/generate-infofiles.pl
Added: trunk/experimental/10.4/main/finkinfo/database/rrdtool-1.2.30-1.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/database/rrdtool-1.2.30-1.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/rrdtool-1.2.30-1.info (added)
+++ trunk/experimental/10.4/main/finkinfo/database/rrdtool-1.2.30-1.info Wed
Apr 8 23:37:19 2009
@@ -1,0 +1,105 @@
+Package: rrdtool
+Version: 1.2.30
+Revision: 1
+Description: Fixed-size "round-robin" database storage
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: librrd2-shlibs (>= %v-%r)
+BuildDepends: <<
+ freetype219,
+ libart2,
+ libpng3,
+ tcltk,
+ tcltk-dev,
+ perl580-core | perl581-core | perl584-core | perl586-core | perl588-core
+<<
+Conflicts: %N-bin
+Replaces: %N-bin
+
+Source: http://oss.oetiker.ch/%n/pub/%n-%v.tar.gz
+Source-MD5: 19b24f7184a8dbf7b48c1bbb565ad9fb
+
+SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
+SetLDFLAGS: -L%b/src/.libs -L%b/src
+SetMAKEFLAGS: -j1
+NoSetLDFLAGS: true
+NoSetMAKEFLAGS: true
+ConfigureParams: --enable-shared --with-tcllib=%p/lib --mandir=%p/share/man
--enable-local-libpng --enable-local-zlib --disable-perl --disable-python
--disable-ruby
+CompileScript: <<
+#!/bin/sh -ex
+
+ 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"
+ ./configure %c
+ perl -pi -e "s,pod2man,$PERLBIN /usr/bin/pod2man,g" doc/Makefile
+ make POD2MAN_EXE="$PERLBIN /usr/bin/pod2man"
+<<
+
+InstallScript: <<
+#!/bin/sh -ex
+
+ make -j1 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" pkglibdir='%p/lib/tclrrd$(VERSION)'
+ ranlib "%i/lib/librrd.a"
+ touch "%i/share/doc/%n/.turd"
+ rm -rf %i/lib/perl %i/share/man/man1/RRDp.1 %i/share/man/man1/RRDs.1
%i/share/doc/%n/examples
+ perl -pi -e 's,-L%b/src/.libs,,gs; s,-L%b/src,,gs;
s,-L%p/lib/freetype219/lib,,gs; s,-L%p/lib,,gs' %i/lib/*.la
+ install_name_tool -id %p/lib/tclrrd%v.dylib %i/lib/tclrrd%v.dylib
+<<
+DocFiles: CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
+SplitOff: <<
+ Package: librrd2-shlibs
+ Description: Fixed-size "round-robin" database storage shared libraries
+ Depends: <<
+ freetype219-shlibs,
+ libart2-shlibs,
+ libpng3-shlibs,
+ rrdtool-fonts
+ <<
+ Suggests: %N
+ 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
+ Depends: %N (>= %v-%r)
+ BuildDependsOnly: true
+ Files: include lib/*.a lib/*.la lib/librrd.dylib lib/librrd_th.dylib
+<<
+SplitOff4: <<
+ Package: %N-tcl
+ Description: TCL scripting module for round-robin databases
+ Depends: <<
+ librrd2-shlibs (>= %v-%r),
+ tcltk-shlibs
+ <<
+ Enhances: librrd2-shlibs
+ Files: lib/tclrrd%v lib/tclrrd%v.dylib
+ Shlibs: %p/lib/tclrrd%v.dylib 0.0.0 rrdtool-tcl (>= 1.2.23-1)
+<<
+
+Homepage: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+DescDetail: <<
+RRD is a system to store and display time-series data (i.e. network bandwidth,
+machine-room temperature, server load average). It stores the data in a very
+compact way that will not expand over time, and it presents useful graphs by
+processing the data to enforce a certain data density. It can be used either
+via simple wrapper scripts (from shell or Perl) or via frontends that poll
+network devices and put a friendly user interface on it.
+<<
+
Added: trunk/experimental/10.4/main/finkinfo/database/rrdtool-java.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/database/rrdtool-java.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/rrdtool-java.info (added)
+++ trunk/experimental/10.4/main/finkinfo/database/rrdtool-java.info Wed Apr 8
23:37:19 2009
@@ -1,0 +1,44 @@
+Info3: <<
+Package: rrdtool-java
+Version: 1.0.3
+Revision: 2
+Description: Java Interface to RRDTool
+Type: java(1.4)
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: librrd4-shlibs
+BuildDepends: <<
+ freetype219 (>= 2.3.7-7),
+ libart2 (>= 2.3.19-1),
+ libpng3,
+ rrdtool-dev (>= 1.3-1)
+<<
+
+Source: mirror:sourceforge:opennms/jrrd-%v.tar.gz
+Source-MD5: 60933aa4e6d2ec52b5b76f3212c8753f
+
+CompileScript: <<
+#!/bin/sh -ev
+
+ case `sw_vers -productVersion` in
+ 10.[01234]*)
+ ;;
+ *)
+ export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
+ ;;
+ esac
+ ./configure %c
+ make
+<<
+
+InstallScript: make install DESTDIR="%d"
+
+Homepage: http://www.opennms.org/
+DescDetail: <<
+This package contains a Java interface to RRDTool.
+It was previously part of the OpenNMS project and has
+since been separated out into it's own package.
+<<
+<<
+
Added: trunk/experimental/10.4/main/finkinfo/database/rrdtool.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/database/rrdtool.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/rrdtool.info (added)
+++ trunk/experimental/10.4/main/finkinfo/database/rrdtool.info Wed Apr 8
23:37:19 2009
@@ -1,0 +1,124 @@
+Info4: <<
+Package: rrdtool
+Version: 1.3.7
+Revision: 1
+Description: Fixed-size "round-robin" database storage
+License: GPL
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: librrd4-shlibs (>= %v-%r)
+BuildDepends: <<
+ cairo (>= 1.8.6-1),
+ expat1,
+ fink (>= 0.28.0-1),
+ fontconfig2-dev (>= 2.4.1-1),
+ freetype219 (>= 2.3.7-7),
+ glib2-dev (>= 2.14.0-1),
+ glitz,
+ libgettext3-dev,
+ libiconv-dev,
+ libpng3,
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.22-3),
+ tcltk,
+ tcltk-dev,
+ x11-dev,
+ xft2-dev
+<<
+Conflicts: %N-bin
+Replaces: %N-bin
+
+Source: http://oss.oetiker.ch/%n/pub/%n-%v.tar.gz
+Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
+
+SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
+ConfigureParams: <<
+--disable-dependency-tracking \
+--disable-static \
+--enable-shared \
+--with-tcllib=%p/lib \
+--mandir=%p/share/man \
+--disable-perl \
+--disable-python \
+--disable-ruby
+<<
+CompileScript: <<
+#!/bin/sh -ex
+
+ export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
lt_cv_sys_max_cmd_len=65536 PERLBIN="/usr/bin/perl"
+
+ case `sw_vers -productVersion` in
+ 10.[01234]*)
+ ;;
+ *)
+ export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
+ ;;
+ esac
+
+ ./configure %c
+ perl -pi -e "s,pod2man,$PERLBIN /usr/bin/pod2man,g" doc/Makefile
+ make POD2MAN_EXE="$PERLBIN /usr/bin/pod2man"
+<<
+
+InstallScript: <<
+#!/bin/sh -ex
+
+ make -j1 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" \
+ pkglibdir='%p/lib/tclrrd$(VERSION)'
+ find %i -name RRDp\* -o -name RRDs\* -exec rm -rf {} \;
+ rm -rf %i/share/man/man1/RRDp.1 %i/share/man/man1/RRDs.1
+ install_name_tool -id %p/lib/tclrrd%v.dylib %i/lib/tclrrd%v.dylib
+<<
+DocFiles: CHANGES CONTRIBUTORS COPYING COPYRIGHT NEWS README THREADS TODO
+SplitOff: <<
+ Package: librrd4-shlibs
+ Description: Fixed-size "round-robin" database storage shared libraries
+ Depends: <<
+ cairo-shlibs (>= 1.8.6-1),
+ glib2-shlibs (>= 2.14.0-1),
+ libpng3-shlibs (>= 1.2.5-4),
+ libxml2-shlibs (>= 2.6.32-1),
+ pango1-xft2-ft219-shlibs (>= 1.20.5-1)
+ <<
+ Suggests: %N
+ Files: lib/librrd*.*.dylib
+ Shlibs: <<
+ %p/lib/librrd.4.dylib 5.0.0 %n (>= 1.3.7-1)
+ %p/lib/librrd_th.4.dylib 5.0.0 %n (>= 1.3.7-1)
+ <<
+<<
+SplitOff3: <<
+ Package: %N-dev
+ Description: Utilities for round-robin databases
+ Depends: %N (>= %v-%r)
+ BuildDependsOnly: true
+ Files: include lib/*.la lib/librrd.dylib lib/librrd_th.dylib
lib/pkgconfig
+<<
+SplitOff4: <<
+ Package: %N-tcl
+ Description: TCL scripting module for round-robin databases
+ Depends: <<
+ librrd4-shlibs (>= %v-%r),
+ tcltk-shlibs
+ <<
+ Enhances: librrd4-shlibs
+ Files: lib/tclrrd%v lib/tclrrd%v.dylib
+ Shlibs: %p/lib/tclrrd%v.dylib 0.0.0 rrdtool-tcl (>= 1.3.7-1)
+<<
+
+Homepage: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+DescDetail: <<
+RRD is a system to store and display time-series data (i.e. network bandwidth,
+machine-room temperature, server load average). It stores the data in a very
+compact way that will not expand over time, and it presents useful graphs by
+processing the data to enforce a certain data density. It can be used either
+via simple wrapper scripts (from shell or Perl) or via frontends that poll
+network devices and put a friendly user interface on it.
+<<
+<<
+
Modified: trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info Wed Apr 8
23:37:19 2009
@@ -1,11 +1,11 @@
-Info2: <<
+Info4: <<
Package: rrd-pm%type_pkg[perl]
-Version: 1.2.30
+Version: 1.3.7
Revision: 1
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4,
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
Description: RRDTool Perl bindings module
-Type: perl(5.8.1 5.8.4 5.8.6 5.8.8)
+Type: perl(5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
License: GPL
Maintainer: Benjamin Reed <[email protected]>
@@ -37,30 +37,30 @@
Suggests: rrdtool
Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%v.tar.gz
-Source-MD5: 19b24f7184a8dbf7b48c1bbb565ad9fb
+Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
PatchFile: rrd-pm.patch
-PatchFile-MD5: 12c6de4e63456c51f8470f75b9f9182c
+PatchFile-MD5: 2042cea1692e4c2fde35f3b31e928167
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
-ConfigureParams: --enable-shared --with-tcllib=%p/lib --mandir=%p/share/man
--enable-local-libpng --enable-local-zlib --enable-perl --disable-python
+ConfigureParams: --disable-static --enable-shared --with-tcllib=%p/lib
--mandir=%p/share/man --enable-perl --disable-python
CompileScript: <<
#!/bin/sh -ex
- export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
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
+ eval "`perl$perlversion -V:archname`"
./configure %c
- eval "`perl$perlversion -V:archname`"
export PERLMAKEARGS="PREFIX=%p
INSTALLPRIVLIB=%p/lib/perl5/%type_raw[perl]
INSTALLARCHLIB=%p/lib/perl5/%type_raw[perl]/$archname
INSTALLSITELIB=%p/lib/perl5/%type_raw[perl]
INSTALLSITEARCH=%p/lib/perl5/%type_raw[perl]/$archname
INSTALLMAN1DIR=%p/lib/perl5/%type_raw[perl]
INSTALLMAN3DIR=%p/lib/perl5/%type_raw[perl]
INSTALLSITEMAN1DIR=%p/lib/perl5/%type_raw[perl]
INSTALLSITEMAN3DIR=%p/lib/perl5/%type_raw[perl] INSTALLBIN=%p/bin
INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin"
pushd bindings/perl-piped
- perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
- make
- make test
+ perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
+ make
+ make test
popd
pushd bindings/perl-shared
- perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
- make INC="-I%p/include" OTHERLDFLAGS="-L%p/lib -lrrd"
- make test
+ perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
+ make INC="-I%p/include -I../../src" OTHERLDFLAGS="-L%p/lib
-lrrd"
+ make test
popd
<<
@@ -73,16 +73,11 @@
export PERLMAKEARGS="PREFIX=%i
INSTALLPRIVLIB=%i/lib/perl5/%type_raw[perl]
INSTALLARCHLIB=%i/lib/perl5/%type_raw[perl]/$archname
INSTALLSITELIB=%i/lib/perl5/%type_raw[perl]
INSTALLSITEARCH=%i/lib/perl5/%type_raw[perl]/$archname
INSTALLMAN1DIR=%i/lib/perl5/%type_raw[perl]
INSTALLMAN3DIR=%i/lib/perl5/%type_raw[perl]
INSTALLSITEMAN1DIR=%i/lib/perl5/%type_raw[perl]
INSTALLSITEMAN3DIR=%i/lib/perl5/%type_raw[perl] INSTALLBIN=%i/bin
INSTALLSITEBIN=%i/bin INSTALLSCRIPT=%i/bin"
pushd bindings/perl-piped
- make install $PERLMAKEARGS
+ make -j1 install $PERLMAKEARGS
popd
pushd bindings/perl-shared
- make install $PERLMAKEARGS
- popd
-
- install -d -m 755 %i/share/doc/rrdtool
- pushd examples
- make -j1 install DESTDIR="%d"
examplesdir="%p/share/doc/rrd-pm%type_pkg[perl]/examples"
+ make -j1 install $PERLMAKEARGS
popd
<<
NoPerlTests: true
Modified: trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.patch&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.patch Wed Apr 8
23:37:19 2009
@@ -1,6 +1,6 @@
-diff -Nurd rrdtool-1.2.30/bindings/perl-piped/t/base.t
rrdtool-1.2.30-patched/bindings/perl-piped/t/base.t
---- rrdtool-1.2.30/bindings/perl-piped/t/base.t 2009-01-19
09:29:14.000000000 -0500
-+++ rrdtool-1.2.30-patched/bindings/perl-piped/t/base.t 2009-02-20
08:45:31.000000000 -0500
+diff -Nurd rrdtool-1.3.7/bindings/perl-piped/t/base.t
rrdtool-1.3.7-new/bindings/perl-piped/t/base.t
+--- rrdtool-1.3.7/bindings/perl-piped/t/base.t 2008-03-15 06:39:48.000000000
-0400
++++ rrdtool-1.3.7-new/bindings/perl-piped/t/base.t 2009-04-08
17:13:19.000000000 -0400
@@ -23,7 +23,7 @@
print "ok 1 module load\n";
@@ -10,18 +10,17 @@
$now=time();
RRDp::cmd qw(create demo.rrd --start ), $now, qw(--step 100 ),
-diff -Nurd rrdtool-1.2.30/bindings/perl-shared/Makefile.PL
rrdtool-1.2.30-patched/bindings/perl-shared/Makefile.PL
---- rrdtool-1.2.30/bindings/perl-shared/Makefile.PL 2009-01-19
09:29:14.000000000 -0500
-+++ rrdtool-1.2.30-patched/bindings/perl-shared/Makefile.PL 2009-02-20
08:46:26.000000000 -0500
-@@ -30,10 +30,9 @@
+diff -Nurd rrdtool-1.3.7/bindings/perl-shared/Makefile.PL
rrdtool-1.3.7-new/bindings/perl-shared/Makefile.PL
+--- rrdtool-1.3.7/bindings/perl-shared/Makefile.PL 2008-12-05
10:39:55.000000000 -0500
++++ rrdtool-1.3.7-new/bindings/perl-shared/Makefile.PL 2009-04-08
17:12:39.000000000 -0400
+@@ -37,9 +37,9 @@
'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
'INC' => '-I../../src',
-- 'LIBS' => '-lm -lpng -lz -lfreetype',
-+ 'LIBS' => '-lm -lpng -lz -lfreetype -lrrd',
++ 'LIBS' => '-lrrd',
# Perl will figure out which one is valid
#'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
- 'depend' => {'RRDs.c' => "../../src/librrd.la"},
- 'LDFROM' => '$(OBJECT) '.$librrd,
- 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' }
- );
+ 'LDFROM' => '$(OBJECT) '.$librrd,
+ 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
+ ($^O eq 'darwin') ? ( 'LDDLFLAGS' => "-L../../src/.libs/
$Config{lddlflags}" ) : ()
Modified: trunk/experimental/common/main/finkinfo/database/rrdtool-java.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/rrdtool-java.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/rrdtool-java.info
(original)
+++ trunk/experimental/common/main/finkinfo/database/rrdtool-java.info Wed Apr
8 23:37:19 2009
@@ -1,7 +1,7 @@
Info3: <<
Package: rrdtool-java
Version: 1.0.3
-Revision: 1
+Revision: 2
Type: java(1.4)
Source: mirror:sourceforge:opennms/jrrd-%v.tar.gz
@@ -11,9 +11,23 @@
freetype219 (>= 2.3.7-7),
libart2 (>= 2.3.19-1),
libpng3,
- rrdtool-dev (>= 1.2-1)
+ rrdtool-dev (>= 1.3-1)
<<
-Depends: librrd2-shlibs
+Depends: librrd4-shlibs
+
+CompileScript: <<
+#!/bin/sh -ev
+
+ case `sw_vers -productVersion` in
+ 10.[01234]*)
+ ;;
+ *)
+ export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
+ ;;
+ esac
+ ./configure %c
+ make
+<<
InstallScript: make install DESTDIR="%d"
Modified: trunk/experimental/common/main/finkinfo/database/rrdtool.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/rrdtool.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/rrdtool.info (original)
+++ trunk/experimental/common/main/finkinfo/database/rrdtool.info Wed Apr 8
23:37:19 2009
@@ -1,29 +1,54 @@
+Info4: <<
Package: rrdtool
-Version: 1.2.30
+Version: 1.3.7
Revision: 1
Conflicts: %N-bin
Replaces: %N-bin
-Depends: librrd2-shlibs (>= %v-%r)
-BuildDepends: freetype219, libart2, libpng3, tcltk, tcltk-dev, perl580-core |
perl581-core | perl584-core | perl586-core | perl588-core
+Depends: librrd4-shlibs (>= %v-%r)
+BuildDepends: <<
+ cairo (>= 1.8.0-1),
+ expat1,
+ fink (>= 0.28.0-1),
+ fontconfig2-dev (>= 2.4.1-1),
+ freetype219 (>= 2.3.7-1),
+ glib2-dev (>= 2.14.0-1),
+ glitz,
+ libgettext3-dev,
+ libiconv-dev,
+ libpng3,
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.22-3),
+ tcltk,
+ tcltk-dev,
+ x11-dev,
+ xft2-dev,
+<<
Source: http://oss.oetiker.ch/%n/pub/%n-%v.tar.gz
-Source-MD5: 19b24f7184a8dbf7b48c1bbb565ad9fb
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%b/src/.libs -L%b/src
+Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
-ConfigureParams: --enable-shared --with-tcllib=%p/lib --mandir=%p/share/man
--enable-local-libpng --enable-local-zlib --disable-perl --disable-python
--disable-ruby
+ConfigureParams: <<
+ --disable-dependency-tracking \
+ --disable-static \
+ --enable-shared \
+ --with-tcllib=%p/lib \
+ --mandir=%p/share/man \
+ --disable-perl \
+ --disable-python \
+ --disable-ruby
+<<
CompileScript: <<
#!/bin/sh -ex
- 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
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
lt_cv_sys_max_cmd_len=65536 PERLBIN="/usr/bin/perl"
- export LIBS="-L`pwd`/src -L`pwd`/src/.libs -L%p/lib"
+ case `sw_vers -productVersion` in
+ 10.[01234]*)
+ ;;
+ *)
+ export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
+ ;;
+ esac
+
./configure %c
perl -pi -e "s,pod2man,$PERLBIN /usr/bin/pod2man,g" doc/Makefile
make POD2MAN_EXE="$PERLBIN /usr/bin/pod2man"
@@ -31,45 +56,50 @@
InstallScript: <<
#!/bin/sh -ex
- make -j1 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" pkglibdir='%p/lib/tclrrd$(VERSION)'
- ranlib "%i/lib/librrd.a"
- touch "%i/share/doc/%n/.turd"
- rm -rf %i/lib/perl %i/share/man/man1/RRDp.1 %i/share/man/man1/RRDs.1
%i/share/doc/%n/examples
- perl -pi -e 's,-L%b/src/.libs,,gs; s,-L%b/src,,gs;
s,-L%p/lib/freetype219/lib,,gs; s,-L%p/lib,,gs' %i/lib/*.la
+ make -j1 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" \
+ pkglibdir='%p/lib/tclrrd$(VERSION)'
+ find %i -name RRDp\* -o -name RRDs\* -exec rm -rf {} \;
+ rm -rf %i/share/man/man1/RRDp.1 %i/share/man/man1/RRDs.1
install_name_tool -id %p/lib/tclrrd%v.dylib %i/lib/tclrrd%v.dylib
<<
SplitOff: <<
- Package: librrd2-shlibs
+ Package: librrd4-shlibs
Suggests: %N
Description: Fixed-size "round-robin" database storage shared libraries
- Depends: freetype219-shlibs, libart2-shlibs, libpng3-shlibs,
rrdtool-fonts
+ Depends: <<
+ cairo-shlibs (>= 1.8.0-1),
+ glib2-shlibs (>= 2.2.1-4),
+ libpng3-shlibs (>= 1.2.5-4),
+ libxml2-shlibs (>= 2.6.1-1),
+ pango1-xft2-ft219-shlibs (>= 1.22.0-1),
+ <<
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)
+ %p/lib/librrd.4.dylib 5.0.0 %n (>= 1.3.7-1)
+ %p/lib/librrd_th.4.dylib 5.0.0 %n (>= 1.3.7-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)
- Files: include lib/*.a lib/*.la lib/librrd.dylib lib/librrd_th.dylib
+ Files: include lib/*.la lib/librrd.dylib lib/librrd_th.dylib
lib/pkgconfig
<<
SplitOff4: <<
Package: %N-tcl
Description: TCL scripting module for round-robin databases
- Depends: librrd2-shlibs (>= %v-%r), tcltk-shlibs
- Enhances: librrd2-shlibs
+ Depends: librrd4-shlibs (>= %v-%r), tcltk-shlibs
+ Enhances: librrd4-shlibs
Files: lib/tclrrd%v lib/tclrrd%v.dylib
- Shlibs: %p/lib/tclrrd%v.dylib 0.0.0 rrdtool-tcl (>= 1.2.23-1)
+ Shlibs: %p/lib/tclrrd%v.dylib 0.0.0 rrdtool-tcl (>= 1.3.7-1)
<<
-DocFiles: CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
+DocFiles: CHANGES CONTRIBUTORS COPYING COPYRIGHT NEWS README THREADS TODO
Description: Fixed-size "round-robin" database storage
DescDetail: <<
RRD is a system to store and display time-series data (i.e. network bandwidth,
@@ -82,3 +112,4 @@
License: GPL
Maintainer: Benjamin Reed <[email protected]>
Homepage: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
+<<
Modified: trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info Wed Apr
8 23:37:19 2009
@@ -1,19 +1,29 @@
-Info2: <<
+Info4: <<
Package: rrd-pm%type_pkg[perl]
-Version: 1.2.30
+Version: 1.3.7
Revision: 1
-BuildDepends: fink (>= 0.28.0-1), libpng3, perl%type_pkg[perl]-core, rrdtool
(>= %v-1), rrdtool-dev (>= %v-1)
-Depends: libpng3-shlibs, perl%type_pkg[perl]-core, rrdtool (>= %v-1)
+BuildDepends: <<
+ fink (>= 0.28.0-1),
+ libpng3,
+ perl%type_pkg[perl]-core,
+ rrdtool (>= %v-1),
+ rrdtool-dev (>= %v-1)
+<<
+Depends: <<
+ libpng3-shlibs,
+ perl%type_pkg[perl]-core,
+ rrdtool (>= %v-1)
+<<
Provides: rrd-pm, rrdtool-perl-pm%type_pkg[perl]
Conflicts: rrdtool-perl-pm%type_pkg[perl] (<< %v-%r)
Replaces: rrd-pm560, rrd-pm561, rrd-pm580, rrd-pm581, rrd-pm584, rrd-pm585,
rrd-pm586, rrd-pm588, rrdtool-perl-pm%type_pkg[perl] (<< %v-%r)
Suggests: rrdtool
Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%v.tar.gz
-Source-MD5: 19b24f7184a8dbf7b48c1bbb565ad9fb
+Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
-ConfigureParams: --enable-shared --with-tcllib=%p/lib --mandir=%p/share/man
--enable-local-libpng --enable-local-zlib --enable-perl --disable-python
+ConfigureParams: --disable-static --enable-shared --with-tcllib=%p/lib
--mandir=%p/share/man --enable-perl --disable-python
PatchFile: rrd-pm.patch
-PatchFile-MD5: 12c6de4e63456c51f8470f75b9f9182c
+PatchFile-MD5: 2042cea1692e4c2fde35f3b31e928167
UpdatePOD: true
Type: perl(0)
NoPerlTests: true
@@ -21,21 +31,21 @@
CompileScript: <<
#!/bin/sh -ex
- export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
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
+ eval "`perl$perlversion -V:archname`"
./configure %c
- eval "`perl$perlversion -V:archname`"
export PERLMAKEARGS="PREFIX=%p
INSTALLPRIVLIB=%p/lib/perl5/%type_raw[perl]
INSTALLARCHLIB=%p/lib/perl5/%type_raw[perl]/$archname
INSTALLSITELIB=%p/lib/perl5/%type_raw[perl]
INSTALLSITEARCH=%p/lib/perl5/%type_raw[perl]/$archname
INSTALLMAN1DIR=%p/lib/perl5/%type_raw[perl]
INSTALLMAN3DIR=%p/lib/perl5/%type_raw[perl]
INSTALLSITEMAN1DIR=%p/lib/perl5/%type_raw[perl]
INSTALLSITEMAN3DIR=%p/lib/perl5/%type_raw[perl] INSTALLBIN=%p/bin
INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin"
pushd bindings/perl-piped
- perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
- make
- make test
+ perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
+ make
+ make test
popd
pushd bindings/perl-shared
- perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
- make INC="-I%p/include" OTHERLDFLAGS="-L%p/lib -lrrd"
- make test
+ perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
+ make INC="-I%p/include -I../../src" OTHERLDFLAGS="-L%p/lib
-lrrd"
+ make test
popd
<<
InstallScript: <<
@@ -46,16 +56,11 @@
export PERLMAKEARGS="PREFIX=%i
INSTALLPRIVLIB=%i/lib/perl5/%type_raw[perl]
INSTALLARCHLIB=%i/lib/perl5/%type_raw[perl]/$archname
INSTALLSITELIB=%i/lib/perl5/%type_raw[perl]
INSTALLSITEARCH=%i/lib/perl5/%type_raw[perl]/$archname
INSTALLMAN1DIR=%i/lib/perl5/%type_raw[perl]
INSTALLMAN3DIR=%i/lib/perl5/%type_raw[perl]
INSTALLSITEMAN1DIR=%i/lib/perl5/%type_raw[perl]
INSTALLSITEMAN3DIR=%i/lib/perl5/%type_raw[perl] INSTALLBIN=%i/bin
INSTALLSITEBIN=%i/bin INSTALLSCRIPT=%i/bin"
pushd bindings/perl-piped
- make install $PERLMAKEARGS
+ make -j1 install $PERLMAKEARGS
popd
pushd bindings/perl-shared
- make install $PERLMAKEARGS
- popd
-
- install -d -m 755 %i/share/doc/rrdtool
- pushd examples
- make -j1 install DESTDIR="%d"
examplesdir="%p/share/doc/rrd-pm%type_pkg[perl]/examples"
+ make -j1 install $PERLMAKEARGS
popd
<<
Description: RRDTool Perl bindings module
Modified: trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.patch&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.patch
(original)
+++ trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.patch Wed Apr
8 23:37:19 2009
@@ -1,6 +1,6 @@
-diff -Nurd rrdtool-1.2.30/bindings/perl-piped/t/base.t
rrdtool-1.2.30-patched/bindings/perl-piped/t/base.t
---- rrdtool-1.2.30/bindings/perl-piped/t/base.t 2009-01-19
09:29:14.000000000 -0500
-+++ rrdtool-1.2.30-patched/bindings/perl-piped/t/base.t 2009-02-20
08:45:31.000000000 -0500
+diff -Nurd rrdtool-1.3.7/bindings/perl-piped/t/base.t
rrdtool-1.3.7-new/bindings/perl-piped/t/base.t
+--- rrdtool-1.3.7/bindings/perl-piped/t/base.t 2008-03-15 06:39:48.000000000
-0400
++++ rrdtool-1.3.7-new/bindings/perl-piped/t/base.t 2009-04-08
17:13:19.000000000 -0400
@@ -23,7 +23,7 @@
print "ok 1 module load\n";
@@ -10,18 +10,17 @@
$now=time();
RRDp::cmd qw(create demo.rrd --start ), $now, qw(--step 100 ),
-diff -Nurd rrdtool-1.2.30/bindings/perl-shared/Makefile.PL
rrdtool-1.2.30-patched/bindings/perl-shared/Makefile.PL
---- rrdtool-1.2.30/bindings/perl-shared/Makefile.PL 2009-01-19
09:29:14.000000000 -0500
-+++ rrdtool-1.2.30-patched/bindings/perl-shared/Makefile.PL 2009-02-20
08:46:26.000000000 -0500
-@@ -30,10 +30,9 @@
+diff -Nurd rrdtool-1.3.7/bindings/perl-shared/Makefile.PL
rrdtool-1.3.7-new/bindings/perl-shared/Makefile.PL
+--- rrdtool-1.3.7/bindings/perl-shared/Makefile.PL 2008-12-05
10:39:55.000000000 -0500
++++ rrdtool-1.3.7-new/bindings/perl-shared/Makefile.PL 2009-04-08
17:12:39.000000000 -0400
+@@ -37,9 +37,9 @@
'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
'INC' => '-I../../src',
-- 'LIBS' => '-lm -lpng -lz -lfreetype',
-+ 'LIBS' => '-lm -lpng -lz -lfreetype -lrrd',
++ 'LIBS' => '-lrrd',
# Perl will figure out which one is valid
#'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
- 'depend' => {'RRDs.c' => "../../src/librrd.la"},
- 'LDFROM' => '$(OBJECT) '.$librrd,
- 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' }
- );
+ 'LDFROM' => '$(OBJECT) '.$librrd,
+ 'realclean' => {FILES => 't/demo?.rrd t/demo?.png' },
+ ($^O eq 'darwin') ? ( 'LDDLFLAGS' => "-L../../src/.libs/
$Config{lddlflags}" ) : ()
Modified: trunk/experimental/common/main/finkinfo/libs/qt4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/qt4-mac.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/qt4-mac.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/qt4-mac.info Wed Apr 8
23:37:19 2009
@@ -106,7 +106,7 @@
%p/sbin/normalize-filenames.sh "%i/lib/%N/include"
if [ -d "%i/lib/%N/include/Phonon" ]; then
- mv "%i/lib/%N/include/Phonon" "%i/lib/%N/include/phonon"
+ /usr/bin/mv "%i/lib/%N/include/Phonon"
"%i/lib/%N/include/phonon"
fi
install -d -m 755 %i/share/doc/installed-packages
Modified: trunk/experimental/common/main/finkinfo/x11/qt4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt4-x11.info&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/qt4-x11.info (original)
+++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.info Wed Apr 8
23:37:19 2009
@@ -98,7 +98,7 @@
END
cat %i/lib/%N/include/QtCore/qglobal.h
>>%i/lib/%N/include/QtCore/qglobal.h.new
- mv %i/lib/%N/include/QtCore/qglobal.h.new
%i/lib/%N/include/QtCore/qglobal.h
+ /usr/bin/mv %i/lib/%N/include/QtCore/qglobal.h.new
%i/lib/%N/include/QtCore/qglobal.h
#### FIX LA, PRL and PC FILES ####
@@ -150,7 +150,7 @@
%p/sbin/normalize-filenames.sh "%i/lib/%N/include"
if [ -d "%i/lib/%N/include/Phonon" ]; then
- mv "%i/lib/%N/include/Phonon" "%i/lib/%N/include/phonon"
+ /usr/bin/mv "%i/lib/%N/include/Phonon"
"%i/lib/%N/include/phonon"
fi
install -d -m 755 %i/share/doc/installed-packages
Modified: trunk/experimental/generate-infofiles.pl
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1482&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/generate-infofiles.pl (original)
+++ trunk/experimental/generate-infofiles.pl Wed Apr 8 23:37:19 2009
@@ -91,6 +91,7 @@
'/qt3',
'readline-java',
'rpm',
+ 'rrdtool',
'sharp',
'screensaver',
'soprano',
@@ -119,7 +120,7 @@
'^akonadi-.*?(-dev|-shlibs)?$' => [ '1.1.1', '1'
],
'^autoconf$' => [ '2.60', '1'
],
'^automoc-.*$' => [ '0.9.89', '0'
],
- '^cairo(-dev|-shlibs)?$' => [ '1.8', '1'
],
+ '^cairo(-dev|-shlibs)?$' => [ '1.8.6', '1'
],
'^cmake$' => [ '2.6.3', '1'
],
'^cocoa-sharp$' => [ '0.9.5', '1'
],
'^dbus(-dev|-shlibs)?$' => [ '1.2.12', '1'
],
@@ -137,8 +138,10 @@
'^libmal10(-shlibs)?$' => [ undef, '+'
],
'^libcdparanoia0-dev$' => [ '3a9.8', '11'
],
'^libpqxx2(-dev|-shlibs)?$' => [ '1:2.6.8', '1'
],
+ '^libxml2(-shlibs)?$' => [ '2.6.32', '1'
],
'^mono(-dev|-shlibs|-tools)?$' => [ '2.4', '1'
],
'^monodevelop.*$' => [ '2.0', '1'
],
+ '^pango1-xft2-ft219(-dev|-shlibs)?$' => [ '1.20.5', '1'
],
'^pcre(-bin|-shlibs)?$' => [ '7.6', '1'
],
'^pixman(-shlibs)?$' => [ '0.12.0', '1'
],
'^postgresql\S+$' => [ undef, '+'
],
@@ -875,11 +878,11 @@
if ($tree =~ /^10.3/) {
@versions = qw(5.6.0 5.8.0 5.8.1 5.8.4 5.8.6);
} elsif ($tree =~ /^10.4/) {
- @versions = qw(5.8.1 5.8.4 5.8.6 5.8.8);
+ @versions = qw(5.8.1 5.8.4 5.8.6 5.8.8 5.10.0);
}
$type = "perl(@versions)";
} elsif ($type =~ /^python\s*\(0\)/i) {
- my @versions = qw(2.1 2.2 2.3 2.4 2.5);
+ my @versions = qw(2.1 2.2 2.3 2.4 2.5 2.6);
if ($tree =~ /^10.3/) {
@versions = qw(2.2 2.3 2.4);
} elsif ($tree =~ /^10.4/) {
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
