Date: Tue, 1 Apr 2008 16:23:57 +0200 (CEST) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/122336: unbreak textproc/ispell for DENEU Message-ID: <200804011423.m31ENvGX099734@home3.dinoex.sub.de> Resent-Message-ID: <200804011500.m31F03d6040849@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122336
>Category: ports
>Synopsis: unbreak textproc/ispell for DENEU
>Confidential: no
>Severity: critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 01 15:00:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Dirk Meyer
>Release: FreeBSD 6.3-STABLE
>Organization:
privat
>Environment:
textproc/ispell
german/ispell
german/ispell-neu
>Description:
textproc/ipsell was updated, but BROKEN
the new german book needs gmake, but gmake breaks for american.
>How-To-Repeat:
cd /usr/ports/german/ispell && make
>Fix:
Apply this patch:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/ispell/Makefile,v
retrieving revision 1.109
diff -u -r1.109 Makefile
--- Makefile 19 Mar 2008 20:46:14 -0000 1.109
+++ Makefile 1 Apr 2008 14:06:40 -0000
@@ -95,10 +95,10 @@
EXTRACT_ONLY+= ${BRDISTFILE}
.endif
.if defined(ISPELL_DENEU)
-BROKEN= igerman98-20071211/Makefile must be patched
DENEUDISTFILE= igerman98-20071211.tar.bz2
MASTER_SITES+= http://www.j3e.de/ispell/igerman98/dict/:denu
EXTRA_DICT+= ${DENEUDISTFILE}:denu
+USE_GMAKE= yes
.endif
.if defined(ISPELL_DEALT)
DEALTDISTFILE= hk-deutsch.tar.gz
@@ -215,6 +215,8 @@
.endif
.if defined(ISPELL_DENEU)
@cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.bz2$==} && ${PATCH} < ${FILESDIR}/DENEU.patch 2>/dev/null
+ @cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.bz2$==} && ${MV} Makefile GNUmakefile
+ @${CP} ${FILESDIR}/DENEU.makefile ${WRKDIR}/${DENEUDISTFILE:S=.tar.bz2$==}/Makefile
.endif
.if defined(ISPELL_SE)
@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/SE.patch 2>/dev/null
Index: files/DENEU.makefile
===================================================================
RCS file: files/DENEU.makefile
diff -N files/DENEU.makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/DENEU.makefile 1 Apr 2008 14:06:40 -0000
@@ -0,0 +1,10 @@
+
+
+german.hash:
+ gmake ispell/de_DE.aff ispell/de_DE.hash
+ cp ispell/de_DE.hash german.hash
+ cp ispell/de_DE.aff german.aff
+
+install:
+ gmake install
+
Index: files/DENEU.patch
===================================================================
RCS file: /home/pcvs/ports/textproc/ispell/files/DENEU.patch,v
retrieving revision 1.2
diff -u -r1.2 DENEU.patch
--- files/DENEU.patch 13 Jan 2001 13:31:19 -0000 1.2
+++ files/DENEU.patch 1 Apr 2008 14:06:40 -0000
@@ -1,18 +1,31 @@
---- Makefile.orig Sun Sep 3 02:57:42 2000
-+++ Makefile Sat Jan 13 14:14:55 2001
-@@ -46,13 +46,13 @@
+--- Makefile.orig 2007-12-11 15:52:44.000000000 +0100
++++ Makefile 2008-04-01 15:44:16.000000000 +0200
+@@ -62,16 +62,16 @@
+ #ZIP_OPTS = -j -r -9 -X
+ ZIP = 7z
+ ZIP_OPTS = a -tzip -mx=9
+-BUILDHASH = buildhash
++BUILDHASH = ../ispell-3.2.06/buildhash
+-ISPELL = ispell
++ISPELL = ../ispell-3.2.06/ispell
+ HUNSPELL_BIN = hunspell
+ # Hunspell starting with 1.1.9 (?) uses automatic charset transcoding,
+ # we need to make sure we use latin1:
+ HUNSPELL = $(HUNSPELL_BIN) `$(HUNSPELL_BIN) -h 2>&1 | grep -q "hunspell \\-i" && echo "-i latin1"`
- MAKE = make
--BUILDHASH = buildhash
-+BUILDHASH ?= buildhash
- ISPELL = ispell
SQ = sq
-UNSQ = unsq
-+UNSQ ?= unsq
++UNSQ = ../ispell-3.2.06/unsq
# if for some reason you don't have Ispell's unsq use my Perl sq/unsq
# and put it into a directory known by your PATH variable!
#UNSQ = unsq.pl
+@@ -113,7 +113,7 @@
+ $$(BUILDHASH) all.words.$(1).tmp ./ispell/$(1).aff $$@
- ASPELL = aspell
+ all.words.$(1).tmp: all.words.$(1).raw ispell/$(1).aff
+- munchlist -l ./ispell/$(1).aff all.words.$(1).raw > $$@
++ ../ispell-3.2.06/munchlist -l ./ispell/$(1).aff all.words.$(1).raw > $$@
+ all.words.$(1).raw: $$(WORDS_$(1)) $$(WORDS_de_all) dicts/abkuerzpunkt.txt
+ sed "s/qq//g;s/\.//;s/\-.*//" dicts/abkuerzpunkt.txt $$(WORDS_$(1)) $$(WORDS_de_all) \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804011423.m31ENvGX099734>