update to 2.28.0

This switches to the gnome-2.28 release branch.

pkgsrc note: disabled the "defaults" service, this wants a version
of "policykit" newer than the pkgsrc one
(looks dispensable, could also be made an addon pkg)

7 files changed, 21 insertions, 47 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 4c20fe97fc7..345f0c378fe 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.69 2009/09/12 19:21:00 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2009/10/21 15:48:50 drochner Exp $
 #
 
 .include "../../devel/GConf/Makefile.common"
-PKGREVISION=	1
 
 CONFIGURE_ARGS+=	--disable-gtk
 CONFIGURE_ARGS+=	ac_cv_header_ldap_h=no
+CONFIGURE_ARGS+=	--disable-defaults-service
 
 CONFLICTS+=	GConf2-[0-9]*
 
@@ -16,8 +16,6 @@ OWN_DIRS+=	${PKG_SYSCONFDIR}/gconf.xml.system
 
 EGDIR=		${PREFIX}/share/examples/GConf
 CONF_FILES=	${EGDIR}/path ${PKG_SYSCONFDIR}/2/path
-CONF_FILES+=	${EGDIR}/org.gnome.GConf.Defaults.conf \
-		${PKG_SYSCONFBASEDIR}/dbus-1/system.d/org.gnome.GConf.Defaults.conf
 
 # XXX: We need to use XML_CATALOGS here to register the installed DTD.
 #      But we have to wait until a public identifier is choosen for it.
@@ -28,7 +26,6 @@ post-install:
 BUILDLINK_ABI_DEPENDS.dbus-glib+=	dbus-glib>=0.74
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../security/policykit/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common
index 14e38566b96..f1a6c85dbe3 100644
--- a/devel/GConf/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.10 2009/06/03 12:40:32 obache Exp $
+# $NetBSD: Makefile.common,v 1.11 2009/10/21 15:48:51 drochner Exp $
 #
 # used by devel/GConf/Makefile
 # used by devel/GConf-ui/Makefile
 
-GCONF_VERSION=		2.26.2
+GCONF_VERSION=		2.28.0
 
 DISTNAME=		GConf-${GCONF_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 1ff0ea0581f..8491c30f292 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2009/06/14 18:48:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.29 2009/10/21 15:48:51 drochner Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -14,15 +14,11 @@ lib/GConf/2/libgconfbackend-oldxml.la
 lib/GConf/2/libgconfbackend-xml.la
 lib/libgconf-2.la
 lib/pkgconfig/gconf-2.0.pc
-libexec/gconf-defaults-mechanism
 libexec/gconfd-2
 man/man1/gconftool-2.1
-share/PolicyKit/policy/org.gnome.gconf.defaults.policy
 share/aclocal/gconf-2.m4
 share/dbus-1/services/org.gnome.GConf.service
-share/dbus-1/system-services/org.gnome.GConf.Defaults.service
 share/examples/GConf/path
-share/examples/GConf/org.gnome.GConf.Defaults.conf
 share/gtk-doc/html/gconf/ch01.html
 share/gtk-doc/html/gconf/gconf-GConfClient.html
 share/gtk-doc/html/gconf/gconf-gconf-backend.html
@@ -55,6 +51,7 @@ share/locale/bn/LC_MESSAGES/GConf2.mo
 share/locale/bn_IN/LC_MESSAGES/GConf2.mo
 share/locale/bs/LC_MESSAGES/GConf2.mo
 share/locale/ca/LC_MESSAGES/GConf2.mo
+share/locale/ca@valencia/LC_MESSAGES/GConf2.mo
 share/locale/cs/LC_MESSAGES/GConf2.mo
 share/locale/cy/LC_MESSAGES/GConf2.mo
 share/locale/da/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 3dcf5425e8d..039c4fca703 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.25 2009/09/12 19:21:00 wiz Exp $
+$NetBSD: distinfo,v 1.26 2009/10/21 15:48:51 drochner Exp $
 
-SHA1 (GConf-2.26.2.tar.bz2) = bf5323d974fa22165de2144100234647fd50ef17
-RMD160 (GConf-2.26.2.tar.bz2) = 280cd55dc3562445c716b88dfddba4ddd2508786
-Size (GConf-2.26.2.tar.bz2) = 1474738 bytes
+SHA1 (GConf-2.28.0.tar.bz2) = 8371d88cc84fd727dfd0f8d413fa20a8bfe814fd
+RMD160 (GConf-2.28.0.tar.bz2) = 99b09ab7d6453338adacc1f194013294b65fe33c
+Size (GConf-2.28.0.tar.bz2) = 1476190 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
 SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a
-SHA1 (patch-ad) = 9ddd396a544cd64a2d7e1929c6852c529b1f45ee
-SHA1 (patch-ae) = 9c91e159d1aadd5e602012fdf18173bbfdf5b4ef
-SHA1 (patch-af) = 63bb82324e365e80d689850bcc75f6bd923f8b47
+SHA1 (patch-ae) = ec5b872713e3a5aec222ad46e6f24e27fff51a86
+SHA1 (patch-af) = 6c32965505db5d0b2e1083e629c7bc7f0cd0a439
 SHA1 (patch-ag) = d9a4347443f114785f236c76881cce1b8881c81d
 SHA1 (patch-ah) = 66485f9aeef7e6023c60f58cc054924f3cac4972
diff --git a/devel/GConf/patches/patch-ad b/devel/GConf/patches/patch-ad
deleted file mode 100644
index fc7e4e08098..00000000000
--- a/devel/GConf/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2009/05/19 23:56:04 wiz Exp $
-
-Needed for Solaris 9. Without the <lber.h> header, struct berval, which
-is used as a member of another struct in <ldap.h>, has an unknown size.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583287
-
---- backends/evoldap-backend.c.orig	2007-03-02 22:10:18.000000000 +0000
-+++ backends/evoldap-backend.c
-@@ -25,6 +25,9 @@
- #include <unistd.h>
- #include <string.h>
- #include <time.h>
-+#ifdef __sun
-+#include <lber.h>
-+#endif
- #include <ldap.h>
- #include <libxml/parser.h>
- #include <libxml/xpath.h>
diff --git a/devel/GConf/patches/patch-ae b/devel/GConf/patches/patch-ae
index 6717efbbd65..6f76f4514d2 100644
--- a/devel/GConf/patches/patch-ae
+++ b/devel/GConf/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.6 2009/03/06 00:08:08 jmcneill Exp $
+$NetBSD: patch-ae,v 1.7 2009/10/21 15:48:51 drochner Exp $
 
---- defaults/Makefile.am.orig	2008-08-19 05:26:21.000000000 -0400
+--- defaults/Makefile.am.orig	2009-08-19 17:35:32.000000000 +0200
 +++ defaults/Makefile.am
-@@ -24,7 +24,7 @@ gconf_defaults_mechanism_LDADD = \
+@@ -25,7 +25,7 @@ gconf_defaults_mechanism_LDADD = \
  BUILT_SOURCES = gconf-defaults-glue.h
  
  dbus_servicesdir = $(datadir)/dbus-1/system-services
 -dbus_confdir = $(sysconfdir)/dbus-1/system.d
 +dbus_confdir = $(PREFIX)/share/examples/GConf
- polkitdir = $(datadir)/PolicyKit/policy
+ polkitdir = $(datadir)/polkit-1/actions
  
  dbus_services_in_files = org.gnome.GConf.Defaults.service.in
diff --git a/devel/GConf/patches/patch-af b/devel/GConf/patches/patch-af
index a42b263f657..49c776c4554 100644
--- a/devel/GConf/patches/patch-af
+++ b/devel/GConf/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2009/03/06 00:08:08 jmcneill Exp $
+$NetBSD: patch-af,v 1.2 2009/10/21 15:48:51 drochner Exp $
 
---- defaults/Makefile.in.orig	2009-03-05 18:35:30.000000000 -0500
+--- defaults/Makefile.in.orig	2009-09-22 14:54:11.000000000 +0200
 +++ defaults/Makefile.in
-@@ -282,7 +282,7 @@ gconf_defaults_mechanism_LDADD = \
+@@ -268,7 +268,7 @@ gconf_defaults_mechanism_LDADD = \
  
  BUILT_SOURCES = gconf-defaults-glue.h
  dbus_servicesdir = $(datadir)/dbus-1/system-services
 -dbus_confdir = $(sysconfdir)/dbus-1/system.d
 +dbus_confdir = $(PREFIX)/share/examples/GConf
- polkitdir = $(datadir)/PolicyKit/policy
+ polkitdir = $(datadir)/polkit-1/actions
  dbus_services_in_files = org.gnome.GConf.Defaults.service.in
  polkit_in_files = org.gnome.gconf.defaults.policy.in