Update of /cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21573
Modified Files:
ptex-base.info ptex-base.patch
Log Message:
Update to ptexlive-20090524.
Index: ptex-base.info
===================================================================
RCS file:
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/ptex-base.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ptex-base.info 24 May 2009 09:07:20 -0000 1.3
+++ ptex-base.info 24 May 2009 15:23:59 -0000 1.4
@@ -2,7 +2,7 @@
Package: ptex%type_pkg[-nox]-base
Type: -nox (boolean)
Version: 3.1.10
-Revision: 1003test1
+Revision: 1003test2
GCC: 4.0
Description: ASCII publishing TeX
BuildDepends: <<
@@ -17,98 +17,44 @@
(%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
+Source: http://tutimura.ath.cx/~nob/tex/ptexlive/ptexlive-20090524.tar.gz
+Source-MD5: 9f498ccce0b4beb5be851d54cbf52135
+TarFilesRename: ptexlive-20090524:ptexlive
+SourceDirectory: ptexlive
+Source2: mirror:ctan:systems/texlive/Source/texlive-20080816-source.tar.lzma
+Source2-MD5: 554287c3e458da776edd684506048d45
PatchFile: ptex-base.patch
-PatchFile-MD5: 68d959707f453fadbfdf97e636e59dee
+PatchFile-MD5: b6695dadfe4b1ca412c3203246326c29
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 's|\(root_check\)|#\1|' \
- -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
+ echo "SRC_TAR=../texlive-20080816-source.tar.lzma" >> ptexlive.cfg
+ echo "TMP_PREFIX=../" >> ptexlive.cfg
+ echo "TEXMFDIST=%p/share/texmf-dist" >> ptexlive.cfg
+ echo "JAPANESE=international" >> ptexlive.cfg
+
+ # extract pTeX src and apply patches of ptexlive
+ ./2extract-src.sh
+ mv ../texlive-20080816-source texlive
# 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
+ -e 's|\(with_makejvf=\)no|\1yes|' texlive/texk/configure
+ sed -i.rev -e 's|pmendexk|pdvipsk|g' \
+ -e 's|pmakejvf|pxdvik|g' texlive/texk/configure
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
+ patch -d texlive -p1 < %{PatchFile}
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
@@ -122,10 +68,11 @@
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
+ # use Hiragino for pxdvi
+ perl -pi -e "s/(Ryumin-Light\t\t)ipam.ttf/\1HiraMinPro-W3.otf/" \
+ texlive/texk/pxdvik/texmf/pxdvi.cfg
+ perl -pi -e "s/(GothicBBB-Medium\t)ipag.ttf/\1HiraKakuPro-W3.otf/" \
+ texlive/texk/pxdvik/texmf/pxdvi.cfg
<<
SetCPPFLAGS:-I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include
SetLDFLAGS: -L%p/lib/freetype219/lib
@@ -181,6 +128,7 @@
echo "Setting up symlinks ..."
ln -s ptex %i/bin/platex
+#ln -s pdvips %i/bin/udvips
echo "Moving files that belong to the texlive* package ..."
install -m 755 -d %i/lib/omegaware
@@ -238,7 +186,9 @@
DocFiles: <<
texlive/texk/web2c/ptexdir/COPYRIGHT*
texlive/texk/web2c/ptexdir/{Changes,INSTALL,README}.txt
- ptexlive-README ptexlive-README.en ptexlive-LICENSE.src
+ README:ptexlive-README
+ README.en:ptexlive-README.en
+ LICENSE:ptexlive-LICENSE.src
<<
PostInstScript: <<
mktexlsr %p/share/texmf
Index: ptex-base.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/todai/ecc-10.4/main/finkinfo/text/ptex-base.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ptex-base.patch 12 May 2009 15:37:01 -0000 1.2
+++ ptex-base.patch 24 May 2009 15:23:59 -0000 1.3
@@ -1,14 +1,3 @@
-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
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
