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

Modified Files:
        extutils-makemaker-pm.info html-tree-pm.info xml-twig-pm.info 
Added Files:
        extutils-makemaker-pm.patch 
Log Message:
latest version to stable


--- NEW FILE: extutils-makemaker-pm.patch ---
diff -Nurd -x'*~' ExtUtils-MakeMaker-6.56.orig/lib/ExtUtils/MakeMaker.pm 
ExtUtils-MakeMaker-6.56/lib/ExtUtils/MakeMaker.pm
--- ExtUtils-MakeMaker-6.56.orig/lib/ExtUtils/MakeMaker.pm      2009-12-17 
17:02:03.000000000 -0500
+++ ExtUtils-MakeMaker-6.56/lib/ExtUtils/MakeMaker.pm   2011-01-11 
06:08:00.000000000 -0500
@@ -344,6 +344,11 @@
         $Recognized_Att_Keys{$item} = 1;
     }
     foreach my $item (@Get_from_Config) {
+       if ($item eq 'lddlflags' && '@PREFIX@' ne '/usr/local') {
+           $Config{$item} =~ s,-L/usr/local/lib,,;
+           print "# removed -L/usr/local/lib from '\U$item\E'\n"
+               if ($Verbose >= 2);
+       }
         $Recognized_Att_Keys{uc $item} = $Config{$item};
         print "Attribute '\U$item\E' => '$Config{$item}'\n"
             if ($Verbose >= 2);

Index: xml-twig-pm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/xml-twig-pm.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xml-twig-pm.info    23 Aug 2009 04:24:13 -0000      1.9
+++ xml-twig-pm.info    22 Jan 2011 23:21:20 -0000      1.10
@@ -1,17 +1,61 @@
 Info2: <<
 Package: xml-twig-pm%type_pkg[perl]
-Version: 3.26
-Revision: 2
-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
+Version: 3.37
+Revision: 1
+Architecture: (%type_pkg[perl] = 581) powerpc
+Distribution: (%type_pkg[perl] = 581) 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
 Replaces: xml-twig-pm (<= 3.14-10), xml-twig-pm560, xml-twig-pm580, 
xml-twig-pm581, xml-twig-pm586
-Depends: xml-parser-pm%type_pkg[perl] (>= 2.31-6), 
scalar-list-utils-pm%type_pkg[perl], text-iconv-pm%type_pkg[perl] (>= 1.2-3)
-BuildDepends: fink (>= 0.20.1-1), perl%type_pkg[perl]-core
+Depends: <<
+       perl%type_pkg[perl]-core,
+       encode-pm%type_pkg[perl],
+       html-entities-numbered-pm,
+       html-parser-pm%type_pkg[perl],
+       html-tree-pm%type_pkg[perl] (>= 4.0-1),
+       html-tidy-pm%type_pkg[perl],
+       libwww-pm%type_pkg[perl],
+       scalar-list-utils-pm%type_pkg[perl],
+       text-iconv-pm%type_pkg[perl] (>= 1.2-3),
+       tie-ixhash-pm,
+       xml-parser-pm%type_pkg[perl] (>= 2.31-6),
+       xml-xpathengine-pm
+<<
+BuildDepends: fink (>= 0.20.1-1)
 Source: mirror:cpan:authors/id/M/MI/MIROD/XML-Twig-%v.tar.gz
+# There is a bug in fink's perl packages which sets perlpath to %p/bin/perl
+# instead of %p/bin/perlx.y.z so the tests fail if perlxyz isn't installed
+# in addition to perlxyz-core. This patch works around the bug.
 PatchScript: <<
-  ### Disable interaction by Justin F. Hallett
-  perl -pi.bak -e 's,\$_;,\$_;\n    push\(\@programs\, \$program\);,g' 
Makefile.PL
-  perl -pi.bak -e 's,prompt,print,g' Makefile.PL
+  perl -pi -e 's/\$Config{perlpath}/"perl%type_raw[perl]"/g' t/*.t
+
+  # hardcode the desired option
+  perl -pi -e 's/\$ARGV\[0\]/"-y"/g' Makefile.PL
+
+  # perl tests aren't getting propagated perl interp flags even if
+  # perl's perlpath var is set correctly
+  perl -pi -e 's/\$\^X/\$ENV{FULLPERL}/' t/test_autoencoding_conversion.t 
t/test_errors.t t/test_xml_split.t t/test_xml_split_g.t
+  perl -pi -e 's/\$\^X/"\$ENV{FULLPERL}"/' t/tools.pm
+  # ...and because it could be a multi-shellword thing, gotta quote
+  # it when passed as a command parameter
+  perl -pi -e 's/(\$perl.*)(\$perl)/\1"\2"/' t/test_errors.t
+<<
+InfoTest: <<
+  TestDepends: <<
+       unicode-map8-pm%type_pkg[perl],
+       unicode-string-pm%type_pkg[perl],
+       xml-filter-buffertext-pm%type_pkg[perl],
+       xml-sax-writer-pm%type_pkg[perl],
+       xml-simple-pm%type_pkg[perl]
+  <<
+  TestScript: <<
+  #!/bin/sh -ev
+    perlversion=%type_raw[perl]
+    if dpkg --compare-versions "$perlversion" ">=" "5.10.0" && [ "%m" != 
"powerpc" ]; then
+      export FULLPERL="/usr/bin/arch -%m perl$perlversion"
+    else
+      export FULLPERL="\$^X"
+    fi
+    %{default_script}
+  <<
 <<
 InstallScript: <<
 #!/bin/sh -ev
@@ -28,18 +72,21 @@
   --install %p/bin/xml_grep                    xml_grep         
%p/bin/xml_grep-%type_pkg[perl] %type_pkg[perl] \
   --slave   %p/bin/xml_pp                      xml_pp           
%p/bin/xml_pp-%type_pkg[perl] \
   --slave   %p/bin/xml_spellcheck              xml_spellcheck   
%p/bin/xml_spellcheck-%type_pkg[perl] \
+  --slave   %p/bin/xml_merge                   xml_merge           
%p/bin/xml_merge-%type_pkg[perl] \
+  --slave   %p/bin/xml_split                   xml_split           
%p/bin/xml_split-%type_pkg[perl] \
   --slave   %p/share/man/man1/xml_grep.1       xml_grep.1       
%p/share/man/man1/xml_grep.1-%type_pkg[perl] \
   --slave   %p/share/man/man1/xml_pp.1         xml_pp.1         
%p/share/man/man1/xml_pp.1-%type_pkg[perl] \
-  --slave   %p/share/man/man1/xml_spellcheck.1 xml_spellcheck.1 
%p/share/man/man1/xml_spellcheck.1-%type_pkg[perl]
+  --slave   %p/share/man/man1/xml_spellcheck.1 xml_spellcheck.1 
%p/share/man/man1/xml_spellcheck.1-%type_pkg[perl] \
+  --slave   %p/share/man/man1/xml_merge.1      xml_merge.1       
%p/share/man/man1/xml_merge.1-%type_pkg[perl] \
+  --slave   %p/share/man/man1/xml_split.1      xml_split.1       
%p/share/man/man1/xml_split.1-%type_pkg[perl]
 <<
 PreRmScript: <<
   update-alternatives --remove xml_grep %p/bin/xml_grep-%type_pkg[perl]
 <<
-Type: perl (5.8.1 5.8.6 5.8.8)
+Type: perl (5.8.1 5.8.6 5.8.8 5.10.0)
 UpdatePOD: True
-Source-MD5: b776ab7e0649dd62a50bac41366046e1
-NoPerlTests: True
-DocFiles: README Changes MANIFEST
+Source-MD5: 48cf8942c0e150dbd2d171c93db7a0a1
+DocFiles: README Changes
 Description: Process huge XML documents in tree mode
 DescDetail: <<
 A perl module for processing huge XML documents in tree mode.
@@ -48,8 +95,9 @@
   Justin Hallett - removed make test as it faild do to a perl bug with <DATA>
                    usage and clean up, xml-twig-pm works fine.
   dmacks - fixed -pmXXX orthogonality
+  dmacks - more fixes for perl interp used during self-test
 <<
-License: Artistic
-Maintainer: None <fink-de...@lists.sourceforge.net>
+License: Artistic/GPL
+Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
 Homepage: http://search.cpan.org/dist/XML-Twig
 <<

Index: extutils-makemaker-pm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/extutils-makemaker-pm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extutils-makemaker-pm.info  25 Aug 2009 07:46:30 -0000      1.1
+++ extutils-makemaker-pm.info  22 Jan 2011 23:21:20 -0000      1.2
@@ -1,7 +1,7 @@
 Info2: <<
 Package: extutils-makemaker-pm%type_pkg[perl]
-Version: 6.54
-Revision: 1
+Version: 6.56
+Revision: 3
 Architecture: (%type_pkg[perl] = 581) powerpc
 Distribution: (%type_pkg[perl] = 581) 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
 Type: perl (5.8.1 5.8.6 5.8.8 5.10.0)
@@ -15,25 +15,48 @@
        Eliminated -bin splitoff and used update-alternatives to
        allow binaries to coexist.
 <<
+DescPort: <<
+       Patch makefile generator to remove -L/usr/local/lib from early
+       in LDDLFLAGS (don't have non-fink mask fink)
+<<
 
 # Dependencies:
-Depends: perl%type_pkg[perl]-core, extutils-install-pm (>= 1.52-1)
+BuildDepends: fink (>= 0.24.12)
+Depends: perl%type_pkg[perl]-core, extutils-install-pm (>= 1.54-1), 
extutils-manifest-pm (>= 1.58-1)
 
 Replaces: %{Ni}581-bin, %{Ni}586-bin, %{Ni}588-bin
 Provides: %N-bin
 
 # Unpack Phase:
 Source: mirror:cpan:authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-%v.tar.gz
-Source-MD5: 003c04b33e8c8eed693f5001fe52b647
+Source-MD5: af7e032a1e845e4decf7672929510b98
+
+PatchFile: %{ni}.patch
+PatchFile-MD5: 81cf1d254982e1f4b13baaa94d92cc6a        
+PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 
 # Install Phase:
 UpdatePOD: True
-DocFiles: Changes MANIFEST README SIGNATURE
+DocFiles: Changes MANIFEST README
 InstallScript: <<
  %{default_script}
  mv %i/share/man %i/lib/perl5/%type_raw[perl]
  /bin/mv %i/bin/instmodsh %i/bin/instmodsh-pm%type_pkg[perl]
 <<
+InfoTest: <<
+       TestScript: <<
+       #!/bin/sh -ev
+               # t/basic.t is broken on non-default arch of multiarch
+               # perl and very hard to fix, so just scrap it in that
+               # situation. Apple perl is multiarch, fink perl is
+               # not, so heuristic is perl likely to be apple's and
+               # arch is not the expected default for it.
+               if dpkg --compare-versions "%type_raw[perl]" ">=" "5.10.0" && [ 
"%m" = "i386" ] && [ -e /usr/bin/perl%type_raw[perl] ]; then
+                       rm t/basic.t
+               fi
+               %{default_script}
+       <<
+<<
 
 PostInstScript: update-alternatives --install %p/bin/instmodsh instmodsh 
%p/bin/instmodsh-pm%type_pkg[perl] %type_pkg[perl]
 

Index: html-tree-pm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/html-tree-pm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- html-tree-pm.info   23 Aug 2009 04:24:13 -0000      1.2
+++ html-tree-pm.info   22 Jan 2011 23:21:20 -0000      1.3
@@ -1,25 +1,64 @@
 Info2: <<
 Package: html-tree-pm%type_pkg[perl]
-version: 3.23
-Revision: 2
+version: 4.1
+Revision: 1
 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
 ###
-Depends: perl%type_pkg[perl]-core, html-parser-pm%type_pkg[perl] (>= 3.36-1), 
html-tagset-pm 
-BuildDepends: fink (>= 0.29.0-1)
+Depends: <<
+       perl%type_pkg[perl]-core,
+       html-parser-pm%type_pkg[perl] (>= 3.46-1),
+       html-tagset-pm (>= 3.02-1)
+<<
+BuildDepends: <<
+       fink (>= 0.29.0-1),
+       module-build-pm%type_pkg[perl]
+<<
 Replaces: html-tree-pm (<= 3.17-2), %N-man
 Conflicts: %N-man
 ###
-Source: mirror:cpan:authors/id/P/PE/PETEK/HTML-Tree-%v.tar.gz
-Source-MD5: 6352f50be402301f79b580dd235d7762
+Source: mirror:cpan:authors/id/J/JF/JFEARN/HTML-Tree-%v.tar.gz
+Source-MD5: c339cc18ec68e9c677480d2e714b20d1
 ###
 Type: perl (5.8.1 5.8.6 5.8.8 5.10.0)
 UpdatePOD: true
 ###
+CompileScript: <<
+#!/bin/sh -ex
+  exec 2>&1
+  perlversion=%type_raw[perl]
+  perlexe=perl$perlversion
+  if [ "%type_pkg[perl]" = "5100" ] ; then
+    if [ "%m" = "powerpc" ]; then
+      perlexe="/usr/bin/arch -ppc perl$perlversion"
+    else
+      perlexe="/usr/bin/arch -%m perl$perlversion"
+    fi
+  fi
+  eval "`$perlexe -V:archname`"
+  $perlexe Build.PL \
+    --install_path arch=%i/lib/perl5/$perlversion/$archname \
+    --install_path bin=%i/bin \
+    --install_path bindoc=%i/lib/perl5/$perlversion/man/man1 \
+    --install_path lib=%i/lib/perl5/$perlversion \
+    --install_path libdoc=%i/lib/perl5/$perlversion/man/man3 \
+    --install_path script=%i/lib/%n/
+  ./Build
+<<
+
+InfoTest: <<
+       TestDepends: <<
+               test-exception-pm,
+               test-perl-critic-pm%type_pkg[perl],
+               test-pod-pm,
+               test-pod-coverage-pm
+       <<
+       TestScript: ./Build test || exit 2
+<<
+
 DocFiles: Changes MANIFEST* README*
 InstallScript: <<
-  %{default_script}
-  mv %i/share/man %i/lib/perl5/%type_raw[perl]
+       ./Build install
 <<
 ###
 Description: Handling information from HTML syntax trees
@@ -31,10 +70,11 @@
   a separate development track.
 <<
 DescPackaging: <<
+ Previously maintained by Christian Schaffner <chri...@users.sourceforge.net>
  Earlier versions by Justin F. Hallett.
 <<
 ###
-License: Artistic
-Maintainer: Christian Schaffner <chri...@users.sourceforge.net>
+License: Artistic/GPL
+Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
 Homepage: http://search.cpan.org/dist/HTML-Tree
 <<


------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to