Revision
147302
Author
devans@macports.org
Date
2016-04-01 13:30:46 -0700 (Fri, 01 Apr 2016)

Log Message

GNOME-3/stable: dconf, update to version 0.26.0.

Modified Paths

Property Changed

Diff

Property changes: users/devans/GNOME-3/stable/dports/gnome/dconf


Modified: svn:mergeinfo

/users/devans/GNOME-3/unstable/dports/gnome/dconf:116416-118151,122424-125568,133860-134459 + /trunk/dports/gnome/dconf:113289-117677 /users/devans/GNOME-3/unstable/dports/gnome/dconf:116416-118151,122424-125568,133860-134459,143648-147064

Modified: users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile (147301 => 147302)


--- users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile	2016-04-01 20:28:33 UTC (rev 147301)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/Portfile	2016-04-01 20:30:46 UTC (rev 147302)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                dconf
-version             0.24.0
+version             0.26.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 maintainers         devans openmaintainer
 categories          gnome
@@ -22,15 +22,14 @@
 
 use_xz              yes
 
-checksums           rmd160  60fcdd4ca2aa09a1102cbdb3586bb462d2292eae \
-                    sha256  4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2
+checksums           rmd160  1421922be5703abb86fa59786a5d2e5c2d4cc646 \
+                    sha256  8683292eb31a3fae31e561f0a4220d8569b0f6d882e9958b68373f9043d658c9
 
 depends_build       port:pkgconfig \
                     port:docbook-xsl \
                     port:libxslt
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                    port:dbus \
                     port:vala
 
 patchfiles          patch-fix-lib-names-Makefile.am.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff (147301 => 147302)


--- users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff	2016-04-01 20:28:33 UTC (rev 147301)
+++ users/devans/GNOME-3/stable/dports/gnome/dconf/files/patch-fix-lib-names-Makefile.am.diff	2016-04-01 20:30:46 UTC (rev 147302)
@@ -67,50 +67,3 @@
  
 -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