- Update to version 5.3.4

PR:		ports/155792
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

8 files changed, 22 insertions, 139 deletions

diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile
index 1c4c3d2fe6af..7cbfe81deae6 100644
--- a/print/dvi2tty/Makefile
+++ b/print/dvi2tty/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	dvi2tty
-PORTVERSION=	1.0
+PORTVERSION=	5.3.4
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	nonfree/dviware
-DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tar
+MASTER_SITES=	http://www.mesa.nl/pub/dvi2tty/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dvi-file previewer for text only devices
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${STRIP}"
 
-IGNOREFILES=	${DISTFILES}
-MAN1=		dvi2tty.1
-PLIST_FILES=	bin/dvi2tty
+MAN1=		disdvi.1 dvi2tty.1
+PLIST_FILES=	bin/disdvi bin/dvi2tty
+
+do-install:
+.for name in disdvi dvi2tty
+	${INSTALL_PROGRAM} ${WRKSRC}/${name} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${name}.1 ${MANPREFIX}/man/man1
+.endfor
 
 .include <bsd.port.mk>
diff --git a/print/dvi2tty/distinfo b/print/dvi2tty/distinfo
index 4a360e101f8b..5f2072069f4b 100644
--- a/print/dvi2tty/distinfo
+++ b/print/dvi2tty/distinfo
@@ -1,2 +1,2 @@
-MD5 (dvi2tty.tar) = IGNORE
-SHA256 (dvi2tty.tar) = IGNORE
+SHA256 (dvi2tty-5.3.4.tgz) = 5272ef88b99ebc0fe58c868fb4752408dfe8b23d7d8b86d7b87357d7206995e6
+SIZE (dvi2tty-5.3.4.tgz) = 59519
diff --git a/print/dvi2tty/files/patch-aa b/print/dvi2tty/files/patch-aa
deleted file mode 100644
index e9ac71517cef..000000000000
--- a/print/dvi2tty/files/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.orig	Thu Mar 11 06:00:00 1993
-+++ Makefile	Mon Oct 16 11:41:01 2000
-@@ -1,4 +1,5 @@
- # Makefile for dvi2tty and disdvi       23/01/89   M.J.E. Mol
-+# Modified by Joel Sutton <suttonj@interconnect.com.au> 8th Feb, 1997
- #
- # For BSD Unix use the following CFLAGS definition
- # CFLAGS = -Dstrchr=index
-@@ -6,17 +7,26 @@
- # This Makefile does not work for MSDOS. Make your 
- # own one, or compile by hand.
- #
--CFLAGS = 
-+
-+PREFIX?=	/usr/local
-+BINDIR=		${PREFIX}/bin/
-+MANDIR=		${PREFIX}/man/man
- 
- all:	dvi2tty disdvi
- 
--dvi2tty:dvi2tty.o dvistuff.o
--	cc -o dvi2tty dvi2tty.o dvistuff.o
-+dvi2tty: dvi2tty.o dvistuff.o
-+	$(CC) $(CFLAGS) -o dvi2tty dvi2tty.o dvistuff.o
- 
--disdvi:disdvi.c commands.h
--	cc -o disdvi disdvi.o
-+disdvi: disdvi.c commands.h
-+	$(CC) $(CFLAGS) -o disdvi disdvi.c
- 
- dvi2tty.o: dvi2tty.c dvi2tty.h
- 
- dvistuff.o: dvistuff.c dvi2tty.h commands.h
- 
-+install: all
-+	${BSD_INSTALL_PROGRAM} dvi2tty ${BINDIR}
-+	${BSD_INSTALL_MAN} dvi2tty.1 ${MANDIR}1/
-+
-+clean:
-+	rm -f dvi2tty disdvi *.o
diff --git a/print/dvi2tty/files/patch-ac b/print/dvi2tty/files/patch-ac
deleted file mode 100644
index 6e98a9b1d58e..000000000000
--- a/print/dvi2tty/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- dvi2tty.c.orig	Mon Oct 16 09:35:23 2000
-+++ dvi2tty.c	Mon Oct 16 09:35:39 2000
-@@ -114,7 +114,7 @@
-                               /* don't have terminals with Scand. nat. chars */
- #define WANTPAGER   TRUE      /* default: try to pipe through a pager (like  */
-                               /* more) if stdout is tty and no -o switch     */
--#define DEFPAGER    "/usr/bin/pg"   /* CHANGE TO YOUR LOCAL PAGER            */
-+#define DEFPAGER    "/usr/bin/more"   /* CHANGE TO YOUR LOCAL PAGER            */
- 
-     /*------------------ end of customization constants ---------------------*/
- 
diff --git a/print/dvi2tty/files/patch-ad b/print/dvi2tty/files/patch-ad
deleted file mode 100644
index eadeb64707ac..000000000000
--- a/print/dvi2tty/files/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
---- dvistuff.c.orig	Fri Mar 12 01:05:35 1993
-+++ dvistuff.c	Mon May  6 04:48:49 1996
-@@ -996,13 +996,14 @@
-     }
-     else
-         free(fnt->name);    /* free old name */
--    if ((name = (char *) malloc(namelen * sizeof(char))) == NULL) {
-+    if ((name = (char *) malloc((namelen + 1) * sizeof(char))) == NULL) {
-         perror("fontdef");
-         exit(1);
-     }
-     
-     for (i = 0; i < namelen; i++)
-         name[i] = get1();
-+    name[namelen] = '\0';
-     fnt->name = name;
-     if (new) {
-         fnt->next = fonts;
diff --git a/print/dvi2tty/files/patch-ae b/print/dvi2tty/files/patch-ae
deleted file mode 100644
index e070d983dcf0..000000000000
--- a/print/dvi2tty/files/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
---- disdvi.c.orig	Fri Mar 12 01:05:11 1993
-+++ disdvi.c	Mon May  6 04:47:36 1996
-@@ -348,13 +348,14 @@
-     }
-     else
-         free(fnt->name);    /* free old name */
--    if ((name = (char *) malloc(namelen * sizeof(char))) == NULL) {
-+    if ((name = (char *) malloc((namelen + 1) * sizeof(char))) == NULL) {
-         perror("fontdef");
-         exit(1);
-     }
-     
-     for (i = 0; i < namelen; i++)
-         name[i] = get1();
-+    name[namelen] = '\0';
-     fnt->name = name;
-     if (new) {
-         fnt->next = fonts;
diff --git a/print/dvi2tty/files/readme.patch-aa b/print/dvi2tty/files/readme.patch-aa
deleted file mode 100644
index 862582895d5b..000000000000
--- a/print/dvi2tty/files/readme.patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-The following are patches against the standard dvi2tty distribution (at
-least as of March of 1996, but it doesn't look like it's going to be
-changing any time in the near future).  The original code doesn't
-null-terminate a string at several points, apparently relying on the
-assumption that all memory will be zeroed.  This is not the case on
-several systems, most notably Linux.  These patches will also clean up the
-Makefile and add a make clean target.
-
-To apply these patches, use:
-
-	patch < dvi2tty.patch
-
-If you don't have patch on your system, you can obtain it from
-prep.ai.mit.edu (or any mirror) in /pub/gnu; I highly recommend you
-install it.  Alternately, you can just make the below changes by hand
-(there aren't very many).
-
-Feel free to send me questions, other problems, corrections, and the like,
-but please be aware that I am not the official maintainer of this package,
-and although I use it I do not know a lot about the internals.  I'll try
-to help, but don't expect too much.
-
-					Russ Allbery
-					rra@cs.stanford.edu
-
---------------------------------------------------------------------------
diff --git a/print/dvi2tty/pkg-descr b/print/dvi2tty/pkg-descr
index 4cfaded79693..656de774ecac 100644
--- a/print/dvi2tty/pkg-descr
+++ b/print/dvi2tty/pkg-descr
@@ -1,14 +1,8 @@
-dvi2tty is a simple utility which displays a dvi file on a text only
-device, say a terminal or a line printer. 
-
-The output is not perfect but it does give you a basic idea of what
-the final text would look like. I personally use this utility for the
-first step in converting a dvi file into a text file.
-
-This program comes from the CTAN archive and it not currently being
-maintained by anyone. Please see the README files in the distribution
-for more information.
-
-Share and enjoy,
-
-Joel...
+dvi2tty converts a TeX DVI-file to a format that is appropriate for
+terminals and line printers. The program is intended to be used for
+preliminary proofreading of TeX-ed documents. By default the output
+is directed to the terminal, possibly through a pager (depending on
+how the program was installed), but it can be directed to a file or
+a pipe.
+
+WWW: http://www.mesa.nl/