Update to 2.24.3; make spell checking an option; update dependencies.

============
gedit 2.24.3
============

New Features and Fixes
======================
- Backport some bugfixes from the developement version

New and updated translations
============================
- Alexander Shopov (bg)
- Priit Laes (et)
- Shankar Prasad (kn)

6 files changed, 41 insertions, 65 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index cf77ef26d42..bc7c52ead74 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2008/12/24 17:56:11 jmcneill Exp $
+# $NetBSD: Makefile,v 1.90 2009/01/12 21:50:16 wiz Exp $
 #
 
-DISTNAME=		gedit-2.24.2
+DISTNAME=		gedit-2.24.3
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.24/}
 EXTRACT_SUFX=		.tar.bz2
@@ -15,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
-USE_TOOLS+=		autoconf
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
@@ -23,32 +22,25 @@ PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
 
 GCONF_SCHEMAS=		gedit.schemas gedit-file-browser.schemas
 
-# 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
-#BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.8.0
-BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.6.0
-BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.16.0
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
-
-pre-configure:
-	cd ${WRKSRC} && autoconf -f
+.include "options.mk"
 
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.6.0
 .include "../../devel/libglade/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.16.0
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
+#.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.13.0
 .include "../../x11/gtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtksourceview2+=	gtksourceview2>=2.2.0
 .include "../../x11/gtksourceview2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 045e6b46c48..bcfba21ad3b 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2008/11/24 13:39:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.33 2009/01/12 21:50:17 wiz Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.20/gedit/gedit-app.h
@@ -33,13 +33,13 @@ lib/gedit-2/plugins/libindent.la
 lib/gedit-2/plugins/libmodelines.la
 lib/gedit-2/plugins/libsample.la
 lib/gedit-2/plugins/libsort.la
-lib/gedit-2/plugins/libspell.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
-lib/gedit-2/plugins/spell.gedit-plugin
+${PLIST.enchant}lib/gedit-2/plugins/spell.gedit-plugin
 lib/gedit-2/plugins/taglist.gedit-plugin
 lib/gedit-2/plugins/time.gedit-plugin
 lib/pkgconfig/gedit-2.20.pc
@@ -53,8 +53,8 @@ share/gedit-2/logo/gedit-logo.png
 share/gedit-2/plugins/docinfo/docinfo.ui
 share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml
 share/gedit-2/plugins/sort/sort.ui
-share/gedit-2/plugins/spell/languages-dialog.ui
-share/gedit-2/plugins/spell/spell-checker.ui
+${PLIST.enchant}share/gedit-2/plugins/spell/languages-dialog.ui
+${PLIST.enchant}share/gedit-2/plugins/spell/spell-checker.ui
 share/gedit-2/plugins/time/time.ui
 share/gedit-2/taglist/HTML.tags.gz
 share/gedit-2/taglist/Latex.tags.gz
@@ -416,7 +416,7 @@ share/omf/gedit/gedit-zh_TW.omf
 @dirrm share/gedit-2/ui
 @dirrm share/gedit-2/taglist
 @dirrm share/gedit-2/plugins/time
-@dirrm share/gedit-2/plugins/spell
+${PLIST.enchant}@dirrm share/gedit-2/plugins/spell
 @dirrm share/gedit-2/plugins/sort
 @exec ${MKDIR} %D/share/gedit-2/plugins/sample
 @dirrm share/gedit-2/plugins/sample
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index dc3ac0315ac..d3170118dda 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.39 2008/12/24 17:56:11 jmcneill Exp $
+$NetBSD: distinfo,v 1.40 2009/01/12 21:50:17 wiz Exp $
 
-SHA1 (gedit-2.24.2.tar.bz2) = dd47269990bcf0f1de11d3ab2cbc3e1d2b75f1d5
-RMD160 (gedit-2.24.2.tar.bz2) = 4e043a5b69c69d1edcdebc3648338d8bac4d615f
-Size (gedit-2.24.2.tar.bz2) = 4089534 bytes
-SHA1 (patch-aa) = 6589d3e14e3210478830f7715077f67cb3556d41
-SHA1 (patch-ab) = 51d328f4c84b9c8a4593891535fc3d67d060550f
+SHA1 (gedit-2.24.3.tar.bz2) = 93738961fac2228dbf425009828299520d8bc06e
+RMD160 (gedit-2.24.3.tar.bz2) = f16efeacf7c1ad66f07c72311eb2567930876969
+Size (gedit-2.24.3.tar.bz2) = 4078641 bytes
+SHA1 (patch-aa) = ea4b076c14260c35298bc9a8875887b6c626a068
diff --git a/editors/gedit/options.mk b/editors/gedit/options.mk
new file mode 100644
index 00000000000..7cd70f2205d
--- /dev/null
+++ b/editors/gedit/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2009/01/12 21:50:17 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.esound
+PKG_SUPPORTED_OPTIONS=	enchant
+#PKG_SUGGESTED_OPTIONS=	enchant
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS=	enchant
+.if !empty(PKG_OPTIONS:Menchant)
+PLIST.enchant=	yes
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-spell
+.endif
diff --git a/editors/gedit/patches/patch-aa b/editors/gedit/patches/patch-aa
index e2a7be80036..d481a11cabf 100644
--- a/editors/gedit/patches/patch-aa
+++ b/editors/gedit/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2008/09/30 08:04:30 hubertf Exp $
+$NetBSD: patch-aa,v 1.9 2009/01/12 21:50:17 wiz Exp $
 
---- plugins/taglist/Makefile.in.orig	2008-09-19 04:57:38.000000000 +0200
+--- plugins/taglist/Makefile.in.orig	2009-01-10 18:45:20.000000000 +0100
 +++ plugins/taglist/Makefile.in
-@@ -138,6 +138,7 @@ GMSGFMT = @GMSGFMT@
+@@ -142,6 +142,7 @@ GMSGFMT = @GMSGFMT@
  GREP = @GREP@
  GTKDOC_CHECK = @GTKDOC_CHECK@
  GZIP = @GZIP@
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.8 2008/09/30 08:04:30 hubertf Exp $
  HELP_DIR = @HELP_DIR@
  HTML_DIR = @HTML_DIR@
  INSTALL = @INSTALL@
-@@ -650,7 +651,7 @@ uninstall-am: uninstall-pluginDATA unins
+@@ -637,7 +638,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
diff --git a/editors/gedit/patches/patch-ab b/editors/gedit/patches/patch-ab
deleted file mode 100644
index 0d42ca5963a..00000000000
--- a/editors/gedit/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2008/12/24 17:56:11 jmcneill Exp $
-
---- configure.ac.orig	2008-11-23 12:16:28.000000000 -0500
-+++ configure.ac	2008-12-24 12:48:29.000000000 -0500
-@@ -176,7 +176,6 @@
- dnl ================================================================
- 
- PKG_CHECK_MODULES(GEDIT, [
--	sm >= 1.0.0
- 	libxml-2.0 >= 2.5.0
- 	glib-2.0 >= 2.13.0
- 	gthread-2.0 >= 2.13.0
-@@ -189,6 +188,18 @@
- AC_SUBST(GEDIT_LIBS)
- AC_SUBST(GEDIT_CFLAGS)
- 
-+PKG_CHECK_MODULES(SM, sm >= $1.0.0, [HAVE_SM=yes], [HAVE_SM=no])
-+if test x$HAVE_SM = xno; then
-+  AC_PATH_XTRA
-+  if test "x$no_x" = xyes; then
-+    AC_MSG_ERROR(X11 and sm development libraries not found);
-+  else
-+    XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lSM -lICE $X_EXTRA_LIBS"
-+    XLIB_CFLAGS=$X_CFLAGS
-+  fi
-+fi
-+GEDIT_CFLAGS="$GEDIT_CFLAGS $SM_CFLAGS $XLIB_CFLAGS"
-+GEDIT_LIBS="$GEDIT_LIBS $SM_LIBS $XLIB_LIBS"
- 
- dnl ================================================================
- dnl GConf related settings