--- ./1check-archive.sh~	2009-06-07 16:58:27.000000000 +0900
+++ ./1check-archive.sh	2010-09-01 13:37:23.000000000 +0900
@@ -104,6 +104,7 @@
 md5check <<EOF || exit
 92579eca220d2279787ddb98b5b1e439  archive/config.ps
 dba57b9893f5632662c7d741874f7159  archive/dvipdfmx-20090506.tar.gz
+3486bd11730bedec2b8b31f1d83bd797  archive/dvipdfmx-20100328.tar.gz
 92f5fcdf523381c6e30288d0e2c487ab  archive/dvipdfmx-contrib-latex.tar.gz
 1f659d779459e62873fc0bb149b59b37  archive/dvipsk-5.97-p1.7b.tar.gz
 a7aefa88799df081ca981ce6aa32ec90  archive/freetype-2.3.5.tar.gz
@@ -149,6 +150,7 @@
 40f757c7c16bce50915893170ed9b916  macro/eclepsf.sty
 601835d441df357d28f93c4d4534dbe0  macro/epsbox.sty
 eab726afd7249145578df56daa3d805f  macro/jsclasses-090222.zip
+d8a31910c27ffae3106b47e8e94c97bf  macro/jsclasses-100314.zip
 4c6224bbdc50345999714c32958eb186  macro/otfstable-speedup.patch
 0fd496d0e9b365457e161d18da9dfffb  macro/otfstable.zip
 50382fd31d95532cbc3d6803bc882578  macro/powerdot.tar.gz
--- ./2extract-src.sh~	2009-06-07 17:00:07.000000000 +0900
+++ ./2extract-src.sh	2010-08-31 20:06:38.000000000 +0900
@@ -134,7 +134,7 @@
 cpatch $PTEXENC/makejvf-1.1a-ptexenc.patch 1 $SRC/texk/makejvf
 
 ## for dvipdfmx
-tarx archive/dvipdfmx-20090506.tar.gz $SRC/texk
+tarx archive/dvipdfmx-20100328.tar.gz $SRC/texk
 mv $SRC/texk/dvipdfmx-* $SRC/texk/dvipdfmx || exit
 perlprint "s/ cid-x.map\$/ kanjix.map/g;
 	s|^(D  \"ps2pdf .*) (%i .*\")|\1 $GSNOEMBED1 \2|" \
--- ./3extract-texmf.sh~	2009-06-10 17:10:51.000000000 +0900
+++ ./3extract-texmf.sh	2010-09-01 13:24:12.000000000 +0900
@@ -175,7 +175,10 @@
 
 
 ## check
-cat md5sum/texmf | (cd $TEXMF; md5check) && exit
+cat md5sum/texmf | (cd $TEXMF; md5check) && {
+  cpatch archive/ptetex3-ubagami.patch "0 -b -z.org" $TMP_PREFIX
+  exit
+}
 cat <<EOF
 
 $0: Some processes were performed improperly.
--- ./4make-install.sh~	2009-05-05 01:35:49.000000000 +0900
+++ ./4make-install.sh	2010-09-01 00:22:00.000000000 +0900
@@ -28,7 +28,7 @@
 if test "$SYSTEM_FREETYPE2" = "no"; then
     echo "[--freetype--] configure"
     cd $SRC/freetype || exit
-    GNUMAKE=$MAKE ./configure || exit
+    GNUMAKE=$MAKE ./configure --prefix=$PREFIX || exit
     echo "[--freetype--] make"
     $MAKE || exit
 
--- ./5macro.sh~	2008-04-17 14:30:43.000000000 +0900
+++ ./5macro.sh	2010-09-01 13:40:13.000000000 +0900
@@ -30,8 +30,8 @@
 $MKDIR $PACKAGE
 
 ## jsclasses
-$MKDIR                     $PACKAGE/jsclasses
-tarx macro/jsclasses-*.zip $PACKAGE/jsclasses
+$MKDIR                          $PACKAGE/jsclasses
+tarx macro/jsclasses-100314.zip $PACKAGE/jsclasses
 lndir $PACKAGE2/jsclasses $TEXMF/ptex/platex jsclasses
 
 ## prosper
--- ./7font-search.sh~	2008-06-16 13:06:07.000000000 +0900
+++ ./7font-search.sh	2010-08-30 20:28:13.000000000 +0900
@@ -115,7 +115,7 @@
 Acrobat5    /usr{,/local,/sfw}{,/lib}/Acrobat5/Resource/Font
 Acrobat7    /usr{,/local,/sfw}{,/lib}{,/Adobe}/Acrobat7.0/Resource/CMap
 Acrobat8    /usr{,/local,/sfw}{,/lib}{,/Adobe}/Acrobat8.0/Resource/CMap
-ghostscript /usr{,/local,/sfw}/{share,lib}/ghostscript{,/*}/Resource/CMap
+ghostscript {/usr,/opt}{,/local,/sfw}{,gs7.07}/{share,lib}/ghostscript{,/*}/Resource/CMap
 openwinja   /usr/openwin/lib/locale/ja/X11/Resource/CMap
 openwinko   /usr/openwin/lib/locale/ko/X11/Resource/CMap
 openwinzh   /usr/openwin/lib/locale/zh/X11/Resource/CMap
@@ -126,7 +126,7 @@
 ### リンク名  検索ディレクトリ/ファイル
 x11       /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/truetype
 X11       /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/TrueType
-X11TTF    /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/TTF
+X11TTF    /opt/local/X11R6/lib/X11/fonts/truetype
 truetype  /usr{,/local}/share/fonts/truetype
 TrueType  /usr{,/local}/share/fonts/TrueType
 TTF	  /usr{,/local}/share/fonts/TTF
@@ -143,17 +143,25 @@
 # for test (contains white space)
 hoge "/tmp/hoge hoge"
 QtPalmtop /opt/QtPalmtop/lib/X11/fonts/opentype
+X11OTF    /opt/local/X11R6/lib/X11/fonts/opentype
 EOF
 
 if test -d /System/Library/Fonts; then # Mac OS X
 LC_ALL=ja_JP.UTF-8
 cat <<EOF | /usr/bin/iconv -f EUC-JP -t UTF-8-MAC | mksymlink $OPENTYPE
-HiraMinPro-W3.otf  {,/System}"/Library/Fonts/ヒラギノ明朝 Pro W3.otf"
-HiraMinPro-W6.otf  {,/System}"/Library/Fonts/ヒラギノ明朝 Pro W6.otf"
-HiraKakuPro-W3.otf {,/System}"/Library/Fonts/ヒラギノ角ゴ Pro W3.otf"
-HiraKakuPro-W6.otf {,/System}"/Library/Fonts/ヒラギノ角ゴ Pro W6.otf"
-HiraKakuStd-W8.otf {,/System}"/Library/Fonts/ヒラギノ角ゴ Std W8.otf"
-HiraMaruPro-W4.otf {,/System}"/Library/Fonts/ヒラギノ丸ゴ Pro W4.otf"
+HiraMinPro-W3.otf  {/opt/local/X11R6/lib/X11/fonts/opentype/HiraMinPro-W3.otf,{,/System}"/Library/Fonts/ヒラギノ明朝 Pro W3.otf"}
+HiraMinPro-W6.otf  {/opt/local/X11R6/lib/X11/fonts/opentype/HiraMinPro-W6.otf,{,/System}"/Library/Fonts/ヒラギノ明朝 Pro W6.otf"}
+HiraKakuPro-W3.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraKakuPro-W3.otf,{,/System}"/Library/Fonts/ヒラギノ角ゴ Pro W3.otf"}
+HiraKakuPro-W6.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraKakuPro-W6.otf,{,/System}"/Library/Fonts/ヒラギノ角ゴ Pro W6.otf"}
+HiraKakuStd-W8.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraKakuStd-W8.otf,{,/System}"/Library/Fonts/ヒラギノ角ゴ Std W8.otf"}
+HiraMaruPro-W4.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraMaruPro-W4.otf,{,/System}"/Library/Fonts/ヒラギノ丸ゴ Pro W4.otf"}
+#
+HiraMinProN-W3.otf  {/opt/local/X11R6/lib/X11/fonts/opentype/HiraMinProN-W3.otf,{,/System}"/Library/Fonts/ヒラギノ明朝 ProN W3.otf"}
+HiraMinProN-W6.otf  {/opt/local/X11R6/lib/X11/fonts/opentype/HiraMinProN-W6.otf,{,/System}"/Library/Fonts/ヒラギノ明朝 ProN W6.otf"}
+HiraKakuProN-W3.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraKakuProN-W3.otf,{,/System}"/Library/Fonts/ヒラギノ角ゴ ProN W3.otf"}
+HiraKakuProN-W6.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraKakuProN-W6.otf,{,/System}"/Library/Fonts/ヒラギノ角ゴ ProN W6.otf"}
+HiraKakuStdN-W8.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraKakuStdN-W8.otf,{,/System}"/Library/Fonts/ヒラギノ角ゴ StdN W8.otf"}
+HiraMaruProN-W4.otf {/opt/local/X11R6/lib/X11/fonts/opentype/HiraMaruProN-W4.otf,{,/System}"/Library/Fonts/ヒラギノ丸ゴ ProN W4.otf"}
 EOF
 fi
 
--- ./md5sum/texsrc.traditional~	2009-06-07 17:03:08.000000000 +0900
+++ ./md5sum/texsrc.traditional	2010-08-31 20:13:07.000000000 +0900
@@ -72,8 +72,8 @@
 aa8bcb252fdfab1e6164e338b6a791ce  ./texk/dvipdfm/ebb.c
 c98e0303e74020945a281afd04b09182  ./texk/dvipdfm/pdfdoc.c
 31b2da812b271b30405acafb8af18e6b  ./texk/dvipdfm/psimage.c
-3abe611cc8205c4ba0b555c8ef04a7fb  ./texk/dvipdfmx/data/Makefile.in
-010b7ce08e6e76ccad86eab443587bfd  ./texk/dvipdfmx/data/dvipdfmx.cfg
+1a8769fad6ce0666388e3f7c06f3c3bf  ./texk/dvipdfmx/data/Makefile.in
+25ed505be962a69fdee4ec0c500a4eba  ./texk/dvipdfmx/data/dvipdfmx.cfg
 df9d869cd778ef524a6d110d3f1185ec  ./texk/dvipsk/ChangeLog
 41cc28b4d96cfd35965c873e8ab23fd7  ./texk/dvipsk/Makefile.in
 d4a5ee5e44a3fe87edf713fa860cca77  ./texk/dvipsk/afm2tfm.c
--- ./my_option~	2008-06-30 02:44:40.000000000 +0900
+++ ./my_option	2010-08-31 23:56:49.000000000 +0900
@@ -75,12 +75,21 @@
 
 ### Mac OS X Leopard の不具合への対処
 # export CFLAGS=-O2
+export CC='gcc -O2 -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -iwithsysroot /Developer/SDKs/MacOSX10.4u.sdk'
+export CPP='gcc -E'
+export CXX='g++ -O2 -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -iwithsysroot /Developer/SDKs/MacOSX10.4u.sdk'
+export CXXCPP='g++ -E'
 
 ### ライブラリの場所を明示的に指定する
 # CPPFLAGS="-I/usr/local/include -I/usr/sfw/include -I/opt/sfw/include -I/usr/openwin/include"
+CPPFLAGS="-I/opt/local/include -I/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include"
 # LDFLAGS="-L/usr/local/lib -L/usr/sfw/lib -L/opt/sfw/lib -L/usr/openwin/lib"
+LDFLAGS="-L/opt/local/lib -L/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib"
 # LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/sfw/lib:/opt/sfw/lib:/usr/openwin/lib
 # export LDFLAGS CPPFLAGS LD_LIBRARY_PATH
+export CPPFLAGS LDFLAGS
+conf_option --disable-dependency-tracking
+conf_option '--x-includes=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include --x-libraries=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib'
 
 ### スクリプトのデバッグ
 # set -x
@@ -109,6 +118,7 @@
 
 ### nkf がある場合［自動判別］
 # NKFJIS="nkf -jd"
+NKFJIS="nkf -jd"
 
 ### qkc がある場合
 # NKFJIS="qkc -bj -u"
@@ -122,6 +132,7 @@
 
 ### freetype-2.1.10 以降があれば［自動判別］
 # SYSTEM_FREETYPE2=yes
+SYSTEM_FREETYPE2=no
 
 
 ### 一時的にインストールする（作業用）ディレクトリを指定
@@ -130,6 +141,7 @@
 ### 最終的にインストールするディレクトリを指定
 # PREFIX=%{_prefix}
 # DATADIR=%{_datadir}
+PREFIX=/opt/local/ptetex3
 
 ### teTeX-{src,texmf}-*.tar.gz の場所を指定（RPM に有用）
 # SRC_DIR=%{_sourcedir}