<!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>[117701] users/devans/GNOME-3/stable/dports/gnome</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/117701">117701</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-08 08:28:17 -0800 (Sat, 08 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: dconf, empathy, libgdata, sync with trunk (intltool fixes).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconfPortfile">users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeempathyPortfile">users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgdataPortfile">users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconffilespatchfixlibnamesMakefileamdiff">users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconffilespatchfixlibnamesdiff">users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff</a></li>
<li>users/devans/GNOME-3/stable/dports/gnome/empathy/files/</li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomedconf">users/devans/GNOME-3/stable/dports/gnome/dconf/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomeempathy">users/devans/GNOME-3/stable/dports/gnome/empathy/</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomelibgdata">users/devans/GNOME-3/stable/dports/gnome/libgdata/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomedconf"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/dconf</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="usersdevansGNOME3stabledportsgnomedconfPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile (117700 => 117701)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile 2014-03-08 16:02:22 UTC (rev 117700)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile 2014-03-08 16:28:17 UTC (rev 117701)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name dconf
</span><span class="cx"> version 0.18.0
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -28,15 +29,26 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:gtk-doc
</del><ins>+ port:gtk-doc \
+ port:libxslt
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gtk3 \
</span><span class="cx"> port:dbus \
</span><del>- port:libxml2
</del><ins>+ port:libxml2 \
+ port:vala
</ins><span class="cx">
</span><del>-patchfiles patch-fix-lib-names.diff
</del><ins>+patchfiles patch-fix-lib-names-Makefile.am.diff
</ins><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-editor \
</span><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedconffilespatchfixlibnamesMakefileamdifffromrev117677trunkdportsgnomedconffilespatchfixlibnamesMakefileamdiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff (from rev 117677, trunk/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff) (0 => 117701)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff 2014-03-08 16:28:17 UTC (rev 117701)
</span><span class="lines">@@ -0,0 +1,127 @@
</span><ins>+--- bin/Makefile.am.orig 2014-03-07 09:32:46.000000000 -0800
++++ bin/Makefile.am 2014-03-07 09:37:25.000000000 -0800
+@@ -11,7 +11,7 @@
+ -w
+
+ dconf_LDADD = \
+- ../client/libdconf.so.1 \
++ ../client/libdconf.1.dylib \
+ $(gio_LIBS)
+
+ dconf_SOURCES = \
+--- client/Makefile.am.orig 2014-03-07 09:38:42.000000000 -0800
++++ client/Makefile.am 2014-03-07 09:52:41.000000000 -0800
+@@ -1,20 +1,20 @@
+ include $(top_srcdir)/Makefile.gtester
+
+ shlibdir=$(libdir)
+-shlib_PROGRAMS = libdconf.so.1.0.0
+-nodist_noinst_DATA = libdconf.so.1 libdconf.so
++shlib_PROGRAMS = libdconf.1.0.0.dylib
++nodist_noinst_DATA = libdconf.1.dylib libdconf.dylib
+ noinst_LIBRARIES = libdconf-client.a
+
+-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
+- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
++libdconf.1.dylib libdconf.dylib: libdconf.1.0.0.dylib
++ $(AM_V_GEN) ln -fs libdconf.1.0.0.dylib $@
+
+ install-data-hook:
+- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
+- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
++ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.1.dylib
++ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.dylib
+
+ uninstall-hook:
+- rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
+- rm -f $(DESTDIR)$(shlibdir)/libdconf.so
++ rm -f $(DESTDIR)$(shlibdir)/libdconf.1.dylib
++ rm -f $(DESTDIR)$(shlibdir)/libdconf.dylib
+
+ dconfinclude_HEADERS = dconf.h
+ dconfclientinclude_HEADERS = dconf-client.h
+@@ -24,16 +24,16 @@
+ libdconf_client_a_SOURCES = \
+ dconf-client.c
+
+-libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
+-libdconf_so_1_0_0_LDADD = \
++libdconf_1_0_0_dylib_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
++libdconf_1_0_0_dylib_LDADD = \
+ ../engine/libdconf-engine-shared.a \
+ ../common/libdconf-common-shared.a \
+ ../gdbus/libdconf-gdbus-thread-shared.a \
+ ../gvdb/libgvdb-shared.a \
+ ../shm/libdconf-shm-shared.a \
+ $(gio_LIBS)
+-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
+-libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
++libdconf_1_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf.1.0.0.dylib
++libdconf_1_0_0_dylib_SOURCES = $(libdconf_client_a_SOURCES)
+
+ EXTRA_DIST = dconf.vapi dconf.deps
+
+@@ -43,4 +43,4 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = dconf.pc
+
+-CLEANFILES = libdconf.so.1 libdconf.so
++CLEANFILES = libdconf.1.dylib libdconf.dylib
+--- dbus-1/Makefile.am.orig 2014-03-07 09:54:03.000000000 -0800
++++ dbus-1/Makefile.am 2014-03-07 10:03:51.000000000 -0800
+@@ -17,10 +17,10 @@
+ pkgconfig_DATA = dconf-dbus-1.pc
+
+ shlibdir = $(libdir)
+-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
++shlib_PROGRAMS = libdconf-dbus-1.0.0.0.dylib
+
+-libdconf_dbus_1_so_0_0_0_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
+-libdconf_dbus_1_so_0_0_0_LDADD = \
++libdconf_dbus_1_0_0_0_dylib_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
++libdconf_dbus_1_0_0_0_dylib_LDADD = \
+ ../engine/libdconf-engine-shared.a \
+ ../common/libdconf-common-hidden.a \
+ ./libdconf-libdbus-1-shared.a \
+@@ -28,20 +28,20 @@
+ ../shm/libdconf-shm-shared.a \
+ $(dbus_LIBS) \
+ $(glib_LIBS)
+-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
+-libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
++libdconf_dbus_1_0_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf-dbus-1.0.0.0.dylib
++libdconf_dbus_1_0_0_0_dylib_SOURCES = dconf-dbus-1.c
+
+-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
++nodist_noinst_DATA = libdconf-dbus-1.dylib libdconf-dbus-1.0.dylib
+
+-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
+- $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
++libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib: libdconf-dbus-1.0.0.0.dylib
++ $(AM_V_GEN) ln -fs libdconf-dbus-1.0.0.0.dylib $@
+
+ install-data-hook:
+- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
+- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
++ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
++ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib
+
+ uninstall-hook:
+- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
+- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
++ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
++ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib
+
+-CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
++CLEANFILES = libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib
+--- editor/Makefile.am.orig 2014-03-07 10:04:58.000000000 -0800
++++ editor/Makefile.am 2014-03-07 10:07:17.000000000 -0800
+@@ -7,7 +7,7 @@
+ dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
+
+ dconf_editor_LDADD = \
+- ../client/libdconf.so.1 \
++ ../client/libdconf.1.dylib \
+ $(gtk_LIBS) \
+ $(gee_LIBS) \
+ $(gmodule_LIBS) \
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomedconffilespatchfixlibnamesdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff (117700 => 117701)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff 2014-03-08 16:02:22 UTC (rev 117700)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names.diff 2014-03-08 16:28:17 UTC (rev 117701)
</span><span class="lines">@@ -1,170 +0,0 @@
</span><del>---- bin/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
-+++ bin/Makefile.in 2013-11-16 09:55:50.000000000 -0800
-@@ -98,7 +98,7 @@
- dconf-dconf.$(OBJEXT)
- dconf_OBJECTS = $(am_dconf_OBJECTS)
- am__DEPENDENCIES_1 =
--dconf_DEPENDENCIES = ../client/libdconf.so.1 $(am__DEPENDENCIES_1)
-+dconf_DEPENDENCIES = ../client/libdconf.1.dylib $(am__DEPENDENCIES_1)
- dconf_LINK = $(CCLD) $(dconf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
- AM_V_P = $(am__v_P_@AM_V@)
-@@ -352,7 +352,7 @@
- -w
-
- dconf_LDADD = \
-- ../client/libdconf.so.1 \
-+ ../client/libdconf.1.dylib \
- $(gio_LIBS)
-
- dconf_SOURCES = \
---- client/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
-+++ client/Makefile.in 2013-11-16 09:55:50.000000000 -0800
-@@ -83,7 +83,7 @@
- $(srcdir)/Makefile.am $(srcdir)/dconf.pc.in \
- $(top_srcdir)/aux/depcomp $(dconfclientinclude_HEADERS) \
- $(dconfinclude_HEADERS)
--shlib_PROGRAMS = libdconf.so.1.0.0$(EXEEXT)
-+shlib_PROGRAMS = libdconf.1.0.0.dylib$(EXEEXT)
- subdir = client
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-@@ -363,7 +363,7 @@
- # initialize variables for unconditional += appending
- TEST_PROGS =
- shlibdir = $(libdir)
--nodist_noinst_DATA = libdconf.so.1 libdconf.so
-+nodist_noinst_DATA = libdconf.1.dylib libdconf.dylib
- noinst_LIBRARIES = libdconf-client.a
- dconfinclude_HEADERS = dconf.h
- dconfclientinclude_HEADERS = dconf-client.h
-@@ -381,14 +381,14 @@
- ../shm/libdconf-shm-shared.a \
- $(gio_LIBS)
-
--libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
-+libdconf_so_1_0_0_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf.1.0.0.dylib$(EXEEXT)
- libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
- EXTRA_DIST = dconf.vapi dconf.deps
- vapi_DATA = dconf.vapi dconf.deps
- vapidir = $(datadir)/vala/vapi
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dconf.pc
--CLEANFILES = libdconf.so.1 libdconf.so
-+CLEANFILES = libdconf.1.dylib libdconf.dylib
- all: all-am
-
- .SUFFIXES:
-@@ -477,8 +477,8 @@
- clean-shlibPROGRAMS:
- -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
-
--libdconf.so.1.0.0$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
-- @rm -f libdconf.so.1.0.0$(EXEEXT)
-+libdconf.1.0.0.dylib$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
-+ @rm -f libdconf.1.0.0.dylib$(EXEEXT)
- $(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS)
-
- mostlyclean-compile:
-@@ -900,16 +900,16 @@
- # run tests in cwd as part of make check
- check-local: test-nonrecursive
-
--libdconf.so.1 libdconf.so: libdconf.so.1.0.0
-- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
-+libdconf.1.dylib libdconf.dylib: libdconf.1.0.0.dylib
-+ $(AM_V_GEN) ln -fs libdconf.1.0.0.dylib $@
-
- install-data-hook:
-- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
-- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
-+ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.1.dylib
-+ ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.dylib
-
- uninstall-hook:
-- rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
-- rm -f $(DESTDIR)$(shlibdir)/libdconf.so
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf.1.dylib
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf.dylib
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- dbus-1/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
-+++ dbus-1/Makefile.in 2013-11-16 09:55:50.000000000 -0800
-@@ -82,7 +82,7 @@
- DIST_COMMON = $(top_srcdir)/Makefile.gtester $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(srcdir)/dconf-dbus-1.pc.in \
- $(top_srcdir)/aux/depcomp $(dconf_dbus_1include_HEADERS)
--shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
-+shlib_PROGRAMS = libdconf-dbus-1.0.0.0.dylib$(EXEEXT)
- subdir = dbus-1
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-@@ -395,10 +395,10 @@
- $(dbus_LIBS) \
- $(glib_LIBS)
-
--libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
-+libdconf_dbus_1_so_0_0_0_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf-dbus-1.0.0.0.dylib$(EXEEXT)
- libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
--nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
--CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
-+nodist_noinst_DATA = libdconf-dbus-1.dylib libdconf-dbus-1.0.dylib
-+CLEANFILES = libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib
- all: all-am
-
- .SUFFIXES:
-@@ -492,8 +492,8 @@
- clean-shlibPROGRAMS:
- -test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
-
--libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
-- @rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT)
-+libdconf-dbus-1.0.0.0.dylib$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES)
-+ @rm -f libdconf-dbus-1.0.0.0.dylib$(EXEEXT)
- $(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
-
- mostlyclean-compile:
-@@ -883,16 +883,16 @@
- # run tests in cwd as part of make check
- check-local: test-nonrecursive
-
--libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
-- $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
-+libdconf-dbus-1.0.dylib libdconf-dbus-1.dylib: libdconf-dbus-1.0.0.0.dylib
-+ $(AM_V_GEN) ln -fs libdconf-dbus-1.0.0.0.dylib $@
-
- install-data-hook:
-- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
-- ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
-+ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
-+ ln -fs libdconf-dbus-1.0.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib
-
- uninstall-hook:
-- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
-- rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.0.dylib
-+ rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.dylib
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- editor/Makefile.in.orig 2013-09-23 14:29:28.000000000 -0700
-+++ editor/Makefile.in 2013-11-16 09:55:50.000000000 -0800
-@@ -103,7 +103,7 @@
- dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) \
- $(nodist_dconf_editor_OBJECTS)
- am__DEPENDENCIES_1 =
--dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
-+dconf_editor_DEPENDENCIES = ../client/libdconf.1.dylib \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
-@@ -355,7 +355,7 @@
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client
- dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
- dconf_editor_LDADD = \
-- ../client/libdconf.so.1 \
-+ ../client/libdconf.1.dylib \
- $(gtk_LIBS) \
- $(gee_LIBS) \
- $(gmodule_LIBS) \
</del></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomeempathy"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/empathy</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/dports/gnome/empathy:108265-117677
</span><a id="usersdevansGNOME3stabledportsgnomeempathyPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile (117700 => 117701)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile 2014-03-08 16:02:22 UTC (rev 117700)
+++ users/devans/GNOME-3/stable/dports/gnome/empathy/Portfile 2014-03-08 16:28:17 UTC (rev 117701)
</span><span class="lines">@@ -25,7 +25,13 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:itstool
</del><ins>+ port:itstool \
+ port:yelp-tools \
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool \
+ port:libxslt
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-icon-theme \
</span><span class="lines">@@ -83,7 +89,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><span class="cx"> configure.args --x-includes=${prefix}/include \
</span><span class="cx"> --x-libraries=${prefix}/lib \
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomelibgdata"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/gnome/libgdata</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/libgdata:108265-117388
</span><span class="cx">/users/rmstonecipher/gnome/libgdata:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/libgdata:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/libgdata:108265-117658
</span><span class="cx">/users/rmstonecipher/gnome/libgdata:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomelibgdataPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile (117700 => 117701)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile 2014-03-08 16:02:22 UTC (rev 117700)
+++ users/devans/GNOME-3/stable/dports/gnome/libgdata/Portfile 2014-03-08 16:28:17 UTC (rev 117701)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:gnome-doc-utils \
</del><ins>+ port:gnome-common \
</ins><span class="cx"> port:gtk-doc
</span><span class="cx">
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="lines">@@ -38,6 +38,15 @@
</span><span class="cx"> port:gnome-online-accounts \
</span><span class="cx"> port:gcr
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-introspection=yes \
</span><span class="cx"> --enable-gnome \
</span><span class="cx"> --enable-goa
</span></span></pre>
</div>
</div>
</body>
</html>