Hello,
Here is an update for German dictionary in textproc/ispell, which covers
new spelling rules, as from 1 August 2005 required. The current in-tree
dictionary is definitive obsolete and should not be used.
Please test and comment.
--
Dimitri Sokolyuk - <[EMAIL PROTECTED]> - http://vhost.dyndns.org
PGP Key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x390AD060
Key Fingerprint: D141 A572 9D44 1BAD 30AF - 4D7F 0BAC D820 390A D060
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/ispell/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- Makefile 2005/02/21 21:04:13 1.41
+++ Makefile 2005/07/24 12:07:04
@@ -12,7 +12,7 @@
VERSION= 3.2.06
DISTNAME= ispell-${VERSION}
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= textproc
MAINTAINER= Jakob Schlyter <[EMAIL PROTECTED]>
@@ -23,7 +23,7 @@
ftp://ftp.netsw.org/dict/tools/
MASTER_SITES0= ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/
MASTER_SITES1= ftp://ftp.robot.ireq.ca/pub/ispell/
-MASTER_SITES2= ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/
+MASTER_SITES2= http://j3e.de/ispell/igerman98/dict/
MASTER_SITES3= http://www.sslug.dk/locale/ispell/iswedish/
MASTER_SITES4= ftp://mch5.chem.msu.su/pub/russian/ispell/ \
ftp://ftp.afti.nsu.ru/pub/mirrors/russian-ispell/
@@ -35,7 +35,7 @@
DUTCH_DICT= ispell-nl-1.0.0
FRENCH_DICT= francais-IREQ-1.4
-GERMAN_DICT= hk2-deutsch
+GERMAN_DICT= igerman98-20030222
SWEDISH_DICT= iswedish-1.2.1
RUSSIAN_DICT= rus-ispell-0.99e7
PORTUGUESE_DICT= UMportugues
@@ -45,7 +45,7 @@
DISTFILES= ${DISTNAME}.tar.gz \
${DUTCH_DICT}.tar.gz:0 \
${FRENCH_DICT}.tar.gz:1 \
- ${GERMAN_DICT}.tar.gz:2 \
+ ${GERMAN_DICT}.tar.bz2:2 \
${SWEDISH_DICT}.tar.gz:3 \
${RUSSIAN_DICT}.tar.gz:4 \
${PORTUGUESE_DICT}.tgz:5 \
@@ -54,6 +54,7 @@
EXTRACT_ONLY= ${DISTNAME}.tar.gz \
${DUTCH_DICT}.tar.gz \
+ ${GERMAN_DICT}.tar.bz2 \
${SWEDISH_DICT}.tar.gz \
${PORTUGUESE_DICT}.tgz \
${SLOVAK_DICT}.tar.gz \
@@ -64,7 +65,7 @@
MULTI_PACKAGES= -dutch -french -german -swedish -russian -portuguese \
-slovak -spanish
.for i in ${MULTI_PACKAGES}
-PKGNAME$i= ispell$i-${VERSION}p0
+PKGNAME$i= ispell$i-${VERSION}p1
.endfor
SUBPACKAGE?=
@@ -78,13 +79,6 @@
WANTLIB= c termcap
.endif
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-german"
-PERMIT_PACKAGE_CDROM= "no license"
-PERMIT_PACKAGE_FTP= "no license"
-PERMIT_DISTFILES_CDROM= "no license"
-PERMIT_DISTFILES_FTP= "no license"
-.endif
-
.if defined(PACKAGING) && !empty(SUBPACKAGE)
RUN_DEPENDS= ::textproc/ispell
.endif
@@ -98,10 +92,6 @@
@(cd ${WRKDIR}/french; \
tar xzf ${FULLDISTDIR}/${FRENCH_DICT}${EXTRACT_SUFX})
- @mkdir -p ${WRKDIR}/german
- @(cd ${WRKDIR}/german; \
- tar xzf ${FULLDISTDIR}/${GERMAN_DICT}${EXTRACT_SUFX})
-
@mkdir -p ${WRKDIR}/russian
@(cd ${WRKDIR}/russian; \
tar xzf ${FULLDISTDIR}/${RUSSIAN_DICT}${EXTRACT_SUFX})
@@ -126,9 +116,8 @@
@(cd ${WRKDIR}/french; \
$(MAKE) RM='rm -f' HASH=${WRKDIST}/buildhash)
- @(cd ${WRKDIR}/german; \
- sort -u *.txt | ./tex2iso >all.words; \
- ${WRKDIST}/buildhash all.words deutsch.aff deutsch.hash)
+ @(cd ${WRKDIR}/${GERMAN_DICT}; \
+ $(MAKE) ${MAKE_FLAGS} PATH=${PATH}:${WRKDIST})
@(cd ${WRKDIR}/${SWEDISH_DICT}; \
${WRKDIST}/buildhash svenska.datalista svenska.aff svenska.hash)
@@ -184,7 +173,7 @@
${INSTALL_DATA} ${WRKDIR}/${DUTCH_DICT}/nederlands.{aff,hash} \
${PREFIX}/lib/ispell
- ${INSTALL_DATA} ${WRKDIR}/german/deutsch.{aff,hash} \
+ ${INSTALL_DATA} ${WRKDIR}/${GERMAN_DICT}/german.{aff,hash} \
${PREFIX}/lib/ispell
${INSTALL_DATA} ${WRKDIR}/french/francais.{aff,hash} \
${PREFIX}/lib/ispell
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/ispell/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 2005/01/05 17:34:21 1.10
+++ distinfo 2005/07/24 12:07:04
@@ -1,7 +1,7 @@
MD5 (ispell/UMportugues.tgz) = 39fd3c33b13838ca1e9121c3d901b396
MD5 (ispell/espa~nol-1.7.tar.gz) = a5b5a6b1e3003d81a2c78648dd1c1362
MD5 (ispell/francais-IREQ-1.4.tar.gz) = 3871371b0f8e57b554f8895ce3a43b5a
-MD5 (ispell/hk2-deutsch.tar.gz) = 7fa72ab88d3ef466e35cf0721140b8ec
+MD5 (ispell/igerman98-20030222.tar.bz2) = 90e3d3f05d6517b389c75e7d2b46dc36
MD5 (ispell/ispell-3.2.06.tar.gz) = d434e1aef1a815294d5012c60c4c414a
MD5 (ispell/ispell-nl-1.0.0.tar.gz) = d9f8c68f28053e71792053e34201a28b
MD5 (ispell/ispell-sk-0.2.0.tar.gz) = 9b73c99b3a69995d26fbca7f0b1ac7ef
@@ -10,7 +10,7 @@
RMD160 (ispell/UMportugues.tgz) = b978d4511ed1cf8ef864ca4c220034e635b19563
RMD160 (ispell/espa~nol-1.7.tar.gz) = be9692aa6c97f0ecefc1143bffd8edc5ac22f019
RMD160 (ispell/francais-IREQ-1.4.tar.gz) =
9f11a627d84488c9cbbd37b75fbeae9060803f3d
-RMD160 (ispell/hk2-deutsch.tar.gz) = 8fe8dadac0ab8bead960915284b3fd89646db968
+RMD160 (ispell/igerman98-20030222.tar.bz2) =
f532e14e3c60e6a7b543f92e173f8dca1a5aad63
RMD160 (ispell/ispell-3.2.06.tar.gz) = 3f6a3840540ebc753146c427da8ce2d54317b46e
RMD160 (ispell/ispell-nl-1.0.0.tar.gz) =
8ee008a8e0e57ffe2e90952bccf16a0dbeb75a85
RMD160 (ispell/ispell-sk-0.2.0.tar.gz) =
049fc933aa62ef51dba836b3effca77f2b3c4be7
@@ -19,7 +19,7 @@
SHA1 (ispell/UMportugues.tgz) = c69d7cca0983421dd9668aa93d21b648ca89f0c6
SHA1 (ispell/espa~nol-1.7.tar.gz) = de8a2f2dbab0d3658aecd7ef109e91773da23dd7
SHA1 (ispell/francais-IREQ-1.4.tar.gz) =
940712167cd2d40c27e673246b8ce9f99595a309
-SHA1 (ispell/hk2-deutsch.tar.gz) = 4e6364b65981be8002acbb65618bdbc646eb5663
+SHA1 (ispell/igerman98-20030222.tar.bz2) =
3c453257cab294260fc2157b175a3ab1318c5ade
SHA1 (ispell/ispell-3.2.06.tar.gz) = 35f496322cda172d56610417e4e1c7b962f734d7
SHA1 (ispell/ispell-nl-1.0.0.tar.gz) = 06934146b6f69ca6ed6f7b8b3300dc1880418d46
SHA1 (ispell/ispell-sk-0.2.0.tar.gz) = 9e3062bcd711dd8b9c4e3e08628043b6d608fee7
@@ -28,7 +28,7 @@
SIZE (ispell/UMportugues.tgz) = 141110
SIZE (ispell/espa~nol-1.7.tar.gz) = 424599
SIZE (ispell/francais-IREQ-1.4.tar.gz) = 326207
-SIZE (ispell/hk2-deutsch.tar.gz) = 375750
+SIZE (ispell/igerman98-20030222.tar.bz2) = 305783
SIZE (ispell/ispell-3.2.06.tar.gz) = 580742
SIZE (ispell/ispell-nl-1.0.0.tar.gz) = 480570
SIZE (ispell/ispell-sk-0.2.0.tar.gz) = 586439
Index: patches/patch-igerman98-20030222_Makefile
===================================================================
RCS file: patches/patch-igerman98-20030222_Makefile
diff -N patches/patch-igerman98-20030222_Makefile
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patches/patch-igerman98-20030222_Makefile Sun Jul 24 12:07:04 2005
@@ -0,0 +1,39 @@
+--- ../igerman98-20030222/Makefile.orig Fri Feb 7 13:40:58 2003
++++ ../igerman98-20030222/Makefile Sun Jul 24 10:53:28 2005
+@@ -1,10 +1,4 @@
+ WORTE = \
+- adjektive-a.txt \
+- anglizismen-a.txt \
+- verben-a.txt \
+- klein-a.txt \
+- worte-a.txt \
+- \
+ adjektive-n.txt \
+ anglizismen-n.txt \
+ klein-n.txt \
+@@ -51,13 +45,13 @@
+ 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
++UNSQ = ../bin/unsq.pl
+
+ ASPELL = aspell
+-vpath %.txt ./dicts
++#vpath %.txt ./dicts
+ .SUFFIXES: .txt
+
+ # to let `sort' behave right: setting LC_ALL ist not enough, because
+@@ -82,7 +76,7 @@
+ mv [EMAIL PROTECTED] $@
+
+ all.words: all.words.raw german.aff
+- munchlist -l ./german.aff all.words.raw > $@
++ munchlist -v -l ./german.aff all.words.raw > $@
+
+ install: german.hash
+ mkdir -p $(DESTDIR)$(ISPELLIBDIR)
Index: pkg/PLIST-german
===================================================================
RCS file: /cvs/ports/textproc/ispell/pkg/PLIST-german,v
retrieving revision 1.4
diff -u -r1.4 PLIST-german
--- pkg/PLIST-german 2004/12/25 22:37:36 1.4
+++ pkg/PLIST-german 2005/07/24 12:07:04
@@ -1,3 +1,3 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-german,v 1.4 2004/12/25 22:37:36 sturm Exp $
-lib/ispell/deutsch.aff
-lib/ispell/deutsch.hash
[EMAIL PROTECTED] $OpenBSD$
+lib/ispell/german.aff
+lib/ispell/german.hash
