Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9211

Modified Files:
        rrd-pm.info rrd-pm.patch 
Log Message:
overhaul build, with maintainer "um... sure..."


Index: rrd-pm.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/rrd-pm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rrd-pm.patch        8 Apr 2009 21:48:06 -0000       1.5
+++ rrd-pm.patch        21 Jun 2010 14:53:08 -0000      1.6
@@ -13,14 +13,19 @@
 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 @@
+@@ -36,12 +36,12 @@
+     'NAME'         => 'RRDs',
      'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
      'DEFINE'     => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
-     'INC'          => '-I../../src',
+-    'INC'          => '-I../../src',
++    'INC'          => "$ENV{CPPFLAGS} -I../../src",
 +    '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' },
-     ($^O eq 'darwin') ? ( 'LDDLFLAGS'    => "-L../../src/.libs/ 
$Config{lddlflags}" ) : ()
+-    ($^O eq 'darwin') ? ( 'LDDLFLAGS'    => "-L../../src/.libs/ 
$Config{lddlflags}" ) : ()
++    ($^O eq 'darwin') ? ( 'LDDLFLAGS'    => "$ENV{LDFLAGS} 
$Config{lddlflags}" ) : ()
+ );
+ 

Index: rrd-pm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/rrd-pm.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- rrd-pm.info 3 Jun 2010 03:04:07 -0000       1.24
+++ rrd-pm.info 21 Jun 2010 14:53:08 -0000      1.25
@@ -1,7 +1,7 @@
 Info4: <<
 Package: rrd-pm%type_pkg[perl]
 Version: 1.3.8
-Revision: 1
+Revision: 3
 Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
 Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4, 
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] = 
5100) 10.5, (%type_pkg[perl] = 5100) 10.6
 Description: RRDTool Perl bindings module
@@ -39,47 +39,51 @@
 Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%v.tar.gz
 Source-MD5: 0de79494ab969cebfbfae3d237de18fe
 PatchFile: rrd-pm.patch
-PatchFile-MD5: 2042cea1692e4c2fde35f3b31e928167
+PatchFile-MD5: 73a20932cbc1290ee759afe22a842f15
 
 SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2
 UseMaxBuildJobs: true
-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
-       eval "`perl$perlversion -V:archname`"
-       ./configure %c
-
-       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"
+       ./configure %c --prefix=%p --disable-static --enable-shared 
--with-tcllib=%p/lib --mandir=%p/share/man --enable-perl --disable-python
 
        pushd bindings/perl-piped
-               perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
-               make
-               make test
+               %{default_script}
        popd
+
        pushd bindings/perl-shared
-               perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
-               make INC="-I%p/include -I../../src" OTHERLDFLAGS="-L%p/lib 
-lrrd"
-               make test
+               %{default_script}
        popd
 <<
+InfoTest: <<
+       TestScript: <<
+       #!/bin/sh -ex
+
+               pushd bindings/perl-piped
+                       %{default_script}
+               popd
+
+               pushd bindings/perl-shared
+                       %{default_script}
+               popd
+       <<
+<<
 
 UpdatePOD: true
 InstallScript: <<
 #!/bin/sh -ex
 
-       eval "`perl$perlversion -V:archname`"
-
-       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 -j1 install $PERLMAKEARGS
+               %{default_script}
        popd
 
        pushd bindings/perl-shared
-               make -j1 install $PERLMAKEARGS
+               %{default_script}
        popd
+
+       mv %i/share/man %i/lib/perl5/%type_raw[perl]
 <<
 NoPerlTests: true
 DocFiles: bindings/perl-piped/README:README.piped 
bindings/perl-shared/README:README.shared


------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to