[120995] trunk/dports/textproc/intltool
mf2k at macports.org
mf2k at macports.org
Fri Jun 13 13:48:17 PDT 2014
Revision: 120995
https://trac.macports.org/changeset/120995
Author: mf2k at macports.org
Date: 2014-06-13 13:48:16 -0700 (Fri, 13 Jun 2014)
Log Message:
-----------
intltool: Add perl5_20 variant. rename patch for lint.
Modified Paths:
--------------
trunk/dports/textproc/intltool/Portfile
Added Paths:
-----------
trunk/dports/textproc/intltool/files/patch-remove-intltool-perl-hack.diff
Removed Paths:
-------------
trunk/dports/textproc/intltool/files/remove-intltool-perl-hack.patch
Modified: trunk/dports/textproc/intltool/Portfile
===================================================================
--- trunk/dports/textproc/intltool/Portfile 2014-06-13 20:00:51 UTC (rev 120994)
+++ trunk/dports/textproc/intltool/Portfile 2014-06-13 20:48:16 UTC (rev 120995)
@@ -33,7 +33,7 @@
depends_build port:gnome-common
depends_lib port:expat
-patchfiles remove-intltool-perl-hack.patch
+patchfiles patch-remove-intltool-perl-hack.diff
# TODO: This perlver cruft should be done in the perl5 PortGroup
if {[variant_isset perl5_8]} {
@@ -46,17 +46,20 @@
set perlver 5.14
} elseif {[variant_isset perl5_18]} {
set perlver 5.18
+} elseif {[variant_isset perl5_20]} {
+ set perlver 5.20
} else {
set perlver 5.16
default_variants +perl5_16
}
-variant perl5_8 conflicts perl5_10 perl5_12 perl5_14 perl5_16 perl5_18 description {use perl 5.8} {}
-variant perl5_10 conflicts perl5_8 perl5_12 perl5_14 perl5_16 perl5_18 description {use perl 5.10} {}
-variant perl5_12 conflicts perl5_8 perl5_10 perl5_14 perl5_16 perl5_18 description {use perl 5.12} {}
-variant perl5_14 conflicts perl5_8 perl5_10 perl5_12 perl5_16 perl5_18 description {use perl 5.14} {}
-variant perl5_16 conflicts perl5_8 perl5_10 perl5_12 perl5_14 perl5_18 description {use perl 5.16} {}
-variant perl5_18 conflicts perl5_8 perl5_10 perl5_12 perl5_14 perl5_16 description {use perl 5.18} {}
+variant perl5_8 conflicts perl5_10 perl5_12 perl5_14 perl5_16 perl5_18 perl5_20 description {use perl 5.8} {}
+variant perl5_10 conflicts perl5_8 perl5_12 perl5_14 perl5_16 perl5_18 perl5_20 description {use perl 5.10} {}
+variant perl5_12 conflicts perl5_8 perl5_10 perl5_14 perl5_16 perl5_18 perl5_20 description {use perl 5.12} {}
+variant perl5_14 conflicts perl5_8 perl5_10 perl5_12 perl5_16 perl5_18 perl5_20 description {use perl 5.14} {}
+variant perl5_16 conflicts perl5_8 perl5_10 perl5_12 perl5_14 perl5_18 perl5_20 description {use perl 5.16} {}
+variant perl5_18 conflicts perl5_8 perl5_10 perl5_12 perl5_14 perl5_16 perl5_20 description {use perl 5.18} {}
+variant perl5_20 conflicts perl5_8 perl5_10 perl5_12 perl5_14 perl5_16 perl5_18 description {use perl 5.20} {}
depends_lib-append \
port:perl${perlver} \
Copied: trunk/dports/textproc/intltool/files/patch-remove-intltool-perl-hack.diff (from rev 120994, trunk/dports/textproc/intltool/files/remove-intltool-perl-hack.patch)
===================================================================
--- trunk/dports/textproc/intltool/files/patch-remove-intltool-perl-hack.diff (rev 0)
+++ trunk/dports/textproc/intltool/files/patch-remove-intltool-perl-hack.diff 2014-06-13 20:48:16 UTC (rev 120995)
@@ -0,0 +1,30 @@
+--- intltool.m4.orig 2013-07-02 11:22:23.000000000 -0700
++++ intltool.m4 2013-07-02 11:22:32.000000000 -0700
+@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+ fi
+
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
+-if test -z "$INTLTOOL_PERL"; then
+- AC_MSG_ERROR([perl not found])
+-fi
+-AC_MSG_CHECKING([for perl >= 5.8.1])
+-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+-if test $? -ne 0; then
+- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+-else
+- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+- AC_MSG_RESULT([$IT_PERL_VERSION])
+-fi
+-if test "x$2" != "xno-xml"; then
+- AC_MSG_CHECKING([for XML::Parser])
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- AC_MSG_RESULT([ok])
+- else
+- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+- fi
+-fi
+-
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+
Deleted: trunk/dports/textproc/intltool/files/remove-intltool-perl-hack.patch
===================================================================
--- trunk/dports/textproc/intltool/files/remove-intltool-perl-hack.patch 2014-06-13 20:00:51 UTC (rev 120994)
+++ trunk/dports/textproc/intltool/files/remove-intltool-perl-hack.patch 2014-06-13 20:48:16 UTC (rev 120995)
@@ -1,30 +0,0 @@
---- intltool.m4.orig 2013-07-02 11:22:23.000000000 -0700
-+++ intltool.m4 2013-07-02 11:22:32.000000000 -0700
-@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
-
--AC_PATH_PROG(INTLTOOL_PERL, perl)
--if test -z "$INTLTOOL_PERL"; then
-- AC_MSG_ERROR([perl not found])
--fi
--AC_MSG_CHECKING([for perl >= 5.8.1])
--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
--if test $? -ne 0; then
-- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
--else
-- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-- AC_MSG_RESULT([$IT_PERL_VERSION])
--fi
--if test "x$2" != "xno-xml"; then
-- AC_MSG_CHECKING([for XML::Parser])
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- AC_MSG_RESULT([ok])
-- else
-- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-- fi
--fi
--
- # Substitute ALL_LINGUAS so we can use it in po/Makefile
- AC_SUBST(ALL_LINGUAS)
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140613/151ae3fb/attachment.html>
More information about the macports-changes
mailing list