new font gfsneohellenic

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

1 files changed, 21 insertions, 18 deletions

diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 81b0d7981d6..7403d2c67fc 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -24,6 +24,7 @@ use Cwd;
 # programs used; must all be on the path
 $MV = "mv";
 $CP = "cp -p";
+$RM = "rm -vf";  # just to get feedback from GNU rm on removals
 
 $| = 1;
 select ((select (STDERR), $| = 1)[0]);
@@ -152,6 +153,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'fragments',	"die 'skipping, not a package'",
  'frcursive',	"&MAKEflatten",
  'germbib',	"&MAKEgermbib",
+ 'gfsneohellenic', "&MAKEflatten",
  'gfsporson',   "&MAKEflatten",
  'gfssolomos',  "&MAKEflatten",
  'graphics',	"&MAKEcopy",  # we use latex-tds/graphics.zip
@@ -710,11 +712,12 @@ $standardins='\.ins';
 $standardinsrunner="latex -interaction=nonstopmode";
 
 %specialins_postdelete = (
- 'dateiliste',	'dateiliste.README*',	# already in dist
- 'ednotes',	'perpage.sty',		# copy from bigfoor
- 'jknapltx',	'ubbold.fd',		# clashes with Ubbold.fd from bbold,
+ 'dateiliste',	   'dateiliste.README*',      # already in dist
+ 'ednotes',	   'perpage.sty',	      # copy from bigfoor
+ 'gfsneohellenic', 'NeohellenicSpecimen.pdf', # nonfree
+ 'jknapltx',	   'ubbold.fd',		# clashes with Ubbold.fd from bbold,
  					# plus sauter bbold doesn't work?
- 'mathexam',	'sample.tex~',
+ 'mathexam',	    'sample.tex~',
 );
 
 %specialmakeindex= (
@@ -1301,14 +1304,14 @@ sub MAKEcopy {
   # remove top-level README (shouldn't overwrite texmf-dist/README!),
   # needed for vntex, pgf, others.  Do this before removing symlinks,
   # in case the README is a symlink (e.g., iwona).
-  -r "$dest/README" && &SYSTEM ("rm -f $dest/README $dest/00readme*");
+  -r "$dest/README" && &SYSTEM ("$RM $dest/README $dest/00readme*");
 
   # for arev et al., remove symlinks.
   &SYSTEM ("find $dest -type l | xargs --no-run-if-empty rm");
 
   # ditto assorted other for lm (files are in doc subtree already).  
   -r "$dest/MANIFEST.txt"
-  && &SYSTEM ("cd $dest && rm -f GUST*.txt MANIFEST.txt README.eng");
+  && &SYSTEM ("cd $dest && $RM GUST*.txt MANIFEST.txt README.eng");
 
   # move CHANGELOG for stellenbosch.
   -r "$dest/CHANGELOG" 
@@ -1361,7 +1364,7 @@ sub setup {
   &SYSTEM("mkdir -p $DEST/source/$whichdocformat/$package");
   
   # remove README symlinks.
-  &SYSTEM ("test -h $packagedir/README && rm -vf $packagedir/README");
+  &SYSTEM ("test -h $packagedir/README && $RM $packagedir/README");
 
   return if $ctl eq "nocopytodoc";
   # copy everything to the doc directory
@@ -1426,7 +1429,7 @@ sub runins {
   }
 
   my $postdelete = $specialins_postdelete{$package};
-  &SYSTEM ("rm -f $postdelete") if $postdelete;
+  &SYSTEM ("$RM $postdelete") if $postdelete;
 }
 
 sub install {
@@ -1658,7 +1661,7 @@ sub runmf {
       &SYSTEM ("$MV @inst $mfdir");
     }
     #
-    &SYSTEM ("rm -f *pk");  # not worth the space
+    &SYSTEM ("$RM *pk");  # not worth the space
     
   } else {
     print "\t (no $mfpatt to runmf)\n";
@@ -1860,7 +1863,7 @@ sub MAKEarabi {
   #
   print "\t SPECIAL $package: rearranging for tds\n";
   &SYSTEM ("mkdir -p tex; mv latex tex");
-  &SYSTEM ("rm -f tex/latex/arabi/updmap.cfg")
+  &SYSTEM ("$RM tex/latex/arabi/updmap.cfg")
   &SYSTEM ("rm -rf dvips");
   #
   print "\t SPECIAL $package: copying to $DEST\n";
@@ -1895,7 +1898,7 @@ sub MAKEaurical {
   &SYSTEM ("$MV fonts/map/dvips/misc fonts/map/dvips/$package");
   &SYSTEM ("mkdir -p fonts/source/public/aurical/");
   &SYSTEM ("$MV aurical_source.zip fonts/source/public/aurical/");
-  &SYSTEM ("rm -f aurical.pdf aurical_texmf.zip");
+  &SYSTEM ("$RM aurical.pdf aurical_texmf.zip");
   #
   &xchdir ("..");
   &MAKEcopy ();
@@ -1907,7 +1910,7 @@ sub MAKEbabel {
  &donormal;
  # maybe also remove bulgarian?
  print "\t SPECIAL $package: remove old lahyph.tex\n";  # since braams hasn't
- &SYSTEM("rm -f $DEST/doc/generic/$package/lahyph.tex");
+ &SYSTEM("$RM $DEST/doc/generic/$package/lahyph.tex");
  my $files = "icehyph.tex iahyphen.tex ";
  print "\t SPECIAL move to /tmp: $files\n";  # since not separate on CTAN
  &SYSTEM("cd $DEST/doc/generic/$package && mv $files /tmp");
@@ -1944,7 +1947,7 @@ sub MAKEmathdesign {
   # basically have several tds hiers to unzip, with some cleanups.
   print "\t SPECIAL $package: unzip etc.\n";
   for my $zip (<*.zip>) {
-    &SYSTEM ("cd $DEST && unzip -q -o $DOCDIR/$zip; rm -f $DOCDIR/zip");
+    &SYSTEM ("cd $DEST && unzip -q -o $DOCDIR/$zip; $RM $DOCDIR/zip");
   }
   &SYSTEM ("rm -rf commercialfonts");
   &SYSTEM ("mv $DEST/dvips/config $DEST/dvips/mathdesign");
@@ -1997,7 +2000,7 @@ sub MAKEhyperref {
   print "\t SPECIAL $package unzip tds and copy\n";
   &SYSTEM ("rm -rf doc test");      # we will use prepared zip
   &SYSTEM ("unzip -q $package-tds.zip");
-  &SYSTEM ("rm -f * 2>/dev/null");  # remove top-level files
+  &SYSTEM ("$RM * 2>/dev/null");  # remove top-level files
   #
   &xchdir ("..");
   &MAKEcopy ();
@@ -2008,7 +2011,7 @@ sub MAKEoberdiek {
   #
   print "\t SPECIAL $package unzip tds and copy\n";
   &SYSTEM ("unzip -q $package-tds.zip");
-  &SYSTEM ("rm -f * 2>/dev/null");  # remove top-level files
+  &SYSTEM ("$RM * 2>/dev/null");  # remove top-level files
   #
   &xchdir ("..");
   &MAKEcopy ();
@@ -2533,7 +2536,7 @@ sub MAKElshort {
   &SYSTEM("mkdir -p $destdir");
   &SYSTEM("$CP -r $packagedir/* $destdir");
   # keep only pdf's to save space.
-  &SYSTEM("cd $destdir && rm -f lshort*.ps *lshort*.ps.*z* lshort*.dvi lshort-*-book.zip");
+  &SYSTEM("cd $destdir && $RM lshort*.ps *lshort*.ps.*z* lshort*.dvi lshort-*-book.zip");
 }
 
 sub MAKEltt {
@@ -2743,7 +2746,7 @@ sub MAKElibertine
   &SYSTEM ("$CP -rv * $DEST");
   
   # remove extra libertine.map.
-  &SYSTEM ("rm -f $DEST/dvips/config/libertine.map");
+  &SYSTEM ("$RM $DEST/dvips/config/libertine.map");
   &SYSTEM ("rmdir -p $DEST/dvips/config");
 }
 
@@ -3033,7 +3036,7 @@ sub MAKEkoma {
   #
   print "\t SPECIAL $package unzip and copy\n";
   &SYSTEM ("unzip -q komascript.tds.zip");
-  &SYSTEM ("rm -f *");  # remove the top-level files, they're in the zip
+  &SYSTEM ("$RM *");  # remove the top-level files, they're in the zip
   #
   &xchdir ("..");
   &MAKEcopy ();