update to 2.28.0

This switches to the gnome-2.28 release branch.

5 files changed, 27 insertions, 37 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 0671031cd0f..2b9c6d19b48 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.99 2009/09/30 09:22:47 sketch Exp $
+# $NetBSD: Makefile,v 1.100 2009/10/21 18:04:55 drochner Exp $
 #
 
-DISTNAME=		gedit-2.26.3
-PKGREVISION=		1
+DISTNAME=		gedit-2.28.0
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 0b0d2960c8d..4a9b0fba57d 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.39 2009/07/09 18:23:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.40 2009/10/21 18:04:55 drochner Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.20/gedit/gedit-app.h
+include/gedit-2.20/gedit/gedit-commands.h
 include/gedit-2.20/gedit/gedit-convert.h
 include/gedit-2.20/gedit/gedit-debug.h
 include/gedit-2.20/gedit/gedit-document.h
@@ -9,7 +10,6 @@ include/gedit-2.20/gedit/gedit-encodings-option-menu.h
 include/gedit-2.20/gedit/gedit-encodings.h
 include/gedit-2.20/gedit/gedit-file-chooser-dialog.h
 include/gedit-2.20/gedit/gedit-help.h
-include/gedit-2.20/gedit/gedit-message-area.h
 include/gedit-2.20/gedit/gedit-message-bus.h
 include/gedit-2.20/gedit/gedit-message-type.h
 include/gedit-2.20/gedit/gedit-message.h
@@ -37,13 +37,11 @@ lib/gedit-2/plugins/libdocinfo.la
 lib/gedit-2/plugins/libfilebrowser.la
 lib/gedit-2/plugins/libindent.la
 lib/gedit-2/plugins/libmodelines.la
-lib/gedit-2/plugins/libsample.la
 lib/gedit-2/plugins/libsort.la
 ${PLIST.enchant}lib/gedit-2/plugins/libspell.la
 lib/gedit-2/plugins/libtaglist.la
 lib/gedit-2/plugins/libtime.la
 lib/gedit-2/plugins/modelines.gedit-plugin
-lib/gedit-2/plugins/sample.gedit-plugin
 lib/gedit-2/plugins/sort.gedit-plugin
 ${PLIST.enchant}lib/gedit-2/plugins/spell.gedit-plugin
 lib/gedit-2/plugins/taglist.gedit-plugin
@@ -66,9 +64,9 @@ share/gedit-2/plugins/taglist/HTML.tags.gz
 share/gedit-2/plugins/taglist/Latex.tags.gz
 share/gedit-2/plugins/taglist/XSLT.tags.gz
 share/gedit-2/plugins/taglist/XUL.tags.gz
-share/gedit-2/plugins/time/time.ui
+share/gedit-2/plugins/time/gedit-time-dialog.ui
+share/gedit-2/plugins/time/gedit-time-setup-dialog.ui
 share/gedit-2/ui/gedit-encodings-dialog.ui
-share/gedit-2/ui/gedit-open-location-dialog.ui
 share/gedit-2/ui/gedit-preferences-dialog.ui
 share/gedit-2/ui/gedit-print-preferences.ui
 share/gedit-2/ui/gedit-search-dialog.ui
@@ -315,6 +313,7 @@ share/locale/bn_IN/LC_MESSAGES/gedit.mo
 share/locale/br/LC_MESSAGES/gedit.mo
 share/locale/bs/LC_MESSAGES/gedit.mo
 share/locale/ca/LC_MESSAGES/gedit.mo
+share/locale/ca@valencia/LC_MESSAGES/gedit.mo
 share/locale/crh/LC_MESSAGES/gedit.mo
 share/locale/cs/LC_MESSAGES/gedit.mo
 share/locale/cy/LC_MESSAGES/gedit.mo
@@ -324,6 +323,7 @@ share/locale/dz/LC_MESSAGES/gedit.mo
 share/locale/el/LC_MESSAGES/gedit.mo
 share/locale/en_CA/LC_MESSAGES/gedit.mo
 share/locale/en_GB/LC_MESSAGES/gedit.mo
+share/locale/eo/LC_MESSAGES/gedit.mo
 share/locale/es/LC_MESSAGES/gedit.mo
 share/locale/et/LC_MESSAGES/gedit.mo
 share/locale/eu/LC_MESSAGES/gedit.mo
@@ -414,6 +414,5 @@ share/omf/gedit/gedit-uk.omf
 share/omf/gedit/gedit-zh_CN.omf
 share/omf/gedit/gedit-zh_HK.omf
 share/omf/gedit/gedit-zh_TW.omf
-@pkgdir share/gedit-2/plugins/sample
 @pkgdir share/gedit-2/plugins/indent
 @pkgdir share/gedit-2/plugins/changecase
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 21c2b39747e..5b7bfa2a9d4 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.45 2009/07/09 18:23:26 drochner Exp $
+$NetBSD: distinfo,v 1.46 2009/10/21 18:04:55 drochner Exp $
 
-SHA1 (gedit-2.26.3.tar.bz2) = 57ee9519a1c28195fb5b5bafa06308d816246c53
-RMD160 (gedit-2.26.3.tar.bz2) = 4248dbbaad3df23203654e8c3a70198bd25a5f3e
-Size (gedit-2.26.3.tar.bz2) = 4527425 bytes
-SHA1 (patch-aa) = 68abf5936e929829329d9644a22b326b031487c7
+SHA1 (gedit-2.28.0.tar.bz2) = bf286db7e867fbcd60504fad00c50a5ea734e885
+RMD160 (gedit-2.28.0.tar.bz2) = cabbfe60ffebb7ff72af9c89b7a31df3852cefc4
+Size (gedit-2.28.0.tar.bz2) = 4638557 bytes
+SHA1 (patch-ab) = 06f1492437126f8ee12bda5b5dd090b713885ba2
diff --git a/editors/gedit/patches/patch-aa b/editors/gedit/patches/patch-aa
deleted file mode 100644
index 8193780b699..00000000000
--- a/editors/gedit/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2009/07/09 18:23:26 drochner Exp $
-
---- plugins/taglist/Makefile.in.orig	2009-07-02 20:02:16.000000000 +0200
-+++ plugins/taglist/Makefile.in
-@@ -141,6 +141,7 @@ GMSGFMT = @GMSGFMT@
- GREP = @GREP@
- GTKDOC_CHECK = @GTKDOC_CHECK@
- GZIP = @GZIP@
-+GZIP_ENV = --best
- HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
-@@ -641,7 +642,7 @@ uninstall-am: uninstall-pluginDATA unins
- 
- %.tags.gz: %.tags.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
- 	LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache
--	$(GZIP) --best -f $(@:.gz=)
-+	env GZIP=$(GZIP_ENV) $(GZIP) -f $(@:.gz=)
- 
- -include $(top_srcdir)/git.mk
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/editors/gedit/patches/patch-ab b/editors/gedit/patches/patch-ab
new file mode 100644
index 00000000000..ea5be913529
--- /dev/null
+++ b/editors/gedit/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2009/10/21 18:04:55 drochner Exp $
+
+--- gedit/gedit-metadata-manager.c.orig	2009-09-20 19:43:50.000000000 +0200
++++ gedit/gedit-metadata-manager.c
+@@ -452,7 +452,7 @@ save_item (const gchar *key, const gpoin
+ 	gedit_debug_message (DEBUG_METADATA, "uri: %s", key);
+ #endif	
+ 
+-	atime = g_strdup_printf ("%ld", item->atime);
++	atime = g_strdup_printf ("%lld", (long long)(item->atime));
+ 	xmlSetProp (xml_node, (const xmlChar *)"atime", (const xmlChar *)atime);	
+ 
+ #ifdef GEDIT_METADATA_VERBOSE_DEBUG