UPdate to 0.12.1.

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

5 files changed, 38 insertions, 25 deletions

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 77b18c60d..58f1641fc 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dconf/Makefile,v 1.27 2011/10/08 09:42:06 kwm Exp $
+#   $MCom: ports/devel/dconf/Makefile,v 1.28 2011/10/16 19:35:42 kwm Exp $
 #
 
 PORTNAME=	dconf
-PORTVERSION=	0.10.0
+PORTVERSION=	0.12.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -24,7 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20 gnomehier
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
+MAKE_JOBS_UNSAFE=	yes
+INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -49,10 +50,14 @@ post-patch:
 		${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
 
 pre-build:
-	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
-	${GMAKE} -C ${WRKSRC}/dbus-1 dconf-dbus-1.c libdconf-dbus-1.so.0
+#	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
+#	${GMAKE} -C ${WRKSRC}/dbus-1 dconf-dbus-1.c libdconf-dbus-1.so.0
 
 post-install:
 	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index 987447a25..eccaa2835 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/dconf-0.10.0.tar.xz) = 9f744ccfb3da20163a4bb27916c960f6bf56048b3ec1112862c85414fc064ee2
-SIZE (gnome3/dconf-0.10.0.tar.xz) = 172752
+SHA256 (gnome3/dconf-0.12.1.tar.xz) = 3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214
+SIZE (gnome3/dconf-0.12.1.tar.xz) = 202112
diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in
index 510f4aabe..d97d83186 100644
--- a/devel/dconf/files/patch-client_Makefile.in
+++ b/devel/dconf/files/patch-client_Makefile.in
@@ -1,5 +1,5 @@
---- client/Makefile.in.orig	2011-01-18 11:48:50.000000000 +0000
-+++ client/Makefile.in	2011-01-18 11:50:05.000000000 +0000
+--- client/Makefile.in.orig	2012-05-28 13:27:17.000000000 +0200
++++ client/Makefile.in	2012-05-28 13:31:25.000000000 +0200
 @@ -34,7 +34,7 @@
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
@@ -9,20 +9,19 @@
  subdir = client
  DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \
-@@ -320,9 +320,10 @@
+@@ -332,9 +332,10 @@
  
  clean-shlibPROGRAMS:
  	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
--libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) 
--	@rm -f libdconf.so.0.0.0$(EXEEXT)
-+libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) 
-+	@rm -f libdconf.so.0$(EXEEXT)
+-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
++libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
+ 	@rm -f libdconf.so.0.0.0$(EXEEXT)
  	$(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS)
 +	$(AM_V_GEN) ln -fs libdconf.so.0 libdconf.so
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -693,12 +694,8 @@
+@@ -695,12 +696,8 @@
  	uninstall-vapiDATA
  
  
diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in
index 55d7ea73e..907188b52 100644
--- a/devel/dconf/files/patch-dbus-1_Makefile.in
+++ b/devel/dconf/files/patch-dbus-1_Makefile.in
@@ -1,5 +1,5 @@
---- dbus-1/Makefile.in.orig	2011-01-18 11:47:14.000000000 +0000
-+++ dbus-1/Makefile.in	2011-01-18 11:47:14.000000000 +0000
+--- dbus-1/Makefile.in.orig	2012-05-28 13:31:56.000000000 +0200
++++ dbus-1/Makefile.in	2012-05-28 13:35:25.000000000 +0200
 @@ -34,7 +34,7 @@
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
@@ -9,20 +9,29 @@
  subdir = dbus-1
  DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in
-@@ -310,9 +310,10 @@
+@@ -246,7 +246,7 @@
+ 	../gvdb/gvdb-reader.c		\
+ 	dconf-dbus-1.c
+ 
+-noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
++noinst_DATA = libdconf-dbus-1.so.0
+ CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
+ all: all-am
+ 
+@@ -321,9 +321,10 @@
  
  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) 
+-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) 
++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)
-@@ -636,12 +637,8 @@
+@@ -640,12 +641,8 @@
  	uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS
  
  
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index 7d552aaa8..3144bbca1 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -5,8 +5,6 @@ include/dconf/dconf-client.h
 include/dconf-dbus-1/dconf-dbus-1.h
 include/dconf/dconf-engine.h
 include/dconf/dconf-paths.h
-include/dconf/dconf-readtype.h
-include/dconf/dconf-resetlist.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
 lib/libdconf.so
@@ -18,14 +16,12 @@ libdata/pkgconfig/dconf-dbus-1.pc
 libexec/dconf-service
 %%EDITOR%%share/applications/dconf-editor.desktop
 share/dbus-1/services/ca.desrt.dconf.service
-share/dbus-1/system-services/ca.desrt.dconf.service
 %%EDITOR%%share/dconf-editor/dconf-editor.ui
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/dconf-DConf-Paths.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.devhelp
 share/gtk-doc/html/dconf/dconf.devhelp2
 share/gtk-doc/html/dconf/home.png
 share/gtk-doc/html/dconf/index.html
@@ -35,6 +31,10 @@ share/gtk-doc/html/dconf/object-tree.html
 share/gtk-doc/html/dconf/right.png
 share/gtk-doc/html/dconf/style.css
 share/gtk-doc/html/dconf/up.png
+share/icons/hicolor/128x128/apps/dconf-editor.png
+share/icons/hicolor/32x32/apps/dconf-editor.png
+share/icons/hicolor/48x48/apps/dconf-editor.png
+share/icons/hicolor/64x64/apps/dconf-editor.png
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
 @dirrm share/gtk-doc/html/dconf