From 8f6d8c9a44c1bc4c1ee94321ff641d7fcfcbf433 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 24 Feb 2007 19:26:25 +0000 Subject: Update to 0.35.5, and retire support for Perl < 5.6. --- textproc/intltool/Makefile | 15 ++-- textproc/intltool/distinfo | 6 +- textproc/intltool/files/OrigTree.pm | 91 ---------------------- textproc/intltool/files/patch-intltool-merge.in.in | 11 --- textproc/intltool/pkg-plist | 4 - 5 files changed, 11 insertions(+), 116 deletions(-) delete mode 100644 textproc/intltool/files/OrigTree.pm delete mode 100644 textproc/intltool/files/patch-intltool-merge.in.in (limited to 'textproc/intltool') diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index 76d0b5f64519..d44a73f3f3f0 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -6,7 +6,7 @@ # PORTNAME= intltool -PORTVERSION= 0.35.4 +PORTVERSION= 0.35.5 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.35 @@ -31,13 +31,14 @@ MAN8= intltool-extract.8 intltool-merge.8 intltool-prepare.8 \ CONFLICTS= xml-i18n-tools-[0-9]* +.include + +.if ${PERL_LEVEL} < 500600 +IGNORE= requires Perl 5.6 or higher +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \ -E -e '/^mkinstalldirs[[:space:]]*=/s^/\.\.^^g' -post-install: - ${MKDIR} ${PREFIX}/share/intltool/XML/Parser/Style - ${INSTALL_DATA} ${FILESDIR}/OrigTree.pm \ - ${PREFIX}/share/intltool/XML/Parser/Style - -.include +.include diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo index c9752da4072a..7612bcc95d23 100644 --- a/textproc/intltool/distinfo +++ b/textproc/intltool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/intltool-0.35.4.tar.bz2) = 19c2c1fcbf225f931a96ea53aa3f6499 -SHA256 (gnome/intltool-0.35.4.tar.bz2) = fe30812f6fe4ac09423f704de299240f38c3cdd92c973a2bd215deb158fe0ff2 -SIZE (gnome/intltool-0.35.4.tar.bz2) = 134225 +MD5 (gnome/intltool-0.35.5.tar.bz2) = f52d5fa7f128db94e884cd21dd45d2e2 +SHA256 (gnome/intltool-0.35.5.tar.bz2) = 38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8 +SIZE (gnome/intltool-0.35.5.tar.bz2) = 134902 diff --git a/textproc/intltool/files/OrigTree.pm b/textproc/intltool/files/OrigTree.pm deleted file mode 100644 index 020400cfa35c..000000000000 --- a/textproc/intltool/files/OrigTree.pm +++ /dev/null @@ -1,91 +0,0 @@ -# $Id: OrigTree.pm,v 1.1 2003/11/26 15:18:28 kenneth Exp $ - -package XML::Parser::Style::OrigTree; -$XML::Parser::Built_In_Styles{OrigTree} = 1; - -sub Init { - my $expat = shift; - $expat->{Lists} = []; - $expat->{Curlist} = $expat->{OrigTree} = []; -} - -sub Start { - my $expat = shift; - my $tag = shift; - my $newlist = [ { @_ } ]; - push @{ $expat->{Lists} }, $expat->{Curlist}; - push @{ $expat->{Curlist} }, $tag => $newlist; - $expat->{Curlist} = $newlist; -} - -sub End { - my $expat = shift; - my $tag = shift; - $expat->{Curlist} = pop @{ $expat->{Lists} }; -} - -sub Char { - my $expat = shift; - my $text = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - if ($pos > 0 and $clist->[$pos - 1] eq '0') { - $clist->[$pos] .= $expat->original_string(); - } else { - push @$clist, 0 => $expat->original_string(); - } -} - -sub Final { - my $expat = shift; - delete $expat->{Curlist}; - delete $expat->{Lists}; - $expat->{OrigTree}; -} - -1; -__END__ - -=head1 NAME - -XML::Parser::Style::OrigTree - -=head1 SYNOPSIS - - use XML::Parser; - my $p = XML::Parser->new(Style => 'OrigTree'); - my $tree = $p->parsefile('foo.xml'); - -=head1 DESCRIPTION - -This module is a variant of the XML::Parser's Tree style parser. It -uses original_string, so that Entities are not converted. - -When parsing a document, C will return a parse tree for the -document. Each node in the tree -takes the form of a tag, content pair. Text nodes are represented with -a pseudo-tag of "0" and the string that is their content. For elements, -the content is an array reference. The first item in the array is a -(possibly empty) hash reference containing attributes. The remainder of -the array is a sequence of tag-content pairs representing the content -of the element. - -So for example the result of parsing: - - Hello thereHowdydo - -would be: - Tag Content - ================================================================== - [foo, [{}, head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], - bar, [ {}, 0, "Howdy", ref, [{}]], - 0, "do" - ] - ] - -The root document "foo", has 3 children: a "head" element, a "bar" -element and the text "do". After the empty attribute hash, these are -represented in it's contents by 3 tag-content pairs. - -=cut diff --git a/textproc/intltool/files/patch-intltool-merge.in.in b/textproc/intltool/files/patch-intltool-merge.in.in deleted file mode 100644 index bd377f7408f3..000000000000 --- a/textproc/intltool/files/patch-intltool-merge.in.in +++ /dev/null @@ -1,11 +0,0 @@ ---- intltool-merge.in.in.orig Mon Dec 8 21:27:55 2003 -+++ intltool-merge.in.in Mon Dec 8 21:28:05 2003 -@@ -875,7 +875,7 @@ - if ($MULTIPLE_OUTPUT) { - for my $lang (sort keys %po_files_by_lang) { - if ( ! -e $lang ) { -- mkdir $lang or die "Cannot create subdirectory $lang: $!\n"; -+ mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n"; - } - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - my $tree = readXml($FILE); diff --git a/textproc/intltool/pkg-plist b/textproc/intltool/pkg-plist index 4b957069c95a..bffa570855ee 100644 --- a/textproc/intltool/pkg-plist +++ b/textproc/intltool/pkg-plist @@ -5,11 +5,7 @@ bin/intltool-update bin/intltoolize share/aclocal/intltool.m4 %%DATADIR%%/Makefile.in.in -%%DATADIR%%/XML/Parser/Style/OrigTree.pm %%DATADIR%%/intltool-extract.in %%DATADIR%%/intltool-merge.in %%DATADIR%%/intltool-update.in -@dirrm %%DATADIR%%/XML/Parser/Style -@dirrm %%DATADIR%%/XML/Parser -@dirrm %%DATADIR%%/XML @dirrm %%DATADIR%% -- cgit v1.2.3