Upgrade to 7.58.

PR:		23893
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

5 files changed, 39 insertions, 59 deletions

diff --git a/textproc/nfbtrans/Makefile b/textproc/nfbtrans/Makefile
index 570a6aae12e..5719e95356f 100644
--- a/textproc/nfbtrans/Makefile
+++ b/textproc/nfbtrans/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	nfbtrans
-PORTVERSION=	7.55
+PORTVERSION=	7.58
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://nfb.org/braille/nfbtrans/
-DISTNAME=	nfbtr755
-EXTRACT_SUFX=	.exe
+MASTER_SITES=	http://www.nfb.org/braille/nfbtrans/
+DISTNAME=	nfbtr${PORTVERSION:S/.//}
 
 MAINTAINER=	max@FreeBSD.org
 
@@ -23,12 +22,12 @@ ALL_TARGET=		freebsd
 MAKEFILE=		makefile
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/nfbtrans/tables
+	${MKDIR} ${PREFIX}/share/nfbtrans/tables
 	${INSTALL_PROGRAM} ${WRKSRC}/nfbtrans ${PREFIX}/bin
 .for f in braille.tab back.tab english.dic nfbtrans.cnf menu.cnf
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/lib/nfbtrans
+	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/nfbtrans
 .endfor
-	@unzip -q -L -a -o ${WRKSRC}/tables.zip -d ${PREFIX}/lib/nfbtrans/tables
+	unzip -q -L -a -o ${WRKSRC}/tables.zip -d ${PREFIX}/share/nfbtrans/tables
 .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
diff --git a/textproc/nfbtrans/distinfo b/textproc/nfbtrans/distinfo
index 562bc77c852..a238c13fb2d 100644
--- a/textproc/nfbtrans/distinfo
+++ b/textproc/nfbtrans/distinfo
@@ -1 +1 @@
-MD5 (nfbtr755.exe) = 74012045fa51b8a88b747b523fde8a14
+MD5 (nfbtr758.zip) = a67cc0e4a37276299071f35cef130c81
diff --git a/textproc/nfbtrans/files/patch-aa b/textproc/nfbtrans/files/patch-aa
index a62029719e6..17d02308199 100644
--- a/textproc/nfbtrans/files/patch-aa
+++ b/textproc/nfbtrans/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.orig	Sat Apr 17 08:22:40 1999
-+++ makefile	Wed Sep  8 06:01:21 1999
+--- makefile.orig	Sat Sep 23 13:46:52 2000
++++ makefile	Thu Nov 30 04:13:38 2000
 @@ -3,6 +3,11 @@
  #translation software written by the National Federation of the Blind
  #compile under the Unix operating system.
@@ -7,20 +7,22 @@
 +#Installation prefix:
 +PREFIX?=/usr/local
 +#Library path:
-+UNIX_PATH?=${PREFIX}/lib/nfbtrans/
++UNIX_PATH?=${PREFIX}/share/nfbtrans/
 +#
  #The source and object files are as follows:
  
  SRCFILES=nfbtrans.c nfbpatch.c
-@@ -10,7 +15,7 @@
+@@ -10,8 +15,8 @@
  LIBS= -ltermcap
  
  #Compiler and linking flags are as follows:
 -CFLAGS="-O"
+-CC=gcc
 +CFLAGS+=-O -DUNIX_PATH=\\\"${UNIX_PATH}\\\"
- CC=gcc
++CC?=gcc
  LDFLAGS=-Bdynamic
  
+ default:
 @@ -21,6 +26,7 @@
  	@echo "make ultrix"
  	@echo "make aix"
diff --git a/textproc/nfbtrans/files/patch-ab b/textproc/nfbtrans/files/patch-ab
index 3f36aee1d65..65fd025a4c6 100644
--- a/textproc/nfbtrans/files/patch-ab
+++ b/textproc/nfbtrans/files/patch-ab
@@ -1,12 +1,11 @@
---- nfbtrans.c.orig	Sun Nov 14 10:58:34 1999
-+++ nfbtrans.c	Fri Feb 18 15:00:00 2000
+--- nfbtrans.c.orig	Sat Sep 23 20:45:38 2000
++++ nfbtrans.c	Thu Nov 30 04:15:53 2000
 @@ -2,7 +2,9 @@
  #define LINT_ARGS
  #define DOS
  #else
--#define UNIX_PATH "/usr/local/lib/"
 +#ifndef UNIX_PATH
-+#define UNIX_PATH "/usr/local/lib/nfbtrans/"
+ #define UNIX_PATH "/usr/local/lib/"
 +#endif
  #endif		   /* unix */
  #ifndef lint
@@ -20,23 +19,3 @@
  #define max(a,b)  (((a) > (b)) ? (a) : (b))
  #define min(a,b)  (((a) < (b)) ? (a) : (b))
  #endif
-@@ -4904,7 +4906,8 @@
-   for (;;)
-   {
-     fprintf(stderr, "Enter dictionary word <RETURN> to skip: ");
--    gets(temp);
-+    fgets(temp, sizeof(temp), stdin);
-+    temp[strlen(temp)-1] = '\0';
-     if (!temp[0])
-       break;	   /* skip, don't store as rejected */
-     strupr(temp);
-@@ -5437,7 +5440,8 @@
- 	for (;;)
- 	{
- 	  fprintf(stderr, "enter word <RETURN> to exit: ");
--	  gets(field);
-+          fgets(field, (sizeof(field_) - (field - field_)), stdin);
-+          field[strlen(field-1)] = '\0';
- 	  if (strlen(field) < 2)
- 	    break;
- 	  strupr(field);
diff --git a/textproc/nfbtrans/pkg-plist b/textproc/nfbtrans/pkg-plist
index d5180e54887..569e766741d 100644
--- a/textproc/nfbtrans/pkg-plist
+++ b/textproc/nfbtrans/pkg-plist
@@ -1,28 +1,28 @@
 bin/nfbtrans
-lib/nfbtrans/back.tab
-lib/nfbtrans/braille.tab
-lib/nfbtrans/english.dic
-lib/nfbtrans/menu.cnf
-lib/nfbtrans/nfbtrans.cnf
-lib/nfbtrans/tables/bhs_bhm.tab
-lib/nfbtrans/tables/danish.tab
-lib/nfbtrans/tables/dutch.tab
-lib/nfbtrans/tables/dutch3.tab
-lib/nfbtrans/tables/esperant.tab
-lib/nfbtrans/tables/german.tab
-lib/nfbtrans/tables/gnt.tab
-lib/nfbtrans/tables/iceland.tab
-lib/nfbtrans/tables/netcom.cap
-lib/nfbtrans/tables/norweg.tab
-lib/nfbtrans/tables/russian.tab
-lib/nfbtrans/tables/span2.tab
-lib/nfbtrans/tables/spanish.tab
-lib/nfbtrans/tables/swedish.tab
-lib/nfbtrans/tables/tables.doc
 share/doc/nfbtrans/nfbtrans.doc
 share/doc/nfbtrans/nfbtrans.fmt
 share/doc/nfbtrans/read.me
 share/doc/nfbtrans/tvfreqs.fmt
-@dirrm lib/nfbtrans/tables
-@dirrm lib/nfbtrans
+share/nfbtrans/back.tab
+share/nfbtrans/braille.tab
+share/nfbtrans/english.dic
+share/nfbtrans/menu.cnf
+share/nfbtrans/nfbtrans.cnf
+share/nfbtrans/tables/bhs_bhm.tab
+share/nfbtrans/tables/danish.tab
+share/nfbtrans/tables/dutch.tab
+share/nfbtrans/tables/dutch3.tab
+share/nfbtrans/tables/esperant.tab
+share/nfbtrans/tables/german.tab
+share/nfbtrans/tables/gnt.tab
+share/nfbtrans/tables/iceland.tab
+share/nfbtrans/tables/netcom.cap
+share/nfbtrans/tables/norweg.tab
+share/nfbtrans/tables/russian.tab
+share/nfbtrans/tables/span2.tab
+share/nfbtrans/tables/spanish.tab
+share/nfbtrans/tables/swedish.tab
+share/nfbtrans/tables/tables.doc
+@dirrm share/nfbtrans/tables
+@dirrm share/nfbtrans
 @dirrm share/doc/nfbtrans