reformat, avoid -warnings

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

1 files changed, 39 insertions, 40 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 066b8982d18..1289a775d24 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -24,6 +24,7 @@ BEGIN {
 use Getopt::Long;
 use File::Basename;
 use Cwd;
+use vars qw($opt_ctan_dir);
 
 # programs used; must all be on the path
 $MV = "mv";
@@ -1533,34 +1534,32 @@ $standardpfb = '\.pfb|\.inf$';
 );
 
 $standardttf='\.ttf';
-%specialttf= ();
+%specialttf = ();
 
 $standardsfd='\.sfd';
-%specialotf= ();
+%specialsfd = ();
 
 $standardotf='\.otf';
-%specialotf= ();
+%specialotf = ();
 
 $standardovf='\.ovf';
-%specialovf= ();
+%specialovf = ();
 
 $standardofm='\.ofm';
-%specialofm= ();
+%specialofm = ();
 
 $standardovp='\.ovp';
-%specialovp= ( 'psfragx',	'NULL',	);
+%specialovp = ( 'psfragx', 'NULL',);
 
 $standardotp='\.otp';
-%specialotp= ();
+%specialotp = ();
 
 $standardocp='\.ocp';
-%specialocp= ();
+%specialocp = ();
 
 # packages which have xmltex files
-%specialxmt= (
-  # 'passivetex',	'\.xmt|fotex.sty',
-);
 $standardxmt='\.xmt';
+%specialxmt = ();
 
 
 # code to install under texmf*/.../scripts.
@@ -1653,34 +1652,34 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
 # if a hash entry is matched here, README.TEXLIVE is created mentioning
 # that the files were removed.  These are checked after runins.
 %moreclean = (
- 'AkkTeX'	=> 'still to do, sorry',
- 'bbcard'	=> 'bbcard.tpm',
- 'chessboard'	=> 'chessboard.pdf',
- 'chessfss'	=> 'chessfonts_gallery.pdf|chessfss.pdf',
- 'dcpic'	=> '.*\.pdf',			# no source
- 'din1505'      => 'leitbild3.pdf|normpatsoft.pdf', # no source
- 'ecclesiastic' => 'ecclesiastic-sample.pdf',   # no source
- 'ednotes'	=> 'perpage.sty',		# copy from bigfoot
- 'easy'         => '.*\.pdf|doc.html.tgz',      # no source
- 'epslatex-fr'	=> 'R?Danger.eps',
- 'eqexam'	=> 'eqexamman.pdf',		# no source
- 'flacards'	=> 'flacards.pdf',
- 'gfsartemisia'	=> 'A*Specimen.pdf',		# nonfree
- 'gfsbaskerville'=>'B*Specimen.pdf',		# nonfree
- 'gfsbodoni'	=> 'B*Specimen.pdf',		# nonfree
- 'gfscomplutum'	=> 'C*Specimen.pdf',		# nonfree
- 'gfsdidot'	=> '[DO]*Specimen.pdf',		# nonfree
- 'gfsneohellenic'=>'N*Specimen.pdf', 		# nonfree
- 'guitbeamer'	=> 'guitbeamer-de.pdf',
- 'jknapltx'	=> 'ubbold.fd', # clashes bbold's Ubbold.fd; sauter bbold fails
- 'librarian'	=> 'librarian-doc.pdf',		# no source
- 'linguex'	=> 'cgloss4e.sty',		# symlink
- 'piechartmp'	=> 'piechartmp.pdf',
- 'ptptex'       => 'overcite.sty|cite.sty|wrapfig.sty', # duplicated
- 'rangen'	=> 'doc/rangen_man.pdf',		# no source
- 'stubs'	=> 'stubs.pdf',			# no source
- 'susy'		=> 'susy.pdf',			# no source
- 'xskak'	=> 'xskak.pdf',			# no source
+ 'AkkTeX'	 => 'still to do, sorry',
+ 'bbcard'	 => 'bbcard.tpm',
+ 'chessboard'	 => 'chessboard.pdf',
+ 'chessfss'	 => 'chessfonts_gallery.pdf|chessfss.pdf',
+ 'dcpic'	 => '.*\.pdf',				# no source
+ 'din1505'       => '(leitbild3|normpatsoft).pdf',	# no source
+ 'ecclesiastic'  => 'ecclesiastic-sample.pdf',		# no source
+ 'ednotes'	 => 'perpage.sty',			# copy from bigfoot
+ 'easy'          => '.*\.pdf|doc.html.tgz',		# no source
+ 'epslatex-fr'	 => 'R?Danger.eps',			# unneeded
+ 'eqexam'	 => 'eqexamman.pdf',			# no source
+ 'flacards'	 => 'flacards.pdf',
+ 'gfsartemisia'	 => 'A*Specimen.pdf',			# nonfree
+ 'gfsbaskerville'=> 'B*Specimen.pdf',			# nonfree
+ 'gfsbodoni'	 => 'B*Specimen.pdf',			# nonfree
+ 'gfscomplutum'	 => 'C*Specimen.pdf',			# nonfree
+ 'gfsdidot'	 => '[DO]*Specimen.pdf',		# nonfree
+ 'gfsneohellenic'=> 'N*Specimen.pdf',	 		# nonfree
+ 'guitbeamer'	 => 'guitbeamer-de.pdf',
+ 'jknapltx'	 => 'ubbold.fd', # clash bbold's Ubbold.fd; sauter bbold fails
+ 'librarian'	 => 'librarian-doc.pdf',		# no source
+ 'linguex'	 => 'cgloss4e.sty',			# symlink
+ 'piechartmp'	 => 'piechartmp.pdf',
+ 'ptptex'        => '(overcite|cite|wrapfig).sty',	# duplicated
+ 'rangen'	 => 'doc/rangen_man.pdf',		# no source
+ 'stubs'	 => 'stubs.pdf',			# no source
+ 'susy'		 => 'susy.pdf',				# no source
+ 'xskak'	 => 'xskak.pdf',			# no source
 );
 
 # 
@@ -2152,7 +2151,7 @@ sub domf {
   #
   # don't use $mfpatt since that's only the tfm-able mf files; just
   # install all the .mf files.
-  my $mf_inst_patt = $specialmfinstall{$package} || '\.mf$';
+  my $mf_inst_patt = $specialmfinstall{$package} || $standardmfinstall;
   &install ($mfdir, $mf_inst_patt);
 }