<!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>[154011] trunk/dports</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/154011">154011</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-10-17 19:56:21 -0700 (Mon, 17 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>keybinder: update to version 0.3.1 using github, correct python configuration, mark py26-keybinder obsolete, replaced by py27-keybinder (#52545).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomekeybinderPortfile">trunk/dports/gnome/keybinder/Portfile</a></li>
<li><a href="#trunkdportspythonpygraveyardPortfile">trunk/dports/python/py-graveyard/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomekeybinderfilespatchconfigureacdiff">trunk/dports/gnome/keybinder/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgnomekeybinderfilespatch_pythonkeybinder_Makefileamdiff">trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.am.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomekeybinderfilespatch_pythonkeybinder_Makefileindiff">trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomekeybinderPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/keybinder/Portfile (154010 => 154011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/keybinder/Portfile 2016-10-18 01:59:25 UTC (rev 154010)
+++ trunk/dports/gnome/keybinder/Portfile 2016-10-18 02:56:21 UTC (rev 154011)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup gobject_introspection 1.0
</span><span class="cx">
</span><del>-github.setup engla keybinder 0.3.0 v
-revision 1
</del><ins>+github.setup engla keybinder 0.3.1 v
</ins><span class="cx"> categories gnome devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -15,22 +14,28 @@
</span><span class="cx"> description library for global keyboard shortcuts in GTK applications
</span><span class="cx">
</span><span class="cx"> long_description ${name} is a library for registering global keyboard \
</span><del>- shortcuts in GTK-based applications using the X Window \
</del><ins>+ shortcuts in GTK2-based applications using the X Window \
</ins><span class="cx"> System.
</span><span class="cx">
</span><del>-master_sites http://kaizer.se/publicfiles/keybinder/
</del><ins>+checksums rmd160 5540b349f193c49413e5e443c40dec2291a715c9 \
+ sha256 3c4636965a228902ef70fb8df34e3cc11036b82c2c3be45819d0780f34345b7b
</ins><span class="cx">
</span><del>-checksums rmd160 2f2e25860fa116f7872bbdb2850b75e3e43958cf \
- sha256 42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb
</del><ins>+depends_build port:pkgconfig \
+ port:autoconf \
+ port:automake \
+ port:libtool \
+ port:gnome-common \
+ port:gtk-doc
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig
-
</del><span class="cx"> depends_lib port:gtk2
</span><span class="cx">
</span><del>-patchfiles patch_python-keybinder_Makefile.in.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch_python-keybinder_Makefile.am.diff
</ins><span class="cx">
</span><ins>+configure.cmd ./autogen.sh
+
</ins><span class="cx"> configure.args --disable-silent-rules \
</span><del>- --disable-gtk-doc \
</del><ins>+ --enable-gtk-doc \
</ins><span class="cx"> --disable-lua
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><span class="lines">@@ -38,7 +43,7 @@
</span><span class="cx"> gobject_introspection yes
</span><span class="cx"> }
</span><span class="cx">
</span><del>-set python.versions {26 27}
</del><ins>+set python.versions {27}
</ins><span class="cx">
</span><span class="cx"> foreach v ${python.versions} {
</span><span class="cx"> set python.version ${v}
</span><span class="lines">@@ -49,10 +54,11 @@
</span><span class="cx"> subport py${python.version}-keybinder {
</span><span class="cx"> depends_lib-append port:${name} \
</span><span class="cx"> port:python${python.version} \
</span><ins>+ port:py${python.version}-gobject \
</ins><span class="cx"> port:py${python.version}-pygtk
</span><span class="cx">
</span><span class="cx"> configure.args-append --enable-python \
</span><del>- ac_cv_path_PYGTK_CODEGEN=${prefix}/bin/pygtk-codegen-2.0-${python.branch}
</del><ins>+ PYGOBJECT_CODEGEN=${python.prefix}/bin/pygtk-codegen-2.0
</ins><span class="cx">
</span><span class="cx"> configure.python ${python.bin}
</span><span class="cx"> configure.pkg_config_path ${python.prefix}/lib/pkgconfig
</span></span></pre></div>
<a id="trunkdportsgnomekeybinderfilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/keybinder/files/patch-configure.ac.diff (0 => 154011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/keybinder/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/keybinder/files/patch-configure.ac.diff 2016-10-18 02:56:21 UTC (rev 154011)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- configure.ac.orig 2016-10-12 11:42:01.000000000 -0700
++++ configure.ac 2016-10-12 11:47:28.000000000 -0700
+@@ -21,7 +21,9 @@
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+
+-GNOME_COMMON_INIT
++dnl long deprecated GNOME_COMMON_INIT removed in gnome-common 3.18.0
++dnl https://git.gnome.org/browse/gnome-common/commit/?id=6684e2fa5d5a4c72c9bf116f74688c0b47f350cf
++dnl GNOME_COMMON_INIT
+
+ AM_MAINTAINER_MODE
+ AM_DISABLE_STATIC
+@@ -115,6 +117,18 @@
+ dnl ****************************************************************************
+ have_python="yes"
+ AM_PATH_PYTHON(2.5)
++
++ dnl Override standard python locations with MacPorts version specific ones
++
++ AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++ AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix)'`])
++
++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++
++ AC_SUBST([pythondir], [$am_cv_python_pythondir])
++ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
++
+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+
+ PKG_CHECK_MODULES(PYGTK,
</ins></span></pre></div>
<a id="trunkdportsgnomekeybinderfilespatch_pythonkeybinder_Makefileamdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.am.diff (0 => 154011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.am.diff 2016-10-18 02:56:21 UTC (rev 154011)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- python-keybinder/Makefile.am.orig 2015-11-06 07:08:46.000000000 -0800
++++ python-keybinder/Makefile.am 2016-10-12 08:08:43.000000000 -0700
+@@ -6,7 +6,7 @@
+ _keybinder_LTLIBRARIES = _keybinder.la
+ _keybinder_la_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(PYEXTRAFLAGS)
+ _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder $(X_LDFLAGS)
+-_keybinder_la_LIBADD = ../libkeybinder/libkeybinder.la $(PYGTK_LIBS)
++_keybinder_la_LIBADD = $(LIBDIR)/libkeybinder.dylib $(PYGTK_LIBS)
+ _keybinder_la_SOURCES = _keybindermodule.c
+
+ nodist__keybinder_la_SOURCES = _keybinder.c
</ins></span></pre></div>
<a id="trunkdportsgnomekeybinderfilespatch_pythonkeybinder_Makefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.in.diff (154010 => 154011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.in.diff 2016-10-18 01:59:25 UTC (rev 154010)
+++ trunk/dports/gnome/keybinder/files/patch_python-keybinder_Makefile.in.diff 2016-10-18 02:56:21 UTC (rev 154011)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- python-keybinder/Makefile.in.orig 2012-06-17 11:25:51.000000000 -0500
-+++ python-keybinder/Makefile.in 2013-12-09 09:34:22.000000000 -0600
-@@ -97,7 +97,7 @@
- "$(DESTDIR)$(_keybinderdir)"
- LTLIBRARIES = $(_keybinder_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--_keybinder_la_DEPENDENCIES = ../libkeybinder/libkeybinder.la \
-+_keybinder_la_DEPENDENCIES = $(LIBDIR)/libkeybinder.dylib \
- $(am__DEPENDENCIES_1)
- am__keybinder_la_OBJECTS = _keybinder_la-_keybindermodule.lo
- nodist__keybinder_la_OBJECTS = _keybinder_la-_keybinder.lo
-@@ -314,7 +314,7 @@
- _keybinder_LTLIBRARIES = _keybinder.la
- _keybinder_la_CPPFLAGS = $(X_CFLAGS) $(PYEXTRAFLAGS)
- _keybinder_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_keybinder $(X_LDFLAGS)
--_keybinder_la_LIBADD = ../libkeybinder/libkeybinder.la $(PYGTK_LIBS)
-+_keybinder_la_LIBADD = $(LIBDIR)/libkeybinder.dylib $(PYGTK_LIBS)
- _keybinder_la_SOURCES = _keybindermodule.c
- nodist__keybinder_la_SOURCES = _keybinder.c
- _keybinder_PYTHON = \
</del></span></pre></div>
<a id="trunkdportspythonpygraveyardPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-graveyard/Portfile (154010 => 154011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-graveyard/Portfile 2016-10-18 01:59:25 UTC (rev 154010)
+++ trunk/dports/python/py-graveyard/Portfile 2016-10-18 02:56:21 UTC (rev 154011)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> py-jsbeautifier 1.4.0_1 26
</span><span class="cx"> py-kapteyn 2.2_1 26
</span><span class="cx"> py-keyring 3.6_1 26 33
</span><ins>+py-keybinder 0.3.1_1 26
</ins><span class="cx"> py-libcloud 0.17.0_1 26 33
</span><span class="cx"> py-lmfit 0.9.2_1 26 33
</span><span class="cx"> py-matplotlib 1.5.0_1 26 33
</span></span></pre>
</div>
</div>
</body>
</html>