Update to 20081106.

NOTE: Now installs de_AT, de_CH, and de_DE dictionaries
instead of "german" before.

since 20071211:
- fix a wrong encoded umlaut and enhance the check for that in the Makefile
- words added and shifted around
- additionaly put the dictionary under GPLv3
- allow Ispell F prefix flag to be combined with suffixes
- eliminate absolutely useless G flag (prefix ge)
- deactivate K suffix flag: unused
- eliminate H suffix flag: was almost unused
- remove Q and q redundancy: every Q flagged word needs a q now, too
- fix build issue with de_CH hunspell dictionary (a missing ß/ss conversion)
- better empty-line fault tolerance of dictionaries
- revise the aspell Makefile target using the myspell format now for aspell
- simplify W flag
- use sha256 checksums and prevent checksumming temporary files

since 20070829:
- words added and shifted around
- Hunspell affix fix

since 20030222:
- in order to make use of Hunspell's compound word support, categorise noun
  word lists into compoundable end and non-end words.
- add blacklists to prevent by compound rules wrongly accepted words to be
  accepted
- add Binnen-I support
- add "nosuggest" flag used by Hunspell to some words where it's appropriate
- in order to support as well Hunspell optimized dictionary builts and ispell
  and myspell builts, a complete Makefile rewrite was done. The Makefile might
  now require GNU make, sorry if that causes trouble. The good news is that
  makefile dependencies are clean now and make -j is possible
- igerman98 names the Ispell dictionaries after ISO 639 language codes now
  (de_{AT,CH,DE}.{aff,hash})
- isowordlist is obsoleted by isowordlist-de_{AT,CH,DE} now

4 files changed, 24 insertions, 47 deletions

diff --git a/textproc/ispell-german/Makefile b/textproc/ispell-german/Makefile
index 50c441f23a9..1bba1d7c71d 100644
--- a/textproc/ispell-german/Makefile
+++ b/textproc/ispell-german/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:47 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/11/10 18:15:05 wiz Exp $
 #
 
-DISTNAME=	igerman98-20030222
-PKGNAME=	ispell-german-20030222
-PKGREVISION=	1
+DISTNAME=	igerman98-20081106
+PKGNAME=	ispell-german-20081106
 CATEGORIES=	textproc
 MASTER_SITES=	http://j3e.de/ispell/igerman98/dict/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +13,7 @@ COMMENT=	German dictionary for interactive spelling checker
 
 DEPENDS+=	ispell-base>=3.1.20nb1:../../textproc/ispell-base
 
-BUILD_TARGET=	german.hash
+BUILD_TARGET=	ispell/de_DE.aff ispell/de_DE.hash ispell/de_AT.aff ispell/de_AT.hash ispell/de_CH.aff ispell/de_CH.hash
 USE_TOOLS+=	gmake perl
 REPLACE_PERL=	bin/dic2iso.pl bin/grepl bin/sq.pl bin/myspellfixprefix.pl \
 		bin/clear_affix.pl bin/unsq.pl bin/uniqflag.pl
@@ -22,11 +21,7 @@ REPLACE_PERL=	bin/dic2iso.pl bin/grepl bin/sq.pl bin/myspellfixprefix.pl \
 INSTALLATION_DIRS=	lib
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/german.aff ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/german.hash ${PREFIX}/lib
-	(cd ${PREFIX}/lib && ${LN} -s german.aff deutsch.aff)
-	(cd ${PREFIX}/lib && ${LN} -s german.hash deutsch.hash)
-	(cd ${PREFIX}/lib && ${LN} -s german.aff ngerman.aff)
-	(cd ${PREFIX}/lib && ${LN} -s german.hash ngerman.hash)
+	${INSTALL_DATA} ${WRKSRC}/ispell/*.aff ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/ispell/*.hash ${PREFIX}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-german/PLIST b/textproc/ispell-german/PLIST
index 769a6b4df09..9c66cb6968d 100644
--- a/textproc/ispell-german/PLIST
+++ b/textproc/ispell-german/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/12 19:54:51 recht Exp $
-lib/deutsch.aff
-lib/deutsch.hash
-lib/german.aff
-lib/german.hash
-lib/ngerman.aff
-lib/ngerman.hash
+@comment $NetBSD: PLIST,v 1.4 2008/11/10 18:15:05 wiz Exp $
+lib/de_AT.aff
+lib/de_AT.hash
+lib/de_CH.aff
+lib/de_CH.hash
+lib/de_DE.aff
+lib/de_DE.hash
diff --git a/textproc/ispell-german/distinfo b/textproc/ispell-german/distinfo
index 3582cdf1770..c37cfb7ebde 100644
--- a/textproc/ispell-german/distinfo
+++ b/textproc/ispell-german/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.9 2008/11/10 18:15:05 wiz Exp $
 
-SHA1 (igerman98-20030222.tar.bz2) = 3c453257cab294260fc2157b175a3ab1318c5ade
-RMD160 (igerman98-20030222.tar.bz2) = f532e14e3c60e6a7b543f92e173f8dca1a5aad63
-Size (igerman98-20030222.tar.bz2) = 305783 bytes
-SHA1 (patch-aa) = a9905826bf120cdf3a54a387cd08ef2ed5428f99
+SHA1 (igerman98-20081106.tar.bz2) = 8416e1f07bd53be48bce677622ff14f823001b74
+RMD160 (igerman98-20081106.tar.bz2) = c6f1ea67302892078b717b4edd03fa74f85d37a0
+Size (igerman98-20081106.tar.bz2) = 470769 bytes
+SHA1 (patch-aa) = 2ee4437296f744a8481b7f9f9f0458ff762587b3
diff --git a/textproc/ispell-german/patches/patch-aa b/textproc/ispell-german/patches/patch-aa
index bcd6481aca5..7536a3fa07d 100644
--- a/textproc/ispell-german/patches/patch-aa
+++ b/textproc/ispell-german/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2004/12/01 12:27:44 markd Exp $
+$NetBSD: patch-aa,v 1.5 2008/11/10 18:15:05 wiz Exp $
 
---- Makefile.orig	2003-02-08 01:40:58.000000000 +1300
+--- Makefile.orig	2008-11-06 19:04:26.000000000 +0000
 +++ Makefile
-@@ -50,8 +50,8 @@ DESTDIR =
- MAKE = make
- BUILDHASH = buildhash
- ISPELL = ispell
+@@ -80,8 +80,8 @@ HUNSPELL_BIN = hunspell
+ # we need to make sure we use latin1:
+ HUNSPELL = $(HUNSPELL_BIN) `$(HUNSPELL_BIN) -h 2>&1 | grep -q "hunspell \\-i" && echo "-i latin1"`
+ 
 -SQ = sq
 -UNSQ = unsq
 +SQ = ../bin/sq.pl
@@ -13,21 +13,3 @@ $NetBSD: patch-aa,v 1.4 2004/12/01 12:27:44 markd Exp $
  #   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
-@@ -209,14 +209,14 @@ clean:
- 
- sort:
- 	@if grep [äöüÄÖÜß] dicts/*.txt ;then echo "!!! wrong characters in dictionay files !!!";exit 1;fi
--	cd dicts; find . -name "*.txt" |while read i; do sort -u -o $$i $$i; done
-+	cd dicts; find . -name "*.txt" -print |while read i; do sort -u -o $$i $$i; done
- 
- pack: sort
- 	rm -f unpack
--	cd dicts; find . -name "*.txt" |while read i; do $(SQ) < $$i > $$i.sq && rm $$i; done
-+	cd dicts; find . -name "*.txt" -print |while read i; do $(SQ) < $$i > $$i.sq && rm $$i; done
- 
- unpack:
--	cd dicts; find . -name "*.sq" |while read i; do $(UNSQ) < $$i > `basename $$i .sq` && rm $$i; done
-+	cd dicts; find . -name "*.sq" -print |while read i; do $(UNSQ) < $$i > `basename $$i .sq` && rm $$i; done
- 	touch unpack
- 
- dist: sort pack clean