Update dconf to 0.19.91. Kill:

Update dconf to 0.19.91, killing:

	patch-editor_dconf-model.vala
	patch-editors_dconf-view.vala
	patch-test_Makefile.am
	patch-test_Makefile.in

they were backported and now are not needed anymore.


git-svn-id: svn://creme-brulee.marcuscom.com/ports-experimental/trunk@19054 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 308 insertions, 0 deletions

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
new file mode 100644
index 0000000..5cd9257
--- /dev/null
+++ b/devel/dconf/Makefile
@@ -0,0 +1,59 @@
+# Created by: Koop Mast <kwm@FreeBSD.org>
+# $FreeBSD$
+#   $MCom$
+
+PORTNAME?=	dconf
+PORTVERSION=	0.19.91
+CATEGORIES=	devel gnome
+MASTER_SITES=	GNOME
+DISTNAME=	dconf-${PORTVERSION}
+DIST_SUBDIR=	gnome3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Configuration database system for GNOME
+
+BUILD_DEPENDS=	vala>=0.18.1:${PORTSDIR}/lang/vala \
+		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+
+USE_XZ=		yes
+USES=		gettext gmake pathfix pkgconfig
+USE_GNOME=	glib20 gnomehier intltool
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+MAKE_JOBS_UNSAFE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+DCONF_SLAVE?=	no
+
+.if ${DCONF_SLAVE} == editor
+USE_GNOME+=	gtk30
+INSTALLS_ICONS=	yes
+GLIB_SCHEMAS=	ca.desrt.dconf-editor.gschema.xml
+LIB_DEPENDS+=	libdconf.so:${PORTSDIR}/devel/dconf
+.else
+CONFIGURE_ARGS+=--disable-editor
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+		${WRKSRC}/engine/dconf-engine.c \
+		${WRKSRC}/engine/dconf-engine-profile.c \
+		${WRKSRC}/engine/dconf-engine-source-system.c \
+		${WRKSRC}/bin/dconf-update.c \
+		${WRKSRC}/tests/engine.c
+	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+		${WRKSRC}/editor/dconf-model.c
+	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
+		${WRKSRC}/editor/dconf-model.vala
+	@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
+		${WRKSRC}/bin/Makefile.in \
+		${WRKSRC}/client/Makefile.in \
+		${WRKSRC}/editor/Makefile.in
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/db
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dconf/profile
+
+.include <bsd.port.mk>
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
new file mode 100644
index 0000000..036d228
--- /dev/null
+++ b/devel/dconf/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/dconf-0.19.91.tar.xz) = 3fe8276a8a1b73b96204f6743141227d3c3c94b89b6e7b867b9f13eafad0daa9
+SIZE (gnome3/dconf-0.19.91.tar.xz) = 388928
diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in
new file mode 100644
index 0000000..5d49e9e
--- /dev/null
+++ b/devel/dconf/files/patch-client_Makefile.in
@@ -0,0 +1,41 @@
+--- client/Makefile.in.orig	2013-09-06 20:42:04.000000000 +0200
++++ client/Makefile.in	2013-09-06 20:44:20.000000000 +0200
+@@ -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.so.1$(EXEEXT)
+ subdir = client
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+@@ -476,12 +476,12 @@
+ 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.so.1$(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$(EXEEXT)
+ 	$(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS)
++	$(AM_V_GEN) ln -fs libdconf.so.1 libdconf.so
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -899,12 +899,8 @@
+ # 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 $@
+-
+ 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.so.1 $(DESTDIR)$(shlibdir)/libdconf.so
+ 
+ uninstall-hook:
+ 	rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in
new file mode 100644
index 0000000..2cb4dc5
--- /dev/null
+++ b/devel/dconf/files/patch-dbus-1_Makefile.in
@@ -0,0 +1,52 @@
+--- dbus-1/Makefile.in.orig	2013-09-06 20:44:51.000000000 +0200
++++ dbus-1/Makefile.in	2013-09-06 20:47:45.000000000 +0200
+@@ -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.so.0$(EXEEXT)
+ subdir = dbus-1
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+@@ -396,7 +396,7 @@
+ 
+ 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
+-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
++nodist_noinst_DATA = libdconf-dbus-1.so.0
+ CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
+ all: all-am
+ 
+@@ -489,14 +489,13 @@
+ 	cd "$(DESTDIR)$(shlibdir)" && rm -f $$files
+ 
+ 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.so.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$(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)
++	$(AM_V_GEN) ln -fs libdconf-dbus-1.so.0 libdconf-dbus-1.so
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -882,12 +881,8 @@
+ # 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 $@
+-
+ 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.so.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
+ 
+ uninstall-hook:
+ 	rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in
new file mode 100644
index 0000000..f9935dd
--- /dev/null
+++ b/devel/dconf/files/patch-editor_Makefile.in
@@ -0,0 +1,20 @@
+--- editor/Makefile.orig.in	2013-03-26 19:20:12.623348896 +0000
++++ editor/Makefile.in	2013-03-26 19:21:40.077341977 +0000
+@@ -72,7 +72,7 @@
+ 	dconf_editor-dconf-view.$(OBJEXT)
+ dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
++dconf_editor_DEPENDENCIES = -ldconf \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
+@@ -297,7 +297,7 @@
+ INCLUDES = -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		\
++	 -ldconf			\
+ 	$(gtk_LIBS)			\
+ 	$(gee_LIBS)			\
+ 	$(gmodule_LIBS)			\
diff --git a/devel/dconf/pkg-descr b/devel/dconf/pkg-descr
new file mode 100644
index 0000000..1688899
--- /dev/null
+++ b/devel/dconf/pkg-descr
@@ -0,0 +1,18 @@
+GConf extends the concept of a configuration registry.  It provides
+a simple way for applications and administrators to store data;
+often GConf is used to store preferences for applications.
+
+Some of the features of GConf are:
+GConf provides:
+
+    * Documentation for each configuration key, so that administrators
+      can better modify the value.
+
+    * Notifications to interested applications when configuration data
+      is changed.  The notification service works across networks,
+      affecting all login sessions for a single user.
+
+    * Proper locking so that configuration data doesn't get corrupted
+      when accessed by multiple applications at the same time.
+
+WWW: http://live.gnome.org/dconf
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
new file mode 100644
index 0000000..04ef56c
--- /dev/null
+++ b/devel/dconf/pkg-plist
@@ -0,0 +1,116 @@
+bin/dconf
+include/dconf/client/dconf-client.h
+include/dconf/common/dconf-changeset.h
+include/dconf/common/dconf-error.h
+include/dconf-dbus-1/dconf-dbus-1.h
+include/dconf/common/dconf-paths.h
+include/dconf/dconf.h
+lib/gio/modules/libdconfsettings.so
+lib/libdconf.so
+lib/libdconf.so.1
+lib/libdconf-dbus-1.so
+lib/libdconf-dbus-1.so.0
+libdata/pkgconfig/dconf.pc
+libdata/pkgconfig/dconf-dbus-1.pc
+libexec/dconf-service
+man/man1/dconf-editor.1.gz
+man/man1/dconf-service.1.gz
+man/man1/dconf.1.gz
+man/man7/dconf.7.gz
+share/bash-completion/completions/dconf
+share/dbus-1/services/ca.desrt.dconf.service
+share/gtk-doc/html/dconf/dconf-DConfChangeset.html
+share/gtk-doc/html/dconf/dconf-DConfError.html
+share/gtk-doc/html/dconf/dconf-dconf-Paths.html
+share/gtk-doc/html/dconf/dconf-editor.html
+share/gtk-doc/html/dconf/dconf-overview.html
+share/gtk-doc/html/dconf/dconf-service.html
+share/gtk-doc/html/dconf/dconf-tool.html
+share/gtk-doc/html/dconf/programs.html
+share/gtk-doc/html/dconf/DConfClient.html
+share/gtk-doc/html/dconf/annotation-glossary.html
+share/gtk-doc/html/dconf/api-index-full.html
+share/gtk-doc/html/dconf/ch01.html
+share/gtk-doc/html/dconf/dconf.devhelp2
+share/gtk-doc/html/dconf/home.png
+share/gtk-doc/html/dconf/index.html
+share/gtk-doc/html/dconf/index.sgml
+share/gtk-doc/html/dconf/left-insensitive.png
+share/gtk-doc/html/dconf/left.png
+share/gtk-doc/html/dconf/object-tree.html
+share/gtk-doc/html/dconf/right-insensitive.png
+share/gtk-doc/html/dconf/right.png
+share/gtk-doc/html/dconf/style.css
+share/gtk-doc/html/dconf/up-insensitive.png
+share/gtk-doc/html/dconf/up.png
+share/locale/an/LC_MESSAGES/dconf.mo
+share/locale/ar/LC_MESSAGES/dconf.mo
+share/locale/as/LC_MESSAGES/dconf.mo
+share/locale/be/LC_MESSAGES/dconf.mo
+share/locale/bg/LC_MESSAGES/dconf.mo
+share/locale/bn_IN/LC_MESSAGES/dconf.mo
+share/locale/ca/LC_MESSAGES/dconf.mo
+share/locale/ca@valencia/LC_MESSAGES/dconf.mo
+share/locale/cs/LC_MESSAGES/dconf.mo
+share/locale/da/LC_MESSAGES/dconf.mo
+share/locale/de/LC_MESSAGES/dconf.mo
+share/locale/el/LC_MESSAGES/dconf.mo
+share/locale/en_GB/LC_MESSAGES/dconf.mo
+share/locale/eo/LC_MESSAGES/dconf.mo
+share/locale/es/LC_MESSAGES/dconf.mo
+share/locale/et/LC_MESSAGES/dconf.mo
+share/locale/eu/LC_MESSAGES/dconf.mo
+share/locale/fa/LC_MESSAGES/dconf.mo
+share/locale/fi/LC_MESSAGES/dconf.mo
+share/locale/fr/LC_MESSAGES/dconf.mo
+share/locale/fur/LC_MESSAGES/dconf.mo
+share/locale/gl/LC_MESSAGES/dconf.mo
+share/locale/he/LC_MESSAGES/dconf.mo
+share/locale/hi/LC_MESSAGES/dconf.mo
+share/locale/hu/LC_MESSAGES/dconf.mo
+share/locale/id/LC_MESSAGES/dconf.mo
+share/locale/it/LC_MESSAGES/dconf.mo
+share/locale/ja/LC_MESSAGES/dconf.mo
+share/locale/ko/LC_MESSAGES/dconf.mo
+share/locale/lt/LC_MESSAGES/dconf.mo
+share/locale/lv/LC_MESSAGES/dconf.mo
+share/locale/ml/LC_MESSAGES/dconf.mo
+share/locale/mr/LC_MESSAGES/dconf.mo
+share/locale/nb/LC_MESSAGES/dconf.mo
+share/locale/nl/LC_MESSAGES/dconf.mo
+share/locale/pa/LC_MESSAGES/dconf.mo
+share/locale/pl/LC_MESSAGES/dconf.mo
+share/locale/pt/LC_MESSAGES/dconf.mo
+share/locale/pt_BR/LC_MESSAGES/dconf.mo
+share/locale/ru/LC_MESSAGES/dconf.mo
+share/locale/sk/LC_MESSAGES/dconf.mo
+share/locale/sl/LC_MESSAGES/dconf.mo
+share/locale/sr/LC_MESSAGES/dconf.mo
+share/locale/sr@latin/LC_MESSAGES/dconf.mo
+share/locale/sv/LC_MESSAGES/dconf.mo
+share/locale/ta/LC_MESSAGES/dconf.mo
+share/locale/te/LC_MESSAGES/dconf.mo
+share/locale/tg/LC_MESSAGES/dconf.mo
+share/locale/th/LC_MESSAGES/dconf.mo
+share/locale/tr/LC_MESSAGES/dconf.mo
+share/locale/ug/LC_MESSAGES/dconf.mo
+share/locale/uk/LC_MESSAGES/dconf.mo
+share/locale/vi/LC_MESSAGES/dconf.mo
+share/locale/zh_CN/LC_MESSAGES/dconf.mo
+share/locale/zh_HK/LC_MESSAGES/dconf.mo
+share/locale/zh_TW/LC_MESSAGES/dconf.mo
+share/vala/vapi/dconf.deps
+share/vala/vapi/dconf.vapi
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
+@dirrm share/gtk-doc/html/dconf
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm include/dconf-dbus-1
+@dirrm include/dconf/common
+@dirrm include/dconf/client
+@dirrm include/dconf
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true