From 8da1e3e7bc316e9cacb6ade3e6320dd9615e1c6b Mon Sep 17 00:00:00 2001 From: jakob Date: Wed, 11 Jul 2001 12:34:28 +0000 Subject: [PATCH] add russion dictionary and clean up patches; dfa@solo.ee --- textproc/ispell/Makefile | 22 ++++++++++++++++--- textproc/ispell/files/md5 | 3 +++ .../patches/{patch-ab => patch-Makefile} | 0 .../patches/{patch-ac => patch-ispell.c} | 0 .../{patch-ae => patch-ispell.texinfo} | 0 ...h-af => patch-languages_english_english.2} | 0 ...h-ag => patch-languages_english_english.3} | 0 .../patches/{patch-ah => patch-local.h.samp} | 15 +++++++++---- .../ispell/patches/{patch-aa => patch-sq.c} | 0 .../ispell/patches/{patch-ad => patch-unsq.c} | 0 textproc/ispell/pkg/DESCR-russian | 6 +++++ textproc/ispell/pkg/PLIST-russian | 6 +++++ textproc/ispell/scripts/configure | 1 - 13 files changed, 45 insertions(+), 8 deletions(-) rename textproc/ispell/patches/{patch-ab => patch-Makefile} (100%) rename textproc/ispell/patches/{patch-ac => patch-ispell.c} (100%) rename textproc/ispell/patches/{patch-ae => patch-ispell.texinfo} (100%) rename textproc/ispell/patches/{patch-af => patch-languages_english_english.2} (100%) rename textproc/ispell/patches/{patch-ag => patch-languages_english_english.3} (100%) rename textproc/ispell/patches/{patch-ah => patch-local.h.samp} (55%) rename textproc/ispell/patches/{patch-aa => patch-sq.c} (100%) rename textproc/ispell/patches/{patch-ad => patch-unsq.c} (100%) create mode 100644 textproc/ispell/pkg/DESCR-russian create mode 100644 textproc/ispell/pkg/PLIST-russian diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile index a90f025cb89..8db17df9ff6 100644 --- a/textproc/ispell/Makefile +++ b/textproc/ispell/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.22 2001/07/09 17:34:11 jakob Exp $ +# $OpenBSD: Makefile,v 1.23 2001/07/11 12:34:28 jakob Exp $ # Original from: Ejovi Nuwere COMMENT= interactive spelling checker COMMENT-french= ispell dictionary for French COMMENT-german= ispell dictionary for German COMMENT-swedish= ispell dictionary for Swedish +COMMENT-russian= ispell dictionary for Russian VERSION= 3.1.20 DISTNAME= ispell-${VERSION} @@ -20,18 +21,21 @@ MASTER_SITES0= ftp://ftp.robot.ireq.ca/pub/ispell/ MASTER_SITES1= ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/ MASTER_SITES2= ftp://ftp.kiarchive.ru/pub/unix/text/ispell/ 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/ DIST_SUBDIR= ispell FRENCH_DICT= francais-IREQ-1.4 GERMAN_DICT= hk2-deutsch SWEDISH_DICT= iswedish-1.2.1 +RUSSIAN_DICT= rus-ispell-0.99e1 -DISTFILES= ${DISTNAME}.tar.gz ${FRENCH_DICT}.tar.gz:0 ${GERMAN_DICT}.tar.gz:1 ${SWEDISH_DICT}.tar.gz:3 +DISTFILES= ${DISTNAME}.tar.gz ${FRENCH_DICT}.tar.gz:0 ${GERMAN_DICT}.tar.gz:1 ${SWEDISH_DICT}.tar.gz:3 ${RUSSIAN_DICT}.tar.gz:4 EXTRACT_ONLY= ${DISTNAME}.tar.gz ${SWEDISH_DICT}.tar.gz PATCHFILES= ispell-html-mode.patch:2 -MULTI_PACKAGES= -french -german -swedish +MULTI_PACKAGES= -french -german -swedish -russian .for i in ${MULTI_PACKAGES} PKGNAME$i= ispell$i-${VERSION} .endfor @@ -53,6 +57,10 @@ post-extract: @(cd ${WRKDIR}/german; \ tar xzf ${DISTDIR}/${DIST_SUBDIR}/${GERMAN_DICT}.tar.gz) + @mkdir -p ${WRKDIR}/russian + @(cd ${WRKDIR}/russian; \ + tar xzf ${DISTDIR}/${DIST_SUBDIR}/${RUSSIAN_DICT}.tar.gz) + post-configure: @echo "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h @@ -70,6 +78,12 @@ post-build: @(cd ${WRKDIR}/${SWEDISH_DICT}; \ ${WRKDIST}/buildhash svenska.datalista svenska.aff svenska.hash) + @(cd ${WRKDIR}/russian; \ + cat base.koi computer.koi geography.koi science.koi >russian.sml; \ + cat russian.aff.koi | sed -e "s/^\#y//;s/^\#koi/wordchars/" \ + > russian.aff; \ + ${WRKDIST}/buildhash russian.sml russian.aff russian.hash) + do-install: ${INSTALL_PROGRAM} ${WRKDIST}/ispell ${PREFIX}/bin/ispell ${INSTALL_PROGRAM} ${WRKDIST}/buildhash ${PREFIX}/bin/buildhash @@ -114,5 +128,7 @@ do-install: ${PREFIX}/lib/ispell ${INSTALL_DATA} ${WRKDIR}/${SWEDISH_DICT}/svenska.{aff,hash} \ ${PREFIX}/lib/ispell + ${INSTALL_DATA} ${WRKDIR}/russian/russian.{aff,hash} \ + ${PREFIX}/lib/ispell .include diff --git a/textproc/ispell/files/md5 b/textproc/ispell/files/md5 index 9518e364560..6524cd792f7 100644 --- a/textproc/ispell/files/md5 +++ b/textproc/ispell/files/md5 @@ -3,13 +3,16 @@ MD5 (ispell/hk2-deutsch.tar.gz) = 7fa72ab88d3ef466e35cf0721140b8ec MD5 (ispell/ispell-3.1.20.tar.gz) = 92986f940548fe4116428d21b16fd356 MD5 (ispell/ispell-html-mode.patch) = 1b44441a3748e55b3d509fcff21af4b7 MD5 (ispell/iswedish-1.2.1.tar.gz) = b546aeb88d7614c32e541488d55f32fe +MD5 (ispell/rus-ispell-0.99e1.tar.gz) = 54839b53518b1fd559440b683edbbdd0 RMD160 (ispell/francais-IREQ-1.4.tar.gz) = 9f11a627d84488c9cbbd37b75fbeae9060803f3d RMD160 (ispell/hk2-deutsch.tar.gz) = 8fe8dadac0ab8bead960915284b3fd89646db968 RMD160 (ispell/ispell-3.1.20.tar.gz) = 97ff82cdd3289d9c911093ca41974bc61314a36d RMD160 (ispell/ispell-html-mode.patch) = 0a25a3f437cbf132fc90a83180cb39790634654a RMD160 (ispell/iswedish-1.2.1.tar.gz) = 4d5a040018b12d06f4d8f45f89eb775ba6f88aab +RMD160 (ispell/rus-ispell-0.99e1.tar.gz) = 555ab6461915a8695f299dd087471cbf1e4dd5b2 SHA1 (ispell/francais-IREQ-1.4.tar.gz) = 940712167cd2d40c27e673246b8ce9f99595a309 SHA1 (ispell/hk2-deutsch.tar.gz) = 4e6364b65981be8002acbb65618bdbc646eb5663 SHA1 (ispell/ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e SHA1 (ispell/ispell-html-mode.patch) = 70819796a3873453c63d939935f78c398ec98003 SHA1 (ispell/iswedish-1.2.1.tar.gz) = c26c851123a427b495ca9ac10c443ec23efa8e3a +SHA1 (ispell/rus-ispell-0.99e1.tar.gz) = 88e951f2d1aa1173a9c164fa990a464dd776dbb0 diff --git a/textproc/ispell/patches/patch-ab b/textproc/ispell/patches/patch-Makefile similarity index 100% rename from textproc/ispell/patches/patch-ab rename to textproc/ispell/patches/patch-Makefile diff --git a/textproc/ispell/patches/patch-ac b/textproc/ispell/patches/patch-ispell.c similarity index 100% rename from textproc/ispell/patches/patch-ac rename to textproc/ispell/patches/patch-ispell.c diff --git a/textproc/ispell/patches/patch-ae b/textproc/ispell/patches/patch-ispell.texinfo similarity index 100% rename from textproc/ispell/patches/patch-ae rename to textproc/ispell/patches/patch-ispell.texinfo diff --git a/textproc/ispell/patches/patch-af b/textproc/ispell/patches/patch-languages_english_english.2 similarity index 100% rename from textproc/ispell/patches/patch-af rename to textproc/ispell/patches/patch-languages_english_english.2 diff --git a/textproc/ispell/patches/patch-ag b/textproc/ispell/patches/patch-languages_english_english.3 similarity index 100% rename from textproc/ispell/patches/patch-ag rename to textproc/ispell/patches/patch-languages_english_english.3 diff --git a/textproc/ispell/patches/patch-ah b/textproc/ispell/patches/patch-local.h.samp similarity index 55% rename from textproc/ispell/patches/patch-ah rename to textproc/ispell/patches/patch-local.h.samp index e44233fdba5..59b25ca0aac 100644 --- a/textproc/ispell/patches/patch-ah +++ b/textproc/ispell/patches/patch-local.h.samp @@ -1,6 +1,13 @@ ---- local.h.samp.orig Fri Jun 16 02:38:42 2000 -+++ local.h.samp Fri Jun 16 02:41:19 2000 -@@ -87,7 +87,7 @@ +--- local.h.samp.orig Mon Jan 23 20:28:27 1995 ++++ local.h.samp Sat Jul 7 07:04:21 2001 +@@ -80,14 +80,13 @@ + */ + + #define MINIMENU /* Display a mini-menu at the bottom of the screen */ +-#define NO8BIT /* Remove this if you use ISO character sets */ + #undef USG /* Define this on System V */ + + /* * Important directory paths */ #define BINDIR "/usr/local/bin" @@ -9,7 +16,7 @@ #define ELISPDIR "/usr/local/lib/emacs/site-lisp" #define TEXINFODIR "/usr/local/info" #define MAN1DIR "/usr/local/man/man1" -@@ -96,3 +96,5 @@ +@@ -96,3 +95,5 @@ /* * Place any locally-required #include statements here */ diff --git a/textproc/ispell/patches/patch-aa b/textproc/ispell/patches/patch-sq.c similarity index 100% rename from textproc/ispell/patches/patch-aa rename to textproc/ispell/patches/patch-sq.c diff --git a/textproc/ispell/patches/patch-ad b/textproc/ispell/patches/patch-unsq.c similarity index 100% rename from textproc/ispell/patches/patch-ad rename to textproc/ispell/patches/patch-unsq.c diff --git a/textproc/ispell/pkg/DESCR-russian b/textproc/ispell/pkg/DESCR-russian new file mode 100644 index 00000000000..b0b47b08d23 --- /dev/null +++ b/textproc/ispell/pkg/DESCR-russian @@ -0,0 +1,6 @@ +Ispell is a fast screen-oriented spelling checker that shows you your +errors in the context of the original file, and suggests possible +corrections when it can figure them out. Compared to UNIX spell, it +is faster and much easier to use. This package adds a Russian +dictionary that can be used by ispell. + diff --git a/textproc/ispell/pkg/PLIST-russian b/textproc/ispell/pkg/PLIST-russian new file mode 100644 index 00000000000..7e55dbc4acc --- /dev/null +++ b/textproc/ispell/pkg/PLIST-russian @@ -0,0 +1,6 @@ +@comment $OpenBSD: PLIST-russian,v 1.1 2001/07/11 12:34:33 jakob Exp $ +@pkgdep ispell-3.1.20 +lib/ispell/russian.aff +lib/ispell/russian.hash +@exec echo 'invoking %D/bin/ispell-config' +@exec %D/bin/ispell-config diff --git a/textproc/ispell/scripts/configure b/textproc/ispell/scripts/configure index a37ae3da7c0..725750a0652 100644 --- a/textproc/ispell/scripts/configure +++ b/textproc/ispell/scripts/configure @@ -11,7 +11,6 @@ fi cd $WRKSRC || exit 1; sed -e s:/usr/local:$PREFIX: local.h || exit 1; -echo "#undef NO8BIT" >> local.h echo "#define LANGUAGES \"{british,MASTERDICTS=british.xlg,HASHFILES=britishxlg.hash,EXTRADICT=} {american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=/usr/share/dict/words}$LOCAL\"" >> local.h || exit 1; echo '#define MASTERHASH "britishxlg.hash"' >> local.h