From f00522078d87631d30f6f8ba051d525afccebf47 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Sep 2011 17:59:15 +0000 Subject: rm terminfo definitions for the dialog program we no longer include git-svn-id: svn://tug.org/texlive/trunk@23826 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tetex/ChangeLog | 10 ++++ Build/source/texk/tetex/Makefile.am | 13 ----- Build/source/texk/tetex/Makefile.in | 60 +++++----------------- Build/source/texk/tetex/texconfig-dialog | 12 ++--- Build/source/texk/tetex/texmf/texconfig/README | 23 --------- Build/source/texk/tetex/texmf/texconfig/g/generic | Bin 981 -> 0 bytes Build/source/texk/tetex/texmf/texconfig/generic | 10 ---- Build/source/texk/tetex/texmf/texconfig/v/vt100 | Bin 1230 -> 0 bytes Build/source/texk/tetex/texmf/texconfig/x/xterm | Bin 1368 -> 0 bytes 9 files changed, 25 insertions(+), 103 deletions(-) delete mode 100644 Build/source/texk/tetex/texmf/texconfig/README delete mode 100644 Build/source/texk/tetex/texmf/texconfig/g/generic delete mode 100644 Build/source/texk/tetex/texmf/texconfig/generic delete mode 100644 Build/source/texk/tetex/texmf/texconfig/v/vt100 delete mode 100644 Build/source/texk/tetex/texmf/texconfig/x/xterm (limited to 'Build') diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 2f62821a816..18a9005f35b 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,13 @@ +2011-09-05 Karl Berry + + * texconfig-dialog (runDialog): only clear screen if we actually + run the dialog program. + (findDialog): do not bother setting DIALOG_TERM and + DIALOG_TERMINFO if we don't find a system dialog program, + since we're just going to abort anyway. + * texmf: remove subdir with terminfo definitions. + * Makefile.am (texconfdir, nobase_dist_texconf_DATA): likewise rm. + 2011-09-04 Norbert Preining * updmap.pl (BEGIN): older versions are supported again. diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am index 7466de17514..73e01aa6f4f 100644 --- a/Build/source/texk/tetex/Makefile.am +++ b/Build/source/texk/tetex/Makefile.am @@ -69,23 +69,11 @@ dist_man5_MANS = \ fmtutil.cnf.5 \ updmap.cfg.5 -texconfdir = ${prefix} - -nobase_dist_texconf_DATA = \ - texmf/texconfig/README \ - texmf/texconfig/g/generic \ - texmf/texconfig/generic \ - texmf/texconfig/v/vt100 \ - texmf/texconfig/x/xterm - texconfigdir = ${prefix}/texmf/texconfig - dist_texconfig_SCRIPTS = tcfmgr - dist_texconfig_DATA = tcfmgr.map web2cdir = ${prefix}/texmf/web2c - dist_web2c_DATA = fmtutil.cnf bin_links = \ @@ -130,4 +118,3 @@ run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \ -e "$(EXEEXT)" $(DESTDIR)$(bindir) run-texlinks: PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks) - diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index cc2e8fc768e..c879acab4e2 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -36,8 +36,7 @@ POST_UNINSTALL = : DIST_COMMON = $(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \ $(dist_man1_MANS) $(dist_man5_MANS) $(dist_texconfig_DATA) \ $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \ - $(dist_web2c_DATA) $(nobase_dist_texconf_DATA) \ - $(srcdir)/../../build-aux/install-sh \ + $(dist_web2c_DATA) $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/missing \ $(srcdir)/../am/script_links.am $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/../am/bin_links.am \ @@ -86,8 +85,7 @@ am__base_list = \ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texconfigdir)" \ "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)" \ - "$(DESTDIR)$(texconfdir)" + "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)" SCRIPTS = $(dist_bin_SCRIPTS) $(dist_texconfig_SCRIPTS) \ $(dist_texmf_SCRIPTS) $(nodist_bin_SCRIPTS) SOURCES = @@ -96,8 +94,7 @@ man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 NROFF = nroff MANS = $(dist_man1_MANS) $(dist_man5_MANS) -DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA) \ - $(nobase_dist_texconf_DATA) +DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -254,14 +251,6 @@ dist_man5_MANS = \ fmtutil.cnf.5 \ updmap.cfg.5 -texconfdir = ${prefix} -nobase_dist_texconf_DATA = \ - texmf/texconfig/README \ - texmf/texconfig/g/generic \ - texmf/texconfig/generic \ - texmf/texconfig/v/vt100 \ - texmf/texconfig/x/xterm - texconfigdir = ${prefix}/texmf/texconfig dist_texconfig_SCRIPTS = tcfmgr dist_texconfig_DATA = tcfmgr.map @@ -564,29 +553,6 @@ uninstall-dist_web2cDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(web2cdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(web2cdir)" && rm -f $$files -install-nobase_dist_texconfDATA: $(nobase_dist_texconf_DATA) - @$(NORMAL_INSTALL) - test -z "$(texconfdir)" || $(MKDIR_P) "$(DESTDIR)$(texconfdir)" - @list='$(nobase_dist_texconf_DATA)'; test -n "$(texconfdir)" || list=; \ - $(am__nobase_list) | while read dir files; do \ - xfiles=; for file in $$files; do \ - if test -f "$$file"; then xfiles="$$xfiles $$file"; \ - else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ - test -z "$$xfiles" || { \ - test "x$$dir" = x. || { \ - echo "$(MKDIR_P) '$(DESTDIR)$(texconfdir)/$$dir'"; \ - $(MKDIR_P) "$(DESTDIR)$(texconfdir)/$$dir"; }; \ - echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(texconfdir)/$$dir'"; \ - $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(texconfdir)/$$dir" || exit $$?; }; \ - done - -uninstall-nobase_dist_texconfDATA: - @$(NORMAL_UNINSTALL) - @list='$(nobase_dist_texconf_DATA)'; test -n "$(texconfdir)" || list=; \ - $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(texconfdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(texconfdir)" && rm -f $$files tags: TAGS TAGS: @@ -758,7 +724,7 @@ check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(texconfdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -810,8 +776,7 @@ info-am: install-data-am: install-dist_texconfigDATA \ install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \ - install-dist_web2cDATA install-man \ - install-nobase_dist_texconfDATA + install-dist_web2cDATA install-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -862,7 +827,7 @@ ps-am: uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \ uninstall-dist_texconfigSCRIPTS uninstall-dist_texmfSCRIPTS \ uninstall-dist_web2cDATA uninstall-man \ - uninstall-nobase_dist_texconfDATA uninstall-nodist_binSCRIPTS + uninstall-nodist_binSCRIPTS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook uninstall-man: uninstall-man1 uninstall-man5 @@ -881,16 +846,15 @@ uninstall-man: uninstall-man1 uninstall-man5 install-dvi-am install-exec install-exec-am install-exec-hook \ install-html install-html-am install-info install-info-am \ install-man install-man1 install-man5 \ - install-nobase_dist_texconfDATA install-nodist_binSCRIPTS \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + install-nodist_binSCRIPTS install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \ uninstall-dist_texconfigSCRIPTS uninstall-dist_texmfSCRIPTS \ uninstall-dist_web2cDATA uninstall-hook uninstall-man \ - uninstall-man1 uninstall-man5 \ - uninstall-nobase_dist_texconfDATA uninstall-nodist_binSCRIPTS + uninstall-man1 uninstall-man5 uninstall-nodist_binSCRIPTS # diff --git a/Build/source/texk/tetex/texconfig-dialog b/Build/source/texk/tetex/texconfig-dialog index 4c2727b5bc6..bdf7ba202bc 100755 --- a/Build/source/texk/tetex/texconfig-dialog +++ b/Build/source/texk/tetex/texconfig-dialog @@ -81,22 +81,21 @@ logexec() ############################################################################### runDialog() { - termCtl clear if test -n "$DIALOG_PROG"; then + termCtl clear $DIALOG_PROG --title "TeX setup utility" ${1+"$@"} runDialogRc=$? + termCtl clear else abort "could not find dialog or whiptail program to run" fi - termCtl clear (exit $runDialogRc) return $runDialogRc } ############################################################################### # findDialog(void) -# Some systems have their own dialog. Use it then and do not use -# faked TERM and TERMINFO variables when calling that dialog. +# set DIALOG_PROG to the system dialog program, or the empty string. ############################################################################### findDialog() { @@ -108,11 +107,6 @@ findDialog() *) DIALOG_PROG=$binLoc; break;; esac done - case $DIALOG_PROG in - "") - : ${DIALOG_TERMINFO=$TEXMFMAIN/texconfig} - : ${DIALOG_TERM=generic} - esac } ############################################################################### diff --git a/Build/source/texk/tetex/texmf/texconfig/README b/Build/source/texk/tetex/texmf/texconfig/README deleted file mode 100644 index 330771aa4fd..00000000000 --- a/Build/source/texk/tetex/texmf/texconfig/README +++ /dev/null @@ -1,23 +0,0 @@ -Thomas Esser, 1999. Public domain. - -I hereby put this README file and the files g/generic, v/vt100 and -x/xterm into the public donain. - -The files contained in the subdirectories are provided, because -texconfig havily relies on a properly installed terminfo system. - -Some systems have buggy or touble-causing terminfo files and/or -a buggy curses library. Therefore, the dialog program provided -by me is linked against the ncurses library and uses its own -terminfo files. - -Set the variable - - DIALOG_TERMINFO to specify an alternate terminfo directory - (e.g. /usr/lib/terminfo) - - DIALOG_TERM to use an alternate configuration file (e.g. xterm) - -before starting texconfig. - -texconfig sets DIALOG_TERM to generic by default. diff --git a/Build/source/texk/tetex/texmf/texconfig/g/generic b/Build/source/texk/tetex/texmf/texconfig/g/generic deleted file mode 100644 index 5165d2c1600..00000000000 Binary files a/Build/source/texk/tetex/texmf/texconfig/g/generic and /dev/null differ diff --git a/Build/source/texk/tetex/texmf/texconfig/generic b/Build/source/texk/tetex/texmf/texconfig/generic deleted file mode 100644 index 1638aa827f5..00000000000 --- a/Build/source/texk/tetex/texmf/texconfig/generic +++ /dev/null @@ -1,10 +0,0 @@ -# -# Minimal terminfo configuration to run the dialog program. -# If this configuration causes problems, please let me know. -# -generic, - cols#80, lines#25, - clear=^[[H^[[2J, - kcud1=^[[B, kcub1=^[[D, kcuf1=^[[C, kcuu1=^[[A, - rev=^[[7m, smso=^[[7m, sgr0=^[[m, rmso=^[[m, bold=^[[1m, - cup=^[[%i%p1%d;%p2%dH, diff --git a/Build/source/texk/tetex/texmf/texconfig/v/vt100 b/Build/source/texk/tetex/texmf/texconfig/v/vt100 deleted file mode 100644 index 58879eb57e3..00000000000 Binary files a/Build/source/texk/tetex/texmf/texconfig/v/vt100 and /dev/null differ diff --git a/Build/source/texk/tetex/texmf/texconfig/x/xterm b/Build/source/texk/tetex/texmf/texconfig/x/xterm deleted file mode 100644 index 2c4bd146551..00000000000 Binary files a/Build/source/texk/tetex/texmf/texconfig/x/xterm and /dev/null differ -- cgit v1.2.3