Make aspell the default backend again (for now), until

http://bugzilla.abisource.com/show_bug.cgi?id=11550
is fixed.

Add fix for compiling with gcc3, from Adam Hoka.

Bump PKGREVISION.

4 files changed, 50 insertions, 5 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index f68f4752edf..5a9adf49a10 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2008/04/14 11:35:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/04/17 14:29:58 wiz Exp $
 #
 
 DISTNAME=		enchant-1.4.0
+PKGREVISION=		1
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.abisource.com/downloads/enchant/1.4.0/
 
@@ -11,7 +12,7 @@ COMMENT=		Generic spell checking library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config autoconf
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
@@ -19,6 +20,9 @@ PKGCONFIG_OVERRIDE+=	enchant.pc.in
 GNU_CONFIGURE=		yes
 CFLAGS.SunOS+=		-D__EXTENSIONS__
 
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
 .include "options.mk"
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/textproc/enchant/distinfo b/textproc/enchant/distinfo
index 414097bdf76..e410db2d9b4 100644
--- a/textproc/enchant/distinfo
+++ b/textproc/enchant/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2008/04/14 11:35:50 wiz Exp $
+$NetBSD: distinfo,v 1.10 2008/04/17 14:29:58 wiz Exp $
 
 SHA1 (enchant-1.4.0.tar.gz) = 1a3c140c96769d3268a7f1faf7d9400016985537
 RMD160 (enchant-1.4.0.tar.gz) = 84a253e665f71ba5b3277ad95a403ea386d42ba4
 Size (enchant-1.4.0.tar.gz) = 601930 bytes
+SHA1 (patch-aa) = 56ca983fdd6de171aba956b46c673299dcb7549e
diff --git a/textproc/enchant/options.mk b/textproc/enchant/options.mk
index 7b990be4f51..332d5b422ac 100644
--- a/textproc/enchant/options.mk
+++ b/textproc/enchant/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/04/14 11:35:50 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/17 14:29:58 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.enchant
 PKG_SUPPORTED_OPTIONS=	aspell enchant-zemberek hunspell ispell
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	aspell enchant-zemberek hunspell ispell
 # hspell - Hebrew spelling
 # uspell - Yiddish spelling
 # voikko - Finnish spelling
-PKG_SUGGESTED_OPTIONS=	hunspell ispell
+PKG_SUGGESTED_OPTIONS=	aspell ispell
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/textproc/enchant/patches/patch-aa b/textproc/enchant/patches/patch-aa
new file mode 100644
index 00000000000..55c72b7bd5a
--- /dev/null
+++ b/textproc/enchant/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.3 2008/04/17 14:29:58 wiz Exp $
+
+http://bugzilla.abisource.com/show_bug.cgi?id=11551
+
+--- configure.in.orig	2008-03-31 19:47:43.000000000 +0200
++++ configure.in
+@@ -75,18 +75,18 @@ AC_DEFUN([ENCHANT_CXX_TRY_FLAG], [
+   AC_MSG_CHECKING([whether $CXX supports $1])
+ 
+   AC_LANG_PUSH(C++)
+-  enchant_save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $1"
++  enchant_save_CXXFLAGS="$CXXFLAGS"
++  CXXFLAGS="$CXXFLAGS $1"
+ 
+-  AC_COMPILE_IFELSE([ ], [enchant_cc_flag=yes], [enchant_cc_flag=no])
+-  CFLAGS="$enchant_save_CFLAGS"
++  AC_COMPILE_IFELSE([ ], [enchant_cxx_flag=yes], [enchant_cxx_flag=no])
++  CXXFLAGS="$enchant_save_CXXFLAGS"
+ 
+-  if test "x$enchant_cc_flag" = "xyes"; then
++  if test "x$enchant_cxx_flag" = "xyes"; then
+     ifelse([$2], , :, [$2])
+   else
+     ifelse([$3], , :, [$3])
+   fi
+-  AC_MSG_RESULT([$enchant_cc_flag])
++  AC_MSG_RESULT([$enchant_cxx_flag])
+   AC_LANG_POP(C++)
+ ])
+ 
+@@ -169,7 +169,7 @@ AC_CACHE_CHECK([for supported C++ warnin
+ 	done
+ 
+ 	enchant_cxx_cv_warn_cflags=$CXX_WARN_CFLAGS
+-	enchant_cxx_cv_warn_cflags=$CXX_MAYBE_WARN
++	enchant_cxx_cv_warn_maybe=$CXX_MAYBE_WARN
+ 
+ 	AC_MSG_CHECKING([which C++ warning flags were supported])])
+ CXX_WARN_CFLAGS="$enchant_cxx_cv_warn_cflags"