From f1405b23c1bf62c2fd99fa8e5ad836a913d89a91 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 13 May 2011 17:07:27 +0000 Subject: update to 2.32.3 changes: -bugfixes -translation updates --- devel/GConf/Makefile | 4 +--- devel/GConf/Makefile.common | 4 ++-- devel/GConf/PLIST | 4 +++- devel/GConf/distinfo | 11 +++++------ devel/GConf/patches/patch-ag | 13 ------------- devel/GConf/patches/patch-ai | 8 ++++---- 6 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 devel/GConf/patches/patch-ag (limited to 'devel/GConf') diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index 38085291d31..ebc7c31086f 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2011/04/26 13:26:42 obache Exp $ +# $NetBSD: Makefile,v 1.76 2011/05/13 17:07:27 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 diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common index f15c30a1b6c..ba2d2545c5f 100644 --- a/devel/GConf/Makefile.common +++ b/devel/GConf/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.16 2011/04/26 13:26:42 obache Exp $ +# $NetBSD: Makefile.common,v 1.17 2011/05/13 17:07:27 drochner Exp $ # # used by devel/GConf/Makefile # used by devel/GConf-ui/Makefile -GCONF_VERSION= 2.32.1 +GCONF_VERSION= 2.32.3 DISTNAME= GConf-${GCONF_VERSION} CATEGORIES= devel gnome diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST index b25c1aec3f2..9504c144ef5 100644 --- a/devel/GConf/PLIST +++ b/devel/GConf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2010/11/15 19:55:10 drochner Exp $ +@comment $NetBSD: PLIST,v 1.32 2011/05/13 17:07:27 drochner Exp $ bin/gconf-merge-tree bin/gconftool-2 bin/gsettings-data-convert @@ -68,6 +68,7 @@ share/locale/el/LC_MESSAGES/GConf2.mo share/locale/en@shaw/LC_MESSAGES/GConf2.mo share/locale/en_CA/LC_MESSAGES/GConf2.mo share/locale/en_GB/LC_MESSAGES/GConf2.mo +share/locale/eo/LC_MESSAGES/GConf2.mo share/locale/es/LC_MESSAGES/GConf2.mo share/locale/et/LC_MESSAGES/GConf2.mo share/locale/eu/LC_MESSAGES/GConf2.mo @@ -123,6 +124,7 @@ share/locale/ta/LC_MESSAGES/GConf2.mo share/locale/te/LC_MESSAGES/GConf2.mo share/locale/th/LC_MESSAGES/GConf2.mo share/locale/tr/LC_MESSAGES/GConf2.mo +share/locale/ug/LC_MESSAGES/GConf2.mo share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo share/locale/xh/LC_MESSAGES/GConf2.mo diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo index 6e34b5ee1cf..f0f36490019 100644 --- a/devel/GConf/distinfo +++ b/devel/GConf/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.29 2011/03/18 16:32:29 drochner Exp $ +$NetBSD: distinfo,v 1.30 2011/05/13 17:07:27 drochner Exp $ -SHA1 (GConf-2.32.1.tar.bz2) = 8d8d113dc654314cf955c4f8c5a4cccd3a15f447 -RMD160 (GConf-2.32.1.tar.bz2) = 455a21d217eeec8a413a664ff19fbc662b88205d -Size (GConf-2.32.1.tar.bz2) = 1544626 bytes +SHA1 (GConf-2.32.3.tar.bz2) = efc7d451c5988207f708b75c01d1d228ba3deed6 +RMD160 (GConf-2.32.3.tar.bz2) = d491165a58dd658987730aeebfdbf70f8b7c93d6 +Size (GConf-2.32.3.tar.bz2) = 1558681 bytes SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0 SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a SHA1 (patch-ae) = ec5b872713e3a5aec222ad46e6f24e27fff51a86 SHA1 (patch-af) = 6c32965505db5d0b2e1083e629c7bc7f0cd0a439 -SHA1 (patch-ag) = d9a4347443f114785f236c76881cce1b8881c81d SHA1 (patch-ah) = 66485f9aeef7e6023c60f58cc054924f3cac4972 -SHA1 (patch-ai) = 4fcb2effbb4e668262d2dfff6ca2875eb42d0521 +SHA1 (patch-ai) = bd343f9e98dbb8597b593fdcb01de35824f18dd4 diff --git a/devel/GConf/patches/patch-ag b/devel/GConf/patches/patch-ag deleted file mode 100644 index 51f2a5acf16..00000000000 --- a/devel/GConf/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2009/03/17 10:12:25 jmcneill Exp $ - ---- gconf/default.path.in.orig 2009-02-16 14:34:10.000000000 -0500 -+++ gconf/default.path.in -@@ -21,7 +21,7 @@ include "$(HOME)/.gconf.path" - xml:readwrite:$(HOME)/.gconf - - # Location for system-wide settings that are set by the defaults mechanism --xml:readonly:/etc/gconf/gconf.xml.system -+xml:readonly:@sysgconfdir@/gconf.xml.system - - # To read in any defaults settings that the Sys Admin may have created - # prior to a desktop system upgrade. The SysAdmin can stick default values diff --git a/devel/GConf/patches/patch-ai b/devel/GConf/patches/patch-ai index 9a9ae11620f..0950199b6d3 100644 --- a/devel/GConf/patches/patch-ai +++ b/devel/GConf/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.1 2010/11/15 19:55:10 drochner Exp $ +$NetBSD: patch-ai,v 1.2 2011/05/13 17:07:27 drochner Exp $ ---- gsettings/Makefile.in.orig 2010-09-27 18:04:55.000000000 +0000 +--- gsettings/Makefile.in.orig 2011-04-25 10:30:54.000000000 +0000 +++ gsettings/Makefile.in @@ -351,7 +351,7 @@ gsettings_data_convert_LDADD = \ $(GSETTINGS_LIBS) \ @@ -8,6 +8,6 @@ $NetBSD: patch-ai,v 1.1 2010/11/15 19:55:10 drochner Exp $ -autostartdir = $(sysconfdir)/xdg/autostart +autostartdir = $(prefix)/share/examples/GConf/autostart - autostart_DATA = gsettings-data-convert.desktop + autostart_in_files = gsettings-data-convert.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) man_MANS = \ - gsettings-schema-convert.1 \ -- cgit v1.2.3