ctan-o-mat reinstall for windows wrapper

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

8 files changed, 16 insertions, 14 deletions

diff --git a/Master/bin/win32/ctan-o-mat.exe b/Master/bin/win32/ctan-o-mat.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/ctan-o-mat.exe
diff --git a/Master/texmf-dist/doc/man/man1/ctan-o-mat.1 b/Master/texmf-dist/doc/man/man1/ctan-o-mat.1
index 5ba43d39483..fdfad2de9a0 100644
--- a/Master/texmf-dist/doc/man/man1/ctan-o-mat.1
+++ b/Master/texmf-dist/doc/man/man1/ctan-o-mat.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -54,16 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.    if !\nF==2 \{\
-.        nr % 0
-.        nr F 2
+.        if !\nF==2 \{\
+.            nr % 0
+.            nr F 2
+.        \}
 .    \}
 .\}
+.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
diff --git a/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf b/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
index 88803ca368c..06de65cff6e 100644
--- a/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
diff --git a/Master/texmf-dist/scripts/ctan-o-mat/ctan-o-mat b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat
index 3041dc07ad3..3041dc07ad3 100755
--- a/Master/texmf-dist/scripts/ctan-o-mat/ctan-o-mat
+++ b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat
diff --git a/Master/bin/win32/ctan-o-mat.bat b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat
index 14aa5ff188b..14aa5ff188b 100755
--- a/Master/bin/win32/ctan-o-mat.bat
+++ b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat
diff --git a/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf
new file mode 100644
index 00000000000..d7dfbf7d853
--- /dev/null
+++ b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 7d17febf26e..c4c72547553 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1293,6 +1293,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'wadalab',     "&MAKEwadalab",
  'wasy2',       "die 'skipping, use wasy'",
  'wasy2-ps',	"&MAKEflatten",
+ 'webomints',	"die 'skipping, nonfree'",
  'win32-emacs-auctex', "die 'skipping, not for us'",
  'windycity',	"&MAKEflatten",
  'winedt',      "die 'skipping, nonfree license'",
@@ -2984,7 +2985,6 @@ $standardttf = '\.ttf|\.TTC';
  'bib2gls'		=> '\.jar$',
  'changes'		=> '\.py$',
  'cloze'		=> '\.lua$',
- 'ctan-o-mat'		=> 'ctan-o-mat(|\.pl)$',
  'epspdf'               => '(epspdf(|\.help|boot|tk)|\.rb|makegray\.pro)$',
  'latex2nemeth'         => '\.jar$',
  'latex-make'           => '\.py$',
@@ -3028,7 +3028,7 @@ $standardttf = '\.ttf|\.TTC';
  'cluttex'		=> 'cluttex\.lua$', # moved by prehook.
  'convbkmk'             => '\.rb$',
  'crossrefware'		=> '\.pl$',
- 'ctan-o-mat'		=> 'ctan-o-mat$',
+ 'ctan-o-mat'		=> 'ctan-o-mat\.pl$',
  'ctanbib'		=> 'ctanbib$',
  'ctanify'              => '^ctanify$',
  'ctanupload'           => '\.pl$',
@@ -3949,8 +3949,7 @@ sub doscripts {
           &SYSTEM ("$MV latexindent.exe $platdir/");
           next; # no wrapper
 
-        } elsif ($s eq "lua2dox_filter"   # package lua2dox
-                 || $s eq "ctan-o-mat") { # package ctan-o-mat
+        } elsif ($s eq "lua2dox_filter") { # package lua2dox
           # handwritten .bat
           &SYSTEM ("$MV $s.bat $platdir/");
           next; # no wrapper
@@ -5455,7 +5454,7 @@ sub PREHOOK_concrete {
 sub PREHOOK_ctan_o_mat {
   print "PREHOOK_$package - make .1 with pod2man\n";
   &prehook_pod2man ("Gerd Neugebauer", "$package.pl");
-  &SYSTEM ("$RM $package.pdf");
+  #&SYSTEM ("$RM $package.pdf");
 }
 
 sub PREHOOK_enctex {
diff --git a/Master/tlpkg/tlpsrc/ctan-o-mat.tlpsrc b/Master/tlpkg/tlpsrc/ctan-o-mat.tlpsrc
index 745e64e018f..dca338c719c 100644
--- a/Master/tlpkg/tlpsrc/ctan-o-mat.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ctan-o-mat.tlpsrc
@@ -1,2 +1 @@
 binpattern f bin/${ARCH}/${PKGNAME}
-docpattern +f texmf-dist/doc/man/man1/${PKGNAME}.*