Update of /cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18996

Modified Files:
        libkpathsea4.info ptex-texmf.info ptexenc.info 
        texlive-texmf.info texlive.info texlive.patch 
Added Files:
        ptex-base.info ptex-base.patch 
Log Message:
Update for pTeX.

--- NEW FILE: ptex-base.info ---
Info2: <<
Package: ptex%type_pkg[-nox]-base
Type: -nox (boolean)
Version: 3.1.10
Revision: 1003test1
GCC: 4.0
Description: ASCII publishing TeX
BuildDepends: <<
 libkpathsea4 (>= 3.5.7-0), t1lib5-nox, libpng3 (>= 1:1.2.8-1), libwww, 
libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.12),
 libjpeg, libiconv-dev,
 lzma, freetype219 (>= 2.2.1-4),
 ptexenc (>= 0.999-0),
 (%type_raw[-nox] = .)  t1lib5-x11, 
 (%type_raw[-nox] = .)  gd2 (>= 2.0.35-2), 
 (%type_raw[-nox] = .) fontconfig2-dev,
 (%type_raw[-nox] = .) x11, 
 (%type_raw[-nox] = .) xmkmf (>= 1.0.2-3),
 (%type_raw[-nox] = .) openmotif3
<<
Source: mirror:ctan:systems/texlive/Source/texlive-20080816-source.tar.lzma
Source-MD5: 554287c3e458da776edd684506048d45
Source2: http://tutimura.ath.cx/~nob/tex/ptexlive/ptexlive-20080715.tar.gz
Source2-MD5: d834b89d20604b1072325ccef2f8b227
Tar2FilesRename: ptexlive-20080715:ptexlive
# Taken from ftp://ring.riken.jp/pub/text/TeX/ptex-win32/utils/, vers. 20090509
Source3: 
http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/dvipsk-5.97-p1.7b-tl.tar.gz
Source3-MD5: 72359ed39d3854489db9413b1b34c8ef
NoSourceDirectory: true
PatchFile: ptex-base.patch
PatchFile-MD5: 6bb6d987b060c961f332e54ee36c55e1
PatchScript: <<
 lzma -dc texlive-20080816-source.tar.lzma | tar xf -
 mv       texlive-20080816-source                texlive

 tar zcf ptexlive/archive/dvipsk-5.97-p1.7b-tl.tar.gz \
  README-tl.txt dvipsk-5.97-p1.7b-tl.diff *.jpatch 

 ####################   Let's apply ptexlive patches   ####################

 # avoid patch conflicts
 gzcat     ptexlive/archive/xdvik-20080715-texlive2007.diff.gz  | \
  sed -n  -e '1,5706p'    \
          -e '7213,7241p' \
          -e '7792,8149p' \
          -e '8209,8244p' \
          -e '8559,$p'    > xdvik-20080715-texlive2007.diff.sed
 perl -pi -e "s/^ (echo \$ac_n)/\n \1/"                             \
                            xdvik-20080715-texlive2007.diff.sed
 perl -pi -e "s/(Ryumin-Light\t\t)ipam.ttf/\1HiraMinPro-W3.otf/"    \
                            xdvik-20080715-texlive2007.diff.sed
 perl -pi -e "s/(GothicBBB-Medium\t)ipag.ttf/\1HiraKakuPro-W3.otf/" \
                            xdvik-20080715-texlive2007.diff.sed
 sed      -e "s/ac_include/kpse_include/"              \
          -e "s/or --disable-magick //"                \
          -e "s/,9 \+6242,361/,6 \+6242,358/"          \
          -e "s/AC_DEFINE(A4))/[AC_DEFINE([A4], 1)])/" \
          -e "s/magick,/[magick],/"                    \
                          < xdvik-20080715-texlive2007.diff.sed | \
  gzip   > ptexlive/archive/xdvik-20090509-texlive2008.diff.gz

 sed -e '1,16d' < ptexlive/archive/omegaware-texlive2007.patch \
                > ptexlive/archive/omegaware-texlive2008.patch

 sed -i.bak -e "/freetype-2.3.5/d"                                    \
            -e "/xdvik-22.84.14/d"                                    \
            -e "/makej.patch/d"                                       \
            -e "/dvipdfm.patch/d"                                     \
            -e 's|tetex/epstopdf|texlive/linked_scripts/epstopdf.pl|' \
            -e "/nostop.patch/d"                                      \
            -e 's|texmf.in|texmf.cnf|g'                               \
            -e 's|texmf.in|texmf.cnf|'                                \
            -e 's|selfautofix|dummy|'                                 \
            -e 's|texlive2007\.|texlive2008.|'                        \
            -e "/4b.diff/d"                                           \
            -e 's|data/config|data|'                                  \
            -e 's|5.96-p1.7b|5.97-p1.7b|'                             \
            -e "/compile freetype2/,/^EOF/d"                          \
            -e "/kdegraphics/d"                                       \
            -e "/2007-0650/d"                                         \
            -e '/## check/,$d'                                        \
          ptexlive/2extract-src.sh
 touch texlive/dummy

 # set option
 echo "TEXSRC_EXTRACTED=`pwd`/texlive" >> ptexlive.cfg
 echo "TEXMFDIST=%p/share/texmf-dist"  >> ptexlive.cfg
 echo "JAPANESE=international"         >> ptexlive.cfg

 # add mendexk and makejvf entry
 sed -i.bak -e 's|dvipsk|mendexk|g' \
            -e 's|xdvik|makejvf|g'  \
            -e 's|\(with_makejvf=\)no|\1yes|'    texlive/texk/configure

 # extract pTeX src and apply patches of ptexlive
 (cd ptexlive && ./2extract-src.sh) || exit
 patch -d texlive/texk/makejvf -p1 \
  < texlive/texk/ptexenc/patches/makejvf-1.1a-ptexenc.patch
 patch -d texlive/texk/mendexk -p1 \
  < texlive/texk/ptexenc/patches/mendexk2.6e-ptexenc.patch

 # apply texlive.patch and jbibtex patch
 sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -d texlive -p1
 sed -i.bak -e '1,31d'               texlive/texk/web2c/ptexdir/jbibextra.c
 sed -i.bak -e 's|pbibtex|jbibtex|g' \
            -e 's|PBIBTEX|JBIBTEX|g' texlive/texk/web2c/ptexdir/ptexhelp.h

 # add ac_subst_vars entry
 perl -pi.bak -e 
"s/(PS_DEF\n)/\1FREETYPE2CPPFLAGS\nLDFREETYPE2\nFREETYPE2DEP\nZLIBCPPFLAGS\nLDZLIB\nZLIBDEP\n/"
 \
                                                 texlive/texk/pxdvik/configure

 # the same patches in ptexenc.info
 perl -pi.bak1 -e 's,\*\.obj\),*.obj | *.dSYM),' texlive/texk/ptexenc/configure
 sed -i.bak2 's|\(nonopt=\)"$ac_option"|\1NONE|' texlive/texk/ptexenc/configure
 sed -i.bak  's|\(0:0 $(objects)\)|\1 $(kpathsea) $(LIBS)|' \
                                                 
texlive/texk/ptexenc/Makefile.in

 # patches for makejvf
 sed -i.bak2 's|\(nonopt=\)"$ac_option"|\1NONE|' texlive/texk/makejvf/configure
 perl -pi.bak1 -e 
's|(post-dist-\$\(distname\):)|\1\n\$\(top_srcdir\)/stamp-configure|' \
                                                 
texlive/texk/makejvf/Makefile.in
 perl -pi.bak2 -e 's|(\$\(top_srcdir\)/stamp-configure)|\1:\n\ttouch \1|' \
                                                 
texlive/texk/makejvf/Makefile.in

 # copy ptexlive's docs
 cp     ptexlive/README    ptexlive-README
 cp     ptexlive/README.en ptexlive-README.en
 cp     ptexlive/LICENSE   ptexlive-LICENSE.src
<<
SetCPPFLAGS:-I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include
SetLDFLAGS: -L%p/lib/freetype219/lib
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: <<
 --without-texi2html --without-texinfo --enable-shared \
 --datadir='${prefix}/share' --infodir='${prefix}/share/info' \
 --mandir='${prefix}/share/man' --disable-multiplatform --with-system-ncurses \
 --with-system-pnglib --with-system-t1lib --with-system-wwwlib \
 --with-system-zlib \
 --without-psutils --without-dialog --without-tex4htk --without-t1utils \
 --without-detex --without-dvipdfmx --without-luatex --without-lcdf-typetools \
 --without-xindy --without-xdv2pdf --without-xetex --without-xdvipdfmx \
 --without-lacheck --without-ttf2pk \
 --without-mf-nowin --without-pdfopen --with-system-freetype2 \
 --with-freetype2-libdir=%p/lib/freetype219/lib \
 --with-freetype2-include=%p/lib/freetype219/include \
 --enable-kanji-iconv --with-ptexenc=UTF8 \
 --without-afm2pl --without-bibtex8 --without-cjkutils --without-devnag \
 --without-dtl --without-dvi2tty --without-dvidvi --without-dviljk \
 --without-dvipdfm --without-dvipng --without-dvipos --without-gsftopk \
 --without-musixflx --without-ps2pkm --without-ps2eps --without-seetexk \
 --without-sam2p --without-tth \
 --without-mendexk \
 (%type_raw[-nox] = .) --with-system-gd 
 (%type_raw[-nox] = .) --x-includes=/usr/X11R6/include
 (%type_raw[-nox] = .) --x-libraries=/usr/X11R6/lib
 (%type_raw[-nox] = -nox) --without-x 
 (%type_raw[-nox] = -nox) --without-xdvik
 (%type_raw[-nox] = -nox) --without-pxdvik
<<
CompileScript: <<
#!/bin/bash -ev
 export PATH=%p/lib/xmkmf/bin:%p/lib/freetype219/bin:$PATH 
 export IMAKEINCLUDE=-I%p/lib/X11/config
 cd texlive && ./configure %c && make
<<
InstallScript: <<
#!/bin/bash -ev
 export PATH=%p/lib/xmkmf/bin:$PATH 
 export IMAKEINCLUDE=-I%p/lib/X11/config
 export PROGRAMS="web2c makejvf pdvipsk"
if [ "%type_raw[-nox]" == "." ]; then
 export PROGRAMS="$PROGRAMS pxdvik"
fi
 for dir in $PROGRAMS
 do
   pushd texlive/texk/$dir
   make install prefix=%i texmf=%i/share/texmf run_texlinks=true 
run_mktexlsr=true
   popd
 done

echo "Setting up symlinks ..."
 ln -s ptex %i/bin/platex

#echo "Renaming files that will be provided the texlive-* package ..."

echo "Removing files that will be provided the texlive-* package ..."
 rm -R %i/share/info
 rm -R %i/share/man
 rm -R %i/share/texmf/dvips
 rm -f %i/share/texmf/xdvi/XDvi
 
 for file in `cat texlive/bin.duplex`
 do
   rm -f %i/bin/${file}
 done

# make font dirs and make links for apple's fonts
install -m 755 -d                %i/share/texmf/fonts/{opentype,truetype}
if [ "%type_raw[-nox]" == "." ]; then
 ln -s %p/lib/X11/fonts/appleotf %i/share/texmf/fonts/opentype
 ln -s %p/lib/X11/fonts/applettf %i/share/texmf/fonts/truetype
fi
<<
Depends: <<
  t1lib5-nox-shlibs, libpng3-shlibs (>= 1:1.2.8-1), 
  libwww-bin, libncurses5-shlibs (>= 5.4-20041023-1006), ncurses (>= 
5.4-20041023-1006),
  (%type_raw[-nox] = -nox) texlive-nox-base,
  (%type_raw[-nox] = .) texlive-base,
  fink (>= 0.12.0-1), ptexenc-shlibs (>= 0.999-0), ptex-texmf (>= 2.5-0), nkf,
  freetype219-shlibs (>= 2.2.1-4),
  (%type_raw[-nox] = .) applesystemfonts,
  (%type_raw[-nox] = .) appleotffonts,
  (%type_raw[-nox] = .) t1lib5-x11-shlibs,
  (%type_raw[-nox] = -nox) ghostscript-nox, 
  (%type_raw[-nox] = .) ghostscript, 
  (%type_raw[-nox] = .) gd2-shlibs (>= 2.0.35-2), 
  (%type_raw[-nox] = .) x11, 
  (%type_raw[-nox] = .) x11-shlibs,
  (%type_raw[-nox] = .) openmotif3-shlibs
<<
Conflicts: <<
  ptex-base (>= 0), ptex-nox-base,
  ptex (<= 3.1.9-1055), ptex-nox (<= 3.1.9-1055), ptex-dev (<= 3.1.3-8), 
ptex-shlibs (<= 3.1.3-8),
  mendexk (<= 2.5-1),
  (%type_raw[-nox] = .) xdvik (<= 22.40y1-7)
 <<
Replaces: <<
  ptex-base (>= 0), ptex-nox-base,
  ptex (<= 3.1.9-1055), ptex-nox (<= 3.1.9-1055), ptex-dev (<= 3.1.3-8), 
ptex-shlibs (<= 3.1.3-8),
  mendexk (<= 2.5-1),
  (%type_raw[-nox] = .) xdvi (<=  22.70-1), 
  (%type_raw[-nox] = .) xdvik (<= 22.40y1-7)
 <<
Provides: ptex3-base, mendexk
DocFiles: <<
 texlive/texk/web2c/ptexdir/COPYRIGHT*
 texlive/texk/web2c/ptexdir/{Changes,INSTALL,README}.txt
 ptexlive-README ptexlive-README.en ptexlive-LICENSE.src
<<
PostInstScript: <<
  mktexlsr %p/share/texmf

  formats="ptex platex"
  for f in ${formats}
  do
    PATH=%p/bin:${PATH} fmtutil-sys --enablefmt ${f}
    PATH=%p/bin:${PATH} fmtutil-sys --byfmt     ${f}
  done

 if [ -x %p/bin/texhash ]; then %p/bin/texhash; fi
<<
PreRmScript: <<
  if [ "$1" != "upgrade" ]; then
    formats="ptex platex"
    for f in ${formats}
    do
      fmt=`%p/bin/kpsewhich -engine ptex ${f}.fmt`
      if [ "x${fmt}" != "x" ]; then rm ${fmt}; fi
      PATH=%p/bin:${PATH} fmtutil-sys --disablefmt ${f} || true
    done
  fi
<<
PostRmScript: if [ -x %p/bin/texhash ]; then %p/bin/texhash; fi
DescDetail: <<
 pTeX is the ASCII publishing TeX distribution. This package can handle
 Japanese TeX file and also takes account of vertical writing.
<<
License: Restrictive/Distributable
Maintainer: Todai Fink Team <f...@sodan.ecc.u-tokyo.ac.jp>
Homepage: http://www.ascii.co.jp/pb/ptex/
<<

--- NEW FILE: ptex-base.patch ---
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-09 
18:29:08.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
@@ -154,3 +154,8 @@
 # $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/tetex/updmap 
texlive-20080816-source/texk/tetex/updmap
--- texlive-20080816-source.orig/texk/tetex/updmap      2008-05-26 
07:24:33.000000000 +0900
+++ texlive-20080816-source/texk/tetex/updmap   2009-05-05 20:21:45.000000000 
+0900
@@ -124,6 +124,7 @@
   --nomkmap                 do not recreate map files
   --nohash                  do not run texhash
   -n, --dry-run             only show the configuration, no output
+  --nostop                  do not stop even if a map files does not exist
   --quiet                   reduce verbosity
 
 Valid commands:
@@ -133,11 +134,14 @@
   --setoption OPTION VALUE  set option, where OPTION is one of:
                              dvipsPreferOutline LW35 dvipsDownloadBase35
                              pdftexDownloadBase14 dvipdfmDownloadBase14
+                             kanjiEmbed
   --setoption OPTION=VALUE  see above, just different syntax
-  --enable MAPTYPE MAPFILE  add MAPFILE as a MAPTYPE, one of: Map MixedMap
+  --enable MAPTYPE MAPFILE  add MAPFILE as a MAPTYPE,
+                             one of: Map MixedMap KanjiMap
   --enable Map=MAPFILE      add MAPFILE as a Map
   --enable MixedMap=MAPFILE add or enable MAPFILE as a MixedMap
-  --disable MAPFILE         disable MAPFILE, whether Map or MixedMap
+  --enable KanjiMap=MAPFILE add or enable MAPFILE as a KanjiMap
+  --disable MAPFILE         disable MAPFILE, one of: Map MixedMap KanjiMap
   --syncwithtrees           entries with unavailable map files will be
                              disabled in the config file
   --listmaps                list all active and inactive maps
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
@@ -54,7 +54,7 @@
 #
        $(POST_INSTALL)
        if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-         install-info --info-dir=$(infodir) $(infodir)/web2c.info; \
+         install-info --info-dir=$(infodir) $(infodir)/web2c.info || true; \
        else true; fi
 
 check: all
diff -udNr texlive-20080816-source.ep-tl/texk/web2c/ptexdir/ptex.mk 
texlive-20080816-source/texk/web2c/ptexdir/ptex.mk
--- texlive-20080816-source.ep-tl/texk/web2c/ptexdir/ptex.mk    2009-02-23 
06:52:53.618335326 +0900
+++ texlive-20080816-source/texk/web2c/ptexdir/ptex.mk  2009-02-23 
06:53:07.534346816 +0900
@@ -6,7 +6,7 @@
 Makefile: $(srcdir)/ptexdir/ptex.mk
 
 # We build ptex.
-ptex = @JPTEX@ ptex ptftopl ppltotf pdvitype
+ptex = @JPTEX@ ptex ptftopl ppltotf pdvitype jbibtex
 
 # Extract ptex version
 ptexdir/ptex.version: ptexdir/ptex-base.ch
@@ -23,8 +23,13 @@
 # Making ptex.
 ptex: $(ptex_o) $(plib) $(ptexenc)
        $(kpathsea_link) $(ptex_o) $(plib) $(ptexenc) $(socketlibs) $(LOADLIBES)
+jbibtex: jbibtex.o  $(plib) $(ptexenc)
+       $(kpathsea_link) jbibtex.o $(plib) $(ptexenc) $(socketlibs) $(LOADLIBES)
 
 # C file dependencies
+jbibtex.c: jbibtex.p web2c/cvtbib.sed 
+       $(web2c) jbibtex
+       cat $(srcdir)/ptexdir/jbibextra.c >> jbibtex.c 
 $(ptex_c) ptexcoerce.h ptexd.h: ptex.p $(web2c_texmf)
        $(web2c) ptex
 ptexextra.c: ptexdir/ptexextra.h lib/texmfmp.c
@@ -36,6 +41,8 @@
 # Tangling
 ptex.p ptex.pool: tangle ptex.web ptex.ch
        $(TANGLE) ptex.web ptex.ch
+jbibtex.p jbibtex.pool: tangle jbibtex.web
+       $(TANGLE) jbibtex.web
 
 # Generation of the web and ch file.
 #   Sources for ptex.web:
@@ -45,7 +52,11 @@
 ptex_ch_srcs = ptex.web \
   $(srcdir)/ptexdir/ptex-base.ch \
   $(srcdir)/ptexdir/ptex-include.ch
+jbibtex_srcs = $(srcdir)/ptexdir/jbibtex.ch $(srcdir)/bibtex.web
+
 #   Rules:
+jbibtex.web: tie $(srcdir)/ptexdir/jbibtex.ch $(srcdir)/bibtex.web
+       $(TIE) -m jbibtex.web $(srcdir)/bibtex.web $(srcdir)/ptexdir/jbibtex.ch
 ptex.web: tie ptexdir/ptex.mk $(ptex_web_srcs)
        $(TIE) -m ptex.web $(ptex_web_srcs)
 ptex.ch: $(ptex_ch_srcs)
diff -udNr texlive-20080816-source.ep-tl/texk/web2c/web2c/convert 
texlive-20080816-source/texk/web2c/web2c/convert
--- texlive-20080816-source.ep-tl/texk/web2c/web2c/convert      2009-02-23 
06:52:53.630335525 +0900
+++ texlive-20080816-source/texk/web2c/web2c/convert    2009-02-23 
06:53:07.534346816 +0900
@@ -65,6 +65,11 @@
   bibtex)
     midcmd="| sed -f $srcdir/web2c/cvtbib.sed"
     ;;
+  jbibtex)
+    more_defines="$srcdir/ptexdir/jbibtex.defines"
+    hfile=$srcdir/ptexdir/jbibextra.h
+    midcmd="| sed -f $srcdir/web2c/cvtbib.sed"
+    ;;
 
   mf) # MF and MP are almost the same.
     more_defines="$srcdir/web2c/texmf.defines $srcdir/web2c/mfmp.defines"
@@ -162,6 +167,10 @@
     sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <bibtex.h >xbibtex.h
     mv xbibtex.h bibtex.h
     ;;
+  jbibtex)
+    sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <jbibtex.h >xjbibtex.h
+    mv xjbibtex.h jbibtex.h
+    ;;
   tex|eomega|etex|luatex|pdftex|pdfetex|omega|aleph|mf|mp|xetex|ptex)
     sleep 2 # so timestamps are definitely later, to avoid make weirdness
     cat ${basefile}coerce.h $srcdir/web2c/coerce.h >x${basefile}coerce.h
diff -Naur texlive-20080816-source.orig/texk/tetex/fmtutil.cnf 
texlive-20080816-source/texk/tetex/fmtutil.cnf
--- texlive-20080816-source.orig/bin.duplex     2009-05-11 00:38:42.000000000 
+0900
+++ texlive-20080816-source/bin.duplex  2009-05-11 00:36:56.000000000 +0900
@@ -0,0 +1,47 @@
+ aleph 
+ bibtex
+ ctangle
+ ctie
+ cweave
+ dmp
+ dvicopy
+ dvitomp
+ dvitype
+ gftodvi
+ gftopk
+ gftype
+ makempx
+ mf
+ mft
+ mkocp
+ mkofm
+ mpost
+ mpto
+ newer
+ odvicopy
+ odvitype
+ ofm2opl
+ omega
+ omfonts
+ opl2ofm
+ otangle
+ otp2ocp
+ outocp
+ ovf2ovp
+ ovp2ovf
+ patgen
+ pdftex
+ pdftosrc
+ pktogf
+ pktype
+ pltotf
+ pooltype
+ synctex
+ tangle
+ tex
+ tftopl
+ tie
+ ttf2afm
+ vftovp
+ vptovf
+ weave

Index: texlive.patch
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/texlive.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- texlive.patch       8 May 2009 13:55:06 -0000       1.2
+++ texlive.patch       10 May 2009 20:02:57 -0000      1.3
@@ -24,7 +24,7 @@
  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-05 
16:47:37.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
@@ -111,7 +111,22 @@
  
  % 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.
-@@ -374,8 +374,8 @@
+@@ -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}//
++
++% jBibTeX bibliographies and style files
++BIBINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bib//
++BSTINPUTS.jbibtex = .;$TEXMF/{jbibtex,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.)
@@ -122,7 +137,7 @@
  
  % Default settings for fontconfig library, used by Win32 versions of
  % xetex/xdvipdfmx (note that fontconfig on Linux/Unix-like systems
-@@ -447,7 +447,7 @@
+@@ -447,7 +455,7 @@
  % 
  % For security reasons, it is better not to include . in this path.
  %
@@ -131,7 +146,7 @@
  
  # 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 +645,6 @@
+@@ -645,3 +653,6 @@
  error_line = 79
  half_error_line = 50
  max_print_line = 79
@@ -140,7 +155,7 @@
 +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-08 
21:02:44.000000000 +0900
++++ texlive-20080816-source/texk/tetex/fmtutil.cnf     2009-05-09 
18:29:08.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
@@ -150,7 +165,7 @@
  #! cont-nl    pdftex         cont-usr.tex    -8bit *cont-nl.ini
  #! cont-uk    pdftex         cont-usr.tex    -8bit *cont-uk.ini
  #
-@@ -89,19 +89,19 @@
+@@ -89,8 +89,8 @@
  eplain                pdftex  -               -translate-file=cp227.tcx 
*eplain.ini
  # ------------------------------------------------------------------
  # $Id$
@@ -161,21 +176,15 @@
  # ------------------------------------------------------------------
  # $Id$
  latex           pdftex        language.dat    -translate-file=cp227.tcx 
*latex.ini
- pdflatex        pdftex        language.dat    -translate-file=cp227.tcx 
*pdflatex.ini
- # ----------------------------------------------------------------------
- # $Id$
--luatex                luatex  -               luatex.ini
--pdfluatex     luatex  -               pdfluatex.ini
-+#! luatex             luatex  -               luatex.ini
-+#! pdfluatex  luatex  -               pdfluatex.ini
- #
--lualatex      luatex  language.dat    lualatex.ini
--pdflualatex   luatex  language.dat    pdflualatex.ini
-+#! lualatex   luatex  language.dat    lualatex.ini
-+#! pdflualatex        luatex  language.dat    pdflualatex.ini
- # ------------------------------------------------------------------
+@@ -154,3 +154,8 @@
  # $Id$
- mf            mf-nowin -              -translate-file=cp227.tcx mf.ini
+ 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/tetex/updmap 
texlive-20080816-source/texk/tetex/updmap
 --- texlive-20080816-source.orig/texk/tetex/updmap     2008-05-26 
07:24:33.000000000 +0900
 +++ texlive-20080816-source/texk/tetex/updmap  2009-05-05 20:21:45.000000000 
+0900

Index: libkpathsea4.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/libkpathsea4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libkpathsea4.info   8 May 2009 13:55:55 -0000       1.2
+++ libkpathsea4.info   10 May 2009 20:02:57 -0000      1.3
@@ -11,7 +11,7 @@
 Source-MD5: 554287c3e458da776edd684506048d45
 NoSourceDirectory: true
 PatchFile: texlive.patch
-PatchFile-MD5: b2e7e880485f6a5100034b17ae533bb0
+PatchFile-MD5: 9a55473d0dc85b5c11059b1afd630bb9
 PatchScript: <<
  lzma -dc texlive-20080816-source.tar.lzma | tar xf -
  mv       texlive-20080816-source                texlive

Index: texlive.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/texlive.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- texlive.info        8 May 2009 13:55:06 -0000       1.2
+++ texlive.info        10 May 2009 20:02:57 -0000      1.3
@@ -2,7 +2,7 @@
 Package: texlive%type_pkg[-nox]
 Type: -nox (boolean)
 Version: 0.20080816
-Revision: 0test1
+Revision: 0test2
 GCC: 4.0
 Description: Bundle package for TeX Live
 Depends: %N-base (= %v-%r), texinfo, debianutils, texi2html
@@ -35,7 +35,7 @@
 Tar2FilesRename: ptexlive-20080715:ptexlive
 NoSourceDirectory: true
 PatchFile: texlive.patch
-PatchFile-MD5: b2e7e880485f6a5100034b17ae533bb0
+PatchFile-MD5: 9a55473d0dc85b5c11059b1afd630bb9
 PatchScript: <<
  lzma -dc texlive-20080816-source.tar.lzma | tar xf -
  mv       texlive-20080816-source                texlive
@@ -183,7 +183,7 @@
   if [ -f ~/Library/texmf/ls-R ]; then chmod a+rw ~/Library/texmf/ls-R; fi
  <<
  PreRmScript: <<
-  if [ $1 != "upgrade" ]; then
+  if [ "$1" != "upgrade" ]; then
     if [ -e %p/bin/xdvik ]; then
       update-alternatives --remove xdvi %p/bin/xdvik
     fi

Index: ptex-texmf.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/ptex-texmf.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ptex-texmf.info     6 May 2009 16:31:13 -0000       1.1
+++ ptex-texmf.info     10 May 2009 20:02:57 -0000      1.2
@@ -1,6 +1,6 @@
 Package: ptex-texmf
 Version: 2.5
-Revision: 0
+Revision: 0test1
 Depends: fink (>= 0.9.3), texlive-base | texlive-nox-base
 Conflicts: ptex (<= 3.1.3-8), ptex-base (<= 3.1.3-8), ptex-jisfonts, 
morisawa-fontfiles
 Replaces:  ptex (<= 3.1.3-8), ptex-base (<= 3.1.3-8), ptex-jisfonts, 
morisawa-fontfiles
@@ -17,10 +17,6 @@
             -e 's|\(tarcp $ISO\)|#\1|' 3extract-texmf.sh
  sed -i.bak -e '/updmap.cfg/d' md5sum/texmf
  ./3extract-texmf.sh
- echo ""                             >> tmp/share/texmf/web2c/updmap.cfg
- echo "# default font for xdvi"      >> tmp/share/texmf/web2c/updmap.cfg
- echo "xdviRml HiraMinPro-W3.otf"    >> tmp/share/texmf/web2c/updmap.cfg
- echo "xdviGbm HiraKakuPro-W3.otf"   >> tmp/share/texmf/web2c/updmap.cfg
 
  cp tmp/share/texmf/doc/ptex/{COPYRIGHT,COPYRIGHT.jis,Changes.txt,README.txt} .
 <<
@@ -28,9 +24,24 @@
 InstallScript: mv tmp/share %i
 DocFiles: COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
 PostInstScript: <<
- echo "Adjusting permissions ..."
- chmod -R a+rX   %p/share/texmf
- %p/bin/mktexlsr %p/share/texmf
+if [ -x %p/bin/mktexlsr ]; then
+       %p/bin/mktexlsr %p/share/texmf
+fi
+if [ -x %p/bin/updmap-sys ]; then
+       %p/bin/updmap-sys
+fi
+<<
+PostRmScript: <<
+if [ $1 != "upgrade" ]; then
+
+if [ -x %p/bin/updmap-sys ]; then
+       %p/bin/updmap-sys
+fi
+if [ -x %p/bin/mktexlsr ]; then
+       %p/bin/mktexlsr %p/share/texmf
+fi
+
+fi
 <<
 License: Restrictive/Distributable
 Description: Additional texmf tree for pTeX

Index: ptexenc.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/ptexenc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ptexenc.info        6 May 2009 16:31:13 -0000       1.1
+++ ptexenc.info        10 May 2009 20:02:57 -0000      1.2
@@ -33,8 +33,13 @@
  --without-detex --without-dvipdfmx --without-luatex --without-lcdf-typetools \
  --without-xindy --without-xdv2pdf --without-xetex --without-xdvipdfmx \
  --without-lacheck --without-ttf2pk \
- --without-xdvik --without-pdfopen \
  --enable-kanji-iconv --with-ptexenc=UTF8 \
+ --without-afm2pl --without-bibtex8 --without-cjkutils --without-devnag \
+ --without-dtl --without-dvi2tty --without-dvidvi --without-dviljk \
+ --without-dvipdfm --without-dvipng --without-dvipos --without-gsftopk \
+ --without-musixflx --without-ps2pkm --without-ps2eps --without-seetexk \
+ --without-sam2p --without-tth \
+ --without-xdvik --without-pdfopen \
  --without-x 
 <<
 CompileScript: <<

Index: texlive-texmf.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/texlive-texmf.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- texlive-texmf.info  8 May 2009 13:55:06 -0000       1.2
+++ texlive-texmf.info  10 May 2009 20:02:57 -0000      1.3
@@ -1,18 +1,18 @@
 Package: texlive-texmf
 Version: 0.2007g0
-Revision: 0test1
-Conflicts: tetex-texmf
+Revision: 0test2
+Conflicts:tetex-texmf
 Replaces: tetex-texmf
 Provides: tetex-texmf
-Source: 
http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/texlive_texmf-minimal-2007g0.tar.gz
-Source-MD5: dc59785d6eeb7e38046fbd0924f8c0ff
-Source2: 
http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/texlive_texmf-full-2007g0.tar.gz
-Source2-MD5: 7b766f57548b0e4f4c1fed0fbc8ff25f
+Source: 
http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/texlive_texmf-full-2007g0.tar.gz
+Source-MD5: 7b766f57548b0e4f4c1fed0fbc8ff25f
+Source2:http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/texlive_texmf-minimal-2007g0.tar.gz
+Source2-MD5:dc59785d6eeb7e38046fbd0924f8c0ff
 PatchScript: <<
 # Moving files from texmf to texmf-dist ...
- cp -R ../texlive_texmf-full-2007g0/texmf-dist/ texmf-dist
- cp -R ../texlive_texmf-full-2007g0/texmf/      texmf-dist
- cp -R                              texmf/      texmf-dist
+ cp -R ../texlive_texmf-minimal-2007g0/texmf-dist/ texmf-dist
+ cp -R ../texlive_texmf-minimal-2007g0/texmf/      texmf-dist
+ cp -R                                 texmf/      texmf-dist
 
 # Removing files that will be provided the dvipdfmx package ...
  rm -fR texmf-dist/dvipdfm
@@ -43,9 +43,18 @@
 # Commenting out the entry for xetex ...
  perl -pi -e 's|^(cont-en xetex)|#! \1|' texmf-dist/fmtutil/format.context.cnf
 
+# Renaming platex to polski, which is default in TeX Live 2008 ...
+ mv texmf-dist/source/latex/{platex,polski}
+ mv texmf-dist/tex/latex/{platex,polski}
+ mv texmf-dist/tex/{platex,polski}
+ mv texmf-dist/tex/polski/config/{platex,polski}.ini
+ mv texmf-dist/tex/polski/config/pdf{platex,polski}.ini
+ mv texmf-dist/fmtutil/format.{platex,polski}.cnf
+ perl -pi -e "s/platex/polski/g" texmf-dist/fmtutil/format.polski.cnf
+
 # Writing README ...
- echo "This package contains a teTeX like subset of the TeX Live texmf," 
>README
- echo "based on the minimal version from Edd Barrets OpenBSD 
repository.">README
+ echo "This package contains a teTeX like subset of the TeX Live texmf,">README
+ echo "based on the version from Edd Barrets OpenBSD repository."       >README
 
 # Creating ls-R files ...
  touch texmf-dist/ls-R


------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image 
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to