Tue Nov 11 14:17:34 2008 UTC ()
Update to 20081106:

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


(wiz)
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/hunspell-de/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/hunspell-de/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/hunspell-de/distinfo
diff -r0 -r1.1 pkgsrc/textproc/hunspell-de/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/hunspell-de/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/hunspell-de/Makefile 2007/09/11 18:37:27 1.1.1.1
+++ pkgsrc/textproc/hunspell-de/Makefile 2008/11/11 14:17:34 1.2
@@ -1,32 +1,38 @@ @@ -1,32 +1,38 @@
1# $NetBSD: Makefile,v 1.1.1.1 2007/09/11 18:37:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2008/11/11 14:17:34 wiz Exp $
2# 2#
3 3
4VERSION= 20070829 4DISTNAME= igerman98-20081106
5# bogus by purpose 5PKGNAME= ${DISTNAME:S/igerman98/hunspell-de/}
6DISTNAME= hunspell-de-${VERSION} 
7CATEGORIES= textproc 6CATEGORIES= textproc
8MASTER_SITES= http://www.j3e.de/hunspell/ 7MASTER_SITES= http://www.j3e.de/ispell/igerman98/dict/
9DISTFILES= de_AT-${VERSION}.zip de_CH-${VERSION}.zip de_DE-${VERSION}.zip 8EXTRACT_SUFX= .tar.bz2
10EXTRACT_SUFX= .zip 
11 9
12MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.j3e.de/ispell/igerman98/ 11HOMEPAGE= http://www.j3e.de/ispell/igerman98/
14COMMENT= German dictionaries for hunspell 12COMMENT= German dictionaries for hunspell
15 13
16DIST_SUBDIR= hunspell-dictionaries 14BUILD_DEPENDS+= ispell-base>=3.1.20nb1:../../textproc/ispell-base
17# don't want -L 15DEPENDS+= hunspell>=1.1.5:../../textproc/hunspell
18EXTRACT_OPTS_ZIP= -aqo 
19 16
20WRKSRC= ${WRKDIR} 
21USE_LANGUAGES= # none 17USE_LANGUAGES= # none
22 18
23INSTALLATION_DIRS= share/hunspell share/doc/hunspell-de 19BUILD_TARGET= hunspell-all
 20USE_TOOLS+= gmake perl sed
 21REPLACE_PERL= bin/clear_affix.pl bin/dic2iso.pl bin/grepl bin/lcfirst.pl \
 22 bin/sq.pl bin/uniqflag.pl bin/unsq.pl bin/extractlines.pl \
 23 bin/hunspell-optimize-roothelper.pl bin/myspellfixprefix.pl
 24
 25SUBST_CLASSES+= sed
 26SUBST_FILES.sed= bin/clear_affix bin/dic2iso bin/iso2dic bin/iso2tex \
 27 bin/tex2iso bin/conv_dict_de_CH
 28SUBST_SED.sed= -e "s,/bin/sed,${SED},"
 29SUBST_STAGE.sed= pre-build
 30SUBST_MESSAGE.sed= Fixing path to sed.
24 31
25do-build: 32INSTALLATION_DIRS= share/hunspell
26 33
27do-install: 34do-install:
28 ${INSTALL_DATA} ${WRKSRC}/de* ${PREFIX}/share/hunspell 35 ${INSTALL_DATA} ${WRKSRC}/hunspell/de*aff ${PREFIX}/share/hunspell
29 ${INSTALL_DATA} ${WRKSRC}/[CR]* ${PREFIX}/share/doc/hunspell-de 36 ${INSTALL_DATA} ${WRKSRC}/hunspell/de*dic ${PREFIX}/share/hunspell
30 ${INSTALL_DATA} ${WRKSRC}/dict* ${PREFIX}/share/doc/hunspell-de 
31 37
32.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/hunspell-de/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/hunspell-de/PLIST 2007/09/11 18:37:27 1.1.1.1
+++ pkgsrc/textproc/hunspell-de/PLIST 2008/11/11 14:17:34 1.2
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2007/09/11 18:37:27 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2008/11/11 14:17:34 wiz Exp $
2share/doc/hunspell-de/COPYING 
3share/doc/hunspell-de/COPYING_OASIS 
4share/doc/hunspell-de/Copyright 
5share/doc/hunspell-de/dictionary.lst.example 
6share/doc/hunspell-de/README_de_AT.txt 
7share/doc/hunspell-de/README_de_CH.txt 
8share/doc/hunspell-de/README_de_DE.txt 
9share/hunspell/de_AT.aff 2share/hunspell/de_AT.aff
10share/hunspell/de_AT.dic 3share/hunspell/de_AT.dic
 4share/hunspell/de_AT_small.aff
 5share/hunspell/de_AT_small.dic
11share/hunspell/de_CH.aff 6share/hunspell/de_CH.aff
12share/hunspell/de_CH.dic 7share/hunspell/de_CH.dic
 8share/hunspell/de_CH_small.aff
 9share/hunspell/de_CH_small.dic
13share/hunspell/de_DE.aff 10share/hunspell/de_DE.aff
14share/hunspell/de_DE.dic 11share/hunspell/de_DE.dic
 12share/hunspell/de_DE_small.aff
 13share/hunspell/de_DE_small.dic
15@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE} 14@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE}
16@dirrm share/doc/hunspell-de 
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/hunspell-de/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/hunspell-de/distinfo 2007/09/11 18:37:27 1.1.1.1
+++ pkgsrc/textproc/hunspell-de/distinfo 2008/11/11 14:17:34 1.2
@@ -1,11 +1,6 @@ @@ -1,11 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2007/09/11 18:37:27 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2008/11/11 14:17:34 wiz Exp $
2 2
3SHA1 (hunspell-dictionaries/de_AT-20070829.zip) = 1753360c700e65ddbd90b2bd5e6804de4ad1fbd5 3SHA1 (igerman98-20081106.tar.bz2) = 8416e1f07bd53be48bce677622ff14f823001b74
4RMD160 (hunspell-dictionaries/de_AT-20070829.zip) = 1820bc3c80dac52f1ced315e1e8dd8487f22eec7 4RMD160 (igerman98-20081106.tar.bz2) = c6f1ea67302892078b717b4edd03fa74f85d37a0
5Size (hunspell-dictionaries/de_AT-20070829.zip) = 299833 bytes 5Size (igerman98-20081106.tar.bz2) = 470769 bytes
6SHA1 (hunspell-dictionaries/de_CH-20070829.zip) = 79a0575e8e1dcb4226c6609cb74bd3c48c073c68 6SHA1 (patch-aa) = Size (igerman98-20081106.tar.bz2) = 470769 bytes
7RMD160 (hunspell-dictionaries/de_CH-20070829.zip) = c91f2a9c4dc0c1b3498cbbdc48ce7aaf5595a68a 
8Size (hunspell-dictionaries/de_CH-20070829.zip) = 305794 bytes 
9SHA1 (hunspell-dictionaries/de_DE-20070829.zip) = e81be462afae2a43bb7ff04b3b0b86370027e3d9 
10RMD160 (hunspell-dictionaries/de_DE-20070829.zip) = a8e0557b1c487687238f0cd87545f7e8443968f5 
11Size (hunspell-dictionaries/de_DE-20070829.zip) = 298720 bytes 
File Added: pkgsrc/textproc/hunspell-de/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2008/11/11 14:17:34 wiz Exp $

--- Makefile.orig	2008-11-06 20:04:26.000000000 +0100
+++ Makefile
@@ -192,7 +192,7 @@ myspell/$(1).dic: $$(WORDS_$(1)) $$(WORD
 	cat $$(WORDS_$(1)) $$(WORDS_de_all) dicts/abkuerzpunkt.txt \
 		| (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) \
 		| ./bin/myspell-generic-process.sh  > $$@.tmp
-	wc -l < $$@.tmp > $$@
+	wc -l < $$@.tmp | sed "s/^ *//" > $$@
 	cat myspell/de_all.dic.header | $(SED) "s/AFF_VERSION_REPLACE/$(VERSION_STRING)/;s/LANG_REPLACE/$(1)/" >> $$@
 	./bin/dic2iso < $$@.tmp >> $$@
 	$(RM_OR_NOT) $$@.tmp
@@ -297,7 +297,7 @@ hunspell/$(1)_small.dic: $$(HUNSPELL_DIC
 		| (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) \
 		| ./bin/hunspell-generic-process.sh \
 		> $$@.tmp
-	wc -l < $$@.tmp > $$@
+	wc -l < $$@.tmp | sed "s/^ *//" > $$@
 	cat myspell/de_all.dic.header | \
 		$(SED) "s/AFF_VERSION_REPLACE/$(VERSION_STRING)/;s/LANG_REPLACE/$(1)/;s/Myspell/Hunspell/" >> $$@
 	./bin/dic2iso < $$@.tmp >> $$@
@@ -314,7 +314,7 @@ hunspell/$(1).dic: $$(HUNSPELL_DICTS_ALL
 		| ./bin/hunspell-generic-process.sh	\
 		| ./bin/hunspell-optimize-roothelper.pl	\
 		> $$@.tmp
-	wc -l < $$@.tmp > $$@
+	wc -l < $$@.tmp | sed "s/^ *//" > $$@
 	cat myspell/de_all.dic.header | $(SED) "s/AFF_VERSION_REPLACE/$$(VERSION_STRING)/;s/LANG_REPLACE/$(1)/;s/Myspell/Hunspell/" >> $$@
 	./bin/dic2iso < $$@.tmp >> $$@
 	$(RM_OR_NOT) $$@.tmp
@@ -365,7 +365,7 @@ huntest: hunspell/hunspell-test.txt
 	# so this is the lesser evil. No perfect solution found so far...
 	cat hunspell/hunspell-test.txt |$(HUNSPELL) -L -d hunspell/de_DE > $@.tmp 2>&1
 	@if `grep -q "^0 " $@.tmp`;then echo "Huntest NICHT bestanden:"; cat $@.tmp; exit 1;fi
-	@if ! test "`wc -l < $@.tmp`" = "`tail -n 1 $@.tmp | cut -f1 -d:`";then echo "Huntest NICHT bestanden (Zu viele als korrekt erkannte Wörter):"; cat $@.tmp; exit 1;fi
+	@if ! test "`wc -l < $@.tmp | sed 's/^ *//'`" = "`tail -n 1 $@.tmp | cut -f1 -d:`";then echo "Huntest NICHT bestanden (Zu viele als korrekt erkannte Wörter):"; cat $@.tmp; exit 1;fi
 
 
 ###