have to rename mathspicNNN.pl in scripts tree for sake of w32 wrapper

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

20 files changed, 27 insertions, 21 deletions

diff --git a/Master/bin/alpha-linux/mathspic b/Master/bin/alpha-linux/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/alpha-linux/mathspic
+++ b/Master/bin/alpha-linux/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/mathspic b/Master/bin/amd64-freebsd/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/amd64-freebsd/mathspic
+++ b/Master/bin/amd64-freebsd/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/mathspic b/Master/bin/amd64-kfreebsd/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/amd64-kfreebsd/mathspic
+++ b/Master/bin/amd64-kfreebsd/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/mathspic b/Master/bin/i386-cygwin/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/i386-cygwin/mathspic
+++ b/Master/bin/i386-cygwin/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/mathspic b/Master/bin/i386-freebsd/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/i386-freebsd/mathspic
+++ b/Master/bin/i386-freebsd/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/mathspic b/Master/bin/i386-kfreebsd/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/i386-kfreebsd/mathspic
+++ b/Master/bin/i386-kfreebsd/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mathspic b/Master/bin/i386-linux/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/i386-linux/mathspic
+++ b/Master/bin/i386-linux/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/mathspic b/Master/bin/i386-netbsd/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/i386-netbsd/mathspic
+++ b/Master/bin/i386-netbsd/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mathspic b/Master/bin/i386-solaris/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/i386-solaris/mathspic
+++ b/Master/bin/i386-solaris/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/mips-irix/mathspic b/Master/bin/mips-irix/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/mips-irix/mathspic
+++ b/Master/bin/mips-irix/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/mathspic b/Master/bin/powerpc-aix/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/powerpc-aix/mathspic
+++ b/Master/bin/powerpc-aix/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/mathspic b/Master/bin/powerpc-linux/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/powerpc-linux/mathspic
+++ b/Master/bin/powerpc-linux/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-linux/mathspic b/Master/bin/sparc-linux/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/sparc-linux/mathspic
+++ b/Master/bin/sparc-linux/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/mathspic b/Master/bin/sparc-solaris/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/sparc-solaris/mathspic
+++ b/Master/bin/sparc-solaris/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/mathspic b/Master/bin/universal-darwin/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/universal-darwin/mathspic
+++ b/Master/bin/universal-darwin/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/mathspic b/Master/bin/x86_64-darwin/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/x86_64-darwin/mathspic
+++ b/Master/bin/x86_64-darwin/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/mathspic b/Master/bin/x86_64-linux/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/x86_64-linux/mathspic
+++ b/Master/bin/x86_64-linux/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/mathspic b/Master/bin/x86_64-solaris/mathspic
index 756e54b6352..53c2b249348 120000
--- a/Master/bin/x86_64-solaris/mathspic
+++ b/Master/bin/x86_64-solaris/mathspic
@@ -1 +1 @@
-../../texmf-dist/scripts/mathspic/mathspic113.pl
\ No newline at end of file
+../../texmf-dist/scripts/mathspic/mathspic.pl
\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/mathspic/mathspic113.pl b/Master/texmf-dist/scripts/mathspic/mathspic.pl
index 5c3ed4ec1f9..5c3ed4ec1f9 100755
--- a/Master/texmf-dist/scripts/mathspic/mathspic113.pl
+++ b/Master/texmf-dist/scripts/mathspic/mathspic.pl
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 094eea80f8f..a6d79f06b60 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -908,6 +908,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'cm-super'		=> '&PREHOOK_cm_super',
  'fixme'		=> '&PREHOOK_fixme',
  'ibygrk'		=> '&PREHOOK_ibygrk',
+ 'mathspic'		=> '&PREHOOK_mathspic',
  'mp3d'			=> '&PREHOOK_mp3d',
  'pictex'		=> '&PREHOOK_pictex',
  'skb'			=> '&PREHOOK_flatten1',
@@ -1977,7 +1978,7 @@ $standardxmt='\.xmt';
  'latexmk'		=> '\.pl$',
  'listings-ext'		=> '\.sh$',
  'match_parens'		=> '^match_parens$',
- 'mathspic'		=> '^mathspic.*\.pl$',
+ 'mathspic'		=> '^mathspic\.pl$',
  'mf2pt1'		=> '\.pl$',
  'mkgrkindex'		=> 'mkgrkindex$',
  'mkjobtexmf'		=> '\.pl$',
@@ -2393,7 +2394,7 @@ sub donormal {
 
      &setup unless $ctrl eq "nosetup";
      &xchdir ("$DEST/doc/$whichdocformat/$package");
-     &run_prehook ($package);
+     &run_prehook ($package) unless $ctrl eq "nosetup";
 
      &buildfilelist;
 
@@ -2645,7 +2646,6 @@ sub doscripts {
     }
 
     (my $linkname = $s) =~ s/\..*$//;
-    $linkname =~ s/^mathspic[0-9]+$/mathspic/;  # version number in name :(
     for my $p (@platforms) {
       my $platdir = "$TOPDEST/bin/$p";
       &xmkdir ($platdir);
@@ -4220,6 +4220,12 @@ sub PREHOOK_ibygrk {
   &SYSTEM ("$RM tex/generic/ibycus4/ibycus4.map");
 }
 
+sub PREHOOK_mathspic {
+  print "PREHOOK_$package - eliminate version from mathspicNNN.pl\n";
+  # the w32 wrapper can only find foo.pl from foo, not fooNNN.pl.
+  &SYSTEM ("$MV mathspic*.pl mathspic.pl");
+}
+
 sub PREHOOK_mp3d {
   print "PREHOOK_$package - rm 1.0\n";
   &SYSTEM ("$RM -rf v1.0");