<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120995] trunk/dports/textproc/intltool</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120995">120995</a></dd>
<dt>Author</dt> <dd>mf2k@macports.org</dd>
<dt>Date</dt> <dd>2014-06-13 13:48:16 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>intltool: Add perl5_20 variant. rename patch for lint.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocintltoolPortfile">trunk/dports/textproc/intltool/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportstextprocintltoolfilespatchremoveintltoolperlhackdiff">trunk/dports/textproc/intltool/files/patch-remove-intltool-perl-hack.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportstextprocintltoolfilesremoveintltoolperlhackpatch">trunk/dports/textproc/intltool/files/remove-intltool-perl-hack.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocintltoolPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/intltool/Portfile (120994 => 120995)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> depends_build port:gnome-common
</span><span class="cx"> depends_lib port:expat
</span><span class="cx">
</span><del>-patchfiles remove-intltool-perl-hack.patch
</del><ins>+patchfiles patch-remove-intltool-perl-hack.diff
</ins><span class="cx">
</span><span class="cx"> # TODO: This perlver cruft should be done in the perl5 PortGroup
</span><span class="cx"> if {[variant_isset perl5_8]} {
</span><span class="lines">@@ -46,17 +46,20 @@
</span><span class="cx"> set perlver 5.14
</span><span class="cx"> } elseif {[variant_isset perl5_18]} {
</span><span class="cx"> set perlver 5.18
</span><ins>+} elseif {[variant_isset perl5_20]} {
+ set perlver 5.20
</ins><span class="cx"> } else {
</span><span class="cx"> set perlver 5.16
</span><span class="cx"> default_variants +perl5_16
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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} {}
</del><ins>+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} {}
</ins><span class="cx">
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> port:perl${perlver} \
</span></span></pre></div>
<a id="trunkdportstextprocintltoolfilespatchremoveintltoolperlhackdifffromrev120994trunkdportstextprocintltoolfilesremoveintltoolperlhackpatch"></a>
<div class="copfile"><h4>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) (0 => 120995)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+--- 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)
+
</ins></span></pre></div>
<a id="trunkdportstextprocintltoolfilesremoveintltoolperlhackpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/intltool/files/remove-intltool-perl-hack.patch (120994 => 120995)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>---- 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)
-
</del></span></pre>
</div>
</div>
</body>
</html>