update to 2.18.1

This moves this pkg to the new stable gnome branch, too much to list here.

3 files changed, 28 insertions, 13 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 26ddc18c0ba..8734c1f86fa 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.71 2007/03/21 12:05:44 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/04/11 18:15:11 drochner Exp $
 #
 
-DISTNAME=		gedit-2.16.2
-PKGREVISION=		1
+DISTNAME=		gedit-2.18.1
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -22,6 +21,10 @@ PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
 GCONF2_SCHEMAS=		gedit.schemas
 
 CONFIGURE_ARGS+=	--enable-schemas-install
+# XXX option?
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+#CONFIGURE_ARGS+=	--disable-spell
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.12.0
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
@@ -41,7 +44,6 @@ BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.16.0
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 1ed5c63fb70..12bb5ffe15b 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2006/11/09 21:03:38 drochner Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/04/11 18:15:35 drochner Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.16/gedit/gedit-app.h
@@ -24,6 +24,7 @@ include/gedit-2.16/gedit/gedit-tab.h
 include/gedit-2.16/gedit/gedit-utils.h
 include/gedit-2.16/gedit/gedit-view.h
 include/gedit-2.16/gedit/gedit-window.h
+lib/gedit-2/gedit-bugreport.sh
 lib/gedit-2/plugins/changecase.gedit-plugin
 lib/gedit-2/plugins/docinfo.gedit-plugin
 lib/gedit-2/plugins/filebrowser.gedit-plugin
@@ -60,9 +61,10 @@ share/gedit-2/glade/time.glade2
 share/gedit-2/icons/gedit-plugin.png
 share/gedit-2/logo/gedit-logo.png
 share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
-share/gedit-2/taglist/HTML.tags
-share/gedit-2/taglist/Latex.tags
-share/gedit-2/taglist/XSLT.tags
+share/gedit-2/taglist/HTML.tags.gz
+share/gedit-2/taglist/Latex.tags.gz
+share/gedit-2/taglist/XSLT.tags.gz
+share/gedit-2/taglist/XUL.tags.gz
 share/gedit-2/ui/gedit-ui.xml
 share/gnome/help/gedit/C/figures/gedit_format_bold.png
 share/gnome/help/gedit/C/figures/gedit_format_italic.png
@@ -147,6 +149,14 @@ share/gnome/help/gedit/sv/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/sv/figures/gedit_window.png
 share/gnome/help/gedit/sv/gedit.xml
 share/gnome/help/gedit/sv/legal.xml
+share/gnome/help/gedit/uk/figures/gedit_format_bold.png
+share/gnome/help/gedit/uk/figures/gedit_format_italic.png
+share/gnome/help/gedit/uk/figures/gedit_format_strikethrough.png
+share/gnome/help/gedit/uk/figures/gedit_format_underline.png
+share/gnome/help/gedit/uk/figures/gedit_recent_files_menu_icon.png
+share/gnome/help/gedit/uk/figures/gedit_window.png
+share/gnome/help/gedit/uk/gedit.xml
+share/gnome/help/gedit/uk/legal.xml
 share/gnome/help/gedit/zh_CN/figures/gedit_format_bold.png
 share/gnome/help/gedit/zh_CN/figures/gedit_format_italic.png
 share/gnome/help/gedit/zh_CN/figures/gedit_format_strikethrough.png
@@ -296,6 +306,7 @@ share/omf/gedit/gedit-ko.omf
 share/omf/gedit/gedit-ro.omf
 share/omf/gedit/gedit-ru.omf
 share/omf/gedit/gedit-sv.omf
+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
@@ -308,6 +319,8 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gnome/help/gedit/zh_HK
 @dirrm share/gnome/help/gedit/zh_CN/figures
 @dirrm share/gnome/help/gedit/zh_CN
+@dirrm share/gnome/help/gedit/uk/figures
+@dirrm share/gnome/help/gedit/uk
 @dirrm share/gnome/help/gedit/sv/figures
 @dirrm share/gnome/help/gedit/sv
 @dirrm share/gnome/help/gedit/ru/figures
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index bfa6f6fc1d3..05961eb97fd 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2006/11/09 21:03:38 drochner Exp $
+$NetBSD: distinfo,v 1.29 2007/04/11 18:15:35 drochner Exp $
 
-SHA1 (gedit-2.16.2.tar.bz2) = 02e653ed0f8eaf5e147e24d8e4e5291eb94814e3
-RMD160 (gedit-2.16.2.tar.bz2) = a15ff0981ee190453fe9a748a601ee03b14a890f
-Size (gedit-2.16.2.tar.bz2) = 2851971 bytes
+SHA1 (gedit-2.18.1.tar.bz2) = a9c460872a439ae346e6ec062065d94c9c02bdf0
+RMD160 (gedit-2.18.1.tar.bz2) = 779981214ea91f3d83c726429026553f34149425
+Size (gedit-2.18.1.tar.bz2) = 3392618 bytes