Date: Sun, 22 Feb 2004 23:19:24 -0500 From: "Tom McLaughlin" <tmclaugh@sdf.lonestar.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/63250: textproc/enchant: update to 1.1.3 and fix ispell in pkg-plist Message-ID: <1077509964.0@compass.straycat.dhs.org> Resent-Message-ID: <200402230420.i1N4KEPL081464@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63250
>Category: ports
>Synopsis: textproc/enchant: update to 1.1.3 and fix ispell in pkg-plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 22 20:20:14 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Tom McLaughlin
>Release: FreeBSD 4.9-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD 4.9-RELEASE-p2 #0: Mon Feb 9 23:47:43 EST 2004
root@compass.straycat.dhs.org:/usr/obj/usr/src/sys/COMPASS
>Description:
The attached patch updates enchant to version 1.1.3.
While working on this I also noticed an error in the pkg-plist regarding ispell.
The ispell library that comes with enchant will always be built and installed.
Enchant's ispell library is Abisource's own c++ fork of ispell so textproc/ispell
is not needed as a dependancy.
>How-To-Repeat:
>Fix:
--- enchant-1.1.3.diff begins here ---
diff -Nur enchant.old/Makefile enchant/Makefile
--- enchant.old/Makefile Wed Feb 4 00:09:11 2004
+++ enchant/Makefile Sun Feb 22 21:43:36 2004
@@ -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
@@ -31,10 +30,6 @@
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="@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=""
@@ -66,10 +54,6 @@
.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} '===>'
diff -Nur enchant.old/distinfo enchant/distinfo
--- enchant.old/distinfo Sat Jan 3 16:30:57 2004
+++ enchant/distinfo Sun Feb 22 16:30:30 2004
@@ -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 -Nur enchant.old/pkg-plist enchant/pkg-plist
--- enchant.old/pkg-plist Fri Feb 20 21:13:54 2004
+++ enchant/pkg-plist Sun Feb 22 20:43:03 2004
@@ -9,9 +9,9 @@
%%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
--- enchant-1.1.3.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1077509964.0>