<!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>[117721] trunk/dports/gnome/alacarte</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/117721">117721</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-09 09:39:26 -0700 (Sun, 09 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>alacarte: update patchfiles, reconfigure with our intltool.m4 to fix intltool configuration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomealacartePortfile">trunk/dports/gnome/alacarte/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomealacartefilespatchMakefileamdiff">trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff</a></li>
<li><a href="#trunkdportsgnomealacartefilespatchacincludem4diff">trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff</a></li>
<li><a href="#trunkdportsgnomealacartefilespatchconfigureacdiff">trunk/dports/gnome/alacarte/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomealacartefilespatchMakefileindiff">trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff</a></li>
<li><a href="#trunkdportsgnomealacartefilespatchconfigurediff">trunk/dports/gnome/alacarte/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomealacartePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/alacarte/Portfile (117720 => 117721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/alacarte/Portfile 2014-03-09 15:53:53 UTC (rev 117720)
+++ trunk/dports/gnome/alacarte/Portfile 2014-03-09 16:39:26 UTC (rev 117721)
</span><span class="lines">@@ -36,10 +36,16 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-Makefile.in.diff \
- patch-configure.diff \
</del><ins>+patchfiles patch-Makefile.am.diff \
+ patch-configure.ac.diff \
+ patch-acinclude.m4.diff \
</ins><span class="cx"> patch-Alacarte-MenuEditor.py.diff
</span><span class="cx">
</span><ins>+# reconfigure with our intltool.m4
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> move ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgnomealacartefilespatchMakefileamdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff (0 => 117721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff 2014-03-09 16:39:26 UTC (rev 117721)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+--- Makefile.am.orig 2014-03-09 09:04:17.000000000 -0700
++++ Makefile.am 2014-03-09 09:06:24.000000000 -0700
+@@ -4,16 +4,16 @@
+
+ CLEANFILES=
+
+-bin_SCRIPTS = alacarte
+-CLEANFILES += alacarte
++bin_SCRIPTS = alacarte.py
++CLEANFILES += alacarte.py
+
+ DISTCLEANFILES = ChangeLog
+
+-alacarte: alacarte.in
++alacarte.py: alacarte.in
+ $(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@! \
+ -e s!\@PYOPTIONS\@!-OOt! \
+ < $< > $@
+-alacarte: Makefile
++alacarte.py: Makefile
+
+ EXTRA_DIST = \
+ alacarte.in \
</ins></span></pre></div>
<a id="trunkdportsgnomealacartefilespatchMakefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff (117720 => 117721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff 2014-03-09 15:53:53 UTC (rev 117720)
+++ trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff 2014-03-09 16:39:26 UTC (rev 117721)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>---- Makefile.in.orig 2013-09-24 10:08:35.000000000 -0700
-+++ Makefile.in 2013-11-06 16:10:24.000000000 -0800
-@@ -356,8 +356,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = data po Alacarte
--CLEANFILES = alacarte
--bin_SCRIPTS = alacarte
-+CLEANFILES = alacarte.py
-+bin_SCRIPTS = alacarte.py
- DISTCLEANFILES = ChangeLog
- EXTRA_DIST = \
- alacarte.in \
-@@ -867,11 +867,11 @@
- tags-am uninstall uninstall-am uninstall-binSCRIPTS
-
-
--alacarte: alacarte.in
-+alacarte.py: alacarte.in
- $(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@! \
- -e s!\@PYOPTIONS\@!-OOt! \
- < $< > $@
--alacarte: Makefile
-+alacarte.py: Makefile
-
- ChangeLog:
- @echo Creating $@
</del></span></pre></div>
<a id="trunkdportsgnomealacartefilespatchacincludem4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff (0 => 117721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff (rev 0)
+++ trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff 2014-03-09 16:39:26 UTC (rev 117721)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- acinclude.m4.orig 2014-03-09 09:22:23.000000000 -0700
++++ acinclude.m4 2014-03-09 09:23:17.000000000 -0700
+@@ -79,8 +79,8 @@
+ dnl distinct variables so they can be overridden if need be. However,
+ dnl general consensus is that you shouldn't need this ability.
+
+- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
++ AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++ AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix);'`])
+
+ dnl At times (like when building shared libraries) you may want
+ dnl to know which OS platform Python thinks this is.
</ins></span></pre></div>
<a id="trunkdportsgnomealacartefilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/alacarte/files/patch-configure.ac.diff (0 => 117721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/alacarte/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/alacarte/files/patch-configure.ac.diff 2014-03-09 16:39:26 UTC (rev 117721)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- configure.ac.orig 2014-03-09 08:56:46.000000000 -0700
++++ configure.ac 2014-03-09 09:02:22.000000000 -0700
+@@ -1,7 +1,7 @@
+ dnl -*- Mode: autoconf -*-
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.53)
+-AC_INIT(alacarte, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
++AC_INIT(alacarte.py, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ AC_CONFIG_SRCDIR(alacarte.in)
+ AC_CONFIG_HEADERS([config.h])
</ins></span></pre></div>
<a id="trunkdportsgnomealacartefilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/alacarte/files/patch-configure.diff (117720 => 117721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/alacarte/files/patch-configure.diff 2014-03-09 15:53:53 UTC (rev 117720)
+++ trunk/dports/gnome/alacarte/files/patch-configure.diff 2014-03-09 16:39:26 UTC (rev 117721)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>---- configure.orig 2013-09-24 10:08:36.000000000 -0700
-+++ configure 2013-11-06 16:10:24.000000000 -0800
-@@ -5861,9 +5861,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);'`
-
-
-
-@@ -5936,9 +5936,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);'`
-
-
-
-@@ -6011,9 +6011,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);'`
-
-
-
-@@ -6086,9 +6086,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>