[138704] trunk/dports/textproc/intltool
devans at macports.org
devans at macports.org
Thu Jul 16 15:40:24 PDT 2015
Revision: 138704
https://trac.macports.org/changeset/138704
Author: devans at macports.org
Date: 2015-07-16 15:40:24 -0700 (Thu, 16 Jul 2015)
Log Message:
-----------
intltool: remove unnecessary perl variants and just use perl 5.22, patch intltool-update to silence perl deprecation warnings, add comments, increment revision (#48365).
Modified Paths:
--------------
trunk/dports/textproc/intltool/Portfile
Added Paths:
-----------
trunk/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff
Property Changed:
----------------
trunk/dports/textproc/intltool/
Property changes on: trunk/dports/textproc/intltool
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/textproc/intltool:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/textproc/intltool:134105-138639
+ /branches/mld-qt-481/dports/textproc/intltool:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/textproc/intltool:134105-138702
Modified: trunk/dports/textproc/intltool/Portfile
===================================================================
--- trunk/dports/textproc/intltool/Portfile 2015-07-16 22:27:45 UTC (rev 138703)
+++ trunk/dports/textproc/intltool/Portfile 2015-07-16 22:40:24 UTC (rev 138704)
@@ -2,11 +2,11 @@
# $Id$
PortSystem 1.0
-PortGroup perl5 1.0
name intltool
epoch 1
version 0.51.0
+revision 1
maintainers devans openmaintainer
categories textproc gnome
license GPL-2+
@@ -30,23 +30,30 @@
checksums rmd160 f10a7a86bdc504db22c2e1eb4e09705c6a41fbaa \
sha256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
-perl5.require_variant yes
-perl5.conflict_variants yes
-perl5.branches 5.16 5.18 5.20 5.22
-perl5.create_variants ${perl5.branches}
+# intltool only uses perl internally and publishes no public modules
+# so there is no need for multiple perl variants
+# now using perl 5.22 (#48365)
+set pbranch 5.22
+
depends_build port:gnome-common
depends_lib-append port:expat \
- port:p${perl5.major}-getopt-long \
- port:p${perl5.major}-pathtools \
- port:p${perl5.major}-scalar-list-utils \
- port:p${perl5.major}-xml-parser
+ port:p${pbranch}-getopt-long \
+ port:p${pbranch}-pathtools \
+ port:p${pbranch}-scalar-list-utils \
+ port:p${pbranch}-xml-parser
patchfiles patch-remove-intltool-perl-hack.diff
-configure.perl ${prefix}/bin/perl${perl5.major}
+# in perl 5.22 literal left braces in regex patterns must be escaped to avoid deprecation warnings
+# introduced in perl 5.21.3
+# https://metacpan.org/pod/release/PCM/perl-5.21.3/pod/perl5211delta.pod#A-literal-should-now-be-escaped-in-a-pattern
+patchfiles-append patch-silence-perl-5.22-deprecation-warnings.diff
+
+configure.perl ${prefix}/bin/perl${pbranch}
+
test.run yes
test.target check
Copied: trunk/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff (from rev 138702, users/devans/GNOME-3/stable/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff)
===================================================================
--- trunk/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff (rev 0)
+++ trunk/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff 2015-07-16 22:40:24 UTC (rev 138704)
@@ -0,0 +1,43 @@
+--- intltool-update.in.orig 2015-07-15 21:16:44.000000000 -0700
++++ intltool-update.in 2015-07-15 21:19:24.000000000 -0700
+@@ -1062,7 +1062,7 @@
+ }
+ }
+
+- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+ {
+ my $rest = $3;
+ my $untouched = $1;
+@@ -1190,10 +1190,10 @@
+ $name =~ s/\(+$//g;
+ $version =~ s/\(+$//g;
+
+- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+ }
+
+ if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@
+ $version =~ s/\(+$//g;
+ $bugurl =~ s/\(+$//g if (defined $bugurl);
+
+- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+ }
+
+ # \s makes this not work, why?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150716/10201b26/attachment.html>
More information about the macports-changes
mailing list