Use 'dialog' instead of 'tcdialog' when running texconfig. Bump PKGREVISION

to 4.  Fixes PR pkg/22151 by Richard Rauch.

3 files changed, 30 insertions, 12 deletions

diff --git a/print/teTeX2-bin/Makefile b/print/teTeX2-bin/Makefile
index d884020f20e..fcb703a003d 100644
--- a/print/teTeX2-bin/Makefile
+++ b/print/teTeX2-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/08/30 22:51:30 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/11 22:38:05 jmmv Exp $
 
 DISTNAME=	tetex-src-${TETEX_BIN_VERS}
 PKGNAME=	teTeX2-bin-${TETEX_BIN_VERS}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
diff --git a/print/teTeX2-bin/distinfo b/print/teTeX2-bin/distinfo
index 1abfc24c8e0..2f1a292db12 100644
--- a/print/teTeX2-bin/distinfo
+++ b/print/teTeX2-bin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2003/03/15 08:17:08 kei Exp $
+$NetBSD: distinfo,v 1.3 2003/09/11 22:38:05 jmmv Exp $
 
 SHA1 (teTeX/tetex-src-2.0.2.tar.gz) = 6445206b14d659458ee352df78d2c2daf8e88ab3
 Size (teTeX/tetex-src-2.0.2.tar.gz) = 11745933 bytes
 SHA1 (patch-ac) = 7e96a7a14090a6b3009d3562b18ee8383d50d3e0
 SHA1 (patch-ad) = 377f52b45ea66b88f682aaa7f0dd72dee8f986fb
-SHA1 (patch-ap) = 7f1ecc287e7ccb250f971c84d0363a2ad8161bd8
+SHA1 (patch-ap) = 40543e9a2fb87d296557f3a8bd9a7207b2331a8e
 SHA1 (patch-aq) = f90ed07b2de340c55c6d987fdaa59d7ed6d46e0f
diff --git a/print/teTeX2-bin/patches/patch-ap b/print/teTeX2-bin/patches/patch-ap
index 2ca23fd6c78..ae7a13efe34 100644
--- a/print/teTeX2-bin/patches/patch-ap
+++ b/print/teTeX2-bin/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1.1.1 2003/02/23 04:59:26 kei Exp $
+$NetBSD: patch-ap,v 1.2 2003/09/11 22:38:06 jmmv Exp $
 
---- texk/tetex/texconfig.orig	Sun Feb 16 04:04:56 2003
-+++ texk/tetex/texconfig	Fri Feb 21 10:25:36 2003
+--- texk/tetex/texconfig.orig	2003-03-01 10:13:18.000000000 +0100
++++ texk/tetex/texconfig
 @@ -7,8 +7,6 @@
  # Thomas Esser, te@dbs.uni-hannover.de
  # Copyright: Thomas Esser, 1994, 1995, 1996, 1997, 1999, 2002. Public domain.
@@ -11,7 +11,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2003/02/23 04:59:26 kei Exp $
  version=teTeX
  #version='TeX Live'
  
-@@ -192,29 +190,11 @@
+@@ -192,29 +190,11 @@ abort()
    cleanup
    exit 1
  }
@@ -42,7 +42,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2003/02/23 04:59:26 kei Exp $
  }
  
  check_environ()
-@@ -293,22 +273,6 @@
+@@ -293,22 +273,6 @@ fonts_rw()
    echo "Done." >&2
  }
  
@@ -65,7 +65,16 @@ $NetBSD: patch-ap,v 1.1.1.1 2003/02/23 04:59:26 kei Exp $
  fix_pager_more()
  {
    case "$PAGER" in
-@@ -1737,7 +1701,6 @@
+@@ -1454,7 +1418,7 @@ echo_file_location()
+ do_print_setup()
+ {
+   echo '==================== binaries found by searching $PATH ==================='
+-  echo_locate_binary tex etex dvipdfm pdftex omega mf mpost tcdialog dvips xdvi kpsewhich mktexpk mktextfm
++  echo_locate_binary tex etex dvipdfm pdftex omega mf mpost dialog dvips xdvi kpsewhich mktexpk mktextfm
+   echo
+   echo '=========================== Kpathsea variables ==========================='
+   echo_show_variable TEXMF TEXMFMAIN VARTEXMF
+@@ -1737,7 +1701,6 @@ esac
  needsCleanup=false
  find_echo
  find_fmt
@@ -73,7 +82,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2003/02/23 04:59:26 kei Exp $
  check_environ
  require_binary kpsewhich pwd
  
-@@ -1813,8 +1776,6 @@
+@@ -1813,8 +1776,6 @@ test -z "$TC_DFT_UPDMAP_CFG" && TC_DFT_U
  
  # The fallback directory for private scripts and config files.
  : ${TEXMF=`kpsewhich -expand-var '$TEXMF'`}
@@ -82,7 +91,16 @@ $NetBSD: patch-ap,v 1.1.1.1 2003/02/23 04:59:26 kei Exp $
  
  formats=$TC_VARTEXMF/web2c
  xdvi_app_dir=$TC_VARTEXMF/xdvi
-@@ -1975,7 +1936,6 @@
+@@ -1955,7 +1916,7 @@ cd "$tmpdir" || exit_return 1
+ EDIT=${VISUAL-${EDITOR-$std_editor}}
+ PAGER=${PAGER-$std_pager}
+ 
+-check_for_binary tcdialog >/dev/null || test -n "$DIALOG_PROG"
++check_for_binary dialog >/dev/null || test -n "$DIALOG_PROG"
+ dialogok=$?
+ 
+ # we have called some shellfunctions, so for HP-UX's shell, we need
+@@ -1975,7 +1936,6 @@ fi
  # fmtutil --missing
  # texlinks --multiplatform