<!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>[117821] trunk/dports/gnome/libpeas</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/117821">117821</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-13 21:12:04 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>libpeas: update m4/intltool.m4 and autoreconf to fix intltool configuration, patches, build deps.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibpeasPortfile">trunk/dports/gnome/libpeas/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibpeasfilespatchconfigureacdiff">trunk/dports/gnome/libpeas/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibpeasfilespatchconfigurediff">trunk/dports/gnome/libpeas/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomelibpeasPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/libpeas/Portfile (117820 => 117821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libpeas/Portfile 2014-03-13 23:30:11 UTC (rev 117820)
+++ trunk/dports/gnome/libpeas/Portfile 2014-03-14 04:12:04 UTC (rev 117821)
</span><span class="lines">@@ -22,19 +22,25 @@
</span><span class="cx"> sha256 008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><del>- port:intltool
</del><ins>+ port:intltool \
+ port:gnome-common
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="cx"> port:gobject-introspection \
</span><span class="cx"> port:gjs \
</span><span class="cx"> port:seed
</span><span class="cx">
</span><del>-pre-patch {
- copy ${worksrcpath}/configure ${worksrcpath}/configure.orig
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-loaders-python-peas-plugin-loader-python.c.diff
+
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
- patch-loaders-python-peas-plugin-loader-python.c.diff
</del><ins>+use_autoreconf yes
+autoreconf.args -fvi
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-gtk \
</span><span class="cx"> --enable-seed \
</span></span></pre></div>
<a id="trunkdportsgnomelibpeasfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/libpeas/files/patch-configure.ac.diff (0 => 117821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libpeas/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/libpeas/files/patch-configure.ac.diff 2014-03-14 04:12:04 UTC (rev 117821)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+--- configure.ac.orig 2014-03-08 21:29:55.000000000 -0800
++++ configure.ac 2014-03-08 21:30:31.000000000 -0800
+@@ -71,9 +71,6 @@
+
+ IT_PROG_INTLTOOL([0.40.0])
+
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=libpeas
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+@@ -347,7 +344,8 @@
+ PYTHON2_CFLAGS=`${PYTHON2_CONFIG} --includes`
+ PYTHON2_LIBS=`${PYTHON2_CONFIG} --libs`
+ PYTHON2_LDFLAGS=`${PYTHON2_CONFIG} --ldflags`
+- PYTHON2_PYEXECDIR=`$PYTHON2 -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1, 0, prefix='\\$' '{exec_prefix}'))"`
++ python2_eprefix=`$PYTHON2 -c "import sys; print(sys.exec_prefix)"`
++ PYTHON2_PYEXECDIR=`$PYTHON2 -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1, 0, '${python2_eprefix}'))"`
+ AC_SUBST(PYTHON2_CFLAGS)
+ AC_SUBST(PYTHON2_LIBS)
+ AC_SUBST(PYTHON2_LDFLAGS)
</ins></span></pre></div>
<a id="trunkdportsgnomelibpeasfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/libpeas/files/patch-configure.diff (117820 => 117821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libpeas/files/patch-configure.diff 2014-03-13 23:30:11 UTC (rev 117820)
+++ trunk/dports/gnome/libpeas/files/patch-configure.diff 2014-03-14 04:12:04 UTC (rev 117821)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>---- configure.orig 2013-06-18 03:37:57.000000000 -0700
-+++ configure 2013-08-29 11:55:29.000000000 -0700
-@@ -15361,7 +15361,8 @@
- PYTHON2_CFLAGS=`${PYTHON2_CONFIG} --includes`
- PYTHON2_LIBS=`${PYTHON2_CONFIG} --libs`
- PYTHON2_LDFLAGS=`${PYTHON2_CONFIG} --ldflags`
-- PYTHON2_PYEXECDIR=`$PYTHON2 -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1, 0, prefix='\\$' '{exec_prefix}'))"`
-+ python2_eprefix=`$PYTHON2 -c "import sys; print(sys.exec_prefix)"`
-+ PYTHON2_PYEXECDIR=`$PYTHON2 -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1, 0, '${python2_eprefix}'))"`
-
-
-
-@@ -15543,9 +15544,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
-
-
-
</del></span></pre>
</div>
</div>
</body>
</html>