Menu
▾
▴
[cvs] dists/10.7/stable/main/finkinfo/text texlive-texmf.info, 1.2, 1.3 libkpathsea6.info, 1.2, 1.3 ptexenc1.info, 1.2, 1.3 texlive.info, 1.2, 1.3 texlive.patch, 1.1, 1.2
|
From: Tomoaki O. <ok...@us...> - 2012-02-06 21:38:21
|
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text In directory vz-cvs-3.sog:/tmp/cvs-serv31816 Modified Files: texlive-texmf.info libkpathsea6.info ptexenc1.info texlive.info texlive.patch Log Message: Import for TeX Live 2011. Index: texlive-texmf.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/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 26 Jan 2012 01:55:37 -0000 1.2 +++ texlive-texmf.info 6 Feb 2012 21:38:18 -0000 1.3 @@ -1,12 +1,12 @@ Package: texlive-texmf -Version: 0.20100722 -Revision: 5 -BuildDepends: fink (>=0.32) +Version: 0.20110705 +Revision: 1 +BuildDepends: fink (>= 0.32) Conflicts:tetex-texmf Replaces: tetex-texmf, texlive-base (<= 0.20080816-3), texlive-nox-base (<= 0.20080816-3) Provides: tetex-texmf, breqn, chess-tex, cm-super, ctan-other-misc, ctan-supported-misc, enumitem, feynmf, ha-prosper, ifmslide, latex-beamer, latex-figbib, mathabx, movie15, okumura-clsfiles, pdfscreen, pdfslide, pdfsync, pgf, powerdot, ppower4, prosper, ptex-texmf, srcltx, texpower, tipa, unicode-tex, xcolor, xkeyval Source: http://www.sr3.t.u-tokyo.ac.jp/~okayama/src/texlive-%v-texmf-delpdf.tar.xz -Source-MD5: 36fc29ad9f7ec3e61b848f55da96bbcd +Source-MD5: b5e15a8763f032ecdecfeb2f3db5118c NoSourceDirectory: true PatchScript: << mv texlive-%v-texmf-delpdf/{texmf-dist,texmf} . @@ -21,9 +21,6 @@ # Removing a compiled *.el file ... rm -f texmf-dist/source/latex/rcs/src/style/rcs.elc -# xcomment.tex is needed for xcomment.sty ... - ln -s ../../../doc/generic/xcomment/xcomment.tex texmf-dist/tex/generic/xcomment - # pl209.def is needed for \documentstyle{jarticle} ln -s ../../../source/platex/base/pl209.def texmf-dist/tex/platex/base << @@ -48,37 +45,37 @@ chmod -R a+rX %p/share/texmf-dist << DescPackaging: << -We split the original texlive-20100722-texmf.tar.xz into two tarballs: -texlive-0.20100722-texmf-delpdf.tar.xz and texlive-0.20100722-texmf-doc.tar.xz, +We split the original texlive-20110705-texmf.tar.xz into two tarballs: +texlive-0.20110705-texmf-delpdf.tar.xz and texlive-0.20110705-texmf-doc.tar.xz, which were made by the following script: ############### #!/bin/bash -ev - wget ftp://tug.org/texlive/historic/2010/texlive-20100722-texmf.tar.xz - xz -dc texlive-20100722-texmf.tar.xz | tar xf - + wget ftp://tug.org/texlive/historic/2011/texlive-20110705-texmf.tar.xz + xz -dc texlive-20110705-texmf.tar.xz | tar xf - - for file in `find texlive-20100722-texmf/texmf-dist/doc -type f -name '*.pdf'` + for file in `find texlive-20110705-texmf/texmf-dist/doc -type f -name '*.pdf'` do mkdir -p tmp/${file%/*} mv $file tmp/$file done - for file in `find texlive-20100722-texmf/texmf/doc -type f -name '*.pdf'` + for file in `find texlive-20110705-texmf/texmf/doc -type f -name '*.pdf'` do mkdir -p tmp/${file%/*} mv $file tmp/$file done - mkdir texlive-0.20100722-texmf-doc - mv tmp/texlive-20100722-texmf/texmf-dist texlive-0.20100722-texmf-doc/ - mv tmp/texlive-20100722-texmf/texmf texlive-0.20100722-texmf-doc/ - tar cf texlive-0.20100722-texmf-doc.tar texlive-0.20100722-texmf-doc - xz -9 texlive-0.20100722-texmf-doc.tar + mkdir texlive-0.20110705-texmf-doc + mv tmp/texlive-20110705-texmf/texmf-dist texlive-0.20110705-texmf-doc/ + mv tmp/texlive-20110705-texmf/texmf texlive-0.20110705-texmf-doc/ + tar cf texlive-0.20110705-texmf-doc.tar texlive-0.20110705-texmf-doc + xz -9 texlive-0.20110705-texmf-doc.tar - mv texlive-20100722-texmf texlive-0.20100722-texmf-delpdf - tar cf texlive-0.20100722-texmf-delpdf.tar texlive-0.20100722-texmf-delpdf - xz -9 texlive-0.20100722-texmf-delpdf.tar + mv texlive-20110705-texmf texlive-0.20110705-texmf-delpdf + tar cf texlive-0.20110705-texmf-delpdf.tar texlive-0.20110705-texmf-delpdf + xz -9 texlive-0.20110705-texmf-delpdf.tar ############### You can download both files from: Index: libkpathsea6.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/libkpathsea6.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libkpathsea6.info 26 Jan 2012 01:55:37 -0000 1.2 +++ libkpathsea6.info 6 Feb 2012 21:38:18 -0000 1.3 @@ -1,25 +1,26 @@ Package: libkpathsea6 -Version: 6.0.0 -Revision: 100 +Version: 6.0.1 +Revision: 1 Description: Path search library for TeX BuildDepends: texlive-texmf | tetex-texmf, fink (>= 0.32) BuildDependsOnly: true Depends: %N-shlibs (= %v-%r) Conflicts: tetex-dev, ptex-dev, libkpathsea4 Replaces: tetex-dev, tetex-base (<= 2.0.2-46), tetex-nox (<= 2.0.2-24), ptex-base (<< 3.1.8), libkpathsea4 -Source: mirror:ctan:systems/texlive/Source/texlive-20100720-source.tar.xz -Source-MD5: 2a2201b84fdbf210032e1df70bc59157 -SourceDirectory: texlive +Source: mirror:ctan:systems/texlive/Source/texlive-20110705-source.tar.xz +Source-MD5: 968d238949e8a34a1fd74c374ddfe6f1 +TarFilesRename: texlive-20110705-source:texlive +NoSourceDirectory: true PatchFile: texlive.patch -PatchFile-MD5: 032fd8cfa3c2d73689ea7b6b26a29b9d -TarFilesRename: texlive-20100720-source:texlive +PatchFile-MD5: d06b3f633b64223544ebff713b663456 PatchScript: << - sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 + sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -d texlive -p1 # Change the directory to be installed - for file in `find texlive -name Makefile.in`; \ - do sed -i.bak -e 's|/texmf/|/share/texmf/|' \ - -e 's|/texmf-dist/|/share/texmf-dist/|' ${file} ; done + for file in `find texlive -name Makefile.in`; do \ + sed -i.bak -e 's|/texmf/|/share/texmf/|' \ + -e 's|\(texmfdir = \)${prefix}|\1${datadir}|' \ + -e 's|/texmf-dist/|/share/texmf-dist/|' ${file} ; done << NoSetLDFLAGS: true ConfigureParams: << @@ -33,20 +34,20 @@ --without-x << CompileScript: << - cd texk/kpathsea; ./configure %c - cd texk/kpathsea; make + cd texlive/texk/kpathsea; ./configure %c + cd texlive/texk/kpathsea; make << InstallScript: << - cd texk/kpathsea; make install-strip DESTDIR=%d + cd texlive/texk/kpathsea; make install-strip DESTDIR=%d rm -Rf %i/bin %i/share/info %i/share/man %i/share/texmf << -DocFiles: texk/kpathsea/README +DocFiles: texlive/texk/kpathsea/README SplitOff: << Package: %N-shlibs Description: Shared libraries of path search library for TeX Files: lib/libkpathsea.*.dylib Shlibs: %p/lib/libkpathsea.6.dylib 7.0.0 %n (>= 6.0.0-1) - DocFiles: texk/kpathsea/README + DocFiles: texlive/texk/kpathsea/README << License: LGPL Maintainer: Todai Fink Team <fi...@so...> Index: texlive.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/texlive.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- texlive.patch 22 Jul 2011 04:07:47 -0000 1.1 +++ texlive.patch 6 Feb 2012 21:38:18 -0000 1.2 @@ -13,83 +13,64 @@ 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,15 +44,15 @@ - - % The tree containing the runtime files closely related to the specific - % program version used: --TEXMFMAIN = $SELFAUTOPARENT/texmf -+TEXMFMAIN = @PREFIX@/share/texmf +@@ -49,7 +49,7 @@ + % (http://tug.org/tds), or files may not be found. + % + % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +-TEXMFROOT = $SELFAUTOPARENT ++TEXMFROOT = @PREFIX@/share - % The main distribution tree: --TEXMFDIST = $SELFAUTOPARENT/texmf-dist -+TEXMFDIST = @PREFIX@/share/texmf-dist + % The tree containing runtime files related to the specific + % distribution and version. +@@ -59,25 +59,25 @@ + TEXMFDIST = $TEXMFROOT/texmf-dist - % 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 + % Local additions to the distribution trees. +-TEXMFLOCAL = $TEXMFROOT/../texmf-local ++TEXMFLOCAL = $TEXMFROOT/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, where *-sys store cached runtime data. +-TEXMFSYSVAR = $TEXMFROOT/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, where *-sys store configuration data. +-TEXMFSYSCONFIG = $TEXMFROOT/texmf-config +TEXMFSYSCONFIG = @PREFIX@/etc/texmf-config - % User texmf trees are allowed as follows. - % This used to be HOMETEXMF. + % Per-user texmf tree(s) -- organized per the TDS, as usual. To define + % more than one per-user tree, set this to a list of directories in + % braces, as described above. (This used to be HOMETEXMF.) ~ expands + % to %USERPROFILE% on Windows, $HOME otherwise. -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 = ~/.texlive2010/texmf-var + % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. +-TEXMFVAR = ~/.texlive2011/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 = ~/.texlive2010/texmf-config + % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. +-TEXMFCONFIG = ~/.texlive2011/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,7 +111,7 @@ - % 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). + % List all the texmf trees. + % +@@ -92,7 +92,7 @@ + % 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} % 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. -@@ -125,18 +125,18 @@ +@@ -100,18 +100,18 @@ % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST} - % The system trees. These are the trees that are shared by all the users. + % The system trees. These are the trees that are shared by all 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. @@ -104,50 +85,73 @@ % On some systems, there will be a system tree which contains all the font % files that may be created as well as the formats. For example -@@ -233,13 +233,21 @@ - TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// - TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// - --% pTeX -+% pTeX family - TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// - TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// -+TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// -+TEXINPUTS.eplatex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// -+TEXINPUTS.uptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// -+TEXINPUTS.uplatex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// -+TEXINPUTS.euptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// -+TEXINPUTS.euplatex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// +@@ -215,10 +215,20 @@ + % epTeX. + TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// - % pBibTeX bibliographies and style files ++% upTeX. ++TEXINPUTS.uptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// ++TEXINPUTS.uplatex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// ++TEXINPUTS.euptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// ++TEXINPUTS.euplatex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// ++ + % pBibTeX bibliographies and style files. BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// -+BIBINPUTS.upbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// -+BSTINPUTS.upbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// ++% upBibTeX bibliographies and style files. ++BIBINPUTS.upbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// ++BSTINPUTS.upbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// ++ % ConTeXt. - TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// -@@ -390,8 +390,8 @@ + TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}// + +@@ -314,7 +324,7 @@ + % OSFONTDIR is to provide a convenient hook for allowing TeX to find + % fonts installed on the system (outside of TeX). An empty default + % value would add "//" to the search paths, so we give it a dummy value. +-OSFONTDIR = /please/set/osfontdir/in/the/environment ++OSFONTDIR = /{System/,}Library/Fonts// + + % PostScript Type 1 outline fonts. + T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR// +@@ -359,14 +369,14 @@ + PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// + + % Used by DMP (ditroff-to-mpx), called by makempx -troff. +-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps ++TRFONTS = /usr{/local,}/share/groff/{current/font,1.19.2/font,1.18.1/font,site-font}/devps + MPSUPPORT = .;$TEXMF/metapost/support + % 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 = $TEXMFROOT/etc +-MAILCAPLIBDIR = $TEXMFROOT/etc +MIMELIBDIR = @PREFIX@/etc +MAILCAPLIBDIR = @PREFIX@/etc % Default settings for fontconfig library, used by Windows versions of % xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this. -@@ -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} +@@ -413,7 +423,7 @@ + LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS - % 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 @@ + % Lua needs to look for binary lua libraries distributed with packages. +-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// ++CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//;@PREFIX@/lib/{$progname,$engine,}/lua// + + % Architecture independent executables. + TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}// +@@ -514,7 +524,7 @@ + % for the purportedly safe shell_escape_commands above to system + % directories. + TEXMF_RESTRICTED_SCRIPTS = \ +- {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// ++ {!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + + % Allow TeX \openin, \openout, or \input on filenames starting with `.' + % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? +@@ -707,3 +717,6 @@ line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 @@ -157,12 +161,10 @@ diff -Naur texlive-20100720-source.orig/texk/tetex/fmtutil.cnf texlive-20100720-source/texk/tetex/fmtutil.cnf --- texlive-20100720-source.orig/texk/tetex/fmtutil.cnf 2011-01-15 20:50:23.000000000 +0900 +++ texlive-20100720-source/texk/tetex/fmtutil.cnf 2011-01-16 10:52:00.000000000 +0900 -@@ -110,6 +110,12 @@ - # from ptex: +@@ -100,6 +100,10 @@ ptex ptex - ptex.ini - platex ptex language.ptx platex.ini -+#! eptex eptex - -etex eptex.src -+#! eplatex eptex language.ptx -etex platex.ini + eptex eptex language.def *eptex.ini + platex eptex language.ptx *platex.ini +#! uptex uptex - uptex.ini +#! uplatex uptex language.ptx uplatex.ini +#! euptex euptex - -etex euptex.src @@ -190,3 +192,183 @@ /*NOTREACHED*/ } +--- texlive-20110705-source.orig/texk/web2c/luatexdir/image/pdftoepdf.cc 2011-04-14 15:45:02.000000000 +0900 ++++ texlive-20110705-source/texk/web2c/luatexdir/image/pdftoepdf.cc 2011-04-12 23:17:47.000000000 +0900 +@@ -25,6 +25,7 @@ + // define DEBUG + + #include "epdf.h" ++//#define HAVE_GETPDFMAJORVERSION 1 + + // This file is mostly C and not very much C++; it's just used to interface + // the functions of xpdf, which happens to be written in C++. +@@ -533,7 +534,11 @@ + Page *page; + int rotate; + PDFRectangle *pagebox; ++#ifdef HAVE_GETPDFMAJORVERSION + int pdf_major_version_found, pdf_minor_version_found; ++#else ++ float pdf_version_found, pdf_version_wanted; ++#endif + float xsize, ysize, xorig, yorig; + assert(idict != NULL); + assert(img_type(idict) == IMG_TYPE_PDF); +@@ -550,6 +555,7 @@ + // this works only for PDF 1.x -- but since any versions of PDF newer + // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will + // then have to changed drastically anyway. ++#ifdef HAVE_GETPDFMAJORVERSION + pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); + pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion(); + if ((pdf_major_version_found > 1) +@@ -564,6 +570,19 @@ + minor_pdf_version_wanted); + } + } ++#else ++ pdf_version_found = pdf_doc->doc->getPDFVersion(); ++ pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); ++ if (pdf_version_found > pdf_version_wanted + 0.01) { ++ char msg[] = ++ "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed"; ++ if (pdf_inclusion_errorlevel > 0) { ++ pdftex_fail(msg, pdf_version_found, pdf_version_wanted); ++ } else { ++ pdftex_warn(msg, pdf_version_found, pdf_version_wanted); ++ } ++ } ++#endif + img_totalpages(idict) = pdf_doc->doc->getCatalog()->getNumPages(); + if (img_pagename(idict)) { + // get page by name +--- texlive-20110705-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc 2011-04-12 23:17:47.000000000 +0900 ++++ texlive-20110705-source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-01-03 09:15:51.000000000 +0900 +@@ -89,8 +89,10 @@ + new_poppler_userdata(Annots); + new_poppler_userdata(Array); + new_poppler_userdata(Catalog); +-new_poppler_userdata(EmbFile); + new_poppler_userdata(Dict); ++#ifdef EMBFILE_IN_CATALOG_H ++new_poppler_userdata(EmbFile); ++#endif + //new_poppler_userdata(GooString); + new_poppler_userdata(LinkDest); + new_poppler_userdata(Links); +@@ -393,7 +395,11 @@ + printf("\n===== Annot GC ===== uin=<%p>\n", uin); + #endif + if (uin->atype == ALLOC_LEPDF) ++#ifdef HAVE_ANNOTDECREFCNT ++ ((Annot *) uin->d)->decRefCnt(); ++#else + delete(Annot *) uin->d; ++#endif + return 0; + } + +@@ -410,6 +416,8 @@ + //********************************************************************** + // AnnotBorderStyle + ++#ifdef HAVE_ANNOTBORDERSTYLE ++ + m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth); + + m_poppler__tostring(AnnotBorderStyle); +@@ -435,6 +443,8 @@ + {NULL, NULL} // sentinel + }; + ++#endif ++ + //********************************************************************** + // Annots + +@@ -684,6 +694,8 @@ + m_poppler_get_poppler(Catalog, Object, getDests); + m_poppler_get_INT(Catalog, numEmbeddedFiles); + ++#ifdef EMBFILE_IN_CATALOG_H ++ + static int m_Catalog_embeddedFile(lua_State * L) + { + EmbFile *ef; +@@ -708,6 +720,8 @@ + return 1; + } + ++#endif ++ + m_poppler_get_INT(Catalog, numJS); + + static int m_Catalog_getJS(lua_State * L) +@@ -749,7 +763,9 @@ + {"findDest", m_Catalog_findDest}, + {"getDests", m_Catalog_getDests}, + {"numEmbeddedFiles", m_Catalog_numEmbeddedFiles}, ++#ifdef EMBFILE_IN_CATALOG_H + {"embeddedFile", m_Catalog_embeddedFile}, ++#endif + {"numJS", m_Catalog_numJS}, + {"getJS", m_Catalog_getJS}, + {"getOutline", m_Catalog_getOutline}, +@@ -761,6 +777,8 @@ + //********************************************************************** + // EmbFile + ++#ifdef EMBFILE_IN_CATALOG_H ++ + m_poppler_get_GOOSTRING(EmbFile, name); + m_poppler_get_GOOSTRING(EmbFile, description); + m_poppler_get_INT(EmbFile, size); +@@ -801,6 +819,8 @@ + {NULL, NULL} // sentinel + }; + ++#endif ++ + //********************************************************************** + // Dict + +@@ -2344,8 +2364,10 @@ + return 1; + } + ++#ifdef HAVE_GETPDFMAJORVERSION + m_PDFDoc_INT(getPDFMajorVersion); + m_PDFDoc_INT(getPDFMinorVersion); ++#endif + + static int m_PDFDoc__gc(lua_State * L) + { +@@ -2388,8 +2410,10 @@ + {"isLinearized", m_PDFDoc_isLinearized}, + {"getDocInfo", m_PDFDoc_getDocInfo}, + {"getDocInfoNF", m_PDFDoc_getDocInfoNF}, ++#ifdef HAVE_GETPDFMAJORVERSION + {"getPDFMajorVersion", m_PDFDoc_getPDFMajorVersion}, + {"getPDFMinorVersion", m_PDFDoc_getPDFMinorVersion}, ++#endif + {"__gc", m_PDFDoc__gc}, // finalizer + {NULL, NULL} // sentinel + }; +@@ -2683,12 +2707,16 @@ + { + register_meta(Annot); + // TODO register_meta(AnnotBorder); ++#ifdef HAVE_ANNOTBORDERSTYLE + register_meta(AnnotBorderStyle); ++#endif + register_meta(Annots); + register_meta(Array); + register_meta(Catalog); +- register_meta(EmbFile); + register_meta(Dict); ++#ifdef EMBFILE_IN_CATALOG_H ++ register_meta(EmbFile); ++#endif + register_meta(GooString); + register_meta(LinkDest); + register_meta(Links); Index: texlive.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/texlive.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- texlive.info 26 Jan 2012 01:55:37 -0000 1.2 +++ texlive.info 6 Feb 2012 21:38:18 -0000 1.3 @@ -1,14 +1,16 @@ Info2: << Package: texlive%type_pkg[-nox] Type: -nox (boolean) -Version: 0.20100722 +Version: 0.20110705 Revision: 100 GCC: 4.0 Description: Bundle package for TeX Live Depends: %N-base (= %v-%r), texinfo, debianutils, texi2html BuildDepends: << - libkpathsea6, t1lib5-nox, libpng14, libncurses5 (>= 5.4-20041023-1006), fink (>= 0.32), - libjpeg8, libiconv-dev, ptexenc1, zziplib13-dev, teckit-dev, libpaper1-dev, + libkpathsea6 (>= 6.0.1-1), ptexenc1 (>= 1.2.0-1), + t1lib5-nox, libpng15, libncurses5 (>= 5.4-20041023-1006), fink (>= 0.32.2), + libjpeg8, libiconv-dev, zziplib13-dev, teckit-dev, libpaper1-dev, + system-perl (>= 5.8.8-1) | perl588, xz, freetype219 (>= 2.2.1-4), (%type_raw[-nox] = .) gd2 (>= 2.0.35-2), (%type_raw[-nox] = .) poppler4, @@ -32,31 +34,36 @@ Provides: bundle-tetex, bundle-texlive Recommends: psutils, tex4ht, t1utils, lcdf-typetools, lacheck, ps2eps Suggests: latex2html, foiltex -Source: mirror:ctan:systems/texlive/Source/texlive-20100720-source.tar.xz -Source-MD5: 2a2201b84fdbf210032e1df70bc59157 -TarFilesRename: texlive-20100720-source:texlive +Source: mirror:ctan:systems/texlive/Source/texlive-20110705-source.tar.xz +Source-MD5: 968d238949e8a34a1fd74c374ddfe6f1 +TarFilesRename: texlive-20110705-source:texlive Source2: http://tutimura.ath.cx/~nob/tex/ptexlive/ptexlive-20100711.tar.gz Source2-MD5: 2dbd0ab5290bf6dfb0b2b04a813df89f Tar2FilesRename: ptexlive-20100711:ptexlive -Source3: http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/dvipsk-TL2010-fix_20110208.diff -Source3-MD5: c09419f618dbc3c9200cf471039404d8 -Source4: http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/xdvik-20090903-texlive2009_2010.patch.gz -Source4-MD5: 066d5d3e4e6bc6143d69db712db8c4d0 +Source3: http://sourceforge.jp/projects/eptex/wiki/TeX_Live_2011/attach/tl11supp-111101.tar.xz +Source3-MD5: 5faa742af438292971415bc088580353 +Source4: http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/xdvik-20090903-texlive2009_2011.patch.gz +Source4-MD5: 2177965a735d9fff0f206b5b8a309258 +Source5: http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/pmpost-makeconf-tl11.diff.gz +Source5-Md5: 0c25f072f252a42a9c4774ffe6378b31 NoSourceDirectory: true UseMaxBuildJobs: true PatchFile: texlive.patch -PatchFile-MD5: 032fd8cfa3c2d73689ea7b6b26a29b9d +PatchFile-MD5: d06b3f633b64223544ebff713b663456 PatchScript: << #!/bin/bash -ev sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -d texlive -p1 # Change the directory to be installed - for file in `find texlive -name Makefile.in`; do + for file in `find texlive -name Makefile.in`; do \ sed -i.bak -e 's|/texmf/|/share/texmf/|' \ - -e 's|/texmf-dist/|/share/texmf-dist/|' ${file} - done + -e 's|\(texmfdir = \)${prefix}|\1${datadir}|' \ + -e 's|/texmf-dist/|/share/texmf-dist/|' ${file} ; done + sed -i.bak -e 's|\(texconfdir = \)${prefix}|\1${datadir}|' \ + -e 's|\(REL=\).. \(TYPE=\)|\1../share \2|' \ texlive/texk/tetex/Makefile.in + # taking back... sed -i.bak2 's|/share/texmf/xdvi.cfg|/texmf/xdvi.cfg|' \ texlive/texk/xdvik/Makefile.in @@ -67,17 +74,14 @@ perl -pi -e 's|(kpse_cv_have_Carbon=)yes|\1no|' texlive/texk/xdv2pdf/configure fi - # Fix cm-super bug on dvipdfm.map -#patch -d texlive -p1 < ptexlive/archive/updmap-cmsuper.patch - - # add --nostop option: don't stop even if a map file is not found - patch -d texlive -p1 < ptexlive/archive/updmap-nostop.patch - - # for pTeX (Japanese font setting) - patch -d texlive -p1 < ptexlive/archive/updmap-live2009-4b.diff - - # fix dvipsk - patch -d texlive/texk/dvipsk -p1 < dvipsk-TL2010-fix_20110208.diff + # Allow to build with poppler 0.10 (configure requires poppler 0.12) + if [ "%type_raw[-nox]" == "." ]; then + sed -i.bak 's|\(poppler --atleast-version=0\).12|\1.10|' \ + texlive/configure texlive/texk/web2c/configure + else + sed -i.bak 's|^//\(#define\)|\1|' \ + texlive/texk/web2c/luatexdir/image/pdftoepdf.cc + fi # Install pxdvik sed -i.bak -e 's|tex4htk|pxdvik|g' texlive/configure @@ -85,7 +89,7 @@ xz -dc ptexlive/archive/xdvik-20090903-texlive2009.diff.xz \ > xdvik-20090903-texlive2009.diff - gzip -dc xdvik-20090903-texlive2009_2010.patch.gz | patch -p0 + gzip -dc xdvik-20090903-texlive2009_2011.patch.gz | patch -p0 xz -c xdvik-20090903-texlive2009.diff \ > ptexlive/archive/xdvik-20090903-texlive2009.diff.xz @@ -97,7 +101,7 @@ echo '#!/bin/bash' >> ptex-app.sh echo '. ./common.sh' >> ptex-app.sh sed -n '118,178p' ptexlive/2extract-src.sh | \ - sed -e 's|2.3.9|2.3.11|g' >> ptex-app.sh + sed -e 's|2.3.9|2.4.4|g' >> ptex-app.sh chmod +x ptex-app.sh mv ptex-app.sh ptexlive/ptex-app.sh pushd ptexlive && ./ptex-app.sh @@ -119,7 +123,48 @@ chmod +x ptex-cmap.sh ./ptex-cmap.sh - echo "f kanjix.map" >> texlive/texk/dvipdfmx/data/dvipdfmx.cfg + ##### Apply patches taken from upstream svn + + sed -i.bak -e "s|\(TLSRCDIR=\)/opt/home-supp/tl11|\1`pwd`/tl11|" \ + -e "s|\(TMPDIR=\)/tmp|\1`pwd`|" \ + -e 's|texlive-$TLV-source|texlive|' tl11/common.sh + + sed -n -e "1,4p" -e "8,18p" \ + -e "34,38p" -e "45,61p" \ + tl11/scripts/unpack.sh > tl11/unpack.sh + + sed -i.bak 's|^# \(zpatch\)|\1|' tl11/unpack.sh + chmod +x tl11/unpack.sh + pushd tl11 && FLG_PMPOST=TRUE ./unpack.sh + popd + + gzcat pmpost-makeconf-tl11.diff.gz | patch -p1 -d texlive + perl -pi.bak -e 's|(#include <errno.h>)|#include <kpathsea/kpathsea.h>\n\1|' \ + texlive/texk/web2c/pmplibdir/jmp.ch + perl -pi.bak1 -e 's|const char\*s|string s|' \ + texlive/texk/web2c/pmplibdir/jmppsw.ch + perl -pi.bak -e 's|const char \*s|string s|' \ + texlive/texk/web2c/pmplibdir/jmppsw.ch + perl -pi.bak -e 's|(char kanjioption)|#include <ptexenc/ptexenc.h>\n\1|' \ + texlive/texk/web2c/pmplibdir/pmpost.ch + mv texlive/texk/web2c/pmplibdir/psvgout.ch{,.bak} + echo '@x' >> texlive/texk/web2c/pmplibdir/psvgout.ch + echo '#include <stdio.h>' >> texlive/texk/web2c/pmplibdir/psvgout.ch + echo '@y' >> texlive/texk/web2c/pmplibdir/psvgout.ch + echo '#include <ptexenc/ptexenc.h>' >> texlive/texk/web2c/pmplibdir/psvgout.ch + echo '#include <stdio.h>' >> texlive/texk/web2c/pmplibdir/psvgout.ch + echo '@z' >> texlive/texk/web2c/pmplibdir/psvgout.ch + echo '' >> texlive/texk/web2c/pmplibdir/psvgout.ch + cat texlive/texk/web2c/pmplibdir/psvgout.ch.bak \ + >> texlive/texk/web2c/pmplibdir/psvgout.ch + ##### + + echo "f kanjix.map" >> texlive/texk/dvipdfmx/dvipdfmx-20*/data/dvipdfmx.cfg + + # adjust for Mac, and sync with pxdvik + sed -i.bak -e 's|firefox|open|' \ + -e 's|kinput2|uim|' texlive/texk/pxdvik/texmf/XDvi + cp texlive/texk/pxdvik/texmf/XDvi texlive/texk/xdvik/texmf/XDvi # wrapper for jbibtex echo '#!/bin/sh' >> jbibtex @@ -144,6 +189,7 @@ --with-freetype2-include=%p/lib/freetype219/include \ (%type_raw[-nox] = .) --with-system-gd (%type_raw[-nox] = .) --with-system-xpdf + (%type_raw[-nox] = .) --with-system-poppler (%type_raw[-nox] = .) --x-includes=/usr/X11R6/include (%type_raw[-nox] = .) --x-libraries=/usr/X11R6/lib (%type_raw[-nox] = .) --with-xdvi-x-toolkit=motif --with-motif-libdir=%p/lib @@ -183,6 +229,10 @@ # install jbibtex install -m 755 jbibtex %i/bin + # install tlpkg dir + install -m 755 -d %i/share/tlpkg/TeXLive + install -m 644 texlive/utils/biber/TeXLive/*.pm %i/share/tlpkg/TeXLive + %i/bin/mktexlsr %i/share/texmf echo "Setting up symlinks ..." @@ -203,7 +253,6 @@ %i/bin/mktexlsr %i/etc/texmf-config echo "Removing files that are supplied in the texlive-texmf package ..." -#mv -f %i/share/texmf-dist/scripts/luaotfload %i/share/texmf/scripts mv -f %i/share/texmf-dist texmf-dist.conflict if [ "%type_raw[-nox]" == "." ]; then @@ -228,10 +277,11 @@ Package: %N-base Description: Base programs for a TeX Live installation Depends: << - t1lib5-nox-shlibs, libpng14-shlibs, + t1lib5-nox-shlibs, libpng15-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006), ncurses (>= 5.4-20041023-1006), - fink (>= 0.12.0-1), libkpathsea6-shlibs, texlive-texmf, - ptexenc1-shlibs, zziplib13-shlibs, teckit-shlibs, nkf, libpaper1-shlibs, + fink (>= 0.12.0-1), texlive-texmf, + libkpathsea6-shlibs (>= 6.0.1-1), ptexenc1-shlibs (>= 1.2.0-1), + zziplib13-shlibs, teckit-shlibs, nkf, libpaper1-shlibs, freetype219-shlibs (>= 2.2.1-4), (%type_raw[-nox] = .) applesystemfonts, (%type_raw[-nox] = .) appleotffonts, @@ -254,9 +304,9 @@ ptex-base (<= 3.1.11-1), ptex-nox-base (<= 3.1.11-1), ptex-texmf (<= 2.5-1), context, dvipdfm, epstopdf, pdftex, tetex-macosx, tetex (<= 2.0-3), (%type_raw[-nox] = .) xdvi (<= 22.70-1), - libkpathsea4, detex, xetex, dvipdfmx, pdfjam, jadetex, latexdiff + libkpathsea4, detex, xetex, dvipdfmx, pdfjam, jadetex, latexdiff, eptex << - Provides: context, dvipdfm, epstopdf, pdftex, tetex-macosx, tetex-base, tetex3-base, texlive-base, detex, xetex, ptex3-base, dvipdfmx, pdfjam, jadetex + Provides: context, dvipdfm, epstopdf, pdftex, tetex-macosx, tetex-base, tetex3-base, texlive-base, detex, xetex, ptex3-base, dvipdfmx, pdfjam, jadetex, eptex Files: bin etc share/info share/man share/texmf share/texmf-local var InfoDocs: web2c.info dvips.info dvipng.info kpathsea.info DocFiles: texlive/README Index: ptexenc1.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/ptexenc1.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ptexenc1.info 26 Jan 2012 01:55:37 -0000 1.2 +++ ptexenc1.info 6 Feb 2012 21:38:18 -0000 1.3 @@ -1,22 +1,19 @@ Package: ptexenc1 -Version: 1.1.1 +Version: 1.2.0 Revision: 1 Description: Kanji code convert library for pTeX -BuildDepends: texlive-texmf, fink (>= 0.32), libiconv-dev, libkpathsea6 (>= 6.0.0-1) +BuildDepends: texlive-texmf, fink (>= 0.32), libiconv-dev, libkpathsea6 (>= 6.0.1-1) BuildDependsOnly: true Depends: %N-shlibs (= %v-%r) Conflicts: ptexenc Replaces: ptexenc -Source: mirror:ctan:systems/texlive/Source/texlive-20100720-source.tar.xz -Source-MD5: 2a2201b84fdbf210032e1df70bc59157 -TarFilesRename: texlive-20100720-source:texlive -SourceDirectory: texlive +Source: mirror:ctan:systems/texlive/Source/texlive-20110705-source.tar.xz +Source-MD5: 968d238949e8a34a1fd74c374ddfe6f1 +TarFilesRename: texlive-20110705-source:texlive +NoSourceDirectory: true PatchScript: << - sed -i.bak 's|\(-version-info\)|$(kpathsea) $(LIBS) \1|' \ - texk/ptexenc/Makefile.in - - # build fixes for x86_64/SL; suggested by Benjamin Reed -#perl -pi -e 's,need_relink=yes,need_relink=no,g' texk/ltmain.sh + sed -i.bak 's|\(-version-info\)|$(KPATHSEA_LIBS) $(LIBS) \1|' \ + texlive/texk/ptexenc/Makefile.in << ConfigureParams: << --with-banner-add="/Fink" \ @@ -24,6 +21,8 @@ --disable-texi2html --disable-texinfo --enable-shared \ --datadir='${prefix}/share' --infodir='${prefix}/share/info' \ --mandir='${prefix}/share/man' --disable-multiplatform --with-system-ncurses \ + --with-system-kpathsea --with-kpathsea-includes=%p/include \ + --with-kpathsea-libdir=%p/lib \ --disable-psutils --disable-dialog --disable-tex4htk --disable-t1utils \ --disable-detex --disable-dvipdfmx --disable-lcdf-typetools \ --disable-xindy --disable-xdv2pdf --disable-xetex --disable-xdvipdfmx \ @@ -38,20 +37,20 @@ --without-x << CompileScript: << - cd texk/ptexenc; ./configure %c - cd texk/ptexenc; make + cd texlive/texk/ptexenc; ./configure %c + cd texlive/texk/ptexenc; make << InstallScript: << - cd texk/ptexenc; make install-strip DESTDIR=%d + cd texlive/texk/ptexenc; make install-strip DESTDIR=%d << -DocFiles: texk/ptexenc/{COPYRIGHT,ChangeLog,README} +DocFiles: texlive/texk/ptexenc/{COPYRIGHT,ChangeLog,README} SplitOff: << Package: %N-shlibs Description: Shared libraries of Kanji code convert library for pTeX - Depends: libkpathsea6-shlibs (>= 6.0.0-1), libiconv + Depends: libkpathsea6-shlibs (>= 6.0.1-1), libiconv Files: lib/libptexenc.*.dylib - Shlibs: %p/lib/libptexenc.1.dylib 3.0.0 %n (>= 1.1.1-1) - DocFiles: texk/ptexenc/{COPYRIGHT,ChangeLog,README} + Shlibs: %p/lib/libptexenc.1.dylib 4.0.0 %n (>= 1.2.0-1) + DocFiles: texlive/texk/ptexenc/{COPYRIGHT,ChangeLog,README} << License: BSD Maintainer: Todai Fink Team <fi...@so...> |