4 files changed, 28 insertions, 30 deletions

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index bce56af02c5c..26fa8623fe69 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 $
 #
 
 PORTNAME=	enchant
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www.abisource.com/downloads/enchant/${PORTVERSION}/
 #		${MASTER_SITE_SOURCEFORGE}
@@ -18,10 +18,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dictionary/spellchecking framework
 
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget glib20 ltverhack
+CONFIGURE_ARGS=	--disable-hspell \
+		--disable-uspell
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -29,23 +30,27 @@ MAN1=		enchant.1
 
 .ifndef(WITHOUT_ASPELL)
 LIB_DEPENDS+=	pspell.16:${PORTSDIR}/textproc/aspell
+CONFIGURE_ARGS+=--enable-aspell
 PLIST_SUB+=	ASPELL=""
 .else
+CONFIGURE_ARGS+=--disable-aspell
 PLIST_SUB+=	ASPELL="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/hspell)
-WITH_HSPELL=	yes
-.endif
+#.if exists(${LOCALBASE}/bin/hspell)
+#WITH_HSPELL=	yes
+#.endif
 
-.if defined(WITH_HSPELL)
-BUILD_DEPENDS+=	hspell:${PORTSDIR}/hebrew/hspell
-PLIST_SUB+=	HSPELL=""
-.else
-PLIST_SUB+=	HSPELL="@comment "
-.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
 
 pre-everything::
 .if !defined(WITHOUT_ASPELL) || !defined(WITH_HSPELL)
@@ -54,10 +59,10 @@ pre-everything::
 	@${ECHO_CMD} '===>'
 	@${ECHO_CMD} '===> Define WITHOUT_ASPELL to disable aspell support'
 .endif
-.if !defined(WITH_HSPELL)
-	@${ECHO_CMD} '===>'
-	@${ECHO_CMD} '===> Define WITH_HSPELL to enable hspell (Hebrew) support'
-.endif
+#.if !defined(WITH_HSPELL)
+#	@${ECHO_CMD} '===>'
+#	@${ECHO_CMD} '===> Define WITH_HSPELL to enable hspell (Hebrew) support'
+#.endif
 .endif
 
 post-patch:
diff --git a/textproc/enchant/distinfo b/textproc/enchant/distinfo
index b86b633d2ff2..a1fb3879e8d0 100644
--- a/textproc/enchant/distinfo
+++ b/textproc/enchant/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/enchant-1.2.0.tar.gz) = e44a734a85fbbadf898fb935ac346f31
-SHA256 (gnome2/enchant-1.2.0.tar.gz) = 033f832721da7da5f88dee50c51328f1404b34f45a4ec42d9b2d685553051bfe
-SIZE (gnome2/enchant-1.2.0.tar.gz) = 454402
+MD5 (gnome2/enchant-1.2.3.tar.gz) = 9340451f33c71bd20cfe176c11975553
+SHA256 (gnome2/enchant-1.2.3.tar.gz) = 7ff11a7743bd202ca36142055aa3efa62b3cfaa3d754c70e233abd02a7208742
+SIZE (gnome2/enchant-1.2.3.tar.gz) = 532584
diff --git a/textproc/enchant/pkg-descr b/textproc/enchant/pkg-descr
index 78a84838fbc2..eb8624759be0 100644
--- a/textproc/enchant/pkg-descr
+++ b/textproc/enchant/pkg-descr
@@ -1,4 +1,4 @@
 Enchant is a dictionary backend. It's somewhat of a broker of various
 pre-existing spellchecking programs.
 
-WWW:	http://www.abisource.com/enchant/
+WWW:	http://www.abisource.com/projects/enchant/
diff --git a/textproc/enchant/pkg-plist b/textproc/enchant/pkg-plist
index 335debd09054..0f24e68a7994 100644
--- a/textproc/enchant/pkg-plist
+++ b/textproc/enchant/pkg-plist
@@ -6,25 +6,18 @@ include/enchant/enchant.h
 %%ASPELL%%lib/enchant/libenchant_aspell.a
 %%ASPELL%%lib/enchant/libenchant_aspell.la
 %%ASPELL%%lib/enchant/libenchant_aspell.so
-%%ASPELL%%lib/enchant/libenchant_aspell.so.1
-%%HSPELL%%lib/enchant/libenchant_hspell.a
-%%HSPELL%%lib/enchant/libenchant_hspell.la
-%%HSPELL%%lib/enchant/libenchant_hspell.so
-%%HSPELL%%lib/enchant/libenchant_hspell.so.1
 lib/enchant/libenchant_ispell.a
 lib/enchant/libenchant_ispell.la
 lib/enchant/libenchant_ispell.so
-lib/enchant/libenchant_ispell.so.1
 lib/enchant/libenchant_myspell.a
 lib/enchant/libenchant_myspell.la
 lib/enchant/libenchant_myspell.so
-lib/enchant/libenchant_myspell.so.1
 lib/libenchant.a
 lib/libenchant.la
 lib/libenchant.so
 lib/libenchant.so.1
 libdata/pkgconfig/enchant.pc
-share/enchant/enchant.ordering
-@dirrm share/enchant
+%%DATADIR%%/enchant.ordering
+@dirrm %%DATADIR%%
 @dirrm lib/enchant
 @dirrm include/enchant