Thu Apr 17 14:29:58 2008 UTC ()
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.


(wiz)
diff -r1.23 -r1.24 pkgsrc/textproc/enchant/Makefile
diff -r1.9 -r1.10 pkgsrc/textproc/enchant/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/enchant/options.mk
diff -r0 -r1.3 pkgsrc/textproc/enchant/patches/patch-aa
cvs diff -r1.23 -r1.24 pkgsrc/textproc/enchant/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/enchant/Makefile 2008/04/14 11:35:50 1.23
+++ pkgsrc/textproc/enchant/Makefile 2008/04/17 14:29:58 1.24
@@ -1,25 +1,29 @@ @@ -1,25 +1,29 @@
1# $NetBSD: Makefile,v 1.23 2008/04/14 11:35:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2008/04/17 14:29:58 wiz Exp $
2# 2#
3 3
4DISTNAME= enchant-1.4.0 4DISTNAME= enchant-1.4.0
 5PKGREVISION= 1
5CATEGORIES= textproc 6CATEGORIES= textproc
6MASTER_SITES= http://www.abisource.com/downloads/enchant/1.4.0/ 7MASTER_SITES= http://www.abisource.com/downloads/enchant/1.4.0/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.abisource.com/projects/enchant/ 10HOMEPAGE= http://www.abisource.com/projects/enchant/
10COMMENT= Generic spell checking library 11COMMENT= Generic spell checking library
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config autoconf
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18PKGCONFIG_OVERRIDE+= enchant.pc.in 19PKGCONFIG_OVERRIDE+= enchant.pc.in
19GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
20CFLAGS.SunOS+= -D__EXTENSIONS__ 21CFLAGS.SunOS+= -D__EXTENSIONS__
21 22
 23pre-configure:
 24 cd ${WRKSRC} && autoconf
 25
22.include "options.mk" 26.include "options.mk"
23 27
24.include "../../devel/glib2/buildlink3.mk" 28.include "../../devel/glib2/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/textproc/enchant/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/enchant/distinfo 2008/04/14 11:35:50 1.9
+++ pkgsrc/textproc/enchant/distinfo 2008/04/17 14:29:58 1.10
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.9 2008/04/14 11:35:50 wiz Exp $ 1$NetBSD: distinfo,v 1.10 2008/04/17 14:29:58 wiz Exp $
2 2
3SHA1 (enchant-1.4.0.tar.gz) = 1a3c140c96769d3268a7f1faf7d9400016985537 3SHA1 (enchant-1.4.0.tar.gz) = 1a3c140c96769d3268a7f1faf7d9400016985537
4RMD160 (enchant-1.4.0.tar.gz) = 84a253e665f71ba5b3277ad95a403ea386d42ba4 4RMD160 (enchant-1.4.0.tar.gz) = 84a253e665f71ba5b3277ad95a403ea386d42ba4
5Size (enchant-1.4.0.tar.gz) = 601930 bytes 5Size (enchant-1.4.0.tar.gz) = 601930 bytes
 6SHA1 (patch-aa) = 56ca983fdd6de171aba956b46c673299dcb7549e
cvs diff -r1.1 -r1.2 pkgsrc/textproc/enchant/options.mk (expand / switch to unified diff)

--- pkgsrc/textproc/enchant/options.mk 2008/04/14 11:35:50 1.1
+++ pkgsrc/textproc/enchant/options.mk 2008/04/17 14:29:58 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.1 2008/04/14 11:35:50 wiz Exp $ 1# $NetBSD: options.mk,v 1.2 2008/04/17 14:29:58 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.enchant 3PKG_OPTIONS_VAR= PKG_OPTIONS.enchant
4PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell ispell 4PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell ispell
5# Package also supports the following: 5# Package also supports the following:
6# hspell - Hebrew spelling 6# hspell - Hebrew spelling
7# uspell - Yiddish spelling 7# uspell - Yiddish spelling
8# voikko - Finnish spelling 8# voikko - Finnish spelling
9PKG_SUGGESTED_OPTIONS= hunspell ispell 9PKG_SUGGESTED_OPTIONS= aspell ispell
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= aspell 13PLIST_VARS+= aspell
14.if !empty(PKG_OPTIONS:Maspell) 14.if !empty(PKG_OPTIONS:Maspell)
15CONFIGURE_ARGS+= --enable-aspell 15CONFIGURE_ARGS+= --enable-aspell
16.include "../../textproc/aspell/buildlink3.mk" 16.include "../../textproc/aspell/buildlink3.mk"
17PLIST.aspell= yes 17PLIST.aspell= yes
18.else 18.else
19CONFIGURE_ARGS+= --disable-aspell 19CONFIGURE_ARGS+= --disable-aspell
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Menchant-zemberek) 22.if !empty(PKG_OPTIONS:Menchant-zemberek)
File Added: pkgsrc/textproc/enchant/patches/Attic/patch-aa
$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"