diff options
| author | jmz <jmz@FreeBSD.org> | 2008-04-07 22:41:14 +0800 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 2008-04-07 22:41:14 +0800 |
| commit | a9879308f916ef302e50ca54f6fe6841d8795675 (patch) | |
| tree | aade2f5f851b09fb9e81c5b0918be3b2bb4fafc3 | |
| parent | f3098ceabb31c69f347e51dbbf368694089edd9f (diff) | |
| download | freebsd-ports-gnome-a9879308f916ef302e50ca54f6fe6841d8795675.tar.gz freebsd-ports-gnome-a9879308f916ef302e50ca54f6fe6841d8795675.tar.zst freebsd-ports-gnome-a9879308f916ef302e50ca54f6fe6841d8795675.zip | |
Unbreak for DENEU. Note that a gmake version > 3.80 is required.
PR: ports/122336
Submitted by: dinoex
| -rw-r--r-- | textproc/ispell/Makefile | 6 | ||||
| -rw-r--r-- | textproc/ispell/files/DENEU.patch | 31 |
2 files changed, 26 insertions, 11 deletions
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile index 8719a270dcd3..84d3436149bb 100644 --- a/textproc/ispell/Makefile +++ b/textproc/ispell/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ispell PORTVERSION?= 3.2.06 -PORTREVISION?= 20 +PORTREVISION?= 21 CATEGORIES+= textproc MASTER_SITES= http://fmg-www.cs.ucla.edu/geoff/tars/ \ http://distfiles.opendarwin.org/ @@ -95,10 +95,10 @@ EXTRA_DICT+= ${BRDISTFILE}:br 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 @@ post-patch: .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 diff --git a/textproc/ispell/files/DENEU.patch b/textproc/ispell/files/DENEU.patch index 337d16bbf057..022fe465b18e 100644 --- a/textproc/ispell/files/DENEU.patch +++ b/textproc/ispell/files/DENEU.patch @@ -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) \ |