<!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>[121998] trunk/dports/gnome/gexiv2</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/121998">121998</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-12 17:28:48 -0700 (Sat, 12 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gexiv2: update to version 0.10.1, livecheck, add +python34 variant.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegexiv2Portfile">trunk/dports/gnome/gexiv2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegexiv2filespatchMakefileamdiff">trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff</a></li>
<li><a href="#trunkdportsgnomegexiv2filespatchconfigureacdiff">trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegexiv2filespatchMakefilediff">trunk/dports/gnome/gexiv2/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsgnomegexiv2filespatchconfigurediff">trunk/dports/gnome/gexiv2/files/patch-configure.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegexiv2">trunk/dports/gnome/gexiv2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegexiv2"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gexiv2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/dports/gnome/gexiv2:116764-121996
</span><span class="cx">/users/rmstonecipher/gnome/gexiv2:102363-103172
</span><a id="trunkdportsgnomegexiv2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gexiv2/Portfile (121997 => 121998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gexiv2/Portfile 2014-07-13 00:03:56 UTC (rev 121997)
+++ trunk/dports/gnome/gexiv2/Portfile 2014-07-13 00:28:48 UTC (rev 121998)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gexiv2
</span><del>-version 0.7.0
-revision 1
</del><ins>+version 0.10.1
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description gexiv2 is a GObject-based wrapper around the exiv2 library.
</span><span class="lines">@@ -23,22 +22,24 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 1a94722c86544c5b788364b60ec178e631809222 \
- sha256 b631fe02402014cb52f22647b384972776ada31cbd3c3f187014b6535461ee8a
</del><ins>+checksums rmd160 d5bd9a657171527b1af05ef04ad1073e9be9b7d2 \
+ sha256 7675752a59c2f091560be1f39514ef492ec705b9fdea5f52281672e6b3eba2c7
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig \
- port:libtool
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><span class="cx"> depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> port:gobject-introspection \
</span><span class="cx"> port:vala \
</span><span class="cx"> port:exiv2
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
- patch-Makefile.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-Makefile.am.diff
</ins><span class="cx">
</span><ins>+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-introspection \
</span><del>- --with-libtool=${prefix}/bin/glibtool
</del><ins>+ --disable-silent-rules
</ins><span class="cx">
</span><span class="cx"> # gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><span class="cx"> build.args-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span class="lines">@@ -50,20 +51,25 @@
</span><span class="cx"> configure.env-append PYTHON2=${prefix}/bin/python2.7
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python32 conflicts python33 description {Build with support for Python 3.2} {
</del><ins>+variant python32 conflicts python33 python34 description {Build with support for Python 3.2} {
</ins><span class="cx"> depends_lib-append port:py32-gobject3
</span><span class="cx"> configure.env-append PYTHON3=${prefix}/bin/python3.2
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python33 conflicts python32 description {Build with support for Python 3.3} {
</del><ins>+variant python33 conflicts python32 python34 description {Build with support for Python 3.3} {
</ins><span class="cx"> depends_lib-append port:py33-gobject3
</span><span class="cx"> configure.env-append PYTHON3=${prefix}/bin/python3.3
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset python33]} {
- default_variants +python32
</del><ins>+variant python34 conflicts python32 python33 description {Build with support for Python 3.4} {
+ depends_lib-append port:py34-gobject3
+ configure.env-append PYTHON3=${prefix}/bin/python3.4
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+if {![variant_isset python32] & ![variant_isset python34]} {
+ default_variants +python33
+}
+
</ins><span class="cx"> default_variants +python27
</span><span class="cx">
</span><del>-livecheck.type gnome-with-unstable
</del><ins>+livecheck.type gnome
</ins></span></pre></div>
<a id="trunkdportsgnomegexiv2filespatchMakefileamdifffromrev121996usersdevansdportsgnomegexiv2filespatchMakefileamdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff (from rev 121996, users/devans/dports/gnome/gexiv2/files/patch-Makefile.am.diff) (0 => 121998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff 2014-07-13 00:28:48 UTC (rev 121998)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- Makefile.am.orig 2014-07-12 11:56:37.000000000 -0700
++++ Makefile.am 2014-07-12 11:57:40.000000000 -0700
+@@ -140,6 +140,6 @@
+ -I @PACKAGE_NAME@ \
+ $(GEXIV2_public_HEADERS) \
+ --library lib@PACKAGE_NAME@.la \
+- $(LIBTOOL) \
++ --libtool "$(LIBTOOL)" \
+ --pkg=gobject-2.0
+
</ins></span></pre></div>
<a id="trunkdportsgnomegexiv2filespatchMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gexiv2/files/patch-Makefile.diff (121997 => 121998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gexiv2/files/patch-Makefile.diff 2014-07-13 00:03:56 UTC (rev 121997)
+++ trunk/dports/gnome/gexiv2/files/patch-Makefile.diff 2014-07-13 00:28:48 UTC (rev 121998)
</span><span class="lines">@@ -1,106 +0,0 @@
</span><del>---- Makefile.orig 2013-10-03 16:16:08.000000000 -0700
-+++ Makefile 2013-11-17 11:51:19.000000000 -0800
-@@ -24,14 +24,17 @@
- BUILD_RELEASE=1
- BUILD_DIR=gexiv2
- LIB=lib
-+LIBTOOL=libtool
-+PYTHON2=python2
-+PYTHON3=python3
-
- -include configure.mk
-
- # Used to determine where Python wants the .gi file to be installed ... if Python is not installed,
--# PYTHON2 and PYTHON3 will be empty
-+# PYTHON2_OVERRIDES_DIR and PYTHON3_OVERRIDES_DIR will be empty
- PYTHON="import gi; print(gi._overridesdir)"
--PYTHON2=$(shell python2 -c $(PYTHON) 2> /dev/null)
--PYTHON3=$(shell python3 -c $(PYTHON) 2> /dev/null)
-+PYTHON2_OVERRIDES_DIR=$(shell $(PYTHON2) -c $(PYTHON) 2> /dev/null)
-+PYTHON3_OVERRIDES_DIR=$(shell $(PYTHON3) -c $(PYTHON) 2> /dev/null)
-
- TYPELIB=`pkg-config gobject-introspection-no-export-1.0 --variable typelibdir`
-
-@@ -133,7 +136,7 @@
- endif
- endif
-
--CFLAGS += $(REQUIRED_CFLAGS)
-+#CFLAGS += $(REQUIRED_CFLAGS)
-
- all: $(LIBRARY_BIN) $(PC_FILE) $(TYPELIB_FILE)
-
-@@ -152,7 +155,7 @@
- $(EXPANDED_INSTALLED_HEADER_FILES) \
- $(EXPANDED_SRC_FILES) \
- --library $(LIBRARY_BIN) \
-- $(LIBTOOL) \
-+ --libtool=$(LIBTOOL) \
- --pkg=gobject-2.0
-
- clean:
-@@ -181,7 +184,7 @@
- .PHONY: install
- install:
- @mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)
-- libtool --mode=install $(INSTALL_PROGRAM) $(LIBRARY).la $(DESTDIR)$(PREFIX)/$(LIB)
-+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(LIBRARY).la $(DESTDIR)$(PREFIX)/$(LIB)
- @mkdir -p $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
- $(INSTALL_DATA) $(EXPANDED_INSTALLED_HEADER_FILES) $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
- @mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
-@@ -194,13 +197,13 @@
- @mkdir -p $(DESTDIR)$(TYPELIB)
- $(INSTALL_DATA) GExiv2-$(GIR_VERSION).typelib $(DESTDIR)$(TYPELIB)
- # No introspection, no .gi file for the Python module to call into
--ifneq "$(PYTHON2)" ""
-- @mkdir -p $(DESTDIR)$(PYTHON2)
-- $(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON2)
--endif
--ifneq "$(PYTHON3)" ""
-- @mkdir -p $(DESTDIR)$(PYTHON3)
-- $(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON3)
-+ifneq "$(PYTHON2_OVERRIDES_DIR)" ""
-+ @mkdir -p $(DESTDIR)$(PYTHON2_OVERRIDES_DIR)
-+ $(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON2_OVERRIDES_DIR)
-+endif
-+ifneq "$(PYTHON3_OVERRIDES_DIR)" ""
-+ @mkdir -p $(DESTDIR)$(PYTHON3_OVERRIDES_DIR)
-+ $(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON3_OVERRIDES_DIR)
- endif
- endif
-
-@@ -209,18 +212,18 @@
- $(INSTALL_DATA) $(VAPI_FILE) $(DESTDIR)$(PREFIX)/share/vala/vapi
-
- uninstall:
-- libtool --mode=uninstall rm -f $(DESTDIR)$(PREFIX)/$(LIB)/$(LIBRARY).la
-+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(PREFIX)/$(LIB)/$(LIBRARY).la
- rm -rf $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
- rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PKGNAME).pc
- rm -f $(DESTDIR)$(PREFIX)/share/vala/vapi/$(PKGNAME).vapi
- ifdef ENABLE_INTROSPECTION
- rm -f $(DESTDIR)$(PREFIX)/share/gir-1.0/GExiv2-$(GIR_VERSION).gir
- rm -f $(DESTDIR)$(TYPELIB)/GExiv2-$(GIR_VERSION).typelib
--ifneq "$(PYTHON2)" ""
-- rm -rf $(DESTDIR)$(PYTHON2)/GExiv2.py
-+ifneq "$(PYTHON2_OVERRIDES_DIR)" ""
-+ rm -rf $(DESTDIR)$(PYTHON2_OVERRIDES_DIR)/GExiv2.py
- endif
--ifneq "$(PYTHON3)" ""
-- rm -rf $(DESTDIR)$(PYTHON3)/GExiv2.py
-+ifneq "$(PYTHON3_OVERRIDES_DIR)" ""
-+ rm -rf $(DESTDIR)$(PYTHON3_OVERRIDES_DIR)/GExiv2.py
- endif
- endif
-
-@@ -236,8 +239,8 @@
- $(EXPANDED_LO_FILES): $(BUILD_DIR)/%.lo: gexiv2/%.cpp $(EXPANDED_HEADER_FILES) $(CONFIG_IN) Makefile
- @pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS)'
- @mkdir -p $(BUILD_DIR)
-- libtool --mode=compile --tag=CC $(CXX) -c $(EXT_PKGS_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I. -o $@ $<
-+ $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(EXT_PKGS_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I. -o $@ $<
-
- $(LIBRARY_BIN): $(EXPANDED_LO_FILES)
-- libtool --mode=link --tag=CC $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -version-info $(VERSION_INFO) -o $(LIBRARY_BIN)
-+ $(LIBTOOL) --mode=link --tag=CC $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -version-info $(VERSION_INFO) -o $(LIBRARY_BIN)
-
</del></span></pre></div>
<a id="trunkdportsgnomegexiv2filespatchconfigureacdifffromrev121996usersdevansdportsgnomegexiv2filespatchconfigureacdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff (from rev 121996, users/devans/dports/gnome/gexiv2/files/patch-configure.ac.diff) (0 => 121998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff 2014-07-13 00:28:48 UTC (rev 121998)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- configure.ac.orig 2014-04-21 15:56:32.000000000 -0700
++++ configure.ac 2014-04-21 15:59:00.000000000 -0700
+@@ -122,10 +122,10 @@
+ if test "x$enable_introspection" = "xyes"; then
+ # Used to determine where Python wants the .gi file to be installed ...
+ # if Python is not installed, PYTHON2 and PYTHON3 will be empty
+- PYTHON="import gi; print(gi._overridesdir)"
+- PYTHON2_GIDIR=$(python2 -c "$PYTHON")
++ PYTHON_SCRIPT="import gi; print(gi._overridesdir)"
++ PYTHON2_GIDIR=`$PYTHON2 -c "$PYTHON_SCRIPT"`
+ AC_MSG_RESULT([Python2 GObject Introspection directory: $PYTHON2_GIDIR])
+- PYTHON3_GIDIR=$(python3 -c "$PYTHON")
++ PYTHON3_GIDIR=`$PYTHON3 -c "$PYTHON_SCRIPT"`
+ AC_MSG_RESULT([Python3 GObject Introspection directory: $PYTHON3_GIDIR])
+ if test "x$PYTHON2_GIDIR" != "x"; then
+ enable_python2=yes
</ins></span></pre></div>
<a id="trunkdportsgnomegexiv2filespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gexiv2/files/patch-configure.diff (121997 => 121998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gexiv2/files/patch-configure.diff 2014-07-13 00:03:56 UTC (rev 121997)
+++ trunk/dports/gnome/gexiv2/files/patch-configure.diff 2014-07-13 00:28:48 UTC (rev 121998)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>---- configure.orig 2013-06-06 16:44:40.000000000 -0700
-+++ configure 2013-11-17 11:53:19.000000000 -0800
-@@ -60,7 +60,7 @@
- abort $1
- fi
-
-- variables="${variables}LIBTOOL=--libtool=$value\n"
-+ variables="${variables}LIBTOOL=$value\n"
- ;;
-
- --assume-pkgs) variables="${variables}ASSUME_PKGS=1\n"
-@@ -97,6 +97,14 @@
- then
- echo -e -n $variables > $CONFIG_IN
- fi
-+
-+echo "CXX=${CXX}" >> $CONFIG_IN
-+echo "CPPFLAGS=${CPPFLAGS}" >> $CONFIG_IN
-+echo "CFLAGS=${CXXFLAGS}" >> $CONFIG_IN
-+echo "LDFLAGS=${CXXFLAGS}" >> $CONFIG_IN
-+echo "PYTHON2=${PYTHON2}" >> $CONFIG_IN
-+echo "PYTHON3=${PYTHON3}" >> $CONFIG_IN
-+
- echo "CONFIG_IN=${CONFIG_IN}" >> $CONFIG_IN
-
- printf "Configured. Type 'make' to build, 'make install' to install.\n"
</del></span></pre>
</div>
</div>
</body>
</html>