7 files changed, 42 insertions, 46 deletions

diff --git a/textproc/nfbtrans/Makefile b/textproc/nfbtrans/Makefile
index 32a6a1024984..e943f5abba4b 100644
--- a/textproc/nfbtrans/Makefile
+++ b/textproc/nfbtrans/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nfbtrans
-PORTVERSION=	7.58
+PORTVERSION=	7.74
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.nfb.org/braille/nfbtrans/
 DISTNAME=	nfbtr${PORTVERSION:S/.//}
@@ -16,7 +16,6 @@ COMMENT=	ASCII text to Grade Two braille translator
 
 RESTRICTED=	"Unclear copyright status"
 
-BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
 USE_ZIP=		yes
 EXTRACT_BEFORE_ARGS=	-q -a -L -o
 NO_WRKSUBDIR=		yes
@@ -35,14 +34,15 @@ do-install:
 .for f in braille.tab back.tab english.dic nfbtrans.cnf menu.cnf
 	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/nfbtrans
 .endfor
-	unzip -q -L -a -o ${WRKSRC}/tables.zip -d ${PREFIX}/share/nfbtrans/tables
+	${UNZIP_CMD} -q -L -a -o ${WRKSRC}/tables.zip -d ${PREFIX}/share/nfbtrans/tables
+	${UNZIP_CMD} -q -L -a -o ${WRKSRC}/spanish.zip -d ${PREFIX}/share/nfbtrans/spanish
 .if !defined(NOPORTDOCS)
 	@${ECHO} '~0 ~-pw=80 ~-ls=99 ~-pl=56 ~-if=12 ~-fc=. ~o5 ~p- ~-ip=0 ~-oc=1' \
 	  | ${CAT} - ${WRKSRC}/nfbtrans.fmt > ${WRKSRC}/nfbprint.fmt
 	@${WRKSRC}/nfbtrans st=${WRKSRC}/stat.txt qm=1 ob=oc=15 \
 	  ${WRKSRC}/nfbprint.fmt > ${WRKSRC}/nfbtrans.doc
 	${MKDIR} ${PREFIX}/share/doc/nfbtrans
-.for f in read.me nfbtrans.doc nfbtrans.fmt tvfreqs.fmt
+.for f in readme.txt nfbtrans.doc nfbtrans.fmt tvfreqs.fmt
 	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/nfbtrans
 .endfor
 .endif
diff --git a/textproc/nfbtrans/distinfo b/textproc/nfbtrans/distinfo
index 1051ee941db2..37da80b0f749 100644
--- a/textproc/nfbtrans/distinfo
+++ b/textproc/nfbtrans/distinfo
@@ -1,2 +1,2 @@
-MD5 (nfbtr758.zip) = a67cc0e4a37276299071f35cef130c81
-SIZE (nfbtr758.zip) = 432812
+MD5 (nfbtr774.zip) = 46d45c0ef54b659aca8f773c08caa057
+SIZE (nfbtr774.zip) = 470847
diff --git a/textproc/nfbtrans/files/patch-aa b/textproc/nfbtrans/files/patch-aa
index 17d023081996..a45bde23c025 100644
--- a/textproc/nfbtrans/files/patch-aa
+++ b/textproc/nfbtrans/files/patch-aa
@@ -1,8 +1,8 @@
---- makefile.orig	Sat Sep 23 13:46:52 2000
-+++ makefile	Thu Nov 30 04:13:38 2000
+--- makefile.orig	Fri Jan  4 18:23:22 2002
++++ makefile	Mon May  9 17:39:33 2005
 @@ -3,6 +3,11 @@
  #translation software written by the National Federation of the Blind
- #compile under the Unix operating system.
+ #compile under unix, MSVC, or djgpp
  #
 +#Installation prefix:
 +PREFIX?=/usr/local
@@ -12,26 +12,28 @@
  #The source and object files are as follows:
  
  SRCFILES=nfbtrans.c nfbpatch.c
-@@ -10,8 +15,8 @@
+@@ -10,8 +15,10 @@
  LIBS= -ltermcap
  
  #Compiler and linking flags are as follows:
--CFLAGS="-O"
+-CFLAGS=-O
 -CC=gcc
++#CFLAGS=-O
++#CC=gcc
 +CFLAGS+=-O -DUNIX_PATH=\\\"${UNIX_PATH}\\\"
 +CC?=gcc
  LDFLAGS=-Bdynamic
  
  default:
-@@ -21,6 +26,7 @@
- 	@echo "make ultrix"
- 	@echo "make aix"
+@@ -23,6 +30,7 @@
  	@echo "make linux"
+ 	@echo "make djgpp"
+ 	@echo "make msvc"
 +	@echo "make freebsd"
  all: nfbtrans
  
- nfbtrans: $(OBJFILES)
-@@ -28,6 +34,9 @@
+ djgppall: nfbtrans.exe
+@@ -35,6 +43,9 @@
  
  ultrix:
  	$(MAKE) CFLAGS=-O
diff --git a/textproc/nfbtrans/files/patch-ab b/textproc/nfbtrans/files/patch-ab
index 65fd025a4c6e..d2031d919800 100644
--- a/textproc/nfbtrans/files/patch-ab
+++ b/textproc/nfbtrans/files/patch-ab
@@ -1,21 +1,21 @@
---- nfbtrans.c.orig	Sat Sep 23 20:45:38 2000
-+++ nfbtrans.c	Thu Nov 30 04:15:53 2000
-@@ -2,7 +2,9 @@
+--- nfbtrans.c.orig	Mon Nov  4 08:10:00 2002
++++ nfbtrans.c	Mon May  9 17:45:14 2005
+@@ -6,7 +6,9 @@
  #define LINT_ARGS
  #define DOS
  #else
 +#ifndef UNIX_PATH
  #define UNIX_PATH "/usr/local/lib/"
 +#endif
- #endif		   /* unix */
- #ifndef lint
- #endif		   /* lint */
-@@ -24,7 +26,7 @@
- #include <fcntl.h>
+ #endif             /* unix */
+ #include	<stdio.h>
+ #include <sys/types.h>
+@@ -27,7 +29,7 @@
  #include <stdarg.h>
  #define MAXARGS 7
--#if defined(sunos) || defined(linux)
-+#if defined(sunos) || defined(linux) || defined(freebsd)
+ #endif             /* DOS */
+-#if defined(sunos) || defined(linux) || defined(DJGPP)
++#if defined(sunos) || defined(linux) || defined(DJGPP) || defined(freebsd)
  #define max(a,b)  (((a) > (b)) ? (a) : (b))
  #define min(a,b)  (((a) < (b)) ? (a) : (b))
  #endif
diff --git a/textproc/nfbtrans/files/patch-ac b/textproc/nfbtrans/files/patch-ac
index cd8b71baf24f..e34385ee7186 100644
--- a/textproc/nfbtrans/files/patch-ac
+++ b/textproc/nfbtrans/files/patch-ac
@@ -1,18 +1,16 @@
---- nfbpatch.c.orig	Mon Mar 25 07:23:16 1996
-+++ nfbpatch.c	Wed Sep  8 05:58:22 1999
-@@ -31,9 +31,11 @@
+--- nfbpatch.c.orig	Thu May 24 08:41:34 2001
++++ nfbpatch.c	Mon May  9 17:48:33 2005
+@@ -21,7 +21,9 @@
  #include <unistd.h>
  
- #define CASE_SHIFT 32	/* diference between upper and lower case */
+ #define CASE_SHIFT 32   /* diference between upper and lower case */
 +#ifndef freebsd
- #define SYSVR4	   /* use with gcc and solaris 2.1 see getpgrp. Also defines
- 		    * usleep.  Wasn't able to link with /usr/ucblib/libucb.a
- 		    * Really no need for delay anyway */
+ #define SYSVR4     /* use with gcc and solaris 2.1 see getpgrp. */
 +#endif
  #ifdef ultrix
  #define ECHOCTL TCTLECH
  #endif
-@@ -97,7 +99,7 @@
+@@ -88,7 +90,7 @@
    int i;
  
    i = tcgetpgrp(0);/* Use stdin as the file descriptor */
diff --git a/textproc/nfbtrans/files/patch-ad b/textproc/nfbtrans/files/patch-ad
deleted file mode 100644
index 17359778a703..000000000000
--- a/textproc/nfbtrans/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- nfbtrans.cnf.orig	Sun Aug 30 06:11:38 1998
-+++ nfbtrans.cnf	Sun Aug 30 07:52:45 1998
-@@ -30,7 +30,7 @@
- ;s0=~[DL instructs juliet printer to ignore formfeed in spool mode
- so=15 sound enabled
- sp=0 spool mode off don't use dos print for backround printing
--st=c:\stat.txt statistics file
-+st=stat.txt statistics file
- ;tv=2000 timming value for microsoft C not used otherwise
- 
- ;Assign extension types
diff --git a/textproc/nfbtrans/pkg-plist b/textproc/nfbtrans/pkg-plist
index 569e766741de..51b71b8674ac 100644
--- a/textproc/nfbtrans/pkg-plist
+++ b/textproc/nfbtrans/pkg-plist
@@ -1,13 +1,19 @@
 bin/nfbtrans
 share/doc/nfbtrans/nfbtrans.doc
 share/doc/nfbtrans/nfbtrans.fmt
-share/doc/nfbtrans/read.me
+share/doc/nfbtrans/readme.txt
 share/doc/nfbtrans/tvfreqs.fmt
 share/nfbtrans/back.tab
 share/nfbtrans/braille.tab
 share/nfbtrans/english.dic
 share/nfbtrans/menu.cnf
 share/nfbtrans/nfbtrans.cnf
+share/nfbtrans/spanish/span1.tab
+share/nfbtrans/spanish/span2.tab
+share/nfbtrans/spanish/spanish1.cnf
+share/nfbtrans/spanish/spanish1.dic
+share/nfbtrans/spanish/spanish2.cnf
+share/nfbtrans/spanish/spanish2.dic
 share/nfbtrans/tables/bhs_bhm.tab
 share/nfbtrans/tables/danish.tab
 share/nfbtrans/tables/dutch.tab
@@ -24,5 +30,6 @@ share/nfbtrans/tables/spanish.tab
 share/nfbtrans/tables/swedish.tab
 share/nfbtrans/tables/tables.doc
 @dirrm share/nfbtrans/tables
+@dirrm share/nfbtrans/spanish
 @dirrm share/nfbtrans
 @dirrm share/doc/nfbtrans