Update dvi2tty to 6.0.0

fix license.  OK by wiz

2016-03-05  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>

        dvi2tty-6.0.0.
        Support T1,TS1,OT2,T2A,T2B,T2C,X2 encodings.
        Add utf8 output for the latin, cyrillic encodings and
        OML,OMS encodings.
        Add option '-C' not to compose a combining character sequence.
        * dvi2tty.c, dvi2tty.h: Add new option '-C', '-Eu1' and inner flags.
        * tex2ucs.h (new), dvistuff.c: Add utf8 support and new encodings.
        * test/table.tex, table.dvi, dvi2tty.test: Add a new test.
        * table{,c,s,u,uC,Eu,Eu1,EuC,Eua}.tty,
          testEu.tty, ligtest{u,Eu}.tty (new);
          test{,s,u}.tty, ligtest.tty (update): Expected output.
        * Makefile{,.am,.in}: Add the new test and the new header file.
        * configure{,.ac}: Update version number.

2011-11-21  Peter Breitenlohner   <peb@mppmu.mpg.de>

        Add upTeX support from Tanaka Takuji <KXD02663@nifty.ne.jp>.
        * ac/withenable.ac, Makefile.am: Require ptexenc.
        * version.ac (new): Define dvi2tty_version.
        * configure.ac: Adapted.

2011-01-26  Peter Breitenlohner   <peb@mppmu.mpg.de>

        * dvi2tty.test: Unset DVI2TTY to nullify dvi2tty options.
        Additional testcase with '-c'.
        * testc.tty: Expected output.

2010-11-06  Peter Breitenlohner   <peb@mppmu.mpg.de>

        Import dvi2tty-5.3.3.
        * configure.ac: Adapted.

2010-10-15  Peter Breitenlohner  <peb@mppmu.mpg.de>

        Add two disdvi command line options to handle .dvi files as
        created by pTeX and .xdv files as created by XeTeX.

        * commands.h: Define DVI opcodes for pTeX and XeTeX extensions.
        * disdvi.c: Add command line options `-p' or `--ptex' and `-x'
        or `--xetex'; handle DVI opcodes for pTeX and XeTeX extensions.

2009-08-23  Peter Breitenlohner  <peb@mppmu.mpg.de>

        Avoid maximal compiler warnings.
        * disdvi.c, dvi2tty.c, dvistuff.c: Ignore RCS strings.
        ANSI C function definitions.
        * disdvi.c (fontname): Constify string return type.
        * dvi2tty.c (path, OUTfilename): Constify global strings.
        (getpages, getfname, getinteger, setoption, getargs):
        Constify string params and local vars.

2009-06-22  Peter Breitenlohner  <peb@mppmu.mpg.de>

        * dvi2tty.c (readable_file): declare as static.
        * disdvi.c, dvi2tty.h: do not #include <kpathsea/c-proto.h>.

2009-06-20  Peter Breitenlohner  <peb@mppmu.mpg.de>

        * Makefile.am: enable compiler warnings.
        * disdvi.c, dvi2tty.c, dvi2tty.h, dvistuff.c: ANSI C prototypes.

2009-06-15  Karl Berry  <karl@tug.org>

        * dvi2tty.c,
        * README: clarify that it's GPLv2+, per
        http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=424018.

2009-06-12  Francois Charette  <firmicus@ankabut.net>

        * dvistuff.c: rename getline to texlive_getline.

5 files changed, 25 insertions, 117 deletions

diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile
index c9b1b37cd2b..ca0019b27bb 100644
--- a/converters/dvi2tty/Makefile
+++ b/converters/dvi2tty/Makefile
@@ -1,30 +1,30 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 00:20:10 asau Exp $
+# $NetBSD: Makefile,v 1.17 2016/09/23 11:35:18 markd Exp $
 #
 
-DISTNAME=	dvi2tty
-PKGNAME=	dvi2tty-1.0
+DISTNAME=	texlive-20160523-source
+PKGNAME=	dvi2tty-6.0.0
 CATEGORIES=	converters
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-#MASTER_SITES=	ftp://tug.ctan.org/pub/tex-archive/dviware/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2016/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Program for previewing DVI files
-LICENSE=	no-commercial-use
+LICENSE=	gnu-gpl-v2
 
-MAKE_FLAGS+=	CFLAGS=${CFLAGS:M*:Q}
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/texk/dvi2tty
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/dvi2tty
 
-pre-patch:
-	cd ${WRKSRC};						\
-	    for p in dvi2tty.patch dvi2tty-latin1.patch;	\
-	    do							\
-		${PATCH} < $$p;					\
-	    done
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
-do-install:
-	${INSTALL_PROGRAM} \
-		${WRKSRC}/disdvi ${WRKSRC}/dvi2tty ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+CONFIGURE_ARGS+=	--with-system-kpathsea
+CONFIGURE_ARGS+=	--with-system-ptexenc
 
+.include "../../print/kpathsea/buildlink3.mk"
+.include "../../print/ptexenc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/dvi2tty/PLIST b/converters/dvi2tty/PLIST
index fa90a4f6493..4e440e2af92 100644
--- a/converters/dvi2tty/PLIST
+++ b/converters/dvi2tty/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:50:50 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/23 11:35:18 markd Exp $
 bin/disdvi
 bin/dvi2tty
+man/man1/disdvi.1
 man/man1/dvi2tty.1
diff --git a/converters/dvi2tty/distinfo b/converters/dvi2tty/distinfo
index fb97c0a4b4e..4c73d18f57e 100644
--- a/converters/dvi2tty/distinfo
+++ b/converters/dvi2tty/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 01:43:48 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/09/23 11:35:18 markd Exp $
 
-SHA1 (dvi2tty.tar.gz) = 7b62aef389325d87683630869261e14a6e98258e
-RMD160 (dvi2tty.tar.gz) = 331f9ca12c1d905ce3ec2963cb970dfbff80848d
-SHA512 (dvi2tty.tar.gz) = 1faf30a6aabdac9f2f0fe925f438bcd76694872e8967215381de1e312e7263e8e61444781f5b4c0abb79072bd0ec943171494b817f92c478e32cf569452749d7
-Size (dvi2tty.tar.gz) = 30720 bytes
-SHA1 (patch-aa) = c6452a3ea322b507b3f7a3c5dc654c0a2b4bfea6
-SHA1 (patch-ab) = 7776499817462f9a1f9dff1c50f876e3dc7de2b1
+SHA1 (texlive-20160523-source.tar.xz) = 8cdcc00492fc642db59a9a07f9ea080ff6765460
+RMD160 (texlive-20160523-source.tar.xz) = 4ffc4d92f8c6408c23a34815e2d4b0f4877d9c3f
+SHA512 (texlive-20160523-source.tar.xz) = 9fdd69d237238385240e918456f54791a38e57b573edf5df839c57e56a0009012b68b7b92298c3e137181325e2be84d7a84e9c7cf41ae9739bb3329d84194564
+Size (texlive-20160523-source.tar.xz) = 258176464 bytes
diff --git a/converters/dvi2tty/patches/patch-aa b/converters/dvi2tty/patches/patch-aa
deleted file mode 100644
index b8de550d428..00000000000
--- a/converters/dvi2tty/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/26 13:04:32 fredb Exp $
-
---- dvi2tty.c.orig	Thu Mar 11 16:00:00 1993
-+++ dvi2tty.c	Sun Jul 11 03:41:12 1999
-@@ -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/converters/dvi2tty/patches/patch-ab b/converters/dvi2tty/patches/patch-ab
deleted file mode 100644
index dd52af842e4..00000000000
--- a/converters/dvi2tty/patches/patch-ab
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/08/11 15:01:14 taca Exp $
-
-Avoid confliction with getline(3).
-
---- dvistuff.c.orig	2009-08-11 23:56:48.000000000 +0900
-+++ dvistuff.c
-@@ -123,7 +123,7 @@ void            rule            (bool, l
- void            ruleaux         (long, long, char);
- long            horizontalmove  (long);
- int             skipnops        (void);
--linetype    *   getline         (void);
-+linetype    *   get_line         (void);
- linetype    *   findline        (void);
- unsigned long   num             (int);
- long            snum            (int);
-@@ -148,7 +148,7 @@ void            rule            ();
- void            ruleaux         ();
- long            horizontalmove  ();
- int             skipnops        ();
--linetype    *   getline         ();
-+linetype    *   get_line         ();
- linetype    *   findline        ();
- unsigned long   num             ();
- long            snum            ();
-@@ -290,7 +290,7 @@ void initpage()
-     h = 0L;  v = 0L;                        /* initialize coordinates   */
-     x = 0L;  w = 0L;  y = 0L;  z = 0L;      /* initialize amounts       */
-     sptr = 0;                               /* initialize stack         */
--    currentline = getline();                /* initialize list of lines */
-+    currentline = get_line();                /* initialize list of lines */
-     currentline->vv = 0L;
-     firstline   = currentline;
-     lastline    = currentline;
-@@ -647,7 +647,7 @@ int skipnops()                      /* s
- 
- /*----------------------------------------------------------------------------*/
- 
--linetype *getline()             /* returns an initialized line-object */
-+linetype *get_line()             /* returns an initialized line-object */
- {
-     register int  i;
-     register linetype *temp;
-@@ -662,7 +662,7 @@ linetype *getline()             /* retur
-     temp->text[i] = '\0';
-     return temp;
- 
--} /* getline */
-+} /* get_line */
- 
- /*----------------------------------------------------------------------------*/
- 
-@@ -673,7 +673,7 @@ linetype *findline()            /* find 
- 
-     if (v <= firstline->vv) {                      /* above first line */
-         if (firstline->vv - v > VERTICALEPSILON) {
--            temp = getline();
-+            temp = get_line();
-             temp->next = firstline;
-             firstline->prev = temp;
-             temp->vv = v;
-@@ -684,7 +684,7 @@ linetype *findline()            /* find 
- 
-     if (v >= lastline->vv) {                       /* below last line */
-         if (v - lastline->vv > VERTICALEPSILON) {
--            temp = getline();
-+            temp = get_line();
-             temp->prev = lastline;
-             lastline->next = temp;
-             temp->vv = v;
-@@ -707,7 +707,7 @@ linetype *findline()            /* find 
-             return temp->next;
- 
-     /* no line fits suitable, generate a new one */
--    currentline = getline();
-+    currentline = get_line();
-     currentline->next = temp->next;
-     currentline->prev = temp;
-     temp->next->prev = currentline;