[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bbc2278c3e55e1bdaa42f0797e74052d6fe51bb4)

Treeve Jelbert scm at mail.sourcemage.org
Sat Dec 2 15:15:37 EST 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 libs/xmltv/DEPENDS               |    5 ++++-
 libs/xmltv/DETAILS               |    4 ++--
 libs/xmltv/HISTORY               |    6 ++++++
 libs/xmltv/PRE_BUILD             |    5 +++++
 libs/xmltv/grabbers              |    3 ++-
 perl-cpan/unicode-string/DETAILS |    4 ++--
 perl-cpan/unicode-string/HISTORY |    3 +++
 perl-cpan/xml-twig/BUILD         |    1 +
 perl-cpan/xml-twig/DETAILS       |    1 +
 perl-cpan/xml-twig/HISTORY       |    6 ++++++
 perl-cpan/xml-twig/Makefile.PL   |   28 ----------------------------
 perl-cpan/xml-twig/PRE_BUILD     |   26 --------------------------
 perl-cpan/xml-twig/query.patch   |   27 ---------------------------
 13 files changed, 32 insertions(+), 87 deletions(-)

New commits:
commit 3a00786f611e8d5fa990459d6b1cad41c50499e3
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    xmltv-0.5.45

commit f9ed61005138d2ab938c7c52db6fa4f9be293153
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    xml-twig - fix install

commit 2c2347f685cc8ed6d750fbe77e960527694f6811
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    unicode-string-2.09

diff --git a/libs/xmltv/DEPENDS b/libs/xmltv/DEPENDS
index 8336304..a599df2 100755
--- a/libs/xmltv/DEPENDS
+++ b/libs/xmltv/DEPENDS
@@ -4,7 +4,10 @@ depends  xml-twig      &&
 depends  xml-writer    &&
 depends  date-manip    &&
 depends  term-readkey  &&
-depends  soap-lite	   &&
+optional_depends  soap-lite	                       \
+                  ''                                   \
+                  ''                                   \
+                  'for Grabber North America support'  &&
 
 optional_depends  html-parser                          \
                   ''                                   \
diff --git a/libs/xmltv/DETAILS b/libs/xmltv/DETAILS
index 925253e..9cb411d 100755
--- a/libs/xmltv/DETAILS
+++ b/libs/xmltv/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xmltv
-         VERSION=0.5.44
-    SOURCE_HASH=sha512:28a81a624c69b2b4b0ac1d5f444a039385a64b676ebdb9d94a8bba1537bb8d347d3f80eeffef7d288e7110df5ffd2fbb305ffeb6f7c8cc14c9b562961ea33831
+         VERSION=0.5.45
+    SOURCE_HASH=sha512:45fe425b311c3372bdb7c41606fd5099a335e4816d0917036f6e2bcf9c85b7747d75620ffbdcacde2f1b87eb0ee146a0d81237482c5a3ac5a1e95b6f3461a9fd
           SOURCE=${SPELL}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/$SOURCE
diff --git a/libs/xmltv/HISTORY b/libs/xmltv/HISTORY
index 69655ab..505b9bb 100644
--- a/libs/xmltv/HISTORY
+++ b/libs/xmltv/HISTORY
@@ -1,3 +1,9 @@
+2006-12-02 Treeve Jelbert <treeve01 at pi.be>
+	* DETAILS: version 0.5.45
+	* grabbers; add tv_grab_hr, tv_grab_ch_bluewin
+	  remove tv_grab_ch
+	* DEPENDS: soap-lite is optional ( only needed for NA grabber)
+
 2006-06-20 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: version 0.5.44
 
diff --git a/libs/xmltv/PRE_BUILD b/libs/xmltv/PRE_BUILD
index e66ff08..0983408 100755
--- a/libs/xmltv/PRE_BUILD
+++ b/libs/xmltv/PRE_BUILD
@@ -1,3 +1,8 @@
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
+# fix xml-twig detection
+TWIG=`installed_version xml-twig`     &&
+message twig=$TWIG &&
+sedit  "s/3\.10/$TWIG/"  Makefile.PL  &&
+sedit  "s/3\.10/$TWIG/"  grab/na_dd/tv_grab_na_dd.in  &&
 sedit  's:die "bad makefile:#\0:'  Makefile.PL
diff --git a/libs/xmltv/grabbers b/libs/xmltv/grabbers
index 8399dc5..073e027 100644
--- a/libs/xmltv/grabbers
+++ b/libs/xmltv/grabbers
@@ -1,11 +1,12 @@
 tv_grab_au		Australia		off
 tv_grab_be		Belgium_and_Luxemburg	off
 tv_grab_br		Brazil			off
-tv_grab_ch		Switzerland		off
+tv_grab_ch_bluewin	Switzerland		off
 tv_grab_de_tvtoday	Germany			off
 tv_grab_dk		Denmark			off
 tv_grab_ee		Estonia			off
 tv_grab_es		Spain			off
+tv_grab_hr		Croatia			off
 tv_grab_huro		Hungary_and_Romania	off
 tv_grab_is		Iceland			off
 tv_grab_it		Italy			off
diff --git a/perl-cpan/unicode-string/DETAILS b/perl-cpan/unicode-string/DETAILS
index cb15133..053e596 100755
--- a/perl-cpan/unicode-string/DETAILS
+++ b/perl-cpan/unicode-string/DETAILS
@@ -1,9 +1,9 @@
            SPELL=unicode-string
-         VERSION=2.07
+         VERSION=2.09
           SOURCE=Unicode-String-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Unicode-String-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
-     SOURCE_HASH=sha512:d42ce6e9fd018122d90a58e6842ee27dc62380fe3a0e2e7706ad9ee1a6c3f48aa8059e4517f79f7b4997f453f7ac0d2edf7687d00443989d3d6ce85d32132d52
+     SOURCE_HASH=sha512:88bd5fe4a1e8ac05b7da5f75411f3e2cb17fb756ca926ace7f46d047ba7a7f22e54462efb61c2f0bf651d2c63d6fe74bffa8b7bcf49aa59847135a43b5cde759
          LICENSE=ART
         WEB_SITE="http://search.cpan.org/search?module=Unicode::String"
          ENTERED=20020403
diff --git a/perl-cpan/unicode-string/HISTORY b/perl-cpan/unicode-string/HISTORY
index e2a3015..f5e3321 100644
--- a/perl-cpan/unicode-string/HISTORY
+++ b/perl-cpan/unicode-string/HISTORY
@@ -1,3 +1,6 @@
+2006-12-02 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 2.09
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/perl-cpan/xml-twig/BUILD b/perl-cpan/xml-twig/BUILD
index 8afc7f3..57d0417 100755
--- a/perl-cpan/xml-twig/BUILD
+++ b/perl-cpan/xml-twig/BUILD
@@ -1,2 +1,3 @@
+echo "${XML_PP}${XML_GREP}${XML_SPLIT}${XML_MERGE}${XML_SPELLCHECK}"|\
 perl  Makefile.PL  &&
 make
diff --git a/perl-cpan/xml-twig/DETAILS b/perl-cpan/xml-twig/DETAILS
index 97e1262..1bb6b21 100755
--- a/perl-cpan/xml-twig/DETAILS
+++ b/perl-cpan/xml-twig/DETAILS
@@ -7,6 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-Tw
    SOURCE_URL[0]=$WEB_SITE/$SOURCE
    SOURCE_URL[1]=http://www.cpan.org/authors/id/M/MI/MIROD/$SOURCE
          LICENSE=ART
+      PATCHLEVEL=1
          ENTERED=20020405
         KEYWORDS="xml perl"
            SHORT="A perl module for processing huge XML documents in tree mode"
diff --git a/perl-cpan/xml-twig/HISTORY b/perl-cpan/xml-twig/HISTORY
index 5ff6b8d..6cde2ec 100755
--- a/perl-cpan/xml-twig/HISTORY
+++ b/perl-cpan/xml-twig/HISTORY
@@ -1,3 +1,9 @@
+2005-12-02 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD, Makefile.PL, query.patch: delete
+	* BUILD: use configured options
+	  was previously installing an empty script
+
 2005-11-13 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 3.26
 
diff --git a/perl-cpan/xml-twig/Makefile.PL b/perl-cpan/xml-twig/Makefile.PL
deleted file mode 100644
index d883003..0000000
--- a/perl-cpan/xml-twig/Makefile.PL
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: Makefile.PL,v 1.6 2005/02/10 12:27:15 mrodrigu Exp $
-# tool installation part shamelessly lifted from YAML's Makefile.PL
-
-use ExtUtils::MakeMaker;
-
-my @programs;
-
-push(@programs,"xml_pp");
-push(@programs,"xml_grep");
-push(@programs,"xml_split");
-push(@programs,"xml_merge");
-push(@programs,"xml_spellcheck");
-
-WriteMakefile(
-    NAME	     => 'XML::Twig',
-    ABSTRACT     => 'XML, The Perl Way',
-    AUTHOR       => 'Michel Rodriguez <mirod at xmltwig.com>',
-    EXE_FILES    => [ map {"tools/$_/$_"} @programs],
-    VERSION_FROM => 'Twig.pm', # finds $VERSION
-    PREREQ_PM    => { 'XML::Parser' => '2.23' },
-    dist         => { COMPRESS    => 'gzip -9f',
-                      SUFFIX	     => 'gz',
-                    },
-    'depend'     => { 'Twig.pm' => "FORCE\n\techo \"building Twig.pm\"\n\t\$(PERL) speedup Twig.pm.slow > Twig.pm\n\t\$(PERL) check_optional_modules",
-		                  'FORCE'   => '',
-									  },
-);
-
diff --git a/perl-cpan/xml-twig/PRE_BUILD b/perl-cpan/xml-twig/PRE_BUILD
deleted file mode 100755
index af54017..0000000
--- a/perl-cpan/xml-twig/PRE_BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-default_pre_build &&
-
-#Makefile.PL without queries
-cp ${SCRIPT_DIRECTORY}/Makefile.PL ${SOURCE_DIRECTORY}/Makefile.PL &&
-
-#Deleting lines related to programs we don't want to install
-
-if [ "$XML_PP" = "n" ]; then 
-   sed -i /xml_pp/d "${SOURCE_DIRECTORY}/Makefile.PL"
-fi
-
-if [ "$XML_GREP" = "n" ]; then
-   sed -i /xml_grep/d "${SOURCE_DIRECTORY}/Makefile.PL"
-fi
-
-if [ "$XML_SPLIT" = "n" ]; then
-   sed -i /xml_split/d "${SOURCE_DIRECTORY}/Makefile.PL"
-fi
-
-if [ "$XML_MERGE" = "n" ]; then 
-   sed -i /xml_merge/d "${SOURCE_DIRECTORY}/Makefile.PL"
-fi
-
-if [ "$XML_SPELLCHECK" = "n" ]; then 
-   sed -i /xml_spellcheck/d "${SOURCE_DIRECTORY}/Makefile.PL"
-fi
diff --git a/perl-cpan/xml-twig/query.patch b/perl-cpan/xml-twig/query.patch
deleted file mode 100644
index f45d504..0000000
--- a/perl-cpan/xml-twig/query.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.PL	2005-02-10 13:27:15.000000000 +0100
-+++ Makefile.PL.new	2005-02-21 18:38:29.277746320 +0100
-@@ -5,19 +5,11 @@
- 
- my @programs;
- 
--for (split "\n", <<'QUERIES') {
--xml_pp|y|XML pretty printer
--xml_grep|y|XML grep - grep XML files using XML::Twig's subset of XPath
--xml_split|y|split big XML files
--xml_merge|y|merge back files created by xml_split
--xml_spellcheck|y|spellcheck XML files skipping tags
--QUERIES
--    my ($program, $default, $description) = split /\|/, $_;
--    if (prompt("Do you want to install '$program' ($description)?", 
--               $default) =~ /^y/) {
--	push(@programs, $program);
--    }
--}
-+push(@programs,"xml_pp");
-+push(@programs,"xml_grep");
-+push(@programs,"xml_split");
-+push(@programs,"xml_merge");
-+push(@programs,"xml_spellcheck");
- 
- WriteMakefile(
-     NAME	     => 'XML::Twig',



More information about the SM-Commit mailing list