Remove gedit3-spell and make the spell check plugin an (enchant) option

Update gedit3 to 3.14.2

============
gedit 3.14.2
============

New Features and Fixes
======================
- External tools plugin: fix document saving
- Various other bug fixes

New and updated translations
============================
- ja (Hajime Taira)
- nb (Kjartan Maraas)
- vi (Tran Ngoc Quan)

9 files changed, 72 insertions, 78 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 654dac68927..f1878196253 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2014/01/23 14:15:12 wiz Exp $
+# $NetBSD: Makefile,v 1.167 2014/12/06 20:41:36 prlw1 Exp $
 #
 
 COMMENT=	Editors
@@ -47,7 +47,6 @@ SUBDIR+=	gconf-editor
 SUBDIR+=	gedit
 SUBDIR+=	gedit-python
 SUBDIR+=	gedit3
-SUBDIR+=	gedit3-spell
 SUBDIR+=	ghex
 SUBDIR+=	gice
 SUBDIR+=	gnuserv
diff --git a/editors/gedit3-spell/DESCR b/editors/gedit3-spell/DESCR
deleted file mode 100644
index 07857b04447..00000000000
--- a/editors/gedit3-spell/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Spell-check plugin for gedit, the GNOME 3 editor.
diff --git a/editors/gedit3-spell/Makefile b/editors/gedit3-spell/Makefile
deleted file mode 100644
index 3d237d9485c..00000000000
--- a/editors/gedit3-spell/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2014/02/12 01:49:10 prlw1 Exp $
-
-.include "../../editors/gedit3/Makefile.common"
-
-PKGNAME=	${DISTNAME:S/gedit/gedit3-spell/}
-
-COMMENT=	Spell-check plugin for gedit
-
-BUILD_DIRS=	plugins/spell
-INSTALL_DIRS=	plugins/spell
-
-.include "../../textproc/enchant/buildlink3.mk"
-.include "../../textproc/iso-codes/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit3-spell/PLIST b/editors/gedit3-spell/PLIST
deleted file mode 100644
index 7218c710f9a..00000000000
--- a/editors/gedit3-spell/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/31 19:55:21 prlw1 Exp $
-lib/gedit/plugins/libspell.la
-lib/gedit/plugins/spell.plugin
diff --git a/editors/gedit3/Makefile b/editors/gedit3/Makefile
index 4538d5c6490..2e67c25e18a 100644
--- a/editors/gedit3/Makefile
+++ b/editors/gedit3/Makefile
@@ -1,11 +1,50 @@
-# $NetBSD: Makefile,v 1.16 2014/11/23 13:57:02 prlw1 Exp $
+# $NetBSD: Makefile,v 1.17 2014/12/06 20:41:36 prlw1 Exp $
 
+DISTNAME=	gedit-3.14.2
+CATEGORIES=	editors gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gedit/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	prlw1@cam.ac.uk
+HOMEPAGE=	http://www.gedit.org/
+COMMENT=	Lightweight GNOME UTF-8 text editor
+LICENSE=	gnu-gpl-v2
+
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
+USE_PKGLOCALEDIR=	yes
+
+PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
+PY_PATCHPLIST=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	26 27
 REPLACE_PYTHON+=	plugins/externaltools/data/send-to-fpaste.tool.in
 
-.include "../../editors/gedit3/Makefile.common"
+CONFIGURE_ARGS+=	--disable-updater
+CONFIGURE_ARGS+=	--disable-deprecations
+CONFIGURE_ARGS+=	--disable-maintainer-mode
 
-COMMENT=	Lightweight GNOME UTF-8 text editor
+.include "options.mk"
+
+BUILD_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
+
+.include "../../devel/gobject-introspection/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libpeas+=	libpeas>=1.7.0
+.include "../../devel/libpeas/buildlink3.mk"
+.include "../../devel/py-gobject3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.40.0
+.include "../../devel/glib2/schemas.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.14.0
+.include "../../x11/gtk3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtksourceview3+=	gtksourceview3>=3.14.0
+.include "../../x11/gtksourceview3/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 
-CONFIGURE_ARGS+=	--disable-spell
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit3/Makefile.common b/editors/gedit3/Makefile.common
deleted file mode 100644
index 37b236b7831..00000000000
--- a/editors/gedit3/Makefile.common
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2014/11/23 13:57:02 prlw1 Exp $
-# used by editors/gedit3/Makefile
-# used by editors/gedit3-spell/Makefile
-
-DISTNAME=	gedit-3.14.1
-CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gedit/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	prlw1@cam.ac.uk
-HOMEPAGE=	http://www.gedit.org/
-LICENSE=	gnu-gpl-v2
-
-DISTINFO_FILE=	${.CURDIR}/../../editors/gedit3/distinfo
-
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
-USE_PKGLOCALEDIR=	yes
-
-PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
-PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	26 27
-
-CONFIGURE_ARGS+=	--disable-updater
-CONFIGURE_ARGS+=	--disable-deprecations
-CONFIGURE_ARGS+=	--disable-maintainer-mode
-
-BUILD_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
-
-.include "../../devel/gobject-introspection/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libpeas+=	libpeas>=1.7.0
-.include "../../devel/libpeas/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.40.0
-.include "../../devel/glib2/schemas.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.14.0
-.include "../../x11/gtk3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtksourceview3+=	gtksourceview3>=3.14.0
-.include "../../x11/gtksourceview3/buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
diff --git a/editors/gedit3/PLIST b/editors/gedit3/PLIST
index b0cc3e631a0..960ebf2dc55 100644
--- a/editors/gedit3/PLIST
+++ b/editors/gedit3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/11/23 13:57:02 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/12/06 20:41:36 prlw1 Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-3.12/gedit/gedit-app-activatable.h
@@ -1765,3 +1765,5 @@ share/locale/xh/LC_MESSAGES/gedit.mo
 share/locale/zh_CN/LC_MESSAGES/gedit.mo
 share/locale/zh_HK/LC_MESSAGES/gedit.mo
 share/locale/zh_TW/LC_MESSAGES/gedit.mo
+${PLIST.enchant}lib/gedit/plugins/libspell.la
+${PLIST.enchant}lib/gedit/plugins/spell.plugin
diff --git a/editors/gedit3/distinfo b/editors/gedit3/distinfo
index d4769906d28..4cd612a7e1a 100644
--- a/editors/gedit3/distinfo
+++ b/editors/gedit3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2014/11/23 13:57:02 prlw1 Exp $
+$NetBSD: distinfo,v 1.6 2014/12/06 20:41:36 prlw1 Exp $
 
-SHA1 (gedit-3.14.1.tar.xz) = c53d7d6167e5c2c517074e5cb9cf59bb3ded2660
-RMD160 (gedit-3.14.1.tar.xz) = a96f09aacd124e4a50b1388d41af7cef1a825c30
-Size (gedit-3.14.1.tar.xz) = 2882804 bytes
+SHA1 (gedit-3.14.2.tar.xz) = c4bd3f22b8cd750e9de0d7914a572788dc1ac8b7
+RMD160 (gedit-3.14.2.tar.xz) = 48418bb69fff1412ab29dd4ba0b812c2275eb9e0
+Size (gedit-3.14.2.tar.xz) = 2884188 bytes
diff --git a/editors/gedit3/options.mk b/editors/gedit3/options.mk
new file mode 100644
index 00000000000..199b2cbb7ff
--- /dev/null
+++ b/editors/gedit3/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2014/12/06 20:41:36 prlw1 Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gedit3
+PKG_SUPPORTED_OPTIONS=	enchant
+PKG_SUGGESTED_OPTIONS=	enchant
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS=		enchant
+
+###
+### Spell-check plugin which uses enchant
+###
+.if !empty(PKG_OPTIONS:Menchant)
+CONFIGURE_ARGS+=	--enable-spell
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+PLIST.enchant=		yes
+.else
+CONFIGURE_ARGS+=	--disable-spell
+.endif