Update GConf2 to 1.2.1. Bugfixes and API changes required by GNOME-2.0.1

Provided in PR pkg/18181 by Julio Merino <jmmv@hispabsd.org>

3 files changed, 18 insertions, 15 deletions

diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index b58247994ac..490a73cb6d2 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2002/08/25 19:22:16 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/07 00:36:53 rh Exp $
 #
 
-DISTNAME=		GConf-1.1.10
-PKGNAME=		GConf2-1.1.10
+DISTNAME=		GConf-1.2.1
+PKGNAME=		${DISTNAME:S/GConf/GConf2/}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=pre-gnome2/sources/GConf/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.1/sources/GConf/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@hispabsd.org
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 5ba0e3ec66a..150c4b4684f 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:16 jlam Exp $
-bin/gconf-sanity-check-2
-bin/gconfd-2
+@comment $NetBSD: PLIST,v 1.5 2002/09/07 00:36:53 rh Exp $
 bin/gconftool-2
-etc/gconf/2/path
 include/gconf/2/gconf/gconf-changeset.h
 include/gconf/2/gconf/gconf-client.h
 include/gconf/2/gconf/gconf-engine.h
@@ -21,14 +18,19 @@ lib/libgconf-2.so
 lib/libgconf-2.so.5
 lib/libgconf-2.so.5.0
 lib/pkgconfig/gconf-2.0.pc
+libexec/gconf-sanity-check-2
+libexec/gconfd-2
 share/aclocal/gconf-2.m4
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/GConf2.mo
@@ -37,6 +39,7 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/GConf2.mo
@@ -50,14 +53,14 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/GConf2.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/GConf2.mo
 @exec ${MKDIR} %D/share/gtk-doc/html/gconf
 @dirrm share/gtk-doc/html/gconf
+@unexec ${RMDIR} -p %D/gtk-doc/html 2>/dev/null || true
 @dirrm lib/GConf/2
-@unexec ${RMDIR} %D/lib/GConf 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/lib/GConf 2>/dev/null || true
 @dirrm include/gconf/2/gconf
 @dirrm include/gconf/2
-@unexec ${RMDIR} %D/include/gconf 2>/dev/null || ${TRUE}
-@dirrm etc/gconf/2
-@unexec ${RMDIR} %D/etc/gconf 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/include/gconf 2>/dev/null || true
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index 59fa8a2a499..b3bf5a877d5 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/08/25 19:22:17 jlam Exp $
+$NetBSD: distinfo,v 1.3 2002/09/07 00:36:53 rh Exp $
 
-SHA1 (GConf-1.1.10.tar.bz2) = 7fa90d0c5f8962fd5307a2f38177daf26b795312
-Size (GConf-1.1.10.tar.bz2) = 878638 bytes
+SHA1 (GConf-1.2.1.tar.bz2) = a0b585dbfbd598380bd4e40f275ff478b196eefc
+Size (GConf-1.2.1.tar.bz2) = 954798 bytes