Start updating enchant to 2.2.6.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Thu Oct 25 21:55:15 2018 +0200
Changeset:	4bf6c1934571579e9facdd7ab82180dfeb9dee13

Modified Files:
	enchant/Makefile
	enchant/PLIST
	enchant/distinfo
	enchant/options.mk

Log Message:
Start updating enchant to 2.2.6.

*Almost* no conflicts with the old enchant package.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4bf6c1934571579e9facdd7ab82180dfeb9dee13

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 enchant/Makefile   | 11 ++++-------
 enchant/PLIST      | 24 ++++++++++++------------
 enchant/distinfo   |  8 ++++----
 enchant/options.mk | 24 ++++++++----------------
 4 files changed, 28 insertions(+), 39 deletions(-)

diffs:
diff --git a/enchant/Makefile b/enchant/Makefile
index 67f5b28de9..cb6729572a 100644
--- a/enchant/Makefile
+++ b/enchant/Makefile
@@ -1,26 +1,23 @@
 # $NetBSD: Makefile,v 1.38 2018/10/24 15:42:47 bsiegert Exp $
 #
 
-DISTNAME=		enchant-1.6.0
-PKGREVISION=		6
+DISTNAME=		enchant-2.2.3
 CATEGORIES=		textproc
-MASTER_SITES=		http://www.abisource.com/downloads/enchant/1.6.0/
+MASTER_SITES=		https://github.com/AbiWord/enchant/releases/download/v${PKGVERSION_NOREV}/
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://www.abisource.com/projects/enchant/
+HOMEPAGE=		https://abiword.github.io/enchant/
 COMMENT=		Generic spell checking library
 LICENSE=		gnu-lgpl-v2.1
 
 USE_TOOLS+=		pkg-config autoconf
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	enchant.pc.in
 GNU_CONFIGURE=		yes
 CFLAGS.SunOS+=		-D__EXTENSIONS__
 
-CONFIGURE_ARGS+=	--with-myspell-dir=${BUILDLINK_PREFIX.hunspell}/share/hunspell
-
 .include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/enchant/PLIST b/enchant/PLIST
index 4a55415f1b..3b873abfe7 100644
--- a/enchant/PLIST
+++ b/enchant/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:17:15 joerg Exp $
-bin/enchant
-bin/enchant-lsmod
-include/enchant/enchant++.h
-include/enchant/enchant-provider.h
-include/enchant/enchant.h
-${PLIST.aspell}lib/enchant/libenchant_aspell.la
-${PLIST.ispell}lib/enchant/libenchant_ispell.la
-${PLIST.hunspell}lib/enchant/libenchant_myspell.la
-lib/libenchant.la
-lib/pkgconfig/enchant.pc
-man/man1/enchant.1
+@comment $NetBSD$
+bin/enchant-2
+bin/enchant-lsmod-2
+include/enchant-2/enchant++.h
+include/enchant-2/enchant-provider.h
+include/enchant-2/enchant.h
+${PLIST.aspell}lib/enchant-2/libenchant_aspell.la
+${PLIST.hunspell}lib/enchant-2/enchant_hunspell.la
+lib/libenchant-2.la
+lib/pkgconfig/enchant-2.pc
+man/man1/enchant-2.1
+man/man1/enchant-lsmod-2.1
 share/enchant/enchant.ordering
diff --git a/enchant/distinfo b/enchant/distinfo
index 3a19d7ae97..2c2c4124b6 100644
--- a/enchant/distinfo
+++ b/enchant/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.16 2015/11/04 01:59:28 agc Exp $
 
-SHA1 (enchant-1.6.0.tar.gz) = 321f9cf0abfa1937401676ce60976d8779c39536
-RMD160 (enchant-1.6.0.tar.gz) = a992034355bb36b9acabdbd400c9f4a3b996cce6
-SHA512 (enchant-1.6.0.tar.gz) = 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137
-Size (enchant-1.6.0.tar.gz) = 607018 bytes
+SHA1 (enchant-2.2.3.tar.gz) = 181d5563d282af0f30c7ab68c5d432271b6fd11e
+RMD160 (enchant-2.2.3.tar.gz) = 87ac76b00ed54d47d246b0938d493d2a82180de6
+SHA512 (enchant-2.2.3.tar.gz) = abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
+Size (enchant-2.2.3.tar.gz) = 957451 bytes
diff --git a/enchant/options.mk b/enchant/options.mk
index 7bedcb3a0b..4342d7fccc 100644
--- a/enchant/options.mk
+++ b/enchant/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.5 2009/10/12 19:56:04 ahoka Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.enchant
-PKG_SUPPORTED_OPTIONS=	aspell enchant-zemberek hunspell ispell
+PKG_SUPPORTED_OPTIONS=	aspell enchant-zemberek hunspell
 # Package also supports the following:
 # hspell - Hebrew spelling
 # uspell - Yiddish spelling
@@ -12,35 +12,27 @@ PKG_SUGGESTED_OPTIONS=	hunspell
 
 PLIST_VARS+=            aspell
 .if !empty(PKG_OPTIONS:Maspell)
-CONFIGURE_ARGS+=	--enable-aspell
+CONFIGURE_ARGS+=	--with-aspell
 .include "../../textproc/aspell/buildlink3.mk"
 PLIST.aspell=		yes
 .else
-CONFIGURE_ARGS+=	--disable-aspell
+CONFIGURE_ARGS+=	--without-aspell
 .endif
 
 .if !empty(PKG_OPTIONS:Menchant-zemberek)
-CONFIGURE_ARGS+=	--enable-zemberek
+CONFIGURE_ARGS+=	--with-zemberek
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-zemberek
+CONFIGURE_ARGS+=	--without-zemberek
 .endif
 
 PLIST_VARS+=            hunspell
 .if !empty(PKG_OPTIONS:Mhunspell)
-CONFIGURE_ARGS+=	--enable-myspell
+CONFIGURE_ARGS+=	--with-hunspell
+CONFIGURE_ARGS+=	--with-hunspell-dir=${BUILDLINK_PREFIX.hunspell}/share/hunspell
 .include "../../textproc/hunspell/buildlink3.mk"
 DEPENDS+=		hunspell-en_US-[0-9]*:../../textproc/hunspell-en_US
 PLIST.hunspell=		yes
 .else
-CONFIGURE_ARGS+=	--disable-myspell
-.endif
-
-PLIST_VARS+=            ispell
-.if !empty(PKG_OPTIONS:Mispell)
-CONFIGURE_ARGS+=	--enable-ispell
-PLIST.ispell=		yes
-DEPENDS+=		ispell-base>=3.3.02:../../textproc/ispell-base
-.else
-CONFIGURE_ARGS+=	--disable-ispell
+CONFIGURE_ARGS+=	--without-hunspell
 .endif