Port gedit to enchant 2, bump revision.

4 files changed, 62 insertions, 7 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index f072d4fc6b2..f9232562208 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.143 2018/11/12 03:51:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.144 2018/11/14 21:17:22 bsiegert Exp $
 #
 
 DISTNAME=		gedit-2.30.4
-PKGREVISION=		31
+PKGREVISION=		32
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.30/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index d42e9c2f554..0fbdf49821c 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.54 2015/11/03 03:32:16 agc Exp $
+$NetBSD: distinfo,v 1.55 2018/11/14 21:17:22 bsiegert Exp $
 
 SHA1 (gedit-2.30.4.tar.bz2) = ff7f4088d0b89224b84406557a7d9970323fdcc3
 RMD160 (gedit-2.30.4.tar.bz2) = b2659b8847ef02c66a70acd2f4a492555e1e4d21
 SHA512 (gedit-2.30.4.tar.bz2) = 31d96a86d4d207fe83aa1c8b8faadd82c2c6eeca019f2df4fdf75a8678233e76edf7a09f32dba6350ab9fc003029cbb585608d864632e1d13c42650d1894b5e1
 Size (gedit-2.30.4.tar.bz2) = 4705692 bytes
 SHA1 (patch-ab) = 06f1492437126f8ee12bda5b5dd090b713885ba2
-SHA1 (patch-ac) = 997c8a7ddcfc98369afdf42dddeff5cf6e159c23
+SHA1 (patch-ac) = a664f803d9801f46414750da5f9c956e6cef9c18
 SHA1 (patch-tests_document-saver.c) = 5317930c5da888c33f43f341e627b2e85829212b
diff --git a/editors/gedit/options.mk b/editors/gedit/options.mk
index 4edda7eb718..ea524aeb643 100644
--- a/editors/gedit/options.mk
+++ b/editors/gedit/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2009/04/17 18:40:42 drochner Exp $
+# $NetBSD: options.mk,v 1.3 2018/11/14 21:17:22 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gedit
 PKG_SUPPORTED_OPTIONS=	enchant
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=	enchant
 PLIST_VARS=	enchant
 .if !empty(PKG_OPTIONS:Menchant)
 PLIST.enchant=	yes
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-spell
diff --git a/editors/gedit/patches/patch-ac b/editors/gedit/patches/patch-ac
index c5313e6a15e..50c7d39f543 100644
--- a/editors/gedit/patches/patch-ac
+++ b/editors/gedit/patches/patch-ac
@@ -1,7 +1,62 @@
-$NetBSD: patch-ac,v 1.1 2010/11/03 19:55:18 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2018/11/14 21:17:22 bsiegert Exp $
+
+Enchant V2 support
 
 --- configure.orig	2010-09-28 07:31:53.000000000 +0000
 +++ configure
+@@ -13665,7 +13665,7 @@ fi
+ 
+ 
+ 
+-ENCHANT_REQUIRED=1.2.0
++ENCHANT_REQUIRED=2.0.0
+ ISO_CODES_REQUIRED=0.35
+ 
+ # Check whether --enable-spell was given.
+@@ -13687,12 +13687,12 @@ if test -n "$ENCHANT_CFLAGS"; then
+     pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2 >= \$ENCHANT_REQUIRED\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "enchant-2 >= $ENCHANT_REQUIRED") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
++  pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant-2 >= $ENCHANT_REQUIRED" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13703,12 +13703,12 @@ if test -n "$ENCHANT_LIBS"; then
+     pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2 >= \$ENCHANT_REQUIRED\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "enchant-2 >= $ENCHANT_REQUIRED") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= $ENCHANT_REQUIRED" 2>/dev/null`
++  pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant-2 >= $ENCHANT_REQUIRED" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -13728,9 +13728,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant >= $ENCHANT_REQUIRED" 2>&1`
++	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant-2 >= $ENCHANT_REQUIRED" 2>&1`
+         else
+-	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant >= $ENCHANT_REQUIRED" 2>&1`
++	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant-2 >= $ENCHANT_REQUIRED" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$ENCHANT_PKG_ERRORS" >&5
 @@ -14406,7 +14406,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
    $as_echo_n "(cached) " >&6
  else