--- dvipdfmx/src/pdfdoc.c~	2007-01-25 14:43:45.000000000 +0900
+++ dvipdfmx/src/pdfdoc.c	2007-01-25 15:57:37.000000000 +0900
@@ -494,7 +494,6 @@
   const time_t now = time(NULL);
   struct tm tm;
   struct tm local;
-  time_t gmtoff;
 
   localtime_r(&now, &local);
   gmtime_r(&now, &tm);
@@ -516,13 +515,15 @@
 #endif  /* not HAVE_TIMEZONE */
   time_t      current_time;
   struct tm  *bd_time;
+  ldiv_t       offset;
 
   time(&current_time);
   bd_time = localtime(&current_time);
+  offset = ldiv(-timezone / 60, 60);
   sprintf(date_string, "D:%04d%02d%02d%02d%02d%02d%+03ld'%02ld'",
 	  bd_time->tm_year + 1900, bd_time->tm_mon + 1, bd_time->tm_mday,
 	  bd_time->tm_hour, bd_time->tm_min, bd_time->tm_sec,
-	  (-timezone / 3600), (timezone % 3600) / 60);
+	  offset.quot, offset.rem);
 
   return strlen(date_string);
 }
--- dvipdfmx-20071115.orig/data/Makefile.in	2007-11-16 15:54:28.000000000 +0900
+++ dvipdfmx-20071115/data/Makefile.in	2008-05-20 06:12:50.000000000 +0900
@@ -161,18 +161,18 @@
 dist_configdata_DATA = \
   $(srcdir)/dvipdfmx.cfg
 
-cmapdatadir = $(datadir)/texmf/fonts/cmap
+cmapdatadir = $(datadir)/texmf/fonts/cmap/dvipdfm
 dist_cmapdata_DATA = \
   $(srcdir)/EUC-UCS2 \
   $(srcdir)/UniKSCms-UCS2-H \
   $(srcdir)/UniKSCms-UCS2-V
 
-glyphlistdatadir = $(datadir)/texmf/fonts/map/glyphlist
+glyphlistdatadir = $(datadir)/texmf/fonts/map/dvipdfm/glyphlist
 dist_glyphlistdata_DATA = \
   $(srcdir)/glyphlist.txt \
   $(srcdir)/pdfglyphlist.txt
 
-mapdatadir = $(datadir)/texmf/fonts/map/dvipdfmx
+mapdatadir = $(datadir)/texmf/fonts/map/dvipdfm
 dist_mapdata_DATA = \
   $(srcdir)/cid-x.map
 
--- dvipdfmx-20071115.orig/data/cid-x.map	2007-11-16 02:08:52.000000000 +0900
+++ dvipdfmx-20071115/data/cid-x.map	2008-05-23 19:48:29.000000000 +0900
@@ -71,10 +71,10 @@
 %%
 
 %% Ryumin and GothicBBB found in PostScript printers:
-rml  H Ryumin-Light
-gbm  H GothicBBB-Medium
-rmlv V Ryumin-Light
-gbmv V GothicBBB-Medium
+%rml  H Ryumin-Light
+%gbm  H GothicBBB-Medium
+%rmlv V Ryumin-Light
+%gbmv V GothicBBB-Medium
 
 %% Synthetic font used for futo* family.
 %% jun101 not available.
--- dvipdfmx-20071115.orig/data/dvipdfmx.cfg	2007-11-16 02:08:52.000000000 +0900
+++ dvipdfmx-20071115/data/dvipdfmx.cfg	2008-05-20 05:56:48.000000000 +0900
@@ -132,7 +132,7 @@
 %% simply means large size paper)
 %%
 %% GhostScript (Unix/Linux):
-D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
+D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o -c '.setpdfwrite << /NeverEmbed [/Courier /Courier-Bold /Courier-Oblique /Courier-BoldOblique /Helvetica /Helvetica-Bold /Helvetica-Oblique /Helvetica-BoldOblique /Times-Roman /Times-Bold /Times-Italic /Times-BoldItalic /Symbol /ZapfDingbats /Ryumin-Light /GothicBBB-Medium] >> setdistillerparams' -f %i -c quit"
 
 %% GhostScript (Win32):
 %D  "gswin32c -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
@@ -193,3 +193,4 @@
 
 %% Put additonal fontmap files here
 f  cid-x.map
+f  kanjix.map
--- dvipdfmx-20070518/src/pdfdev.c~	2007-05-03 20:14:47.000000000 +0900
+++ dvipdfmx-20070518/src/pdfdev.c	2008-01-21 07:56:24.000000000 +0900
@@ -1090,11 +1090,8 @@
      * Same issues as earlier. Use floating point for simplicity.
      * This routine needs to be fast, so we don't call sprintf() or strcpy().
      */
-#if 0
     text_state.offset -=
       (spt_t) (kern * font->extend * (font->sptsize / 1000.0));
-#endif
-    text_state.offset   -= delh;
     format_buffer[len++] = text_state.is_mb ? '>' : ')';
     if (font->wmode)
       len += p_itoa(-kern, format_buffer + len);
--- dvipdfmx-20070518.orig/fink/out2uni	1970-01-01 09:00:00.000000000 +0900
+++ dvipdfmx-20070518/fink/out2uni	2008-03-09 02:54:25.000000000 +0900
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+trap 'test -z "$tmpf" || rm -f "$tmpf"' 0
+test -z "$1" && { echo "Usage: out2uni filename" 1>&2; exit 1; }
+tmpf=`mktemp /tmp/out2uni.XXXXXX` || { echo "$0: mktemp failed" 1>&2; exit 1; }
+
+if NKF="`which nkf 2>/dev/null`"
+then
+	$NKF -e ${1}.out > ${tmpf}
+	/bin/cp ${tmpf} ${1}.out
+fi
+
+${0}.bin ${1}