diff -Naur texlive-20080816-source.orig/libs/lua51/lcoco.c texlive-20080816-source/libs/lua51/lcoco.c
--- texlive-20080816-source.orig/libs/lua51/lcoco.c	2008-03-25 00:47:15.000000000 +0900
+++ texlive-20080816-source/libs/lua51/lcoco.c	2009-10-11 04:14:04.000000000 +0900
@@ -331,7 +331,7 @@
 /* Else fallback to ucontext. Slower, because it saves/restores signals. */
 #else /* !defined(COCO_MAKECTX) */
 
-#include <ucontext.h>
+#include <sys/ucontext.h>
 
 #define COCO_CTX		ucontext_t
 
diff -Naur texlive-20080816-source.orig/texk/dvipsk/Makefile.in texlive-20080816-source/texk/dvipsk/Makefile.in
--- texlive-20080816-source.orig/texk/dvipsk/Makefile.in	2008-04-30 07:40:29.000000000 +0900
+++ texlive-20080816-source/texk/dvipsk/Makefile.in	2009-05-04 00:25:56.000000000 +0900
@@ -104,7 +104,7 @@
 # PostScript prologues and encodings.
 	for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
 # Info files.
-	$(INSTALL_DATA) $(srcdir)/$(program).i* $(infodir)/
+#	$(INSTALL_DATA) $(srcdir)/$(program).i* $(infodir)/
 # Man pages.
 	$(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
 	rm -f $(man1dir)/o$(program).$(manext)
@@ -113,7 +113,7 @@
 # Post.
 	$(POST_INSTALL)
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --info-dir=$(infodir) $(infodir)/$(program).info; \
+	  true; \
 	else true; fi
 
 uninstall-data:
diff -Naur texlive-20080816-source.orig/texk/dvipsk/tex.lpro texlive-20080816-source/texk/dvipsk/tex.lpro
--- texlive-20080816-source.orig/texk/dvipsk/tex.lpro	Mon Mar 19 02:18:46 2007
+++ texlive-20080816-source/texk/dvipsk/tex.lpro	Sat Mar 24 11:54:51 2007
@@ -258,7 +258,22 @@
     65781.76 div /hsize X
   } N
 
-/p {show} N        %  the main character setting routine
+/dir 0 def
+/dyy {/dir 0 def
+} B
+/dyt {/dir 1 def
+} B
+/dty {/dir 2 def
+} B
+/dtt {/dir 3 def
+} B
+
+%/p {show} N        %  the main character setting routine
+/p {dir 2 eq
+   {-90 rotate show 90 rotate}
+   {dir 3 eq {-90 rotate show 90 rotate}
+   {show} ifelse} ifelse
+} N
 
 /RMat [ 1 0 0 -1 0 0 ] N % things we need for rules
 /BDot 260 string N
diff -Naur texlive-20080816-source.orig/texk/kpathsea/Makefile.in texlive-20080816-source/texk/kpathsea/Makefile.in
--- texlive-20080816-source.orig/texk/kpathsea/Makefile.in	2008-05-30 05:59:08.000000000 +0900
+++ texlive-20080816-source/texk/kpathsea/Makefile.in	2009-05-04 00:25:35.000000000 +0900
@@ -172,7 +172,7 @@
 	  $(INSTALL_DATA) $(srcdir)/texmf.cnf $(web2cdir)/texmf.cnf; \
 	else true; fi
 # Info files.
-	$(INSTALL_DATA) $(srcdir)/kpathsea.i* $(infodir)/
+#	$(INSTALL_DATA) $(srcdir)/kpathsea.i* $(infodir)/
 # Should we install the headers?  They are not just system-dependent,
 # which is bad enough, but even compiler-dependent.
 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(includedir)/kpathsea
@@ -182,7 +182,7 @@
 # Post.
 	$(POST_INSTALL)
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --info-dir=$(infodir) $(infodir)/kpathsea.info; \
+	  true; \
 	else true; fi
 
 uninstall-data:
diff -Naur texlive-20080816-source.orig/texk/kpathsea/texmf.cnf texlive-20080816-source/texk/kpathsea/texmf.cnf
--- texlive-20080816-source.orig/texk/kpathsea/texmf.cnf	2008-07-27 06:39:36.000000000 +0900
+++ texlive-20080816-source/texk/kpathsea/texmf.cnf	2009-05-10 21:31:18.000000000 +0900
@@ -44,18 +44,18 @@
 
 % The tree containing the runtime files closely related to the specific
 % program version used:
-TEXMFMAIN = $SELFAUTOPARENT/texmf
+TEXMFMAIN = @PREFIX@/share/texmf
 
 % The main distribution tree:
-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
+TEXMFDIST = @PREFIX@/share/texmf-dist
 
 % Our documentation-only tree, arranged by language:
-TEXMFDOC = $SELFAUTOPARENT/texmf-doc
+TEXMFDOC = @PREFIX@/share/texmf-doc
 
 % A place for local additions to a "standard" texmf tree.
 % This tree is not used for local configuration maintained by
 % texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
+TEXMFLOCAL = @PREFIX@/share/texmf-local
 
 % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
 % With teTeX-3.0 or later, this must be set.
@@ -63,7 +63,7 @@
 %   TEXMFSYSVAR = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
-TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
+TEXMFSYSVAR = @PREFIX@/var/lib/texmf
 
 % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
 % With teTeX-3.0 or later, this must be set.
@@ -71,11 +71,11 @@
 %   TEXMFSYSCONFIG = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
+TEXMFSYSCONFIG = @PREFIX@/etc/texmf-config
 
 % User texmf trees are allowed as follows.
 % This used to be HOMETEXMF.
-TEXMFHOME = ~/texmf
+TEXMFHOME = ~/Library/texmf
 
 % TEXMFVAR, where texconfig stores variable runtime data.
 % With teTeX-3.0 or later, this must be set.
@@ -83,7 +83,7 @@
 %   TEXMFVAR = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFVAR = ~/.texmf-var  # teTeX 3.0 default
-TEXMFVAR = ~/.texlive2008/texmf-var
+TEXMFVAR = ~/.texmf-var
 
 % TEXMFCONFIG, where texconfig stores configuration data.
 % With teTeX-3.0 or later, this must be set.
@@ -93,7 +93,7 @@
 %   TEXMFCONFIG = ~/.texmf-config  # teTeX 3.0 default
 % For using a separate tree:
 %   TEXMFCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFCONFIG = ~/.texlive2008/texmf-config
+TEXMFCONFIG = ~/.texmf-config
 
 % Now, list all the texmf trees. If you have multiple trees you can
 % use shell brace notation, like this:
@@ -111,18 +111,18 @@
 % versions should take precedence over those (although it is generally a
 % source of confusion to have different versions of a package installed,
 % whatever the trees, so try to avoid it).
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST}
 
 % The system trees.  These are the trees that are shared by all the users.
 % If a tree appears in this list, the mktex* scripts will use
 % VARTEXFONTS for generated files, if the original tree isn't writable;
 % otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
+SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
 
 % Where generated fonts may be written.  This tree is used when the sources
 % were found in a system tree and either that tree wasn't writable, or the
 % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
+VARTEXFONTS = $TEXMFSYSVAR/fonts
 
 % Where to look for ls-R files.  There need not be an ls-R in the
 % directories in this path, but if there is one, Kpathsea will use it.
@@ -225,6 +225,14 @@
 TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
 TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
 
+% pTeX
+TEXINPUTS.ptex    = .;$TEXMF/{ptex/{plain,generic},tex/{plain,generic,}}//
+TEXINPUTS.platex  = .;$TEXMF/{ptex/platex,{p,}tex/latex,{p,}tex/generic,{p,}tex}//
+
+% pBibTeX bibliographies and style files
+BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib//
+BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst//
+
 % ConTeXt
 TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
 
@@ -374,8 +382,8 @@
 % For xdvi to find mime.types and .mailcap, if they do not exist in
 % ~.  These are single directories, not paths.
 % (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = $SELFAUTOPARENT/etc
-MAILCAPLIBDIR = $SELFAUTOPARENT/etc
+MIMELIBDIR = @PREFIX@/etc
+MAILCAPLIBDIR = @PREFIX@/etc
 
 % Default settings for fontconfig library, used by Win32 versions of
 % xetex/xdvipdfmx (note that fontconfig on Linux/Unix-like systems
@@ -447,7 +455,7 @@
 % 
 % For security reasons, it is better not to include . in this path.
 %
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT,@PREFIX@}{,{/share,}/texmf{-local,}/web2c}
 
 # kpathsea 3.5.3 and later sets these at runtime. To avoid empty
 # expansions from binaries linked against an earlier version of the
@@ -645,3 +653,6 @@
 error_line = 79
 half_error_line = 50
 max_print_line = 79
+
+% for ptex filter
+PTEX_IN_FILTER = @PREFIX@/bin/nkf -w
diff -Naur texlive-20080816-source.orig/texk/tetex/fmtutil.cnf texlive-20080816-source/texk/tetex/fmtutil.cnf
--- texlive-20080816-source.orig/texk/tetex/fmtutil.cnf	2008-07-08 00:39:23.000000000 +0900
+++ texlive-20080816-source/texk/tetex/fmtutil.cnf	2009-05-11 18:39:42.000000000 +0900
@@ -58,7 +58,7 @@
 #! cont-cz	pdftex	       cont-usr.tex    -8bit *cont-cz.ini
 #! cont-de	pdftex	       cont-usr.tex    -8bit *cont-de.ini
 cont-en		pdftex	       cont-usr.tex    -8bit *cont-en.ini
-cont-en		xetex	       cont-usr.tex    -8bit *cont-en.ini
+#! cont-en	xetex	       cont-usr.tex    -8bit *cont-en.ini
 #! cont-nl	pdftex	       cont-usr.tex    -8bit *cont-nl.ini
 #! cont-uk	pdftex	       cont-usr.tex    -8bit *cont-uk.ini
 #
@@ -89,8 +89,8 @@
 eplain		pdftex	-		-translate-file=cp227.tcx *eplain.ini
 # ------------------------------------------------------------------
 # $Id: format.jadetex.cnf 8442 2008-05-31 23:30:56Z karl $
-jadetex         pdftex	language.dat	&latex jadetex.ini
-pdfjadetex      pdftex	language.dat	&pdflatex pdfjadetex.ini
+#! jadetex         pdftex	language.dat	&latex jadetex.ini
+#! pdfjadetex      pdftex	language.dat	&pdflatex pdfjadetex.ini
 # ------------------------------------------------------------------
 # $Id: format.latex.cnf 8442 2008-05-31 23:30:56Z karl $
 latex           pdftex	language.dat    -translate-file=cp227.tcx *latex.ini
@@ -148,9 +148,14 @@
 # ------------------------------------------------------------------
 # $Id: format.xetex.cnf 8610 2008-06-09 00:47:52Z karl $
 # XeTeX-based formats.
-xetex		xetex	language.def	-etex xetex.ini
-xelatex		xetex	language.dat	-etex xelatex.ini
+#! xetex		xetex	language.def	-etex xetex.ini
+#! xelatex		xetex	language.dat	-etex xelatex.ini
 # ------------------------------------------------------------------
 # $Id: format.xmltex.cnf 8442 2008-05-31 23:30:56Z karl $
 xmltex          pdftex	language.dat	&latex xmltex.ini
 pdfxmltex       pdftex	language.dat	&pdflatex pdfxmltex.ini
+# ------------------------------------------------------------------
+# $Id: $
+# Japanese pTeX:
+#! ptex		ptex	-		--kanji=default ptex.ini
+#! platex		ptex	language.dat	--kanji=default platex.ini
diff -Naur texlive-20080816-source.orig/texk/web2c/Makefile.in texlive-20080816-source/texk/web2c/Makefile.in
--- texlive-20080816-source.orig/texk/web2c/Makefile.in	2008-08-13 08:46:59.000000000 +0900
+++ texlive-20080816-source/texk/web2c/Makefile.in	2009-05-04 00:23:48.000000000 +0900
@@ -880,6 +880,7 @@
 	$(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext)
 	$(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext)
 	$(INSTALL_DATA) $(srcdir)/synctexdir/man1/synctex.1 $(man1dir)/synctex.$(manext)
+	$(top_srcdir)/../mkinstalldirs $(man5dir)
 	$(INSTALL_DATA) $(srcdir)/synctexdir/man5/synctex.5 $(man5dir)/synctex.5
 
 # Dummy target.
diff -Naur texlive-20080816-source.orig/texk/web2c/doc/Makefile.in texlive-20080816-source/texk/web2c/doc/Makefile.in
--- texlive-20080816-source.orig/texk/web2c/doc/Makefile.in	2008-04-30 07:40:29.000000000 +0900
+++ texlive-20080816-source/texk/web2c/doc/Makefile.in	2009-05-04 00:26:14.000000000 +0900
@@ -50,11 +50,11 @@
 install-exec:
 install-data: web2c.info
 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(infodir)
-	$(INSTALL_DATA) $(srcdir)/web2c.i* $(infodir)/
+#	$(INSTALL_DATA) $(srcdir)/web2c.i* $(infodir)/
 #
 	$(POST_INSTALL)
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --info-dir=$(infodir) $(infodir)/web2c.info; \
+	  true; \
 	else true; fi
 
 check: all