3 files changed, 25 insertions, 43 deletions

diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 970bbb96ac90..984d9966827d 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -30,6 +30,7 @@ EXTRA_DICT=
 MAKE_FLAGS=	TMPDIR=${WRKDIR} -f
 ALL_TARGET=
 BUILDHASH=	${WRKSRC}/buildhash
+UNSQ=		${WRKSRC}/unsq
 DATADIR=	${PREFIX}/share/ispell
 
 .if (!defined(ISPELL_FR) && !defined(ISPELL_SE) && !defined(ISPELL_BR) && !defined(ISPELL_DENEU) && !defined(ISPELL_DEALT) && !defined(ISPELL_BRITISH) && !defined(ISPELL_NO) && !defined(ISPELL_NL) && !defined(ISPELL_DA) && !defined(ISPELL_AF))
@@ -69,12 +70,10 @@ EXTRA_DICT+=	${BRDISTFILE}
 EXTRACT_ONLY+=	${BRDISTFILE}
 .endif
 .if defined(ISPELL_DENEU)
-DENEUDISTFILE=	igerman98-19991219.tar.gz
-MASTER_SITES+=	http://members.xoom.com/maccy/ispell/dict/ \
+DENEUDISTFILE=	igerman98-20001109.tar.bz2
+MASTER_SITES+=	http://www.suse.de/~bjacke/igerman98/dict/ \
 		ftp://student.physik.uni-dortmund.de/pub/users/jacke/ispell/
 EXTRA_DICT+=	${DENEUDISTFILE}
-EXTRACT_ONLY+=	${DENEUDISTFILE}
-FETCH_BEFORE_ARGS+=	-b		# HTTP Workaround at Xoom
 .endif
 .if defined(ISPELL_DEALT)
 DEALTDISTFILE=	hk-deutsch.tar.gz
@@ -125,6 +124,9 @@ post-extract:
 	@${MKDIR} ${WRKDIR}/hk-deutsch
 	@${TAR} -C ${WRKDIR}/hk-deutsch/ -zxf ${PORTSDIR}/distfiles/${DEALTDISTFILE}
 .endif
+.if defined(ISPELL_DENEU)
+	@${TAR} -C ${WRKDIR}/ -yxf ${DISTDIR}/${DENEUDISTFILE}
+.endif
 .if defined(ISPELL_NO)
 	@${MKDIR} ${WRKDIR}/inorsk
 	@${TAR} -C ${WRKDIR}/inorsk/ -zxf ${PORTSDIR}/distfiles/${NODISTFILE}
@@ -138,7 +140,7 @@ post-patch:
 	@cd ${WRKDIR}/${BRDISTFILE:S/.tar.gz$//} && ${PATCH} < ${FILESDIR}/BR.patch 2>/dev/null
 .endif
 .if defined(ISPELL_DENEU)
-	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/DENEU.patch 2>/dev/null
+	@cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.bz2$==} && ${PATCH} < ${FILESDIR}/DENEU.patch 2>/dev/null
 .endif
 .if defined(ISPELL_SE)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/SE.patch 2>/dev/null
@@ -165,8 +167,9 @@ post-configure:
 
 post-build:
 .if defined(ISPELL_DENEU)
-	@cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.gz==} && \
-		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} german.hash && \
+	@cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.bz2==} && \
+		${MAKE} ${MAKEFLAGS} UNSQ=${UNSQ} BUILDHASH=${BUILDHASH} \
+			german.hash && \
 		${MV} german.hash ndeutsch.hash && ${MV} german.aff ndeutsch.aff
 .endif
 .if defined(ISPELL_DEALT)
diff --git a/textproc/ispell/distinfo b/textproc/ispell/distinfo
index f993923762c1..81b649c71c0a 100644
--- a/textproc/ispell/distinfo
+++ b/textproc/ispell/distinfo
@@ -1,7 +1,6 @@
 MD5 (ispell-3.1.20.tar.gz) = 92986f940548fe4116428d21b16fd356
 MD5 (francais-IREQ-1.4.tar.gz) = 3871371b0f8e57b554f8895ce3a43b5a
 MD5 (iswedish-1.2.1.tar.gz) = b546aeb88d7614c32e541488d55f32fe
-MD5 (igerman98-19991219.tar.gz) = 418f50fc8fd51044b43a843ab03842b6
 MD5 (hk-deutsch.tar.gz) = 0fb468159f7f0ba5b8a02c1fe111ac2d
 MD5 (ispell-html-mode.patch) = 1b44441a3748e55b3d509fcff21af4b7
 MD5 (br.ispell-2.4.tar.gz) = 241d9e2fefb92ea74f13c1e07d0b4e7b
@@ -9,3 +8,4 @@ MD5 (ispell-norsk-1.1a.tar.gz) = d096dce5003b4e221e96fbf34f523c4c
 MD5 (ispell-nl-1.0.0.tar.gz) = d9f8c68f28053e71792053e34201a28b
 MD5 (ispell-da-1.4.7.tar.gz) = 767ee1ce66b1213c45b086b59bf44312
 MD5 (ispell-sa-1.0.0.tar.gz) = b70889894d1427e5b78c0a6ecc4f8235
+MD5 (igerman98-20001109.tar.bz2) = ec06d69a4b045b738788fd3359de37ee
diff --git a/textproc/ispell/files/DENEU.patch b/textproc/ispell/files/DENEU.patch
index 21c593ea54cf..337d16bbf057 100644
--- a/textproc/ispell/files/DENEU.patch
+++ b/textproc/ispell/files/DENEU.patch
@@ -1,39 +1,18 @@
---- igerman98-19991219/Makefile.orig	Sun Dec 19 10:46:45 1999
-+++ igerman98-19991219/Makefile	Fri Dec 31 11:31:02 1999
-@@ -36,16 +38,16 @@
- ## Ispell and Aspell stuff:
- ###
+--- Makefile.orig	Sun Sep  3 02:57:42 2000
++++ Makefile	Sat Jan 13 14:14:55 2001
+@@ -46,13 +46,13 @@
  
--german.hash: all.words copyright
--	buildhash all.words german.aff $@
-+german.hash: all.words 
-+	${BUILDHASH} all.words german.aff $@
  
--all.words: $(WORTE)
--	sed s/qq//g $+ | sort -u > $@
-+all.words: ${WORTE}
-+	sed s/qq//g ${WORTE} | sort -u > $@
+ MAKE = make
+-BUILDHASH = buildhash
++BUILDHASH ?= buildhash
+ ISPELL = ispell
+ SQ = sq
+-UNSQ = unsq
++UNSQ ?= 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
  
- swiss: all.words copyright
- 	cat german.aff |sed /swiss-del/d |sed /swiss-convert/s/sS/SS/g |sed '/stringchar/!s/sS//g' > swiss.aff
- 	cat all.words helvetismen.txt |sed s/sS/ss/g |sort -u > all.words.swiss
--	buildhash all.words.swiss swiss.aff swiss.hash
-+	${BUILDHASH} all.words.swiss swiss.aff swiss.hash
+ ASPELL = aspell
  
- install: german.hash
- 	cp german.aff german.hash `ispell -vv|grep LIBDIR|sed "s/.*\=//" |tr -d \"`
-@@ -68,11 +70,11 @@
- liglist.aff:
- 	sed '/\#qqq/s/^\#//g;/\#nnn/d' german.aff > liglist.aff
- 
--all.words.liglist: $(WORTE)
--	sort -u $+ > $@
-+all.words.liglist: ${WORTE}
-+	sort -u ${WORTE} > $@
- 
- liglist.hash: liglist.aff all.words.liglist
--	buildhash all.words.liglist liglist.aff $@
-+	${BUILDHASH} all.words.liglist liglist.aff $@
- 
- liglist: liglist.hash copyright
- 	cat oldspell.liglist all.words.liglist             \