From nobody@FreeBSD.org  Wed Dec 27 12:11:18 2000
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id ED53C37B402
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Dec 2000 12:11:18 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eBRKBIN31686;
	Wed, 27 Dec 2000 12:11:18 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200012272011.eBRKBIN31686@freefall.freebsd.org>
Date: Wed, 27 Dec 2000 12:11:18 -0800 (PST)
From: tkato@prontomail.ne.jp
Sender: nobody@FreeBSD.org
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: textproc/nfbtrans to 7.58
X-Send-Pr-Version: www-1.0

>Number:         23893
>Category:       ports
>Synopsis:       Update port: textproc/nfbtrans to 7.58
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    max
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 27 12:20:01 PST 2000
>Closed-Date:    Wed Jun 6 17:58:50 PDT 2001
>Last-Modified:  Wed Jun 06 17:59:31 PDT 2001
>Originator:     KATO Tsuguru
>Release:        4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 7.58

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/textproc/nfbtrans/Makefile textproc/nfbtrans/Makefile
--- /usr/ports/textproc/nfbtrans/Makefile	Mon Apr 10 21:03:47 2000
+++ textproc/nfbtrans/Makefile	Tue Dec 19 00:09:59 2000
@@ -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${PORTNAME:S/.//}
 
 MAINTAINER=	max@FreeBSD.org
 
@@ -23,20 +22,20 @@
 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
 	@${WRKSRC}/nfbtrans st=${WRKSRC}/stat.txt qm=1 ob=oc=15 \
 	  ${WRKSRC}/nfbprint.fmt > ${WRKSRC}/nfbtrans.doc
-	${MKDIR} ${PREFIX}/share/doc/nfbtrans
+	@${MKDIR} ${PREFIX}/share/doc/nfbtrans
 .for f in read.me nfbtrans.doc nfbtrans.fmt tvfreqs.fmt
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/nfbtrans
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/nfbtrans
 .endfor
 .endif
 
diff -urN /usr/ports/textproc/nfbtrans/distinfo textproc/nfbtrans/distinfo
--- /usr/ports/textproc/nfbtrans/distinfo	Fri Feb 18 15:53:08 2000
+++ textproc/nfbtrans/distinfo	Thu Nov 30 04:10:35 2000
@@ -1 +1 @@
-MD5 (nfbtr755.exe) = 74012045fa51b8a88b747b523fde8a14
+MD5 (nfbtr758.zip) = a67cc0e4a37276299071f35cef130c81
diff -urN /usr/ports/textproc/nfbtrans/files/patch-aa textproc/nfbtrans/files/patch-aa
--- /usr/ports/textproc/nfbtrans/files/patch-aa	Wed Sep  8 06:33:38 1999
+++ textproc/nfbtrans/files/patch-aa	Thu Nov 30 04:20:31 2000
@@ -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"
-+CFLAGS+=-O -DUNIX_PATH=\\\"${UNIX_PATH}\\\"
- CC=gcc
+-CC=gcc
++CFLAGS+=-DUNIX_PATH=\\\"${UNIX_PATH}\\\"
++CC?=gcc
  LDFLAGS=-Bdynamic
  
+ default:
 @@ -21,6 +26,7 @@
  	@echo "make ultrix"
  	@echo "make aix"
diff -urN /usr/ports/textproc/nfbtrans/files/patch-ab textproc/nfbtrans/files/patch-ab
--- /usr/ports/textproc/nfbtrans/files/patch-ab	Fri Feb 18 15:53:10 2000
+++ textproc/nfbtrans/files/patch-ab	Thu Nov 30 04:16:03 2000
@@ -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 -urN /usr/ports/textproc/nfbtrans/pkg-plist textproc/nfbtrans/pkg-plist
--- /usr/ports/textproc/nfbtrans/pkg-plist	Fri Feb 18 15:53:12 2000
+++ textproc/nfbtrans/pkg-plist	Thu Nov 30 04:27:16 2000
@@ -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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->max 
Responsible-Changed-By: sf 
Responsible-Changed-When: Sun Jan 28 12:10:51 PST 2001 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23893 
State-Changed-From-To: open->closed 
State-Changed-By: max 
State-Changed-When: Wed Jun 6 17:58:50 PDT 2001 
State-Changed-Why:  
The port has been updated. thanks. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=23893 
>Unformatted:
