diff --git a/print/pTeX/Portfile b/print/pTeX/Portfile
index ce8fca0d85855..761ef6849d74a 100644
--- a/print/pTeX/Portfile
+++ b/print/pTeX/Portfile
@@ -1,11 +1,11 @@
-# $Id: Portfile,v 1.5 2006/03/16 17:45:55 takanori Exp $
+# $Id: Portfile,v 1.6 2006/03/24 22:57:21 takanori Exp $
+PortSystem		1.0
 
-set ptetex_version 20060315
+set ptetex_version 20060324
 
-PortSystem		1.0
 name			pTeX
 version			ptetex3-${ptetex_version}
-epoch			20060315
+epoch			${ptetex_version}
 categories		print textproc
 maintainers		takanori@opendarwin.org
 description		Japanese TeX (pTeX) processing environment
@@ -28,9 +28,9 @@ checksums	tetex-src-3.0.tar.gz md5 944a4641e79e61043fdaf8f38ecbb4b3 \
 		tetex-texmf-3.0.tar.gz md5 11aa15c8d3e28ee7815e0d5fcdf43fd4 \
 				       sha1 10f7d2fa007c95ca066d899fca0e9a8446108824 \
 				       rmd160 67cb6325f1edbea89c4723791116717190ec73c4 \
-		ptetex3-${ptetex_version}.tar.gz md5 0be4b7f78eb993f3cb546a18633dd853 \
-					  sha1 5b5c4a7bd5d55d1845109a36b7b83f7cfa70d735 \
-					  rmd160 f85c397476722dff63214303a4f67394ce1b0100
+		ptetex3-${ptetex_version}.tar.gz md5 34766345088e7a3f6b6a9f6c8100d85a \
+						 sha1 7051e7d0a482af54004bc008a5c8abcf2d7d2768 \
+						 rmd160 7f4ebe9328989d0b33615a963d998e1a4cb10309
 
 default_variants	+hiragino +otf
 
@@ -41,7 +41,8 @@ depends_run	port:texinfo port:texi2html
 extract.only	ptetex3-${ptetex_version}.tar.gz
 worksrcdir	ptetex3-${ptetex_version}
 
-patch		{
+configure.args	--without-texinfo --without-texi2html --with-system-gd --with-system-zlib --with-system-pnglib --with-system-ncurses --with-xdvi-x-toolkit=motif
+configure	{
 		system "echo MD5CHECK=md5check  >> ${worksrcpath}/my_option"
 		system "echo SRC_DIR=${distpath} >> ${worksrcpath}/my_option"
 		system "echo REAL_PREFIX=${prefix} >> ${worksrcpath}/my_option"
@@ -54,9 +55,6 @@ patch		{
 		system "echo export CPPFLAGS LDFLAGS LD_LIBRARY_PATH >> ${worksrcpath}/my_option"
 }
 
-configure.args	--without-texinfo --without-texi2html --with-system-gd --with-system-zlib --with-system-pnglib --with-system-ncurses --with-xdvi-x-toolkit=motif
-configure {}
-
 build		{
 		file mkdir ${workpath}/temp
 
@@ -80,9 +78,10 @@ destroot	{
 		file rename ${destroot}${prefix}/man ${destroot}${prefix}/share/man
 
 		if {[variant_isset hiragino]} {
-		   system "perl -pi -e \"s|^(KanjiMap utf-noEmbeddedFont.map)$|#\\1\\nKanjiMap utf-unicode-x.map|, s|^(KanjiMap otf-noEmbeddedFont.map)$|#\\1\\nKanjiMap otf-hiraginox.map|\" ${destroot}${prefix}/share/texmf-config/web2c/updmap.cfg"
-		   system "perl -pi -e \"s|^(rml\\s.+)$|#\\1\\nrml\\tH\\tHiraMinPro-W3.otf|, s|^(rmlv\\s.+)$|#\\1\\nrmlv\\tV\\tHiraMinPro-W3.otf|, s|^(gbm\\s.+)$|#\\1\\ngbm\\tH\\tHiraKakuPro-W3.otf|, s|^(gbmv\\s.+)$|#\\1\\ngbmv\\tV\\tHiraKakuPro-W3.otf|, \" ${destroot}${prefix}/share/texmf/fonts/map/dvipdfm/cid-x.map"
+		   system "perl -pi -e \"s|^(KanjiMap ptex-noEmbeddedFont.map)$|#! \\1|, s|^#! (KanjiMap ptex-hiragino.map)$|\\1|, s|^(KanjiMap morisawa.map)$|#! \\1\\nKanjiMap morisawa-hiraginoEmbed.map|, s|^(KanjiMap utf-noEmbeddedFont.map)$|#! \\1\\nKanjiMap utf-unicode-x.map|, s|^(KanjiMap otf-noEmbeddedFont.map)$|#! \\1|, s|^#! (KanjiMap otf-hiraginox.map)$|\\1|\" ${destroot}${prefix}/share/texmf-config/web2c/updmap.cfg"
 		}
+		file copy ${destroot}${prefix}/share/texmf/fonts/map/dvipdfm/morisawa.map ${destroot}${prefix}/share/texmf/fonts/map/dvipdfm/morisawa-hiraginoEmbed.map
+		system "perl -pi -e \"s|Ryumin-Light|HiraMinPro-W3.otf|, s|GothicBBB-Medium|HiraKakuPro-W3.otf|, s|FutoMinA101-Bold|HiraMinPro-W6.otf|, s|FutoGoB101-Bold|HiraKakuPro-W6.otf|, s|Jun101-Light|HiraMaruPro-W4.otf|\" ${destroot}${prefix}/share/texmf/fonts/map/dvipdfm/morisawa-hiraginoEmbed.map"
 
 		# Modify mktex.opt to force use of varfonts
 		reinplace "s|MT_FEATURES=appendonlydir|MT_FEATURES=appendonlydir:varfonts|g" ${destroot}${prefix}/share/texmf/web2c/mktex.opt
@@ -107,15 +106,20 @@ post-activate	{
 		system "${prefix}/bin/updmap-sys"
 }
 
+#Embed Hiragino fonts in PDF
 variant hiragino {}
+
+#Use otf.sty
 variant otf {}
+
+#Use babel
 variant babel {}
 
 variant euc conflicts sjis {
-	pre-patch { system "echo KANJI_CODE=EUC  >> ${worksrcpath}/my_option" }
+	pre-configure { system "echo KANJI_CODE=EUC  >> ${worksrcpath}/my_option" }
 }
 variant sjis conflicts euc {
-	pre-patch { system "echo KANJI_CODE=SJIS  >> ${worksrcpath}/my_option" }
+	pre-configure { system "echo KANJI_CODE=SJIS  >> ${worksrcpath}/my_option" }
 }
 
 variant nox11 conflicts motif xaw xaw3d nextaw {