Fix patching, fat fingered False in hand typed patch from git. [1]

Fix plist, tweak lib install. I don't know why they switched from libtool
to something hand written.

Submitted by:	romain@ [1]


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

4 files changed, 51 insertions, 9 deletions

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 1cb33b4c4..43597fea5 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dconf/Makefile,v 1.7 2010/10/23 11:29:28 kwm Exp $
+#   $MCom: ports/devel/dconf/Makefile,v 1.8 2010/11/02 23:28:58 kwm Exp $
 #
 
 PORTNAME=	dconf
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in
new file mode 100644
index 000000000..f0452b917
--- /dev/null
+++ b/devel/dconf/files/patch-client_Makefile.in
@@ -0,0 +1,41 @@
+--- client/Makefile.in.orig	2010-11-04 17:09:33.000000000 +0100
++++ client/Makefile.in	2010-11-04 17:18:20.000000000 +0100
+@@ -34,7 +34,7 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-shlib_PROGRAMS = libdconf.so.0.0.0$(EXEEXT)
++shlib_PROGRAMS = libdconf.so.0$(EXEEXT)
+ subdir = client
+ DIST_COMMON = $(am__dist_gir_DATA_DIST) $(dconfinclude_HEADERS) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+@@ -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)
+ 	$(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)
+@@ -750,14 +751,10 @@
+ 
+ @HAVE_INTROSPECTION_TRUE@include $(INTROSPECTION_MAKEFILE)
+ 
+-@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0 libdconf.so
+-
+-libdconf.so.0 libdconf.so: libdconf.so.0.0.0
+-	$(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
++@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0
+ 
+ install-data-hook:
+-	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0
+-	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
++	ln -fs libdconf.so.0 $(DESTDIR)$(shlibdir)/libdconf.so
+ 
+ uninstall-hook:
+ 	rm -f $(DESTDIR)$(shlibdir)/libdconf.so.0
diff --git a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c b/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
index 36c996ae8..4fe175035 100644
--- a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
+++ b/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
@@ -12,7 +12,7 @@
                                     gpointer          origin_tag)
  {
    DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend;
-+  gboolean success = False;
++  gboolean success = FALSE;
    volatile guint32 *serial;
    DConfEngineMessage dcem;
    GDBusConnection *bus;
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index 6fb0c0605..0a3510bed 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -7,21 +7,19 @@ include/dconf/dconf-readtype.h
 include/dconf/dconf-resetlist.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
-lib/girepository-1.0/dconf-0.3.typelib
-lib/libdconf.a
-lib/libdconf.la
+lib/girepository-1.0/dconf-1.0.typelib
 lib/libdconf.so
 lib/libdconf.so.0
 libdata/pkgconfig/dconf.pc
 libexec/dconf-service
 share/dbus-1/services/ca.desrt.dconf.service
 share/dbus-1/system-services/ca.desrt.dconf.service
-share/gir-1.0/dconf-0.3.gir
+share/gir-1.0/dconf-1.0.gir
+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-dconf-client.html
-share/gtk-doc/html/dconf/dconf-paths.html
 share/gtk-doc/html/dconf/dconf.devhelp
 share/gtk-doc/html/dconf/dconf.devhelp2
 share/gtk-doc/html/dconf/home.png
@@ -32,6 +30,9 @@ 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/vala/vapi/dconf.deps
+share/vala/vapi/dconf.vapi
+@dirrmtry share/vala/vapi
 @dirrm share/gtk-doc/html/dconf
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc