- make use of multiple MASTER_SITES

- remove deprecated variables
- remove workaround for texinfo install-info bug
- correct filename of ispell info page, ispell -> ispell.info
- add SHA1 and RMD160 checksums for francais-IREQ-1.4.tar.gz
- stop installing ispell.el to share/emacs/site-lisp, since the one
coming with emacs is newer
This commit is contained in:
brad 2000-01-04 19:09:57 +00:00
parent 758b057bd8
commit 09c07c4062
6 changed files with 86 additions and 57 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 1999/06/28 17:45:51 brad Exp $
# $OpenBSD: Makefile,v 1.9 2000/01/04 19:09:57 brad Exp $
# Original from: Ejovi Nuwere <ejovi@ejovi.net>
NEED_VERSION= 1.89
@ -8,10 +8,10 @@ GERMAN_DICT= hk2-deutsch
DISTNAME= ispell-3.1.20
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ \
ftp://ftp.robot.ireq.ca/pub/ispell/ \
ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/
SUPDISTFILES= ${DISTNAME}.tar.gz ${FRENCH_DICT}.tar.gz ${GERMAN_DICT}.tar.gz
MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
MASTER_SITES0= ftp://ftp.robot.ireq.ca/pub/ispell/
MASTER_SITES1= ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/
SUPDISTFILES= ${FRENCH_DICT}.tar.gz:0 ${GERMAN_DICT}.tar.gz:1
PATCH_SITES= ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
PATCHFILES= ispell-html-mode.patch
@ -20,64 +20,61 @@ MAINTAINER= ports@openbsd.org
MAKE_FLAGS= TMPDIR=${WRKDIR} -f
WRKSRC= ${WRKDIR}/ispell-3.1
WRKSRC= ${WRKDIR}/ispell-3.1
pre-fetch pre-build pre-install:
.if !defined(NO_WARNINGS)
.if !defined(ISPELL_FR) && !defined(ISPELL_DE)
@${ECHO} '******************************************************'
@${ECHO} '* Note that you can build a french/english or a *'
@${ECHO} '* german/english version by setting the shell *'
@${ECHO} '* variable ISPELL_FR or ISPELL_DE *'
@${ECHO} '******************************************************'
.elif defined(ISPELL_FR)
@echo ''
@echo '******************************************************'
@echo '* Note that you can build a french/english or a *'
@echo '* german/english version by setting the shell *'
@echo '* variable ISPELL_FR or ISPELL_DE to yes, ie. *'
@echo '* "make ISPELL_FR=yes" or "make ISPELL_DE=yes" *'
@echo '******************************************************'
@echo ''
.elif defined(ISPELL_FR) && ${ISPELL_FR:U} == YES
EXTRA_DICT= ${FRENCH_DICT}.tar.gz
DISTFILES= ${DISTNAME}.tar.gz ${EXTRA_DICT}
DISTFILES= ${DISTNAME}.tar.gz ${EXTRA_DICT}:0
PLIST= ${PKGDIR}/PLIST.french
.elif defined(ISPELL_DE)
.elif defined(ISPELL_DE) && ${ISPELL_DE:U} == YES
EXTRA_DICT= ${GERMAN_DICT}.tar.gz
DISTFILES= ${DISTNAME}.tar.gz ${EXTRA_DICT}
DISTFILES= ${DISTNAME}.tar.gz ${EXTRA_DICT}:1
PLIST= ${PKGDIR}/PLIST.german
.endif
.endif
pre-extract:
.if !defined(LANG)
@${ECHO} '******************************************************'
@${ECHO} '* Note that you can build a british version by *'
@${ECHO} '* typing "make british" following a "make clean" *'
@${ECHO} '******************************************************'
@echo ''
@echo '******************************************************'
@echo '* Note that you can build a british version by *'
@echo '* typing "make british" following a "make clean" *'
@echo '******************************************************'
@echo ''
.endif
pre-configure:
.if defined(EXTRA_DICT)
@${ECHO} ${EXTRA_DICT} > ${WRKDIR}/extra_dict
.else
@${ECHO} -n
@echo ${EXTRA_DICT} > ${WRKDIR}/extra_dict
.endif
post-configure:
@${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
@echo "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
british:
@${ECHO} "Okay, making a british version of ispell...."
@${MAKE} ${.MAKEFLAGS} LANG=british all
@echo "Okay, making a british version of ispell...."
@make ${.MAKEFLAGS} LANG=british
french:
@${ECHO} "Okay, making a french/english version of ispell...."
@${MAKE} ${.MAKEFLAGS} ISPELL_FR=yes
@echo "Okay, making a french/english version of ispell...."
@make ${.MAKEFLAGS} ISPELL_FR=Yes
german:
@${ECHO} "Okay, making a german/english version of ispell...."
@${MAKE} ${.MAKEFLAGS} ISPELL_DE=yes
pre-install:
@${MKDIR} ${PREFIX}/share/emacs/site-lisp
@echo "Okay, making a german/english version of ispell...."
@make ${.MAKEFLAGS} ISPELL_DE=Yes
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
fi
@install-info ${PREFIX}/info/ispell ${PREFIX}/info/dir
@install-info ${PREFIX}/info/ispell.info ${PREFIX}/info/dir
.include <bsd.port.mk>

View File

@ -2,9 +2,11 @@ MD5 (francais-IREQ-1.4.tar.gz) = 3871371b0f8e57b554f8895ce3a43b5a
MD5 (hk2-deutsch.tar.gz) = 7fa72ab88d3ef466e35cf0721140b8ec
MD5 (ispell-3.1.20.tar.gz) = 92986f940548fe4116428d21b16fd356
MD5 (ispell-html-mode.patch) = 1b44441a3748e55b3d509fcff21af4b7
RMD160 (francais-IREQ-1.4.tar.gz) = 9f11a627d84488c9cbbd37b75fbeae9060803f3d
RMD160 (hk2-deutsch.tar.gz) = 8fe8dadac0ab8bead960915284b3fd89646db968
RMD160 (ispell-3.1.20.tar.gz) = 97ff82cdd3289d9c911093ca41974bc61314a36d
RMD160 (ispell-html-mode.patch) = 0a25a3f437cbf132fc90a83180cb39790634654a
SHA1 (francais-IREQ-1.4.tar.gz) = 940712167cd2d40c27e673246b8ce9f99595a309
SHA1 (hk2-deutsch.tar.gz) = 4e6364b65981be8002acbb65618bdbc646eb5663
SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e
SHA1 (ispell-html-mode.patch) = 70819796a3873453c63d939935f78c398ec98003

View File

@ -1,24 +1,60 @@
--- Makefile.orig Thu Oct 12 20:04:06 1995
+++ Makefile Wed Jun 4 05:05:47 1997
@@ -253,7 +253,7 @@
--- Makefile.orig Thu Oct 12 15:04:06 1995
+++ Makefile Tue Jan 4 00:43:59 2000
@@ -240,31 +240,14 @@
set $(SHELLDEBUG); \
if [ -d $$TEXINFODIR -a -r ispell.info ]; then \
set -ex; \
rm -f $$ELISPDIR/ispell.el; \
$$INSTALL ispell.el $$ELISPDIR; \
- rm -f $$TEXINFODIR/ispell; \
- $$INSTALL ispell.info $$TEXINFODIR/ispell; \
- chmod 644 $$TEXINFODIR/ispell; \
+ rm -f $$TEXINFODIR/ispell.info; \
+ $$INSTALL ispell.info $$TEXINFODIR; \
+ chmod 644 $$TEXINFODIR/ispell.info; \
else \
: ; \
fi
@set +e; \
- . ./config.sh; \
- set $(SHELLDEBUG); \
- if [ -d $$ELISPDIR ]; then \
- 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 @@
- echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \
- > /tmp/emi$$$$; \
- $$EMACS -batch -l /tmp/emi$$$$; \
- rm -f /tmp/emi$$$$; \
- chmod 644 $$ELISPDIR/ispell.el $$ELISPDIR/ispell.elc; \
- else \
- chmod 644 $$ELISPDIR/ispell.el; \
- fi; \
- else \
- : ; \
- fi
+ . ./config.sh
install-dictbuild:
@. ./config.sh; \
@@ -324,7 +307,7 @@
set $(SHELLDEBUG); \
if [ -d $$TEXINFODIR ]; then \
if sh iwhich makeinfo >/dev/null \
- && makeinfo ispell.texinfo 2>/dev/null; then \
+ && makeinfo --no-split ispell.texinfo 2>/dev/null; then \
:; \
elif sh iwhich $$EMACS >/dev/null; then \
set -e; \
@@ -508,7 +491,7 @@
local.h:
set +e; [ -r local.h ] || cp local.h.samp local.h
-msgs.h: config.sh FRC
+msgs.h: config.sh
+msgs.h: config.sh
@. ./config.sh; \
set $(SHELLDEBUG); \
set +e; \
@@ -522,7 +522,8 @@
@@ -522,7 +505,8 @@
else \
set -x; \
rm -f msgs.h; ln $$msgs msgs.h || cp $$msgs msgs.h; \

View File

@ -8,8 +8,7 @@ bin/munchlist
bin/icombine
bin/unsq
@unexec install-info --delete %D/info/ispell %D/info/dir
info/ispell
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
info/ispell.info
@exec install-info %D/%F %D/info/dir
lib/americanmed+.hash
lib/english.aff
@ -24,4 +23,3 @@ man/man1/tryaffix.1
man/man1/unsq.1
man/man4/ispell.4
man/man4/english.4
share/emacs/site-lisp/ispell.el

View File

@ -8,8 +8,7 @@ bin/munchlist
bin/icombine
bin/unsq
@unexec install-info --delete %D/info/ispell %D/info/dir
info/ispell
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
info/ispell.info
@exec install-info %D/%F %D/info/dir
lib/americanmed+.hash
lib/english.aff
@ -26,4 +25,3 @@ man/man1/tryaffix.1
man/man1/unsq.1
man/man4/ispell.4
man/man4/english.4
share/emacs/site-lisp/ispell.el

View File

@ -8,8 +8,7 @@ bin/munchlist
bin/icombine
bin/unsq
@unexec install-info --delete %D/info/ispell %D/info/dir
info/ispell
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
info/ispell.info
@exec install-info %D/%F %D/info/dir
lib/americanmed+.hash
lib/english.aff
@ -26,4 +25,3 @@ man/man1/tryaffix.1
man/man1/unsq.1
man/man4/ispell.4
man/man4/english.4
share/emacs/site-lisp/ispell.el