Update to version 2.4.

PR:		14674
Submitted by:	maintainer

5 files changed, 58 insertions, 27 deletions

diff --git a/textproc/br-ispell/Makefile b/textproc/br-ispell/Makefile
index 984a56c1c42b..e0570eabc76f 100644
--- a/textproc/br-ispell/Makefile
+++ b/textproc/br-ispell/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for: br-ispell
 # URL: http://www.ime.usp.br/~ueda/br.ispell/
-# Version required:     2.2
+# Version required:     2.4
 # Date created:         5 February 1999
 # Whom:                 Joao Carlos Mendes Luis <jonny@jonny.eng.br>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	br.ispell-2.2
-PKGNAME=	br-ispell-2.2
+DISTNAME=	br.ispell-2.4
+PKGNAME=	br-ispell-2.4
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.ime.usp.br/pub/ueda/br.ispell/
 
@@ -16,9 +16,6 @@ MAINTAINER=	jonny@jonny.eng.br
 
 BUILD_DEPENDS=	buildhash:${PORTSDIR}/textproc/ispell
 
-NO_WRKSUBDIR=	YES
-
-pre-build:
-	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
+MAN1=		conjugue.1
 
 .include <bsd.port.mk>
diff --git a/textproc/br-ispell/distinfo b/textproc/br-ispell/distinfo
index 7accad7249fa..afe4d341cdf1 100644
--- a/textproc/br-ispell/distinfo
+++ b/textproc/br-ispell/distinfo
@@ -1 +1 @@
-MD5 (br.ispell-2.2.tar.gz) = 0402c7b5c7f50b7d1a633b1ac492ab50
+MD5 (br.ispell-2.4.tar.gz) = 241d9e2fefb92ea74f13c1e07d0b4e7b
diff --git a/textproc/br-ispell/files/patch-aa b/textproc/br-ispell/files/patch-aa
new file mode 100644
index 000000000000..a2213217356c
--- /dev/null
+++ b/textproc/br-ispell/files/patch-aa
@@ -0,0 +1,46 @@
+--- 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
diff --git a/textproc/br-ispell/pkg-descr b/textproc/br-ispell/pkg-descr
index 3c7188365dba..5db63d1c0b6d 100644
--- a/textproc/br-ispell/pkg-descr
+++ b/textproc/br-ispell/pkg-descr
@@ -1,17 +1,6 @@
-This is version 2.2 (May 13, 1998) of the ispell dictionary br.ispell for
-brazilian portuguese. It's available here for download as br.ispell-2.2.tar.gz
-, under the terms of the GNU GPL . You can freely redistribute and/or use it
-for spelling checking through ispell . It can also be freely used for other
-purposes, as far as the resulting work remain free. The main page (in
-portuguese) for this dictionary is http://www.ime.usp.br/~ueda/br.ispell . 
+This the br.ispell dictionary for brazilian portuguese. It's
+freely available under the terms of the GNU GPL. You can freely
+redistribute and/or use it for spell checking through ispell
+(http://fmg-www.cs.ucla.edu/ficus-members/geoff/ispell.html).
 
-Current status is good enough to be used for daily needs. This dictionary is
-being developed in a structured way. Verbs are treated apart by a specific
-software, a verb conjugator ( conjugue ). Names are partitioned into semantic
-classes to make vocabulary completion and revision easier. Please send your
-questions and/or comments to ueda@ime.usp.br (Ricardo Ueda Karpischek). 
-
-p.s. You can find another ispell dictionary for portuguese (as spoken in
-Portugal) at http://www.di.uminho.pt/~jj/pln/pln.html .
-
-WWW: http://www.ime.usp.br/~ueda/br.ispell/
+WWW: http://www.ime.usp.br/~ueda/br.ispell
diff --git a/textproc/br-ispell/pkg-plist b/textproc/br-ispell/pkg-plist
index f2f164166f6a..38b44eee6f3b 100644
--- a/textproc/br-ispell/pkg-plist
+++ b/textproc/br-ispell/pkg-plist
@@ -1,5 +1,4 @@
+bin/conjugue
 lib/br.aff
 lib/br.hash
-lib/palavras+flags-2.2
-lib/palavras+flags-2.2.cnt
-lib/palavras+flags-2.2.stat
+lib/verbos