[csw-devel] SF.net SVN: gar:[8988] csw/mgar/pkg/rrdtool/branches/benny

[bensons at users.sourceforge.net]

Revision: 8988
          http://gar.svn.sourceforge.net/gar/?rev=8988&view=rev
Author:   bensons
Date:     2010-03-05 14:12:40 +0000 (Fri, 05 Mar 2010)

Log Message:
-----------
rrdtool: final GAR recipe

Modified Paths:
--------------
    csw/mgar/pkg/rrdtool/branches/benny/Makefile
    csw/mgar/pkg/rrdtool/branches/benny/checksums
    csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c

Added Paths:
-----------
    csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL
    csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL

Modified: csw/mgar/pkg/rrdtool/branches/benny/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-03-05 11:16:42 UTC (rev 8987)
+++ csw/mgar/pkg/rrdtool/branches/benny/Makefile	2010-03-05 14:12:40 UTC (rev 8988)
@@ -43,6 +43,7 @@
 BUILD_DEP_PKGS += CSWrenderproto
 BUILD_DEP_PKGS += CSWkbproto
 BUILD_DEP_PKGS += CSWpython-devel
+BUILD_DEP_PKGS += CSWrubydev
 
 EXTRA_INC = $(prefix)/include/cairo
 EXTRA_INC += $(prefix)/include/libxml2
@@ -75,6 +76,8 @@
 PATCHFILES += patch-src-rrd_open.c
 PATCHFILES += patch-bindings-Makefile.in
 PATCHFILES += patch-bindings-ruby-extconf.rb
+PATCHFILES += patch-bindings-perl-piped-Makefile.PL
+PATCHFILES += patch-bindings-perl-shared-Makefile.PL
 
 BUILD64 = 1
 

Modified: csw/mgar/pkg/rrdtool/branches/benny/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/checksums	2010-03-05 11:16:42 UTC (rev 8987)
+++ csw/mgar/pkg/rrdtool/branches/benny/checksums	2010-03-05 14:12:40 UTC (rev 8988)
@@ -1,4 +1,6 @@
 c6bc2f9c3d88e0488f0332a9d288dc39  patch-bindings-Makefile.in
+0d068a4648f3a52c79c00374fa0ef486  patch-bindings-perl-piped-Makefile.PL
+4fd31144a5e2799db7440d97430d3ab6  patch-bindings-perl-shared-Makefile.PL
 072482090287b462c8c092b2ead132da  patch-bindings-ruby-extconf.rb
 20e58c7facf2687037288c157c32df1a  patch-src-Makefile.in
 47709778545eec2e8c5c3b38f9c94fcd  patch-src-rrd_open.c

Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-piped-Makefile.PL	2010-03-05 14:12:40 UTC (rev 8988)
@@ -0,0 +1,10 @@
+--- rrdtool-1.4.2.orig/bindings/perl-piped/Makefile.PL	2008-03-15 11:39:48.000000000 +0100
++++ rrdtool-1.4.2/bindings/perl-piped/Makefile.PL	2010-03-04 16:15:51.013159708 +0100
+@@ -5,6 +5,7 @@
+ WriteMakefile(
+     'NAME'         => 'RRDp',
+     'VERSION'      => '0.99.0', # finds $VERSION
++    'LIBS'         => '-lperl',
+     'linkext'   => {LINKTYPE => ''},
+     'dist'    =>    {COMPRESS=>'gzip', SUFFIX=>'gz'},
+ );

Added: csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/patch-bindings-perl-shared-Makefile.PL	2010-03-05 14:12:40 UTC (rev 8988)
@@ -0,0 +1,10 @@
+--- rrdtool-1.4.2.orig/bindings/perl-shared/Makefile.PL	2008-12-05 16:39:55.000000000 +0100
++++ rrdtool-1.4.2/bindings/perl-shared/Makefile.PL	2010-03-04 16:15:30.877275566 +0100
+@@ -37,6 +37,7 @@
+     'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
+     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+     'INC'          => '-I../../src',
++    'LIBS'         => '-lperl',
+     # Perl will figure out which one is valid
+     #'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
+     'depend'       => {'RRDs.c' => "../../src/librrd.la"},

Modified: csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c
===================================================================
--- csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	2010-03-05 11:16:42 UTC (rev 8987)
+++ csw/mgar/pkg/rrdtool/branches/benny/files/s_round.c	2010-03-05 14:12:40 UTC (rev 8988)
@@ -25,15 +25,13 @@
  */
 
 #include <math.h>
+#include "s_round.h"
 
 double
 round(double x)
 {
         double t;
 
-	if (!isfinite(x))
-                return (x);
-
         if (x >= 0.0) {
                 t = floor(x);
                 if (t - x <= -0.5)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.