Update of 
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/perlmods
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395/common/main/finkinfo/libs/perlmods

Modified Files:
        rrd-pm.info rrd-pm.patch 
Log Message:
commiting some stuff that went to unstable

Index: rrd-pm.patch
===================================================================
RCS file: 
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/perlmods/rrd-pm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rrd-pm.patch        27 Aug 2004 01:45:16 -0000      1.4
+++ rrd-pm.patch        5 Jun 2005 15:09:11 -0000       1.5
@@ -1,58 +1,11 @@
-diff -uNr rrdtool-1.0.49/Makefile.in rrdtool-1.0.49-new/Makefile.in
---- rrdtool-1.0.49/Makefile.in Tue Apr  6 17:30:22 2004
-+++ rrdtool-1.0.49-new/Makefile.in     Wed Jul 21 16:43:03 2004
-@@ -172,7 +172,7 @@
- 
- # build the following subdirectories
- SUBDIRS = cgilib-0.4 gd1.3 $(SUBDIRS_1) $(SUBDIRS_2) \
--          src doc examples contrib tcl
-+          src
- 
- 
- # the following files are not mentioned in any other Makefile
-@@ -214,8 +214,7 @@
-       config/config.sub config/depcomp config/install-sh \
-       config/ltmain.sh config/missing config/mkinstalldirs configure \
-       configure.ac
--DIST_SUBDIRS = cgilib-0.4 gd1.3 zlib-1.1.4 libpng-1.0.9 src doc examples \
--      contrib tcl
-+DIST_SUBDIRS = cgilib-0.4 gd1.3 zlib-1.1.4 libpng-1.0.9 src
- all: config.h
-       $(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-diff -uNr rrdtool-1.0.49/configure rrdtool-1.0.49-new/configure
---- 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
-diff -uNr rrdtool-1.0.49/src/Makefile.in rrdtool-1.0.49-new/src/Makefile.in
---- 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
- 
-diff -uNr rrdtool-1.0.49/tcl/Makefile.in rrdtool-1.0.49-new/tcl/Makefile.in
---- 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 @@
+--- rrdtool-1.2.9/bindings/perl-piped/t/base.t 2005-05-28 09:01:55.000000000 
-0400
++++ rrdtool-1.2.9-new/bindings/perl-piped/t/base.t     2005-06-04 
13:26:08.000000000 -0400
+@@ -23,7 +23,7 @@
  
+ print "ok 1 module load\n";
  
- @[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)
+-ok("RRDp::start", RRDp::start "../src/rrdtool" > 0);
++ok("RRDp::start", RRDp::start "rrdtool" > 0);
  
- @[EMAIL PROTECTED]: tclrrd.c
- @COMP_TCL_TRUE@       $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) 
$(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"
+ $now=time();
+ RRDp::cmd qw(create demo.rrd --start ), $now, qw(--step 100 ),

Index: rrd-pm.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs/perlmods/rrd-pm.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rrd-pm.info 3 Mar 2005 04:14:57 -0000       1.6
+++ rrd-pm.info 5 Jun 2005 15:09:11 -0000       1.7
@@ -1,29 +1,38 @@
 Info2: <<
 Package: rrd-pm%type_pkg[perl]
-Version: 1.0.49
+Version: 1.2.9
 Revision: 1
-BuildDepends: libpng3, perl%type_pkg[perl]-core, rrdtool (>= 1.0.49-1), 
rrdtool-dev (>= 1.0.49-1)
+BuildDepends: libpng3, perl%type_pkg[perl]-core, rrdtool (>= 1.2.9-1), 
rrdtool-dev (>= 1.2.9-1)
 Depends: libpng3-shlibs, perl%type_pkg[perl]-core
 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, 
rrdtool-perl-pm%type_pkg[perl] (<< %v-%r)
+Replaces: rrd-pm560, rrd-pm561, rrd-pm580, rrd-pm581, rrd-pm584, rrd-pm585, 
rrd-pm586, rrdtool-perl-pm%type_pkg[perl] (<< %v-%r)
 Suggests: rrdtool
 Source: 
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%v.tar.gz
-Source-MD5: fbe492dbf3d68abb1d86c2322e7ed44a
-PatchScript: sed -e 's,@PREFIX@,%p,g' %a/rrd-pm.patch | patch -p1
+Source-MD5: 6e358356336317974665b3f4b97ec790
+Patch: rrd-pm.patch
 UpdatePOD: true
-Type: perl(5.6.0 5.6.1 5.8.0 5.8.1 5.8.4 5.8.5)
-DocFiles: perl-piped/README:README.piped perl-shared/README:README.shared
+Type: perl(5.6.0 5.8.0 5.8.1 5.8.4 5.8.6)
+DocFiles: bindings/perl-piped/README:README.piped 
bindings/perl-shared/README:README.shared
 CompileScript: <<
 #!/bin/sh -ex
 
-  export lt_cv_sys_max_cmd_len=65536
-  ./configure --prefix=%p --infodir=%p/share/info --mandir=%p/share/man 
--enable-local-libpng --enable-local-zlib --with-perl-options='%c'
-  make PNG_INC="-I%p/include" PNG_LIB="-L%p/lib -lpng" PNG_LINK="-L%p/lib 
-lpng"
-  pushd perl-piped
+  if perl -e 'use 5.8.1' >/dev/null 2>&1; then
+    perlarchdir=darwin-thread-multi-2level
+  else
+    perlarchdir=darwin
+  fi
+
+  export PERLMAKEARGS="PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/%type_raw[perl] 
INSTALLARCHLIB=%p/lib/perl5/%type_raw[perl]/$perlarchdir 
INSTALLSITELIB=%p/lib/perl5/%type_raw[perl] 
INSTALLSITEARCH=%p/lib/perl5/%type_raw[perl]/$perlarchdir 
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
   popd
-  pushd perl-shared
+  pushd bindings/perl-shared
+  perl%type_raw[perl] Makefile.PL $PERLMAKEARGS
+  make INC="-I%p/include" OTHERLDFLAGS="-L%p/lib -lrrd -lcgi"
   make test
   popd
 <<
@@ -36,12 +45,14 @@
     perlarchdir=darwin
   fi
 
-  pushd perl-piped
-  make install PREFIX=%i INSTALLPRIVLIB=%i/lib/perl5/%type_raw[perl] 
INSTALLARCHLIB=%i/lib/perl5/%type_raw[perl]/$perlarchdir 
INSTALLSITELIB=%i/lib/perl5/%type_raw[perl] 
INSTALLSITEARCH=%i/lib/perl5/%type_raw[perl]/$perlarchdir 
INSTALLMAN1DIR=%i/share/man/man1 INSTALLMAN3DIR=%i/share/man/man3 
INSTALLSITEMAN1DIR=%i/share/man/man1 INSTALLSITEMAN3DIR=%i/share/man/man3 
INSTALLBIN=%i/bin INSTALLSITEBIN=%i/bin INSTALLSCRIPT=%i/bin
+  export PERLMAKEARGS="PREFIX=%i INSTALLPRIVLIB=%i/lib/perl5/%type_raw[perl] 
INSTALLARCHLIB=%i/lib/perl5/%type_raw[perl]/$perlarchdir 
INSTALLSITELIB=%i/lib/perl5/%type_raw[perl] 
INSTALLSITEARCH=%i/lib/perl5/%type_raw[perl]/$perlarchdir 
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
   popd
 
-  pushd perl-shared
-  make install PREFIX=%i INSTALLPRIVLIB=%i/lib/perl5/%type_raw[perl] 
INSTALLARCHLIB=%i/lib/perl5/%type_raw[perl]/$perlarchdir 
INSTALLSITELIB=%i/lib/perl5/%type_raw[perl] 
INSTALLSITEARCH=%i/lib/perl5/%type_raw[perl]/$perlarchdir 
INSTALLMAN1DIR=%i/share/man/man1 INSTALLMAN3DIR=%i/share/man/man3 
INSTALLSITEMAN1DIR=%i/share/man/man1 INSTALLSITEMAN3DIR=%i/share/man/man3 
INSTALLBIN=%i/bin INSTALLSITEBIN=%i/bin INSTALLSCRIPT=%i/bin
+  pushd bindings/perl-shared
+  make install $PERLMAKEARGS
   popd
 <<
 Description: RRDTool Perl bindings module



-------------------------------------------------------
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

Reply via email to