Upgrade to 7.53, and as a result, unbreak.

4 files changed, 24 insertions, 30 deletions

diff --git a/textproc/nfbtrans/Makefile b/textproc/nfbtrans/Makefile
index 393930b0dd71..00027e944f3a 100644
--- a/textproc/nfbtrans/Makefile
+++ b/textproc/nfbtrans/Makefile
@@ -1,28 +1,23 @@
 # New ports collection makefile for:	nfbtrans
-# Version required:		7.50.2
+# Version required:		7.53
 # Date created:			30 Aug 1998
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nfbtr750
-PKGNAME=	nfbtrans-7.50.2
+DISTNAME=	nfbtr753
+PKGNAME=	nfbtrans-7.53
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.netcom.com/pub/in/inge/
 EXTRACT_SUFX=	.zip
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} nfb7502.zip
 
 MAINTAINER=	max@FreeBSD.org
 
-BROKEN="fetch, nfb7507 is the latest"
-
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
 RESTRICTED=	"Unclear copyright status"
-EXTRACT_CMD=	unzip
+
+USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-q -a -L -o
-EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	freebsd
 MAKEFILE=	makefile
diff --git a/textproc/nfbtrans/distinfo b/textproc/nfbtrans/distinfo
index dfaa0282f647..b063d1074138 100644
--- a/textproc/nfbtrans/distinfo
+++ b/textproc/nfbtrans/distinfo
@@ -1,2 +1 @@
-MD5 (nfbtr750.zip) = c118ad48d76e9e04a32a6fb6e93c33d8
-MD5 (nfb7502.zip) = 0a2c31ee62431713eb6143aa1fbce043
+MD5 (nfbtr753.zip) = bb827f13f057efb03849bc6b7f82d164
diff --git a/textproc/nfbtrans/files/patch-aa b/textproc/nfbtrans/files/patch-aa
index 8e83aa8d30f7..a62029719e65 100644
--- a/textproc/nfbtrans/files/patch-aa
+++ b/textproc/nfbtrans/files/patch-aa
@@ -1,5 +1,5 @@
---- makefile.orig	Sun Aug 30 06:13:32 1998
-+++ makefile	Sun Aug 30 07:58:37 1998
+--- makefile.orig	Sat Apr 17 08:22:40 1999
++++ makefile	Wed Sep  8 06:01:21 1999
 @@ -3,6 +3,11 @@
  #translation software written by the National Federation of the Blind
  #compile under the Unix operating system.
@@ -16,20 +16,20 @@
  LIBS= -ltermcap
  
  #Compiler and linking flags are as follows:
--CFLAGS=-O
-+CFLAGS+=-O -dUNIX_PATH=${UNIX_PATH}
+-CFLAGS="-O"
++CFLAGS+=-O -DUNIX_PATH=\\\"${UNIX_PATH}\\\"
  CC=gcc
  LDFLAGS=-Bdynamic
  
-@@ -22,6 +27,7 @@
- 	@echo "ultrix"
- 	@echo "aix"
- 	@echo "linux"
-+	@echo "freebsd"
+@@ -21,6 +26,7 @@
+ 	@echo "make ultrix"
+ 	@echo "make aix"
+ 	@echo "make linux"
++	@echo "make freebsd"
  all: nfbtrans
  
- #Lint can wait a while
-@@ -31,6 +37,9 @@
+ nfbtrans: $(OBJFILES)
+@@ -28,6 +34,9 @@
  
  ultrix:
  	$(MAKE) CFLAGS=-O
@@ -38,4 +38,4 @@
 +	${MAKE} all CFLAGS="${CFLAGS} -Dfreebsd"
  
  linux:
- 	$(MAKE) CFLAGS=-O
+ 	$(MAKE) all CFLAGS="-O -Dlinux"
diff --git a/textproc/nfbtrans/files/patch-ac b/textproc/nfbtrans/files/patch-ac
index 425a44de9925..cd8b71baf24f 100644
--- a/textproc/nfbtrans/files/patch-ac
+++ b/textproc/nfbtrans/files/patch-ac
@@ -1,13 +1,13 @@
---- nfbpatch.c.orig	Thu Feb  6 12:00:00 1997
-+++ nfbpatch.c	Sun Aug 30 05:44:36 1998
+--- nfbpatch.c.orig	Mon Mar 25 07:23:16 1996
++++ nfbpatch.c	Wed Sep  8 05:58:22 1999
 @@ -31,9 +31,11 @@
  #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. Also defines
+ 		    * usleep.  Wasn't able to link with /usr/ucblib/libucb.a
+ 		    * Really no need for delay anyway */
 +#endif
  #ifdef ultrix
  #define ECHOCTL TCTLECH