19 files changed, 13 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-adobe.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-adobe.dat
index 0081d845d20..0081d845d20 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-adobe.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-adobe.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-dynacomware.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-dynacomware.dat
index ac99b67c334..ac99b67c334 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-dynacomware.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-dynacomware.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-fontworks.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-fontworks.dat
index 0a40e4f5efd..0a40e4f5efd 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-fontworks.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-fontworks.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-founder.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-founder.dat
index 8951754865b..8951754865b 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-founder.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-founder.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-hiragino.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-hiragino.dat
index 94b4a07e698..94b4a07e698 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-hiragino.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-hiragino.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-kozuka.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-kozuka.dat
index f9fb1a44dd4..f9fb1a44dd4 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-kozuka.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-kozuka.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-macos-removeonly.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-macos-removeonly.dat
index cc6440d73f9..cc6440d73f9 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-macos-removeonly.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-macos-removeonly.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-microsoft.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-microsoft.dat
index 19e70596ec0..19e70596ec0 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-microsoft.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-microsoft.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-mogamobo.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-mogamobo.dat
index bddebd45e15..bddebd45e15 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-mogamobo.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-mogamobo.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-morisawa.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-morisawa.dat
index 740c7b683cb..740c7b683cb 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-morisawa.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-morisawa.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ryokana.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ryokana.dat
index 9364cc55a27..9364cc55a27 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ryokana.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ryokana.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-sinotype.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sinotype.dat
index 37a032391e2..37a032391e2 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-sinotype.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sinotype.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-solaris.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-solaris.dat
index 157f84327f9..157f84327f9 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-solaris.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-solaris.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-toppan.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-toppan.dat
index f4bc4a54fa2..f4bc4a54fa2 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-toppan.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-toppan.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-typebank.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-typebank.dat
index d0fac9c1f7e..d0fac9c1f7e 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-typebank.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-typebank.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ume.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ume.dat
index dc0e129b8f4..dc0e129b8f4 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-ume.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ume.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-osx.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-yu-osx.dat
index 68866fe2f95..68866fe2f95 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-osx.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-yu-osx.dat
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-win.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-yu-win.dat
index 34d2e1be6f1..34d2e1be6f1 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/database/cjkgs-yu-win.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-yu-win.dat
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index aa3bc6ebb77..79947823d5c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1322,6 +1322,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'bibtex'               => '&POSTbibtex',
  'bibtexperllibs'       => '&POSTbibtexperllibs',
  'cfr-lm'               => '&POSTcfr_lm',
+ 'cjk-gs-integrate'	=> '&POSTcjk_gs_integrate',
  'cmcyr'		=> '&POSTcmcyr',
  'context'              => '&POSTcontext',
  'context-games'        => '&POSTcontext_games',
@@ -5600,6 +5601,13 @@ sub POSTcfr_lm {
   &SYSTEM("rmdir doc");
 }
 
+sub POSTcjk_gs_integrate {
+  print "POST$package - move database/ -> fonts/misc/PKGNAME/\n";  
+  my $destdir = "$DEST/fonts/misc";
+  &xmkdir ($destdir);
+  &SYSTEM ("$MV database $destdir/$package"); # rename to pkgname
+}
+
 sub POSTcmcyr {
   print "POST$package - exclude cmcsc{8,9,10}.mf from runtime\n";  
   # because they are duplicates of the standard files
@@ -5958,9 +5966,13 @@ sub POSTptex_fontmaps {
   &SYSTEM ("$MV cmap/* $cmapdest");
   &SYSTEM ("rmdir cmap");
   &SYSTEM ("$MV script/kanji-* $scriptdest");
-  &SYSTEM ("$MV jis04cmap_exp tools script $srcdest");
+  &SYSTEM ("$MV jis04cmap_exp script $srcdest");
   &SYSTEM ("$MV maps/* $mapdest");
   &SYSTEM ("rmdir maps");
+  #
+  my $fmiscdest= "$DEST/fonts/misc";
+  &xmkdir ($fmiscdest);
+  &SYSTEM ("$MV database $fmiscdest");
 }
 
 sub POSTknitting {