Build british dictionary with ISPELL_BRITISH=yes instead of `make british'.

Cleanups from PR ports/16450
Add norvegian dictionary (ports/16533)
Don't create a dummy file in ${WRKSRC}. It is only valid when emacs is a link
to xemacs.

PR:		ports/16450, ports/16533
Submitted by:	Alexander Langer <alex@big.endian.de>
Reviewed by:	jmz
This commit is contained in:
Jean-Marc Zucconi 2000-02-11 17:08:00 +00:00
parent 4bff59aa48
commit bbfb2cdea9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=25662
6 changed files with 149 additions and 64 deletions

View file

@ -1,97 +1,93 @@
# New ports collection makefile for: ispell
# http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html
# Version required: 3.1.20
# Date created: 6 November 1994
# Whom: jmz
# New ports collection makefile for: ispell
# Version required: 3.1.20
# Date created: 6 November 1994
# Whom: jmz
#
# $FreeBSD$
#
DISTNAME= ispell-3.1
PKGNAME= ispell-3.1.20c
PKGNAME?= ispell-3.1.20c
CATEGORIES= textproc elisp
MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ \
ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
MAINTAINER= jmz@FreeBSD.org
PATCH_SITES= ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
ISPELL_FILES= ispell-3.1.20.tar.gz
HTML_PATCH= ispell-html-mode.patch
DISTFILES= ${ISPELL_FILES}
PATCHFILES= ${HTML_PATCH}
MAKE_FLAGS= TMPDIR=${WRKDIR} -f
MAN1= ispell.1 sq.1
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
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}
EXTRA_DICT=
MAKE_FLAGS= TMPDIR=${WRKDIR} -f
ALL_TARGET=
BUILDHASH= ${WRKSRC}/buildhash
DATADIR= ${PREFIX}/share/ispell
.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))
.if (!defined(ISPELL_FR) && !defined (ISPELL_SE) && !defined(ISPELL_BR) && !defined(ISPELL_DENEU) && !defined(ISPELL_DEALT) && !defined(ISPELL_BRITISH) && !defined(ISPELL_NO))
.if (make(extract) || make(patch) || make(configure) || make(build) || make (install))
.BEGIN:
@${ECHO_MSG} '*********************************************************'
@${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} '* You can add further dictionaries: *'
@${ECHO_MSG} '* Use make-flag: *'
@${ECHO_MSG} '* - British ISPELL_BRITISH=yes *'
@${ECHO_MSG} '* (replaces the American dictionary) *'
@${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} '* - Norwegian ISPELL_NO=yes *'
@${ECHO_MSG} '* Example: "make ISPELL_FR=yes ISPELL_SE=yes install" *'
@${ECHO_MSG} '*********************************************************'
.endif
.else
.if defined(ISPELL_FR)
FRDISTFILE= francais-IREQ-1.4.tar.gz
EXTRA_DICT+= ${FRDISTFILE}
MASTER_SITES+= ftp://ftp.robot.ireq.ca/pub/ispell/
ALL_TARGET+= ISPELL_FR=yes
EXTRA_DICT+= ${FRDISTFILE}
.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}
ALL_TARGET+= ISPELL_SE=yes
.endif
.if defined(ISPELL_BR)
BRDISTFILE= br.ispell-2.4.tar.gz
MASTER_SITES+= ftp://ftp.ime.usp.br/pub/ueda/br.ispell/
EXTRA_DICT+= ${BRDISTFILE}
EXTRACT_ONLY+= ${BRDISTFILE}
MASTER_SITES+= ftp://ftp.ime.usp.br/pub/ueda/br.ispell/
ALL_TARGET+= ISPELL_BR=yes
.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/
EXTRA_DICT+= ${DENEUDISTFILE}
EXTRACT_ONLY+= ${DENEUDISTFILE}
FETCH_BEFORE_ARGS+= -b # HTTP Workaround at Xoom
ALL_TARGET+= ISPELL_DENEU=yes
.endif
.if defined(ISPELL_DEALT)
DEALTDISTFILE= hk-deutsch.tar.gz
EXTRA_DICT+= ${DEALTDISTFILE}
MASTER_SITES+= ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/
ALL_TARGET+= ISPELL_DEALT=yes
.endif
.if defined(ISPELL_NO)
NODISTFILE= ispell-norsk-1.1a.tar.gz
MASTER_SITES+= http://www.uio.no/~runekl/
EXTRA_DICT+= ${NODISTFILE}
MASKBITS?= 64
.endif
DISTFILES+= ${EXTRA_DICT}
.endif
ALL_TARGET+= WRKDIR=${WRKDIR} SEDISTFILE=${SEDISTFILE} BRDISTFILE=${BRDISTFILE} all
british:
@${ECHO_MSG} "Okay, making a british version of ispell...."
@${MAKE} ${.MAKEFLAGS} ISPELL_LANG=british all
@${TOUCH} ${WRKDIR}/.british-build
post-extract:
.if defined(ISPELL_FR)
@ -99,11 +95,13 @@ post-extract:
@${TAR} -C ${WRKDIR}/francais-IREQ -zxf ${PORTSDIR}/distfiles/${FRDISTFILE}
.endif
.if defined(ISPELL_DEALT)
-@${MKDIR} ${WRKDIR}/hk-deutsch
@${MKDIR} ${WRKDIR}/hk-deutsch
@${TAR} -C ${WRKDIR}/hk-deutsch/ -zxf ${PORTSDIR}/distfiles/${DEALTDISTFILE}
.endif
@${TOUCH} ${WRKSRC}/dummy
@${CP} ${FILESDIR}/Makefile ${WRKDIR}/Makefile
.if defined(ISPELL_NO)
@${MKDIR} ${WRKDIR}/inorsk
@${TAR} -C ${WRKDIR}/inorsk/ -zxf ${PORTSDIR}/distfiles/${NODISTFILE}
.endif
post-patch:
.if defined(ISPELL_FR)
@ -118,35 +116,79 @@ post-patch:
.if defined(ISPELL_SE)
@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/SE.patch 2>/dev/null
.endif
.if defined(ISPELL_NO)
@cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/NO.patch 2>/dev/null
.endif
post-configure:
@${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
.if defined(MASKBITS)
@${ECHO} "#define MASKBITS ${MASKBITS}" >> ${WRKSRC}/local.h
.endif
do-build:
@(cd ${WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} WRKSRC=${WRKSRC} ${ALL_TARGET})
do-install:
@(cd ${WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} WRKSRC=${WRKSRC} ${INSTALL_TARGET})
post-install:
@[ -e ${WRKDIR}/.british-build ] && \
${CAT} ${MASTERDIR}/pkg/PLIST.BRITISH >> ${TMPPLIST} || \
${CAT} ${MASTERDIR}/pkg/PLIST.AM >> ${TMPPLIST}
.if defined(ISPELL_FR)
@cat ${MASTERDIR}/pkg/PLIST.FR >> ${TMPPLIST}
post-build:
.if defined(ISPELL_DENEU)
@cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.gz==} && \
${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} german.hash && \
${MV} german.hash ndeutsch.hash && ${MV} german.aff ndeutsch.aff
.endif
.if defined(ISPELL_DEALT)
@cat ${MASTERDIR}/pkg/PLIST.DEALT >> ${TMPPLIST}
.endif
.if defined(ISPELL_DENEU)
@cat ${MASTERDIR}/pkg/PLIST.DENEU >> ${TMPPLIST}
@cd ${WRKDIR}/${DEALTDISTFILE:S=.tar.gz==} && \
${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
.endif
.if defined(ISPELL_BR)
@cat ${MASTERDIR}/pkg/PLIST.BR >> ${TMPPLIST}
@cd ${WRKDIR}/${BRDISTFILE:S=.tar.gz==} && \
${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} all
.endif
.if defined(ISPELL_SE)
@cat ${MASTERDIR}/pkg/PLIST.SE >> ${TMPPLIST}
@cd ${WRKDIR}/${SEDISTFILE:S=.tar.gz==} && \
${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH}
.endif
@echo "@dirrm share/ispell" >> ${TMPPLIST}
.if defined(ISPELL_FR)
@cd ${WRKDIR}/francais-IREQ && \
${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH}
.endif
.if defined(ISPELL_NO)
@cd ${WRKDIR}/inorsk && \
${CP} norsk.7bit norsk.aff && \
${CAT} norsk.base > norsk.sml && \
${BUILDHASH} norsk.sml norsk.aff norsk.hash
.endif
pre-install:
@if [ ! -d ${DATADIR} ]; then ${MKDIR} ${DATADIR}; fi
post-install:
@-${INSTALL_DATA} ${WRKDIR}/*/*.aff ${WRKDIR}/*/*.hash ${DATADIR}
.if defined(ISPELL_FR)
@${CAT} ${MASTERDIR}/pkg/PLIST.FR >> ${TMPPLIST}
.endif
.if defined(ISPELL_DEALT)
@${CAT} ${MASTERDIR}/pkg/PLIST.DEALT >> ${TMPPLIST}
.endif
.if defined(ISPELL_DENEU)
@${CAT} ${MASTERDIR}/pkg/PLIST.DENEU >> ${TMPPLIST}
.endif
.if defined(ISPELL_BR)
@${CAT} ${MASTERDIR}/pkg/PLIST.BR >> ${TMPPLIST}
.endif
.if defined(ISPELL_SE)
@${CAT} ${MASTERDIR}/pkg/PLIST.SE >> ${TMPPLIST}
.endif
.if defined(ISPELL_NO)
@${CAT} ${MASTERDIR}/pkg/PLIST.NO >> ${TMPPLIST}
.endif
.if defined(ISPELL_BRITISH)
@${CAT} ${MASTERDIR}/pkg/PLIST.BRITISH >> ${TMPPLIST}
.else
@${CAT} ${MASTERDIR}/pkg/PLIST.AM >> ${TMPPLIST}
.endif
@${ECHO} "@dirrm share/ispell" >> ${TMPPLIST}
.include <bsd.port.mk>

View file

@ -5,3 +5,4 @@ MD5 (igerman98-19991219.tar.gz) = 418f50fc8fd51044b43a843ab03842b6
MD5 (hk-deutsch.tar.gz) = 0fb468159f7f0ba5b8a02c1fe111ac2d
MD5 (ispell-html-mode.patch) = 1b44441a3748e55b3d509fcff21af4b7
MD5 (br.ispell-2.4.tar.gz) = 241d9e2fefb92ea74f13c1e07d0b4e7b
MD5 (ispell-norsk-1.1a.tar.gz) = d096dce5003b4e221e96fbf34f523c4c

View file

@ -1,5 +1,5 @@
--- Makefile.orig Mon Oct 18 15:15:22 1999
+++ Makefile Tue Nov 2 23:55:52 1999
--- Makefile.orig Mon Oct 18 19:15:22 1999
+++ Makefile Thu Feb 10 17:04:59 2000
@@ -16,12 +16,11 @@
# VDIR - aqui será colocado o banco de verbos
# MANDIR - aqui será colocada a man page do conjugue
@ -18,7 +18,13 @@
#
# Daqui para baixo não mexa mais em nada
@@ -71,20 +70,16 @@
@@ -66,25 +65,21 @@
br.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
#

View file

@ -0,0 +1,36 @@
*** inorsk/parse.y.org Sun Feb 6 19:41:49 2000
--- inorsk/parse.y Sun Feb 6 19:42:58 2000
***************
*** 870,876 ****
flagbit = toupper (flagbit);
#endif /* MASKBITS */
#if MASKBITS <= 64
! if (!isalpha (flagbit))
yyerror (PARSE_Y_BAD_FLAG);
#endif /* MASKBITS */
flagbit = CHARTOBIT (flagbit);
--- 870,876 ----
flagbit = toupper (flagbit);
#endif /* MASKBITS */
#if MASKBITS <= 64
! if (flagbit < 'A' || flagbit > 'z')
yyerror (PARSE_Y_BAD_FLAG);
#endif /* MASKBITS */
flagbit = CHARTOBIT (flagbit);
***************
*** 902,908 ****
flagbit = toupper (flagbit);
#endif /* MASKBITS */
#if MASKBITS <= 64
! if (!isalpha (flagbit))
yyerror (PARSE_Y_BAD_FLAG);
#endif /* MASKBITS */
flagbit = CHARTOBIT (flagbit);
--- 902,908 ----
flagbit = toupper (flagbit);
#endif /* MASKBITS */
#if MASKBITS <= 64
! if (flagbit < 'A' || flagbit > 'z')
yyerror (PARSE_Y_BAD_FLAG);
#endif /* MASKBITS */
flagbit = CHARTOBIT (flagbit);

View file

@ -4,9 +4,11 @@ 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.
Included in this port are:
- British English
- French
- Brasilian
- German (old and new spelling)
- Norwegian
- Swedish
WWW: http://fmg-www.cs.ucla.edu/geoff/ispell.html

View file

@ -12,15 +12,13 @@ cd $WRKSRC || exit 1;
sed -e s:/usr/local:$PREFIX: <local.h.samp >local.h || exit 1;
echo "#undef NO8BIT" >> local.h
case $ISPELL_LANG in
british)
if [ ! -z "$ISPELL_BRITISH" ] && \
[ "$ISPELL_BRITISH" = "YES" -o "$ISPELL_BRITISH" = "yes" ]; then
echo "#define LANGUAGES \"{british,MASTERDICTS=british.xlg,HASHFILES=britishxlg.hash,EXTRADICT=}$LOCAL\"" >>local.h ||exit 1;
echo '#define MASTERHASH "britishxlg.hash"' >> local.h
break ;;
*)
else
echo "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=/usr/share/dict/words}$LOCAL\"" >>local.h ||exit 1;
:;;
esac
fi
echo "#undef WORDS" >> local.h
echo '#define WORDS "/usr/share/dict/words"' >> local.h