update to 2.32.0

This switches to the gnome-2.32 release branch.

7 files changed, 40 insertions, 36 deletions

diff --git a/sysutils/nautilus-sendto/Makefile b/sysutils/nautilus-sendto/Makefile
index 2f7c37c8ac6..6cf64149348 100644
--- a/sysutils/nautilus-sendto/Makefile
+++ b/sysutils/nautilus-sendto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/11/29 15:17:00 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2011/01/12 18:51:24 drochner Exp $
 #
 
-DISTNAME=		nautilus-sendto-2.28.5
+DISTNAME=		nautilus-sendto-2.32.0
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus-sendto/2.28/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus-sendto/2.32/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -16,16 +16,16 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
-GCONF_SCHEMAS=		nst.schemas
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-plugins="bluetooth evolution nautilus-burn pidgin removable-devices"
+CONFIGURE_ARGS+=	--with-plugins="evolution nautilus-burn pidgin removable-devices"
+
+BUILD_DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
 
 #XXX: needs libempathy-gtk >= 2.25.2
 #.include "../../chat/empathy/buildlink3.mk"
 # XXX: not in pkgsrc proper yet
 #.include "../../wip/gajim/buildlink3.mk"
 .include "../../chat/pidgin/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../mail/evolution/buildlink3.mk"
diff --git a/sysutils/nautilus-sendto/PLIST b/sysutils/nautilus-sendto/PLIST
index ffe83cc23df..b0075af10ce 100644
--- a/sysutils/nautilus-sendto/PLIST
+++ b/sysutils/nautilus-sendto/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2010/11/29 15:17:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/01/12 18:51:24 drochner Exp $
 bin/nautilus-sendto
 include/nautilus-sendto/nautilus-sendto-plugin.h
-lib/nautilus-sendto/plugins/libnstbluetooth.la
 lib/nautilus-sendto/plugins/libnstburn.la
 lib/nautilus-sendto/plugins/libnstevolution.la
 lib/nautilus-sendto/plugins/libnstpidgin.la
@@ -9,7 +8,9 @@ lib/nautilus-sendto/plugins/libnstremovable_devices.la
 lib/nautilus/extensions-2.0/libnautilus-sendto.la
 lib/pkgconfig/nautilus-sendto.pc
 man/man1/nautilus-sendto.1
-share/gconf/schemas/nst.schemas
+share/GConf/gsettings/nautilus-sendto-convert
+share/glib-2.0/schemas/org.gnome.Nautilus.Sendto.gschema.xml
+share/gtk-doc/html/nautilus-sendto/annotation-glossary.html
 share/gtk-doc/html/nautilus-sendto/api-index-full.html
 share/gtk-doc/html/nautilus-sendto/ch01.html
 share/gtk-doc/html/nautilus-sendto/home.png
@@ -63,6 +64,7 @@ share/locale/lv/LC_MESSAGES/nautilus-sendto.mo
 share/locale/mk/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ml/LC_MESSAGES/nautilus-sendto.mo
 share/locale/mr/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ms/LC_MESSAGES/nautilus-sendto.mo
 share/locale/nb/LC_MESSAGES/nautilus-sendto.mo
 share/locale/nds/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ne/LC_MESSAGES/nautilus-sendto.mo
@@ -86,6 +88,7 @@ share/locale/sv/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ta/LC_MESSAGES/nautilus-sendto.mo
 share/locale/te/LC_MESSAGES/nautilus-sendto.mo
 share/locale/th/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ug/LC_MESSAGES/nautilus-sendto.mo
 share/locale/uk/LC_MESSAGES/nautilus-sendto.mo
 share/locale/vi/LC_MESSAGES/nautilus-sendto.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-sendto.mo
diff --git a/sysutils/nautilus-sendto/distinfo b/sysutils/nautilus-sendto/distinfo
index f06233e76fc..c791e3f3046 100644
--- a/sysutils/nautilus-sendto/distinfo
+++ b/sysutils/nautilus-sendto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/11/29 15:17:00 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/01/12 18:51:24 drochner Exp $
 
-SHA1 (nautilus-sendto-2.28.5.tar.bz2) = 16f6e42e7b322332cfce91ef700d2b4afc3a5c8f
-RMD160 (nautilus-sendto-2.28.5.tar.bz2) = 09447497b4292e1d11719ac4a37fd7b4d85d057a
-Size (nautilus-sendto-2.28.5.tar.bz2) = 445612 bytes
-SHA1 (patch-aa) = f8a652e150effc4a1989cb8a4844e4d2deebe8de
+SHA1 (nautilus-sendto-2.32.0.tar.bz2) = d02d13896bbb6ea4ee358401359b1c51eaa5c898
+RMD160 (nautilus-sendto-2.32.0.tar.bz2) = 3ef5fcaac94de0bf7411dc4b74722472e7c316a2
+Size (nautilus-sendto-2.32.0.tar.bz2) = 446731 bytes
+SHA1 (patch-ab) = 441f650fac1b519a3b92d89a1c964f1d895986b6
diff --git a/sysutils/nautilus-sendto/patches/patch-aa b/sysutils/nautilus-sendto/patches/patch-aa
deleted file mode 100644
index dcedc653445..00000000000
--- a/sysutils/nautilus-sendto/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/10/31 13:55:30 wiz Exp $
-
---- Makefile.in.orig	2008-10-31 13:46:35.000000000 +0000
-+++ Makefile.in
-@@ -299,7 +299,7 @@ DISTCLEANFILES = \
- 	intltool-update
- 
- schema_in_files = nst.schemas.in
--schemadir = $(sysconfdir)/gconf/schemas
-+schemadir = $(prefix)/share/gconf/schemas
- schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/sysutils/nautilus-sendto/patches/patch-ab b/sysutils/nautilus-sendto/patches/patch-ab
new file mode 100644
index 00000000000..05b6bdd4148
--- /dev/null
+++ b/sysutils/nautilus-sendto/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2011/01/12 18:51:25 drochner Exp $
+
+--- configure.orig	2010-09-28 14:29:57.000000000 +0000
++++ configure
+@@ -11041,8 +11041,8 @@ install-data-am: install-gsettings-schem
+ .SECONDARY: $(gsettings_SCHEMAS)
+ 
+ gsettings__base_list = \
+-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++  gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
++  gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index bc9bdc7064c..46c8cd4f0d4 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2010/12/17 07:36:10 obache Exp $
+# $NetBSD: Makefile,v 1.63 2011/01/12 18:53:21 drochner Exp $
 #
 
-DISTNAME=	epiphany-extensions-2.30.2
-PKGREVISION=	3
+DISTNAME=	epiphany-extensions-2.32.0
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -23,7 +22,7 @@ USE_LANGUAGES=		c c++
 CONFIGURE_ARGS+=	--enable-compile-warnings=no
 CONFIGURE_ARGS+=	--with-extensions=all
 
-.include "../../devel/GConf/schemas.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.15.5
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 998d9a06acb..0643930531a 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.30 2010/08/31 18:49:04 drochner Exp $
+$NetBSD: distinfo,v 1.31 2011/01/12 18:53:21 drochner Exp $
 
-SHA1 (epiphany-extensions-2.30.2.tar.bz2) = e62bb53d17bf1ffc755c91061d4d8ea8eb880550
-RMD160 (epiphany-extensions-2.30.2.tar.bz2) = 4d96f8f180d861a00e4a7391a0cd1f45c0aef773
-Size (epiphany-extensions-2.30.2.tar.bz2) = 1565280 bytes
+SHA1 (epiphany-extensions-2.32.0.tar.bz2) = 20541ea312d1860886a8d377f26779a9bbc99ca6
+RMD160 (epiphany-extensions-2.32.0.tar.bz2) = f4ff2a8b937486e8d5ac8571c52b1c8f34e9516e
+Size (epiphany-extensions-2.32.0.tar.bz2) = 1045984 bytes