Update to 1.1.3, and de-conditionalize the ispell bidness. Ispell is

included in the enchant source, and is built automatically.

PR:		ports/63250
Submitted by:	Tom McLaughlin <tmclaugh@sdf.lonestar.org>

4 files changed, 8 insertions, 33 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 800c22a71689..ad35d5bbf802 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	enchant
-PORTVERSION=	1.1.2
-PORTREVISION=	3
+PORTVERSION=	1.1.3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	abiword
@@ -19,7 +18,7 @@ COMMENT=	Dictionary/spellchecking framework
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget glib20
+USE_GNOME=	gnomehack gnomeprefix gnometarget glib20 lthack
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -31,10 +30,6 @@ MAN1=		enchant.1
 WITH_ASPELL=	yes
 .endif
 
-.if exists(${LOCALBASE}/bin/ispell)
-WITH_ISPELL=	yes
-.endif
-
 .if exists(${LOCALBASE}/bin/hspell)
 WITH_HSPELL=	yes
 .endif
@@ -46,13 +41,6 @@ PLIST_SUB+=	ASPELL=""
 PLIST_SUB+=	ASPELL="@comment "
 .endif
 
-.if defined(WITH_ISPELL)
-BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
-PLIST_SUB+=	ISPELL=""
-.else
-PLIST_SUB+=	ISPELL="@comment "
-.endif
-
 .if defined(WITH_HSPELL)
 BUILD_DEPENDS+=	hspell:${PORTSDIR}/hebrew/hspell
 PLIST_SUB+=	HSPELL=""
@@ -61,16 +49,12 @@ PLIST_SUB+=	HSPELL="@comment "
 .endif
 
 pre-everything::
-.if !defined(WITH_ASPELL) || !defined(WITH_ISPELL) || !defined(WITH_HSPELL)
+.if !defined(WITH_ASPELL) || !defined(WITH_HSPELL)
 	@${ECHO_CMD} '===> The following options are available for this port:'
 .if !defined(WITH_ASPELL)
 	@${ECHO_CMD} '===>'
 	@${ECHO_CMD} '===> Define WITH_ASPELL to enable aspell support'
 .endif
-.if !defined(WITH_ISPELL)
-	@${ECHO_CMD} '===>'
-	@${ECHO_CMD} '===> Define WITH_ISPELL to enable ispell support'
-.endif
 .if !defined(WITH_HSPELL)
 	@${ECHO_CMD} '===>'
 	@${ECHO_CMD} '===> Define WITH_HSPELL to enable hspell (Hebrew) support'
diff --git a/textproc/enchant/distinfo b/textproc/enchant/distinfo
index e7a888be5e4d..76cdfb7559a2 100644
--- a/textproc/enchant/distinfo
+++ b/textproc/enchant/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/enchant-1.1.2.tar.gz) = 0d05bd7480382d4189b82111b727263d
+MD5 (gnome2/enchant-1.1.3.tar.gz) = c95186755fe46b27a78d9a85fef2175c
+SIZE (gnome2/enchant-1.1.3.tar.gz) = 303556
diff --git a/textproc/enchant/files/patch-configure b/textproc/enchant/files/patch-configure
deleted file mode 100644
index 00d91c4518c9..000000000000
--- a/textproc/enchant/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat Jan  3 16:19:57 2004
-+++ configure	Sat Jan  3 16:20:35 2004
-@@ -8164,6 +8164,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/enchant/pkg-plist b/textproc/enchant/pkg-plist
index 388332f012c8..2ded1091f236 100644
--- a/textproc/enchant/pkg-plist
+++ b/textproc/enchant/pkg-plist
@@ -9,9 +9,9 @@ include/enchant/enchant.h
 %%HSPELL%%lib/enchant/libenchant_hspell.a
 %%HSPELL%%lib/enchant/libenchant_hspell.so
 %%HSPELL%%lib/enchant/libenchant_hspell.so.2
-%%ISPELL%%lib/enchant/libenchant_ispell.a
-%%ISPELL%%lib/enchant/libenchant_ispell.so
-%%ISPELL%%lib/enchant/libenchant_ispell.so.2
+lib/enchant/libenchant_ispell.a
+lib/enchant/libenchant_ispell.so
+lib/enchant/libenchant_ispell.so.2
 lib/enchant/libenchant_myspell.a
 lib/enchant/libenchant_myspell.so
 lib/enchant/libenchant_myspell.so.2