OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-May-2007 10:11:51
Branch: HEAD Handle: 2007051409115100
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
modifying package: rrdtool-1.2.23 20070503 -> 20070514
Summary:
Revision Changes Path
1.17 +68 -68 openpkg-src/rrdtool/rrdtool.patch
1.98 +2 -2 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 11 Sep 2006 05:38:59 -0000 1.16
+++ openpkg-src/rrdtool/rrdtool.patch 14 May 2007 08:11:51 -0000 1.17
@@ -1,71 +1,6 @@
-Index: bindings/perl-shared/Makefile.PL
---- bindings/perl-shared/Makefile.PL.orig 2006-07-14 14:11:26 +0200
-+++ bindings/perl-shared/Makefile.PL 2006-07-14 17:52:24 +0200
-@@ -1,30 +1,8 @@
- use ExtUtils::MakeMaker;
- use Config;
--# See lib/ExtUtils/MakeMaker.pm for details of how to influence
--# the contents of the Makefile that is written.
--
--# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
--# path to librrd.so then the Makefile will be written such that RRDs.so
knows
--# where to find librrd.so later on ...
--my $R="";
--if ($ARGV[-1] =~ /RPATH=(\S+)/){
-- pop @ARGV;
-- my $rp = $1;
-- for ($^O){
-- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
-- /hpux/ && do{ $R = "+b$rp"};
-- /solaris/ && do{ $R = "-R$rp"};
-- /aix/ && do{ $R = "-Wl,-blibpath:$rp"};
-- }
--}
--
--# darwin works without this because librrd contains its
--# install_name which will includes the final location of the
--# library after it is installed. This install_name gets transfered
--# to the perl shared object.
--
--my $librrd = "-L../../src/.libs/ $R -lrrd";
-
-+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype
-lpng -lz -lart_lgpl";
-+
- WriteMakefile(
- 'NAME' => 'RRDs',
- 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
-Index: RRDTool-OO-0.17/lib/RRDTool/OO.pm
---- RRDTool-OO-0.17/lib/RRDTool/OO.pm.orig 2005-08-12 07:21:40 +0200
-+++ RRDTool-OO-0.17/lib/RRDTool/OO.pm 2006-05-14 20:59:44 +0200
-@@ -5,7 +5,6 @@
- use warnings;
- use Carp;
- use RRDs;
--use Log::Log4perl qw(:easy);
-
- our $VERSION = '0.13';
-
-@@ -158,7 +157,7 @@
- # Check if we got all mandatory parameters
- for(@{$ref->{mandatory}}) {
- if(! exists $options_hash{$_}) {
-- Log::Log4perl->get_logger("")->logcroak(
-+ croak(
- "Mandatory parameter '$_' not set " .
- "in $method() (@{[%mandatory]}) (@$options)");
- }
-@@ -169,7 +168,7 @@
- for(keys %options_hash) {
- if(! exists $optional{$_} and
- ! exists $mandatory{$_}) {
-- Log::Log4perl->get_logger("")->logcroak(
-+ croak(
- "Illegal parameter '$_' in $method()");
- }
- }
-Index: RRDTool-OO-0.17/Makefile.PL
---- RRDTool-OO-0.17.orig/Makefile.PL 2006-09-10 19:21:18 +0200
-+++ RRDTool-OO-0.17/Makefile.PL 2006-09-11 07:36:14 +0200
+Index: RRDTool-OO-0.19/Makefile.PL
+--- RRDTool-OO-0.19/Makefile.PL.orig 2006-09-10 19:21:18 +0200
++++ RRDTool-OO-0.19/Makefile.PL 2007-05-14 10:07:38 +0200
@@ -2,55 +2,12 @@
use ExtUtils::MakeMaker;
use File::Basename;
@@ -122,3 +57,68 @@
RRDs => 0,
}, # e.g., Module::Name => 1.1
($] >= 5.005 ? ## Add these new keywords supported since 5.005
+Index: RRDTool-OO-0.19/lib/RRDTool/OO.pm
+--- RRDTool-OO-0.19/lib/RRDTool/OO.pm.orig 2007-05-13 05:59:48 +0200
++++ RRDTool-OO-0.19/lib/RRDTool/OO.pm 2007-05-14 10:08:51 +0200
+@@ -5,7 +5,6 @@
+ use warnings;
+ use Carp;
+ use RRDs;
+-use Log::Log4perl qw(:easy);
+
+ our $VERSION = '0.19';
+
+@@ -173,7 +172,7 @@
+ # Check if we got all mandatory parameters
+ for(@{$ref->{mandatory}}) {
+ if(! exists $options_hash{$_}) {
+- Log::Log4perl->get_logger("")->logcroak(
++ croak(
+ "Mandatory parameter '$_' not set " .
+ "in $method() (@{[%mandatory]}) (@$options)");
+ }
+@@ -185,7 +184,7 @@
+ for(keys %options_hash) {
+ if(! exists $optional{$_} and
+ ! exists $mandatory{$_}) {
+- Log::Log4perl->get_logger("")->logcroak(
++ croak(
+ "Illegal parameter '$_' in $method()");
+ }
+ }
+Index: bindings/perl-shared/Makefile.PL
+--- bindings/perl-shared/Makefile.PL.orig 2007-05-02 20:06:11 +0200
++++ bindings/perl-shared/Makefile.PL 2007-05-14 10:07:38 +0200
+@@ -1,30 +1,8 @@
+ use ExtUtils::MakeMaker;
+ use Config;
+-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+-# the contents of the Makefile that is written.
+-
+-# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
+-# path to librrd.so then the Makefile will be written such that RRDs.so
knows
+-# where to find librrd.so later on ...
+-my $R="";
+-if ($ARGV[-1] =~ /RPATH=(\S+)/){
+- pop @ARGV;
+- my $rp = $1;
+- for ($^O){
+- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
+- /hpux/ && do{ $R = "+b$rp"};
+- /solaris/ && do{ $R = "-R$rp"};
+- /aix/ && do{ $R = "-Wl,-blibpath:$rp"};
+- }
+-}
+-
+-# darwin works without this because librrd contains its
+-# install_name which will includes the final location of the
+-# library after it is installed. This install_name gets transfered
+-# to the perl shared object.
+-
+-my $librrd = "-L../../src/.libs/ $R -lrrd";
+
++my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype
-lpng -lz -lart_lgpl";
++
+ WriteMakefile(
+ 'NAME' => 'RRDs',
+ 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.97 -r1.98 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 3 May 2007 10:22:23 -0000 1.97
+++ openpkg-src/rrdtool/rrdtool.spec 14 May 2007 08:11:51 -0000 1.98
@@ -24,7 +24,7 @@
# package version
%define V_rrdtool 1.2.23
-%define V_rrdtool_oo 0.17
+%define V_rrdtool_oo 0.19
%define V_rrd_simple 1.43
# package information
@@ -38,7 +38,7 @@
Group: Database
License: LGPL
Version: %{V_rrdtool}
-Release: 20070503
+Release: 20070514
# list of sources
Source0: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{V_rrdtool}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
