From owner-freebsd-ports Thu Jan 6 8: 0:21 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id C2D7B15672 for ; Thu, 6 Jan 2000 08:00:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA71580; Thu, 6 Jan 2000 08:00:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from cichlids.com (as15-045.rp-plus.de [149.221.237.45]) by hub.freebsd.org (Postfix) with ESMTP id 73021155DE for ; Thu, 6 Jan 2000 07:50:33 -0800 (PST) (envelope-from alex@cichlids.com) Received: from cichlids.cichlids.com (cichlids.cichlids.com [192.168.0.10]) by cichlids.com (Postfix) with ESMTP id 3880DAB90 for ; Thu, 6 Jan 2000 16:31:48 +0100 (CET) Received: (from alex@localhost) by cichlids.cichlids.com (8.9.3/8.9.3) id QAA03004; Thu, 6 Jan 2000 16:32:44 +0100 (CET) (envelope-from alex) Message-Id: <200001061532.QAA03004@cichlids.cichlids.com> Date: Thu, 6 Jan 2000 16:32:44 +0100 (CET) From: Alexander Langer Reply-To: alex@cichlids.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/15948: include dictionaries into textproc/ispell Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 15948 >Category: ports >Synopsis: include dictionaries into textproc/ispell >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 6 08:00:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: Alexander Langer >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: ports from tonight. >Description: As discussed (in -ports or cvs-all, don't know), this PR includes additional ispell-dictionaries into the ispell-port. You can build them with ISPELL_=SOMEVALUE Currently: * French --> FR * Swedish --> SE * Brasilian --> BR * German (old and new spelling) --> DEALT and DENEU I changed the configure script and stuff, the language handling is more complex now. the french-only part was a little buggy before and not extendable. It's a little ugly, because some dictionaries don't have a SUBDIR. Thus I handle it with post-extract. I use NO_WRKSUBDIR but a special Makefile in files/Makefile for building, that builds all important parts. the files/md5 also included an unneeded checksum. Maybe a relict. Also - jmz forgot, that the ispell's PLIST for british has additional files (british.*), that were not mentioned in pkg/PLIST. I fixed this. We now have different PLIST.{SE,BRITISH,FR,DEALT,...}, that are build to a common PLIST for the port. This PR supercedes (sp?) at least one PR by me (ispell-dictionaries) and two ports (textproc/{br,se}-ispell) >How-To-Repeat: n/a >Fix: diff -rNu ispell.old/Makefile ispell/Makefile --- ispell.old/Makefile Thu Dec 30 17:44:12 1999 +++ ispell/Makefile Fri Dec 31 12:11:05 1999 @@ -12,10 +12,10 @@ CATEGORIES= textproc elisp MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ \ ftp://ftp.kiarchive.ru/pub/unix/text/ispell/ -DISTFILES= ispell-3.1.20.tar.gz - -PATCH_SITES= ftp://ftp.kiarchive.ru/pub/unix/text/ispell/ -PATCHFILES= ispell-html-mode.patch +ISPELL_FILES= ispell-3.1.20.tar.gz +HTML_PATCH= ispell-html-mode.patch +DISTFILES= ${ISPELL_FILES} \ + ${HTML_PATCH} MAINTAINER= jmz@FreeBSD.org @@ -24,34 +24,108 @@ MAN4= ispell.4 english.4 MLINKS= ispell.1 buildhash.1 ispell.1 findaffix.1 ispell.1 munchlist.1\ ispell.1 tryaffix.1 sq.1 unsq.1 +EXTRACT_ONLY= ${ISPELL_FILES} +NO_WRKSUBDIR= yes +EXTRA_DICT= -.if !defined(ISPELL_FR) +.if (!defined(ISPELL_FR) && !defined (ISPELL_SE) && !defined(ISPELL_BR) && !defined(ISPELL_DENEU) && !defined(ISPELL_DEALT) && !defined(ISPELL_LANG)) .if (make(patch) || make(configure) || make(build) || make (install)) .BEGIN: @${ECHO_MSG} '*********************************************************' - @${ECHO_MSG} '* Note that you can build a french or british version *' - @${ECHO_MSG} '* by typing "make french" or "make british" *' + @${ECHO_MSG} '* Note that you can add build a british version by *' + @${ECHO_MSG} '* typing "make british" (port must be clean, type *' + @${ECHO_MSG} '* "make clean" to clean it). *' + @${ECHO_MSG} '* Additionally, you can add further dictionaries: *' + @${ECHO_MSG} '* Use make-flag: *' + @${ECHO_MSG} '* - French ISPELL_FR=yes *' + @${ECHO_MSG} '* - Brasilian ISPELL_BR=yes *' + @${ECHO_MSG} '* - German (old spelling) ISPELL_DEALT=yes *' + @${ECHO_MSG} '* - German (new spelling) ISPELL_DENEU=yes *' + @${ECHO_MSG} '* - Swedish ISPELL_SE=yes *' + @${ECHO_MSG} '* Example: "make ISPELL_FR=yes ISPELL_SE=yes british" *' @${ECHO_MSG} '*********************************************************' .endif .else -EXTRA_DICT= francais-IREQ-1.4.tar.gz +.if defined(ISPELL_FR) +FRDISTFILE= francais-IREQ-1.4.tar.gz +EXTRA_DICT+= ${FRDISTFILE} MASTER_SITES+= ftp://ftp.robot.ireq.ca/pub/ispell/ +.endif +.if defined(ISPELL_SE) +SEDISTFILE= iswedish-1.2.1.tar.gz +MASTER_SITES+= http://www.sslug.dk/locale/ispell/iswedish/ +EXTRA_DICT+= ${SEDISTFILE} +EXTRACT_ONLY+= ${SEDISTFILE} +.endif +.if defined(ISPELL_BR) +BRDISTFILE= br.ispell-2.3.tar.gz +EXTRA_DICT+= ${BRDISTFILE} +EXTRACT_ONLY+= ${BRDISTFILE} +MASTER_SITES+= ftp://ftp.ime.usp.br/pub/ueda/br.ispell/ +.endif +.if defined(ISPELL_DENEU) +DENEUDISTFILE= igerman98-19991219.tar.gz +EXTRA_DICT+= ${DENEUDISTFILE} +EXTRACT_ONLY+= ${DENEUDISTFILE} +MASTER_SITES+= http://members.xoom.com/maccy/ispell/dict/ \ + ftp://student.physik.uni-dortmund.de/pub/users/jacke/ispell/ +FETCH_BEFORE_ARGS+= -b # HTTP Workaround at Xoom +.endif +.if defined(ISPELL_DEALT) +DEALTDISTFILE= hk-deutsch.tar.gz +EXTRA_DICT+= ${DEALTDISTFILE} +MASTER_SITES+= ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/ +.endif DISTFILES+= ${EXTRA_DICT} .endif +ALL_TARGET= WRKDIR=${WRKDIR} SEDISTFILE=${SEDISTFILE} BRDISTFILE=${BRDISTFILE} all -pre-extract: -.if !defined(LANG) - @${ECHO_MSG} '******************************************************' - @${ECHO_MSG} '* Note that you can build a british version by *' - @${ECHO_MSG} '* typing "make british" following a "make clean" *' - @${ECHO_MSG} '******************************************************' +post-extract: +# generate PLIST + @cat ${.CURDIR}/pkg/PLIST.common > ${.CURDIR}/pkg/PLIST +.if defined(ISPELL_LANG) # British + @cat ${.CURDIR}/pkg/PLIST.BRITISH >> ${.CURDIR}/pkg/PLIST +.else # American + @cat ${.CURDIR}/pkg/PLIST.AM >> ${.CURDIR}/pkg/PLIST +.endif +.if defined(ISPELL_FR) + @${MKDIR} -p ${WRKDIR}/francais-IREQ + @${TAR} -C ${WRKDIR}/francais-IREQ -zxf ${PORTSDIR}/distfiles/${FRDISTFILE} + @cat ${.CURDIR}/pkg/PLIST.FR >> ${.CURDIR}/pkg/PLIST +.endif +.if defined(ISPELL_DEALT) + -@${MKDIR} ${WRKDIR}/hk-deutsch + @${TAR} -C ${WRKDIR}/hk-deutsch/ -zxf ${PORTSDIR}/distfiles/${DEALTDISTFILE} + @cat ${.CURDIR}/pkg/PLIST.DEALT >> ${.CURDIR}/pkg/PLIST +.endif +.if defined(ISPELL_DENEU) + @cat ${.CURDIR}/pkg/PLIST.DENEU >> ${.CURDIR}/pkg/PLIST .endif :x + @cat ${.CURDIR}/pkg/PLIST.BR >> ${.CURDIR}/pkg/PLIST +.endif +.if defined(ISPELL_SE) + @cat ${.CURDIR}/pkg/PLIST.SE >> ${.CURDIR}/pkg/PLIST +.endif + @${TOUCH} ${WRKSRC}/ispell-3.1/dummy + @${CP} ${FILESDIR}/Makefile ${WRKDIR}/Makefile -pre-configure: -.if defined(EXTRA_DICT) - @${ECHO} ${EXTRA_DICT} > ${WRKDIR}/extra_dict -.else - @${ECHO} -n +pre-patch: + @cd ${WRKDIR}/ispell-3.1/ && ${PATCH} < ${PORTSDIR}/distfiles/${HTML_PATCH} 2>/dev/null + +post-patch: +.if defined(ISPELL_FR) + @cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/FR.patch 2>/dev/null +.endif +.if defined(ISPELL_BR) + @cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/BR.patch 2>/dev/null + @cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/BR2.patch 2>/dev/null +.endif +.if defined(ISPELL_DENEU) + @cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/DENEU.patch 2>/dev/null +.endif +.if defined(ISPELL_SE) + @cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/SE.patch 2>/dev/null .endif post-configure: @@ -59,10 +133,6 @@ british: @${ECHO_MSG} "Okay, making a british version of ispell...." - @${MAKE} ${.MAKEFLAGS} LANG=british all - -french: - @${ECHO_MSG} "Okay, making a french/english version of ispell...." - @${MAKE} ${.MAKEFLAGS} ISPELL_FR=yes + @${MAKE} ${.MAKEFLAGS} ISPELL_LANG=british all .include diff -rNu ispell.old/files/BR.patch ispell/files/BR.patch --- ispell.old/files/BR.patch Thu Jan 1 01:00:00 1970 +++ ispell/files/BR.patch Fri Dec 31 11:07:41 1999 @@ -0,0 +1,8 @@ +--- br.ispell-2.3/conjugue.old Sun Feb 21 13:39:02 1999 ++++ br.ispell-2.3/conjugue Sat Nov 6 01:02:55 1999 +@@ -1,4 +1,4 @@ +-#!/usr/bin/gawk -f ++#!/usr/bin/awk -f + # + + # diff -rNu ispell.old/files/BR2.patch ispell/files/BR2.patch --- ispell.old/files/BR2.patch Thu Jan 1 01:00:00 1970 +++ ispell/files/BR2.patch Fri Dec 31 12:10:39 1999 @@ -0,0 +1,11 @@ +--- br.ispell-2.3/Makefile.org Fri Dec 31 12:10:22 1999 ++++ br.ispell-2.3/Makefile Fri Dec 31 12:09:46 1999 +@@ -48,7 +48,7 @@ + hash: v.ispell + cat v.ispell E.ispell|sort|uniq >br.tmp + mv -f br.tmp br.ispell +- buildhash br.ispell br.aff br.hash ++ ${BUILDHASH} br.ispell br.aff br.hash + + # + # Instala o br.hash diff -rNu ispell.old/files/DENEU.patch ispell/files/DENEU.patch --- ispell.old/files/DENEU.patch Thu Jan 1 01:00:00 1970 +++ ispell/files/DENEU.patch Fri Dec 31 11:37:01 1999 @@ -0,0 +1,39 @@ +--- 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: + ### + +-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 > $@ + + 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 + + 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 \ diff -rNu ispell.old/files/FR.patch ispell/files/FR.patch --- ispell.old/files/FR.patch Thu Jan 1 01:00:00 1970 +++ ispell/files/FR.patch Fri Dec 31 11:37:17 1999 @@ -0,0 +1,26 @@ +--- francais-IREQ/Makefile.old Fri Dec 31 10:23:00 1999 ++++ francais-IREQ/Makefile Fri Dec 31 10:27:35 1999 +@@ -13,10 +13,10 @@ + #------------------------------------------------------------------------------ + + # Prendre soin de bien définir cette variable: +-LIBDIR = /depot/public/lib/ispell ++LIBDIR = ${PREFIX}/lib + + # Il peut être requis de changer celle-ci aussi: +-HASH = $(LIBDIR)/buildhash ++HASH=${BUILDHASH} + + # buildict n'est pas requis pour l'utilisation de francais-IREQ, + # mais si vous décidez de modifier le dictionnaire, la variable suivante +@@ -48,8 +48,8 @@ + > $@' + + francais.hash: francais.dico +- $(RM) francais.dico.cnt francais.dico.stat +- $(HASH) francais.dico $(AFFIXES) francais.hash ++ @rm -f francais.dico.cnt francais.dico.stat ++ @${HASH} francais.dico $(AFFIXES) francais.hash + + install: francais.hash + install francais.hash $(LIBDIR) diff -rNu ispell.old/files/Makefile ispell/files/Makefile --- ispell.old/files/Makefile Thu Jan 1 01:00:00 1970 +++ ispell/files/Makefile Fri Dec 31 11:42:28 1999 @@ -0,0 +1,57 @@ +# +# $FreeBSD$ +# + +BUILDHASH=${WRKDIR}/ispell-3.1/buildhash + +all: ispell +.if defined(ISPELL_DENEU) + @make DENEU; +.endif +.if defined(ISPELL_DEALT) + @make DEALT; +.endif +.if defined(ISPELL_BR) + @make BR; +.endif +.if defined(ISPELL_SE) + @make SE; +.endif +.if defined(ISPELL_FR) + @make FR; +.endif + +DENEU: + @cd ./igerman* && make BUILDHASH=${BUILDHASH} german.hash + +DEALT: + @cd hk-deutsch && cat worte.txt verben.txt \ + adjektive.txt klein.txt geographie.txt vornamen.txt \ + abkuerz.txt imperat.txt latein.txt informatik.txt \ + infoabk.txt elektronik.txt orgabk.txt marken.txt \ + alphabeta.txt roemisch.txt zusammen.txt \ + | sort -u > all.words \ + && ${BUILDHASH} all.words deutsch.aff deutsch.hash + +BR: + @cd ./`echo ${BRDISTFILE} | sed -e 's/\.tar\.gz$$//g'` && make BUILDHASH=${BUILDHASH} hash + +SE: + @cd ./`echo ${SEDISTFILE} | sed -e 's/\.tar.gz\$$//g'` && make BUILDHASH=${BUILDHASH} + +FR: + @cd ./francais-IREQ/ && make BUILDHASH=${BUILDHASH} + +install: install-ispell + @cp */*.aff */*.hash . +.if defined(ISPELL_DENEU) + @mv german.aff ndeutsch.aff + @mv german.hash ndeutsch.hash +.endif + install -c -m 644 *.aff *.hash ${PREFIX}/lib + +ispell: + @cd ispell-3.1 && make + +install-ispell: ispell + @cd ispell-3.1 && make install diff -rNu ispell.old/files/SE.patch ispell/files/SE.patch --- ispell.old/files/SE.patch Thu Jan 1 01:00:00 1970 +++ ispell/files/SE.patch Fri Dec 31 11:33:36 1999 @@ -0,0 +1,17 @@ +--- iswedish-1.2.1/Makefile.orig Fri Dec 31 11:32:49 1999 ++++ iswedish-1.2.1/Makefile Fri Dec 31 11:33:14 1999 +@@ -1,4 +1,5 @@ + installdir=/usr/lib/ispell ++BUILDHASH=../ispell-3.1/buildhash + + all: svenska.hash + +@@ -7,7 +8,7 @@ + install -o root -g root -m 0644 svenska.aff $(installdir) + + svenska.hash: svenska.aff svenska.datalista +- buildhash svenska.datalista svenska.aff svenska.hash ++ ${BUILDHASH} svenska.datalista svenska.aff svenska.hash + + clean: + rm -f svenska.datalista.stat svenska.hash svenska.datalista.cnt *~ diff -rNu ispell.old/files/md5 ispell/files/md5 --- ispell.old/files/md5 Thu Dec 30 17:44:11 1999 +++ ispell/files/md5 Thu Dec 30 19:00:11 1999 @@ -1,5 +1,7 @@ MD5 (ispell-3.1.20.tar.gz) = 92986f940548fe4116428d21b16fd356 -MD5 (ispell.el-3.2.gz) = 39236db8caa43f84ae4629ba14eda768 MD5 (francais-IREQ-1.4.tar.gz) = 3871371b0f8e57b554f8895ce3a43b5a +MD5 (iswedish-1.2.1.tar.gz) = b546aeb88d7614c32e541488d55f32fe +MD5 (br.ispell-2.3.tar.gz) = 76e1614c462e37a35b6df770a9080976 +MD5 (igerman98-19991219.tar.gz) = 418f50fc8fd51044b43a843ab03842b6 +MD5 (hk-deutsch.tar.gz) = 0fb468159f7f0ba5b8a02c1fe111ac2d MD5 (ispell-html-mode.patch) = 1b44441a3748e55b3d509fcff21af4b7 -MD5 (texpatch-3.1.20c.gz) = 49449d5f5b9a366078da2d13124d8fa1 diff -rNu ispell.old/patches/patch-aa ispell/patches/patch-aa --- ispell.old/patches/patch-aa Thu Dec 30 17:44:11 1999 +++ ispell/patches/patch-aa Fri Dec 31 10:41:34 1999 @@ -1,14 +1,47 @@ -*** config.X.bak Mon Jan 23 21:28:24 1995 ---- config.X Tue Dec 16 18:49:29 1997 -*************** -*** 107,115 **** - - #include - #include -- #ifndef USG -- #include -- #endif /* USG */ - - /* - ** Things that normally go in a Makefile. Define these just like you ---- 107,112 ---- +--- ispell-3.1/defmt.c.orig Thu Oct 12 20:04:06 1995 ++++ ispell-3.1/defmt.c Fri Dec 31 10:40:56 1999 +@@ -548,7 +548,7 @@ + (void) fprintf (ofile, "%s", ctoken); + } + +- if (!lflag && (aflag || hadlf)) ++ if (!lflag && hadlf) + (void) putc ('\n', ofile); + } + +@@ -588,6 +588,8 @@ + return 0; + } + ++/* Updates bufp to point to the next character to skip. */ ++/* Should only be called on non-word characters. */ + static int TeX_math_begin (bufp) + char ** bufp; + { +@@ -604,10 +606,7 @@ + if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE) + return 1; + else if (!isalpha(**bufp) && **bufp != '@') +- { +- (*bufp)++; +- continue; +- } ++ return 0; + else if (TeX_strncmp (*bufp, "begin", 5) == 0) + { + if (TeX_math_check ('b', bufp)) +@@ -637,12 +636,10 @@ + { + if (*(*bufp)++ == TEXDOT + && (**bufp == TEXRIGHTSQUARE || **bufp == TEXRIGHTANGLE)) +- return TeX_math_begin (bufp); ++ break; + } +- return 0; + } +- else +- return 0; ++ return 0; + } + + static int TeX_LR_begin (bufp) diff -rNu ispell.old/patches/patch-ab ispell/patches/patch-ab --- ispell.old/patches/patch-ab Thu Dec 30 17:44:11 1999 +++ ispell/patches/patch-ab Fri Dec 31 10:40:24 1999 @@ -1,30 +1,40 @@ ---- Makefile.orig Thu Oct 12 20:04:06 1995 -+++ Makefile Wed Jun 4 05:05:47 1997 -@@ -253,7 +253,7 @@ - set -ex; \ - rm -f $$ELISPDIR/ispell.el; \ - $$INSTALL ispell.el $$ELISPDIR; \ -- if sh iwhich $$EMACS >/dev/null; then \ -+ if sh iwhich ___XXX___$$EMACS >/dev/null; then \ - echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \ - > /tmp/emi$$$$; \ - $$EMACS -batch -l /tmp/emi$$$$; \ -@@ -508,7 +508,7 @@ - local.h: - set +e; [ -r local.h ] || cp local.h.samp local.h +--- ispell-3.1/unsq.c.orig Tue Jan 25 19:32:18 1994 ++++ ispell-3.1/unsq.c Fri Dec 31 10:39:59 1999 +@@ -49,6 +49,7 @@ + */ --msgs.h: config.sh FRC -+msgs.h: config.sh - @. ./config.sh; \ - set $(SHELLDEBUG); \ - set +e; \ -@@ -522,7 +522,8 @@ - else \ - set -x; \ - rm -f msgs.h; ln $$msgs msgs.h || cp $$msgs msgs.h; \ -- fi -+ fi; \ -+ touch msgs.h + #include ++#include + #include "msgs.h" - FRC: + #ifdef __STDC__ +@@ -99,6 +100,8 @@ + register char * prevp; + register int same_count; + register int count_char; ++ int wsize; ++ char *s; + count_char = getchar (); + if (count_char == EOF) +@@ -114,13 +117,18 @@ + } + prevp = prev; + wordp = word; +- while (same_count--) ++ wsize = 257; ++ while (same_count--) { + *wordp++ = (*prevp++); +- if (gets (wordp) == NULL) ++ wsize--; ++ } ++ if (fgets (wordp, wsize, stdin) == NULL) + { + (void) fprintf (stderr, UNSQ_C_SURPRISE_EOF); + exit (1); + } ++ if ((s = strchr(wordp, '\n')) != NULL) ++ *s = '\0'; + (void) strcpy (prev, word); + return 0 ; + } diff -rNu ispell.old/patches/patch-ac ispell/patches/patch-ac --- ispell.old/patches/patch-ac Thu Dec 30 17:44:12 1999 +++ ispell/patches/patch-ac Fri Dec 31 10:39:29 1999 @@ -1,37 +1,25 @@ -*** sq.c.orig Tue Jan 25 21:32:18 1994 ---- sq.c Tue Dec 16 19:02:22 1997 -*************** -*** 49,54 **** ---- 49,55 ---- - */ - - #include -+ #include - - #ifdef __STDC__ - #define P(x) x -*************** -*** 82,90 **** - { - char word[257]; - static char prev[257] = ""; - -! while (gets (word) != NULL) - trunc (word, prev); - return 0; - } - ---- 83,95 ---- - { - char word[257]; - static char prev[257] = ""; -+ char *s; - -! while (fgets (word, sizeof(word), stdin) != NULL) { -! if ((s = strchr(word, '\n')) != NULL) -! *s = '\0'; - trunc (word, prev); -+ } - return 0; - } - +--- ispell-3.1/sq.c.orig Tue Jan 25 19:32:18 1994 ++++ ispell-3.1/sq.c Fri Dec 31 10:39:06 1999 +@@ -49,6 +49,7 @@ + */ + + #include ++#include + + #ifdef __STDC__ + #define P(x) x +@@ -82,9 +83,13 @@ + { + char word[257]; + static char prev[257] = ""; ++ char *s; + +- while (gets (word) != NULL) ++ while (fgets (word, sizeof(word), stdin) != NULL) { ++ if ((s = strchr(word, '\n')) != NULL) ++ *s = '\0'; + trunc (word, prev); ++ } + return 0; + } + diff -rNu ispell.old/patches/patch-ad ispell/patches/patch-ad --- ispell.old/patches/patch-ad Thu Dec 30 17:44:12 1999 +++ ispell/patches/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,57 +0,0 @@ -*** unsq.c.bak Tue Jan 25 21:32:18 1994 ---- unsq.c Tue Dec 16 19:08:44 1997 -*************** -*** 49,54 **** ---- 49,55 ---- - */ - - #include -+ #include - #include "msgs.h" - - #ifdef __STDC__ -*************** -*** 99,104 **** ---- 100,107 ---- - register char * prevp; - register int same_count; - register int count_char; -+ int wsize; -+ char *s; - - count_char = getchar (); - if (count_char == EOF) -*************** -*** 114,126 **** - } - prevp = prev; - wordp = word; -! while (same_count--) - *wordp++ = (*prevp++); -! if (gets (wordp) == NULL) - { - (void) fprintf (stderr, UNSQ_C_SURPRISE_EOF); - exit (1); - } - (void) strcpy (prev, word); - return 0 ; - } ---- 117,134 ---- - } - prevp = prev; - wordp = word; -! wsize = 257; -! while (same_count--) { - *wordp++ = (*prevp++); -! wsize--; -! } -! if (fgets (wordp, wsize, stdin) == NULL) - { - (void) fprintf (stderr, UNSQ_C_SURPRISE_EOF); - exit (1); - } -+ if ((s = strchr(wordp, '\n')) != NULL) -+ *s = '\0'; - (void) strcpy (prev, word); - return 0 ; - } diff -rNu ispell.old/patches/patch-ae ispell/patches/patch-ae --- ispell.old/patches/patch-ae Thu Dec 30 17:44:12 1999 +++ ispell/patches/patch-ae Thu Jan 1 01:00:00 1970 @@ -1,116 +0,0 @@ -*** correct.c Thu Oct 12 12:04:06 1995 ---- correct.c.3.1.20b Tue Oct 5 12:55:03 1999 -*************** -*** 1488,1500 **** - * all that likely). - */ - bufsize = strlen (contextbufs[0]); -! if (contextbufs[0][bufsize - 1] == '\n') -! { -! hadnl = 1; -! contextbufs[0][--bufsize] = '\0'; -! } -! else -! hadnl = 0; - if (bufsize == (sizeof contextbufs[0]) / 2 - 1) - { - ch = (unsigned char) contextbufs[0][bufsize - 1]; ---- 1488,1494 ---- - * all that likely). - */ - bufsize = strlen (contextbufs[0]); -! hadnl = (contextbufs[0][bufsize - 1] == '\n'); - if (bufsize == (sizeof contextbufs[0]) / 2 - 1) - { - ch = (unsigned char) contextbufs[0][bufsize - 1]; -*************** -*** 1556,1564 **** ---- 1550,1562 ---- - } - else if (contextbufs[0][0] == '~') - { -+ if (hadnl) -+ contextbufs[0][bufsize - 1] = '\0'; - defdupchar = findfiletype (&contextbufs[0][1], 1, (int *) NULL); - if (defdupchar < 0) - defdupchar = 0; -+ if (hadnl) -+ contextbufs[0][bufsize - 1] = '\n'; - } - else - { -*** defmt.c Thu Oct 12 12:04:06 1995 ---- defmt.c.3.1.20b Tue Oct 5 12:54:41 1999 -*************** -*** 548,554 **** - (void) fprintf (ofile, "%s", ctoken); - } - -! if (!lflag && (aflag || hadlf)) - (void) putc ('\n', ofile); - } - ---- 548,554 ---- - (void) fprintf (ofile, "%s", ctoken); - } - -! if (!lflag && hadlf) - (void) putc ('\n', ofile); - } - -*************** -*** 588,593 **** ---- 588,595 ---- - return 0; - } - -+ /* Updates bufp to point to the next character to skip. */ -+ /* Should only be called on non-word characters. */ - static int TeX_math_begin (bufp) - char ** bufp; - { -*************** -*** 604,613 **** - if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE) - return 1; - else if (!isalpha(**bufp) && **bufp != '@') -! { -! (*bufp)++; -! continue; -! } - else if (TeX_strncmp (*bufp, "begin", 5) == 0) - { - if (TeX_math_check ('b', bufp)) ---- 606,612 ---- - if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE) - return 1; - else if (!isalpha(**bufp) && **bufp != '@') -! return 0; - else if (TeX_strncmp (*bufp, "begin", 5) == 0) - { - if (TeX_math_check ('b', bufp)) -*************** -*** 637,648 **** - { - if (*(*bufp)++ == TEXDOT - && (**bufp == TEXRIGHTSQUARE || **bufp == TEXRIGHTANGLE)) -! return TeX_math_begin (bufp); - } -- return 0; - } -! else -! return 0; - } - - static int TeX_LR_begin (bufp) ---- 636,645 ---- - { - if (*(*bufp)++ == TEXDOT - && (**bufp == TEXRIGHTSQUARE || **bufp == TEXRIGHTANGLE)) -! break; - } - } -! return 0; - } - - static int TeX_LR_begin (bufp) diff -rNu ispell.old/pkg/COMMENT ispell/pkg/COMMENT --- ispell.old/pkg/COMMENT Thu Dec 30 17:44:12 1999 +++ ispell/pkg/COMMENT Fri Dec 31 12:11:50 1999 @@ -1 +1 @@ -An interactive spelling checker +An interactive spelling checker for multiple languages diff -rNu ispell.old/pkg/DESCR ispell/pkg/DESCR --- ispell.old/pkg/DESCR Thu Dec 30 17:44:12 1999 +++ ispell/pkg/DESCR Fri Dec 31 12:13:13 1999 @@ -3,7 +3,10 @@ corrections when it can figure them out. Compared to UNIX spell, it is faster and much easier to use. Ispell can also handle languages other than English. - -WWW: http://fmg-www.cs.ucla.edu/geoff/ispell.html +Included in this port are: + - French + - Brasilian + - German (old and new spelling) + - Swedish WWW: http://fmg-www.cs.ucla.edu/geoff/ispell.html diff -rNu ispell.old/pkg/PLIST ispell/pkg/PLIST --- ispell.old/pkg/PLIST Thu Dec 30 17:44:12 1999 +++ ispell/pkg/PLIST Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ -bin/buildhash -bin/findaffix -bin/icombine -bin/ijoin -bin/ispell -bin/munchlist -bin/sq -bin/tryaffix -bin/unsq -lib/american.hash -lib/americanmed+.hash -lib/english.aff -lib/english.hash diff -rNu ispell.old/pkg/PLIST.AM ispell/pkg/PLIST.AM --- ispell.old/pkg/PLIST.AM Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.AM Fri Dec 31 11:47:50 1999 @@ -0,0 +1,2 @@ +lib/american.hash +lib/americanmed+.hash diff -rNu ispell.old/pkg/PLIST.BR ispell/pkg/PLIST.BR --- ispell.old/pkg/PLIST.BR Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.BR Fri Dec 31 11:45:24 1999 @@ -0,0 +1,2 @@ +lib/br.aff +lib/br.hash diff -rNu ispell.old/pkg/PLIST.BRITISH ispell/pkg/PLIST.BRITISH --- ispell.old/pkg/PLIST.BRITISH Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.BRITISH Fri Dec 31 11:46:46 1999 @@ -0,0 +1,2 @@ +lib/british.hash +lib/britishxlg.hash diff -rNu ispell.old/pkg/PLIST.DEALT ispell/pkg/PLIST.DEALT --- ispell.old/pkg/PLIST.DEALT Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.DEALT Fri Dec 31 11:45:24 1999 @@ -0,0 +1,2 @@ +lib/deutsch.aff +lib/deutsch.hash diff -rNu ispell.old/pkg/PLIST.DENEU ispell/pkg/PLIST.DENEU --- ispell.old/pkg/PLIST.DENEU Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.DENEU Fri Dec 31 11:45:24 1999 @@ -0,0 +1,2 @@ +lib/ndeutsch.aff +lib/ndeutsch.hash diff -rNu ispell.old/pkg/PLIST.FR ispell/pkg/PLIST.FR --- ispell.old/pkg/PLIST.FR Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.FR Fri Dec 31 11:46:05 1999 @@ -0,0 +1,2 @@ +lib/francais.aff +lib/francais.hash diff -rNu ispell.old/pkg/PLIST.SE ispell/pkg/PLIST.SE --- ispell.old/pkg/PLIST.SE Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.SE Fri Dec 31 11:45:24 1999 @@ -0,0 +1,2 @@ +lib/svenska.aff +lib/svenska.hash diff -rNu ispell.old/pkg/PLIST.common ispell/pkg/PLIST.common --- ispell.old/pkg/PLIST.common Thu Jan 1 01:00:00 1970 +++ ispell/pkg/PLIST.common Fri Dec 31 11:56:23 1999 @@ -0,0 +1,11 @@ +bin/buildhash +bin/findaffix +bin/icombine +bin/ijoin +bin/ispell +bin/munchlist +bin/sq +bin/tryaffix +bin/unsq +lib/english.aff +lib/english.hash diff -rNu ispell.old/scripts/configure ispell/scripts/configure --- ispell.old/scripts/configure Thu Dec 30 17:44:12 1999 +++ ispell/scripts/configure Fri Dec 31 12:07:27 1999 @@ -8,30 +8,11 @@ echo "you need to install /usr/share/dict/words from the 'dict' distribution first" exit 1 fi -cd $WRKSRC || exit 1; - -if [ -f $WRKDIR/extra_dict ]; then - extra_dict=`cat $WRKDIR/extra_dict`; - case $extra_dict in - francais-IREQ*) - mkdir -p $WRKSRC/languages/francais-IREQ - LOCAL=' {francais-IREQ}' - for i in $WRKDIR/[A-Za-z]*; do - if [ -f $i ]; then cp $i $WRKSRC/languages/francais-IREQ/; fi - done - (echo RM=rm -f; echo LIBDIR=$PREFIX/lib; echo HASH=../../buildhash) \ - >> $WRKSRC/languages/francais-IREQ/Makefile - ;; - *) - echo "I don't now how to configure ispell with $extra_dict" - exit 1; - ;; - esac -fi +cd $WRKSRC/ispell-3.1 || exit 1; sed -e s:/usr/local:$PREFIX: local.h || exit 1; echo "#undef NO8BIT" >> local.h -case $LANG in +case $ISPELL_LANG in british) echo "#define LANGUAGES \"{british,MASTERDICTS=british.xlg,HASHFILES=britishxlg.hash,EXTRADICT=}$LOCAL\"" >>local.h ||exit 1; echo '#define MASTERHASH "britishxlg.hash"' >> local.h >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message