3 files changed, 52 insertions, 32 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index c753c5bc76e5..d964e11026ee 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/textproc/enchant/Makefile,v 1.1 2006/03/12 02:08:58 mezz Exp $
+#   $MCom: ports-stable/textproc/enchant/Makefile,v 1.3 2010/07/20 07:48:41 kwm Exp $
 #
 
 PORTNAME=	enchant
-PORTVERSION=	1.4.2
+PORTVERSION=	1.6.0
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 DIST_SUBDIR=	gnome2
@@ -19,34 +19,24 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnometarget glib20 ltverhack
-CONFIGURE_ARGS=	--disable-hspell \
-		--disable-uspell
+CONFIGURE_ARGS=	--disable-uspell \
+		--disable-voikko
+MAKE_JOBS_SAFE=	yes
+
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		enchant.1
 
-OPTIONS=	ASPELL "Enable aspell support" on \
+OPTIONS=	ASPELL "Enable Aspell backend" on \
+		HSPELL "Enable Hspell backend" off \
+		HUNSPELL "Enable Hunspell backend" off \
+		ISPELL "Enable Ispell backend" off \
 		ZEMBEREK "Enable zemberek backend (requires DBUS)" off
-		
 
 .include <bsd.port.pre.mk>
 
-# Disable, it needs hspell 0.9 or above.
-#.if exists(${LOCALBASE}/bin/hspell)
-#WITH_HSPELL=	yes
-#.endif
-#
-#.if defined(WITH_HSPELL)
-#BUILD_DEPENDS+=	hspell:${PORTSDIR}/hebrew/hspell
-#CONFIGURE_ARGS+=--enable-hspell
-#PLIST_SUB+=	HSPELL=""
-#.else
-#CONFIGURE_ARGS+=--disable-hspell
-#PLIST_SUB+=	HSPELL="@comment "
-#.endif
-
-.ifndef(WITHOUT_ASPELL)
+.if defined(WITH_ASPELL)
 LIB_DEPENDS+=	pspell.16:${PORTSDIR}/textproc/aspell
 CONFIGURE_ARGS+=--enable-aspell \
 		--with-aspell-prefix=${LOCALBASE}
@@ -56,13 +46,40 @@ CONFIGURE_ARGS+=--disable-aspell
 PLIST_SUB+=	ASPELL="@comment "
 .endif
 
+.if defined(WITH_HSPELL)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell
+CONFIGURE_ARGS+=--enable-hspell
+PLIST_SUB+=	HSPELL=""
+.else
+CONFIGURE_ARGS+=--disable-hspell
+PLIST_SUB+=	HSPELL="@comment "
+.endif
+
+.if defined(WITH_HUNSPELL)
+LIB_DEPENDS+=	hunspell-1.2.0:${PORTSDIR}/hungarian/hunspell
+CONFIGURE_ARGS+=--enable-myspell
+PLIST_SUB+=	HUNSPELL=""
+.else
+CONFIGURE_ARGS+=--disable-myspell
+PLIST_SUB+=	HUNSPELL="@comment "
+.endif
+
+.if defined(WITH_ISPELL)
+RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
+CONFIGURE_ARGS+=--enable-ispell
+PLIST_SUB+=	ISPELL=""
+.else
+CONFIGURE_ARGS+=--disable-ispell
+PLIST_SUB+=	ISPELL="@comment "
+.endif
+
 .if defined(WITH_ZEMBEREK) && !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=	--enable-zemberek
+CONFIGURE_ARGS+=--enable-zemberek
 PLIST_SUB+=	ZEMBEREK=""
 .else
 PLIST_SUB+=	ZEMBEREK="@comment "
-CONFIGURE_ARGS+=	--disable-zemberek
+CONFIGURE_ARGS+=--disable-zemberek
 .endif
 
 post-patch:
diff --git a/textproc/enchant/distinfo b/textproc/enchant/distinfo
index 6d6c0f4bbc86..52c0d5d1e487 100644
--- a/textproc/enchant/distinfo
+++ b/textproc/enchant/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/enchant-1.4.2.tar.gz) = fe4558269ff59f569ab9581c907d58cb
-SHA256 (gnome2/enchant-1.4.2.tar.gz) = 95c8dd998c8fb436329d204e0edde4400b889e4e26d3f8cb888c408c9a9acc6a
-SIZE (gnome2/enchant-1.4.2.tar.gz) = 595192
+MD5 (gnome2/enchant-1.6.0.tar.gz) = de11011aff801dc61042828041fb59c7
+SHA256 (gnome2/enchant-1.6.0.tar.gz) = 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f
+SIZE (gnome2/enchant-1.6.0.tar.gz) = 607018
diff --git a/textproc/enchant/pkg-plist b/textproc/enchant/pkg-plist
index 695e54ae2c4a..8a679632cbc5 100644
--- a/textproc/enchant/pkg-plist
+++ b/textproc/enchant/pkg-plist
@@ -6,12 +6,15 @@ include/enchant/enchant.h
 %%ASPELL%%lib/enchant/libenchant_aspell.a
 %%ASPELL%%lib/enchant/libenchant_aspell.la
 %%ASPELL%%lib/enchant/libenchant_aspell.so
-lib/enchant/libenchant_ispell.a
-lib/enchant/libenchant_ispell.la
-lib/enchant/libenchant_ispell.so
-lib/enchant/libenchant_myspell.a
-lib/enchant/libenchant_myspell.la
-lib/enchant/libenchant_myspell.so
+%%HSPELL%%lib/enchant/libenchant_hspell.a
+%%HSPELL%%lib/enchant/libenchant_hspell.la
+%%HSPELL%%lib/enchant/libenchant_hspell.so
+%%ISPELL%%lib/enchant/libenchant_ispell.a
+%%ISPELL%%lib/enchant/libenchant_ispell.la
+%%ISPELL%%lib/enchant/libenchant_ispell.so
+%%HUNSPELL%%lib/enchant/libenchant_myspell.a
+%%HUNSPELL%%lib/enchant/libenchant_myspell.la
+%%HUNSPELL%%lib/enchant/libenchant_myspell.so
 %%ZEMBEREK%%lib/enchant/libenchant_zemberek.a
 %%ZEMBEREK%%lib/enchant/libenchant_zemberek.la
 %%ZEMBEREK%%lib/enchant/libenchant_zemberek.so