Revision: 76661 http://trac.macports.org/changeset/76661 Author: l2g@macports.org Date: 2011-03-04 09:37:45 -0800 (Fri, 04 Mar 2011) Log Message: ----------- p5-locale-gettext: (#28318) patching a bug with symbol conflicts between the POSIX and Locale::gettext modules, incorporating patches submitted to upstream by the Debian Project Modified Paths: -------------- trunk/dports/perl/p5-locale-gettext/Portfile trunk/dports/perl/p5-locale-gettext/files/patch-Makefile.PL Added Paths: ----------- trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-1.diff trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-2.diff Modified: trunk/dports/perl/p5-locale-gettext/Portfile =================================================================== --- trunk/dports/perl/p5-locale-gettext/Portfile 2011-03-04 17:01:31 UTC (rev 76660) +++ trunk/dports/perl/p5-locale-gettext/Portfile 2011-03-04 17:37:45 UTC (rev 76661) @@ -5,12 +5,12 @@ PortGroup perl5 1.0 perl5.setup Locale-gettext 1.05 -revision 4 +revision 5 set my_name gettext distname ${my_name}-${version} homepage http://search.cpan.org/dist/gettext/ -maintainers nomaintainer +maintainers l2g openmaintainer platforms darwin description Perl interface to GNU gettext @@ -28,7 +28,13 @@ set archflags ${configure.cc_archflags} } -patchfiles patch-Makefile.PL +# The first patch below corrects a typo in the documentation. The last two +# correct a bug discovered by the Debian Project; they come from the CPAN RT +# ticket tracker (http://rt.cpan.org/Public/Bug/Display.html?id=35680). +patch.pre_args -p1 +patchfiles patch-Makefile.PL \ + patch-cpan-rt-35680-1.diff \ + patch-cpan-rt-35680-2.diff configure.cc ${configure.cc} ${configure.cflags} ${configure.ldflags} \ ${archflags} Modified: trunk/dports/perl/p5-locale-gettext/files/patch-Makefile.PL =================================================================== --- trunk/dports/perl/p5-locale-gettext/files/patch-Makefile.PL 2011-03-04 17:01:31 UTC (rev 76660) +++ trunk/dports/perl/p5-locale-gettext/files/patch-Makefile.PL 2011-03-04 17:37:45 UTC (rev 76661) @@ -1,5 +1,5 @@ ---- Makefile.PL.orig 2008-12-12 11:20:06.000000000 -0800 -+++ Makefile.PL 2008-12-12 11:20:25.000000000 -0800 +--- gettext-1.05/Makefile.PL.orig 2008-12-12 11:20:06.000000000 -0800 ++++ gettext-1.05/Makefile.PL 2008-12-12 11:20:25.000000000 -0800 @@ -35,6 +35,8 @@ NAME => "Locale::gettext", LIBS => ($libs eq '') ? [] : [$libs], Added: trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-1.diff =================================================================== --- trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-1.diff (rev 0) +++ trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-1.diff 2011-03-04 17:37:45 UTC (rev 76661) @@ -0,0 +1,14 @@ +Fix documentation in manual page +Index: liblocale-gettext-perl/gettext.pm +=================================================================== +--- liblocale-gettext-perl.orig/gettext.pm 2006-04-13 22:49:49.000000000 +0200 ++++ liblocale-gettext-perl/gettext.pm 2008-02-03 19:53:01.000000000 +0100 +@@ -235,7 +235,7 @@ + gettext(), dgettext(), and dcgettext() attempt to retrieve a string + matching their C<msgid> parameter within the context of the current + locale. dcgettext() takes the message's category and the text domain +-as parameters while dcgettext() defaults to the LC_MESSAGES category ++as parameters while dgettext() defaults to the LC_MESSAGES category + and gettext() defaults to LC_MESSAGES and uses the current text domain. + If the string is not found in the database, then C<msgid> is returned. + Added: trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-2.diff =================================================================== --- trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-2.diff (rev 0) +++ trunk/dports/perl/p5-locale-gettext/files/patch-cpan-rt-35680-2.diff 2011-03-04 17:37:45 UTC (rev 76661) @@ -0,0 +1,25 @@ +Locale::Gettext exports by default the various LC_* constants as does the +POSIX perl module. Up to perl-5.10, their definition was strictly the same +and didn't cause any harm. Now the POSIX module evolved slightly and the +symbol redefinition are conflictual and +generate warnings. + +Resolve this by making sure that Locale::Gettext reexports the constants +coming from the POSIX module. + +Fixes Debian bug #479803. + + -- Raphael Hertzog <hertzog@debian.org> + +Index: liblocale-gettext-perl-1.05/gettext.pm +=================================================================== +--- liblocale-gettext-perl-1.05.orig/gettext.pm 2008-05-07 09:40:23.000000000 +0200 ++++ liblocale-gettext-perl-1.05/gettext.pm 2008-05-07 09:41:04.000000000 +0200 +@@ -32,6 +32,7 @@ + =cut + + use Carp; ++use POSIX qw(:locale_h); + + require Exporter; + require DynaLoader;