From 506338a341306ba643b50d548d4b5a1c8eda756d Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 25 Apr 2000 18:54:29 +0000
Subject: [PATCH] Turns out tetex dialog is not suitable for anything but
 tetex. In particular, XF86Setup complains...

So, fix texconfig to find misc/dialog first, then fall back on teTeX's
dialog.

This removes the teTeX/dialog conflict, repairs XF86Setup.
Installing tetex-dialog as a fall back removes the need for teTeX to
depend on misc/dialog.

Solved by fries@.
---
 misc/dialog/pkg/PLIST                         |  1 -
 .../base/patches/patch-dialog_Makefile_in     | 24 +++++++++
 .../base/patches/patch-dialog_dialog_man      | 10 ++++
 .../base/patches/patch-texk_tetex_texconfig   | 52 +++++++++++++++++++
 print/teTeX/base/pkg/PLIST                    |  6 +--
 5 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 print/teTeX/base/patches/patch-dialog_Makefile_in
 create mode 100644 print/teTeX/base/patches/patch-dialog_dialog_man
 create mode 100644 print/teTeX/base/patches/patch-texk_tetex_texconfig

diff --git a/misc/dialog/pkg/PLIST b/misc/dialog/pkg/PLIST
index d0b70ddfa89..08e7e86618b 100644
--- a/misc/dialog/pkg/PLIST
+++ b/misc/dialog/pkg/PLIST
@@ -1,3 +1,2 @@
-@pkgcfl teTeX_base-*
 bin/dialog
 man/man1/dialog.1
diff --git a/print/teTeX/base/patches/patch-dialog_Makefile_in b/print/teTeX/base/patches/patch-dialog_Makefile_in
new file mode 100644
index 00000000000..6f51eb4a5ca
--- /dev/null
+++ b/print/teTeX/base/patches/patch-dialog_Makefile_in
@@ -0,0 +1,24 @@
+--- dialog/Makefile.in.orig	Tue Apr 25 20:30:21 2000
++++ dialog/Makefile.in	Tue Apr 25 20:31:18 2000
+@@ -103,17 +103,17 @@ SHELL = /bin/sh
+ @SET_MAKE@
+ 
+ .PHONY: install installdirs install-exec
+-install: install-exec $(mandir)/dialog.$(manext)
++install: install-exec $(mandir)/tetex-dialog.$(manext)
+ 
+-install-exec: installdirs $(bindir)/dialog
++install-exec: installdirs $(bindir)/tetex-dialog
+ 
+ installdirs:
+ 	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(mandir)
+ 
+-$(bindir)/dialog: dialog
++$(bindir)/tetex-dialog: dialog
+ 	$(INSTALL_PROGRAM) dialog $@
+ 
+-$(mandir)/dialog.$(manext): dialog.man
++$(mandir)/tetex-dialog.$(manext): dialog.man
+ 	$(INSTALL_DATA) $(srcdir)/dialog.man $@
+ 
+ 
diff --git a/print/teTeX/base/patches/patch-dialog_dialog_man b/print/teTeX/base/patches/patch-dialog_dialog_man
new file mode 100644
index 00000000000..072d98d20fb
--- /dev/null
+++ b/print/teTeX/base/patches/patch-dialog_dialog_man
@@ -0,0 +1,10 @@
+--- dialog/dialog.man.orig	Tue Apr 25 20:48:40 2000
++++ dialog/dialog.man	Tue Apr 25 20:48:47 2000
+@@ -1,6 +1,6 @@
+ .TH DIALOG 1 "10 January 1994"
+ .SH NAME
+-dialog \- display dialog boxes from shell scripts
++tetex-dialog \- display dialog boxes from shell scripts
+ .SH SYNOPSIS
+ .B dialog --clear
+ .br
diff --git a/print/teTeX/base/patches/patch-texk_tetex_texconfig b/print/teTeX/base/patches/patch-texk_tetex_texconfig
new file mode 100644
index 00000000000..a94106825e4
--- /dev/null
+++ b/print/teTeX/base/patches/patch-texk_tetex_texconfig
@@ -0,0 +1,52 @@
+--- texk/tetex/texconfig.orig	Tue Apr 25 20:31:32 2000
++++ texk/tetex/texconfig	Tue Apr 25 20:48:01 2000
+@@ -122,26 +122,13 @@ find_fmt()
+ 
+ cls() { test -z "$NO_CLEAR" && clear; }
+ 
+-# Some systems have their own dialog. Use it then and do not use
+-# faked TERM and TERMINFO variables when calling that dialog.
+-find_dialogtype()
+-{
+-  own_dialog=false
+-  { u=`uname -s`; } 2>/dev/null
+-  case "$u" in
+-    FreeBSD|Linux)
+-      DIALOG_PROG=/usr/bin/dialog
+-      test -x "$DIALOG_PROG" && own_dialog=true;;
+-  esac
+-}
+- 
+ run_dialog()
+ {
+   test -z "$NO_CLEAR" && clear
+   if $own_dialog; then
+     $DIALOG_PROG --title "$version setup utility" "$@"
+   else
+-    TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO dialog --title "$version setup utility" "$@"
++    TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO tetex-dialog --title "$version setup utility" "$@"
+   fi
+ }
+ 
+@@ -1514,7 +1501,6 @@ config_formats()
+ #------------------ begin: initialisation -----------------------------------
+ find_echo
+ find_fmt
+-find_dialogtype
+ check_environ
+ require_binary kpsewhich pwd
+ 
+@@ -1696,6 +1682,13 @@ PAGER=${PAGER-$std_pager}
+ 
+ check_for_binary dialog >/dev/null
+ dialogok=$?
++if [ $dialogok == 0 ]; then
++	own_dialog=true
++else
++	check_for_binary tetex-dialog >/dev/null
++	own_dialog=false
++	dialogok=$?
++fi
+ 
+ # we have called some shellfunctions, so for HP-UX's shell, we need
+ # to set the positional parameters this again:
diff --git a/print/teTeX/base/pkg/PLIST b/print/teTeX/base/pkg/PLIST
index cd4cfbcd830..a738fbb5078 100644
--- a/print/teTeX/base/pkg/PLIST
+++ b/print/teTeX/base/pkg/PLIST
@@ -1,7 +1,5 @@
 @comment teTeX actually includes texi2html-1.56k
 @pkgcfl texi2html-*
-@comment and a version of dialog
-@pkgcfl dialog-*
 @unexec install-info --delete --info-dir=%D/info %D/info/dvips.info
 @unexec install-info --delete --info-dir=%D/info %D/info/kpathsea.info
 @unexec install-info --delete --info-dir=%D/info %D/info/latex.info
@@ -13,7 +11,6 @@ bin/allcm
 bin/allec
 bin/allneeded
 bin/bibtex
-bin/dialog
 bin/dmp
 bin/dvi2fax
 bin/dvicopy
@@ -103,6 +100,7 @@ bin/readlink
 bin/rubibtex
 bin/rumakeindex
 bin/tangle
+bin/tetex-dialog
 bin/tex
 bin/texconfig
 bin/texdoc
@@ -204,7 +202,6 @@ man/man1/bibtex.1
 man/man1/cont-de.1
 man/man1/cont-en.1
 man/man1/cont-nl.1
-man/man1/dialog.1
 man/man1/dmp.1
 man/man1/dvicopy.1
 man/man1/dvilj.1
@@ -262,6 +259,7 @@ man/man1/tex.1
 man/man1/texconfig.1
 man/man1/texhash.1
 man/man1/texi2html.1
+man/man1/tetex-dialog.1
 man/man1/tftopl.1
 man/man1/tie.1
 man/man1/vftovp.1