From f904476ae5cbcebc8c34b2cf1ebb76d6f1fecfa0 Mon Sep 17 00:00:00 2001 From: Jean-Marc Zucconi Date: Mon, 7 Feb 2000 03:27:40 +0000 Subject: Upgrade the br-part to version 2.4 Portlint Submitted by: Alexander Langer --- textproc/ispell/Makefile | 44 +++++++++++++++++++++----------------- textproc/ispell/distinfo | 2 +- textproc/ispell/files/BR.patch | 48 +++++++++++++++++++++++++++++++++++++----- 3 files changed, 69 insertions(+), 25 deletions(-) (limited to 'textproc/ispell') diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile index 21de2c2dd4bb..203871d41dfc 100644 --- a/textproc/ispell/Makefile +++ b/textproc/ispell/Makefile @@ -12,22 +12,24 @@ 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} -MAINTAINER= jmz@FreeBSD.org - 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 EXTRACT_ONLY= ${ISPELL_FILES} -EXTRA_DICT= +EXTRA_DICT= +ALL_TARGET= .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)) @@ -51,35 +53,40 @@ EXTRA_DICT= FRDISTFILE= francais-IREQ-1.4.tar.gz EXTRA_DICT+= ${FRDISTFILE} MASTER_SITES+= ftp://ftp.robot.ireq.ca/pub/ispell/ +ALL_TARGET+= ISPELL_FR=yes .endif .if defined(ISPELL_SE) SEDISTFILE= iswedish-1.2.1.tar.gz -MASTER_SITES+= http://www.sslug.dk/locale/ispell/iswedish/ +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.3.tar.gz +BRDISTFILE= br.ispell-2.4.tar.gz 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/ + ftp://student.physik.uni-dortmund.de/pub/users/jacke/ispell/ 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 DISTFILES+= ${EXTRA_DICT} .endif -ALL_TARGET= WRKDIR=${WRKDIR} SEDISTFILE=${SEDISTFILE} BRDISTFILE=${BRDISTFILE} all +ALL_TARGET+= WRKDIR=${WRKDIR} SEDISTFILE=${SEDISTFILE} BRDISTFILE=${BRDISTFILE} all british: @${ECHO_MSG} "Okay, making a british version of ispell...." @@ -88,7 +95,7 @@ british: post-extract: .if defined(ISPELL_FR) - @${MKDIR} -p ${WRKDIR}/francais-IREQ + @${MKDIR} ${WRKDIR}/francais-IREQ @${TAR} -C ${WRKDIR}/francais-IREQ -zxf ${PORTSDIR}/distfiles/${FRDISTFILE} .endif .if defined(ISPELL_DEALT) @@ -103,8 +110,7 @@ post-patch: @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 + @cd ${WRKDIR}/${BRDISTFILE:S/.tar.gz$//} && ${PATCH} < ${FILESDIR}/BR.patch 2>/dev/null .endif .if defined(ISPELL_DENEU) @cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/DENEU.patch 2>/dev/null @@ -124,23 +130,23 @@ do-install: post-install: @[ -e ${WRKDIR}/.british-build ] && \ - cat ${.CURDIR}/pkg/PLIST.BRITISH >> ${TMPPLIST} || \ - cat ${.CURDIR}/pkg/PLIST.AM >> ${TMPPLIST} + ${CAT} ${MASTERDIR}/pkg/PLIST.BRITISH >> ${TMPPLIST} || \ + ${CAT} ${MASTERDIR}/pkg/PLIST.AM >> ${TMPPLIST} .if defined(ISPELL_FR) - @cat ${.CURDIR}/pkg/PLIST.FR >> ${TMPPLIST} + @cat ${MASTERDIR}/pkg/PLIST.FR >> ${TMPPLIST} .endif .if defined(ISPELL_DEALT) - @cat ${.CURDIR}/pkg/PLIST.DEALT >> ${TMPPLIST} + @cat ${MASTERDIR}/pkg/PLIST.DEALT >> ${TMPPLIST} .endif .if defined(ISPELL_DENEU) - @cat ${.CURDIR}/pkg/PLIST.DENEU >> ${TMPPLIST} + @cat ${MASTERDIR}/pkg/PLIST.DENEU >> ${TMPPLIST} .endif .if defined(ISPELL_BR) - @cat ${.CURDIR}/pkg/PLIST.BR >> ${TMPPLIST} + @cat ${MASTERDIR}/pkg/PLIST.BR >> ${TMPPLIST} .endif .if defined(ISPELL_SE) - @cat ${.CURDIR}/pkg/PLIST.SE >> ${TMPPLIST} + @cat ${MASTERDIR}/pkg/PLIST.SE >> ${TMPPLIST} .endif @echo "@dirrm share/ispell" >> ${TMPPLIST} - + .include diff --git a/textproc/ispell/distinfo b/textproc/ispell/distinfo index 408c580b887b..d8bce1566379 100644 --- a/textproc/ispell/distinfo +++ b/textproc/ispell/distinfo @@ -1,7 +1,7 @@ MD5 (ispell-3.1.20.tar.gz) = 92986f940548fe4116428d21b16fd356 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 (br.ispell-2.4.tar.gz) = 241d9e2fefb92ea74f13c1e07d0b4e7b diff --git a/textproc/ispell/files/BR.patch b/textproc/ispell/files/BR.patch index 92cb8586d7c4..a2213217356c 100644 --- a/textproc/ispell/files/BR.patch +++ b/textproc/ispell/files/BR.patch @@ -1,8 +1,46 @@ ---- 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 +--- Makefile.orig Mon Oct 18 15:15:22 1999 ++++ Makefile Tue Nov 2 23:55:52 1999 +@@ -16,12 +16,11 @@ + # VDIR - aqui será colocado o banco de verbos + # MANDIR - aqui será colocada a man page do conjugue # +-prefix=/usr/local +-BINDIR=$(prefix)/bin +-HASHDIR=/usr/lib/ispell +-VDIR=$(prefix)/lib +-MANDIR=$(prefix)/man +-AWK=/usr/bin/gawk ++BINDIR=$(PREFIX)/bin ++HASHDIR=$(PREFIX)/lib ++VDIR=$(PREFIX)/lib ++MANDIR=$(PREFIX)/man ++AWK=/usr/bin/awk # + # Daqui para baixo não mexa mais em nada +@@ -71,20 +70,16 @@ + # + # Instala o br.hash + # +-install-hash: br.ispell +- install -d $(HASHDIR) +- install --mode=644 br.hash br.aff $(HASHDIR) ++install-hash: br.hash ++ ${BSD_INSTALL_DATA} br.hash br.aff $(HASHDIR) + + # + # Instala o conjugue + # + install-conjugue: conjugue +- install -d $(BINDIR) +- install --mode=755 conjugue $(BINDIR)/conjugue +- install -d $(VDIR) +- install --mode=644 verbos $(VDIR)/verbos +- install -d $(MANDIR)/man1 +- install --mode=644 conjugue.1 $(MANDIR)/man1/conjugue.1 ++ ${BSD_INSTALL_SCRIPT} conjugue $(BINDIR) ++ ${BSD_INSTALL_DATA} verbos $(VDIR) ++ ${BSD_INSTALL_MAN} conjugue.1 $(MANDIR)/man1 + + # + # instala tudo -- cgit v1.2.3