update pdftexconfig.tex location, remove dvipdfm references

git-svn-id: svn://tug.org/texlive/trunk@43845 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 14 insertions, 44 deletions

diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index ae0ef904002..998dc369cb9 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,11 @@
+2017-04-16  Karl Berry  <karl@tug.org>
+
+	* texconfig.sh: remove references to dvipdfm, since it is no
+	longer separate from dvipdfmx.
+	* tcfmgr.map (config): likewise.
+	(pdftexconfig.tex): now in tex/generic/tex-ini-files.
+	From Paul Vojta.
+
 2017-03-28  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (xupdmap.1,xfmtutil.1): also make /tmp/*.html.
@@ -850,3 +858,5 @@ Sat Dec 18 14:19:43 CET 1999 te
 
 	* added manpages for epstopdf and dvi2fax (contributed by "James
 	R. Van Zandt" <jrv@vanzandt.mv.com>)
+
+(This file public domain.)
diff --git a/Build/source/texk/texlive/tl_scripts/tcfmgr.map b/Build/source/texk/texlive/tl_scripts/tcfmgr.map
index a5c6f35cb3d..9fc9d4cee16 100644
--- a/Build/source/texk/texlive/tl_scripts/tcfmgr.map
+++ b/Build/source/texk/texlive/tl_scripts/tcfmgr.map
@@ -1,9 +1,8 @@
 # file			rel dir			search path		progname
 dvipdfmx.cfg		dvipdfmx		other text files	dvipdfmx
-config			dvipdfm/config		other text files	dvipdfm
 config.ps		dvips/config		dvips config		-
 modes.mf		metafont/misc		.mf			-
-pdftexconfig.tex	tex/generic/config	.tex			-
+pdftexconfig.tex	tex/generic/tex-ini-files	.tex		-
 fmtutil.cnf		web2c			web2c files		-
 mktex.cnf		web2c			web2c files		-
 updmap.cfg		web2c			web2c files		-
diff --git a/Build/source/texk/texlive/tl_scripts/texconfig.sh b/Build/source/texk/texlive/tl_scripts/texconfig.sh
index 3adcbfb5f2a..9b6b87c6798 100755
--- a/Build/source/texk/texlive/tl_scripts/texconfig.sh
+++ b/Build/source/texk/texlive/tl_scripts/texconfig.sh
@@ -559,7 +559,6 @@ the TeX installation.
 
 Usage: $progname conf                  (show configuration information)
        $progname dvipdfmx paper PAPER  (dvipdfmx paper size)
-       $progname dvipdfm paper PAPER   (dvipdfm paper size)
        $progname dvips [OPTION...]     (dvips options)
        $progname faq                   (show teTeX faq)
        $progname findprog PROG...      (show locations of PROGs, a la which)
@@ -580,7 +579,6 @@ Usage: $progname conf                  (show configuration information)
 
 Get more help with:
        $progname dvipdfmx
-       $progname dvipdfm
        $progname dvips
        $progname font
        $progname hyphen
@@ -603,13 +601,13 @@ TeX Live home page: <http://tug.org/texlive/>
       echo
       echo '==================== binaries found by searching $PATH ==================='
       echo "PATH=$PATH"
-      echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfm
+      echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfmx
       echo
       echo '=========================== active config files =========================='
       echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
       echo
       echo '============================= font map files ============================='
-      for m in psfonts.map pdftex.map ps2pk.map dvipdfm.map; do
+      for m in psfonts.map pdftex.map ps2pk.map; do
         echo "$m: `kpsewhich $m`"
       done
       echo
@@ -621,39 +619,6 @@ TeX Live home page: <http://tug.org/texlive/>
       echoShowVariable $envVars
       ;;
 
-    # texconfig dvipdfm
-    dvipdfm)
-      help="Usage: $progname dvipdfm paper PAPER
-
-Valid PAPER settings:
-  letter legal ledger tabloid a4 a3"
-      case $2 in
-        # texconfig dvipdfm paper
-        paper-list)
-          for p in letter legal ledger tabloid a4 a3; do echo $p; done
-          ;;
-        paper)
-          case $3 in
-            letter|legal|ledger|tabloid|a4|a3)
-              fmgrConfigReplace config '^p' "p $3";;
-            "") echo "$help" >&2; rc=1;;
-            *)
-             echo "$progname: unknown PAPER \`$3' given as argument for \`$progname dvipdfm paper'" >&2
-             echo "$progname: try \`$progname dvipdfm paper' for help" >&2
-             rc=1 ;;
-          esac ;;
-        # texconfig dvipdfm ""
-        "")
-          echo "$help" >&2; rc=1 ;;
-        # texconfig dvipdfm <unknown>
-        *)
-          echo "$progname: unknown option \`$2' given as argument for \`$progname dvipdfm'" >&2
-          echo "$progname: try \`$progname dvipdfm' for help" >&2
-          rc=1
-          ;;
-      esac
-      ;;
-
     # texconfig dvipdfmx
     dvipdfmx)
       help="Usage: $progname dvipdfmx paper PAPER
@@ -1234,9 +1199,6 @@ Valid PAPER settings:
       if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then
         tcBatch dvips paper $pDvips
       fi
-      if checkForBinary dvipdfm >/dev/null && tcfmgr --cmd find --file config >/dev/null 2>&1; then
-        tcBatch dvipdfm paper $p
-      fi
       if checkForBinary dvipdfmx >/dev/null && tcfmgr --cmd find --file dvipdfmx.cfg >/dev/null 2>&1; then
         tcBatch dvipdfmx paper $p
       fi
diff --git a/Master/texmf-dist/texconfig/tcfmgr.map b/Master/texmf-dist/texconfig/tcfmgr.map
index a5c6f35cb3d..9fc9d4cee16 100644
--- a/Master/texmf-dist/texconfig/tcfmgr.map
+++ b/Master/texmf-dist/texconfig/tcfmgr.map
@@ -1,9 +1,8 @@
 # file			rel dir			search path		progname
 dvipdfmx.cfg		dvipdfmx		other text files	dvipdfmx
-config			dvipdfm/config		other text files	dvipdfm
 config.ps		dvips/config		dvips config		-
 modes.mf		metafont/misc		.mf			-
-pdftexconfig.tex	tex/generic/config	.tex			-
+pdftexconfig.tex	tex/generic/tex-ini-files	.tex		-
 fmtutil.cnf		web2c			web2c files		-
 mktex.cnf		web2c			web2c files		-
 updmap.cfg		web2c			web2c files		-