Skip to content

Commit

Permalink
Merge texlive 2010 update from /users/dports to /trunk
Browse files Browse the repository at this point in the history 
texlive: update to TeX Live 2010 (https://trac.macports.org/ticket/26430)
 * generate texmf.cnf from contents of $prefix/etc/texmf/texmf.cnf.d
   (https://trac.macports.org/ticket/24204)
 * build binaries in texlive-bin but stage them in
   $prefix/libexec/texlive/binaries until they are activated by other
   ports when their support files are installed (https://trac.macports.org/ticket/25460, https://trac.macports.org/ticket/25875)
 * symlink binaries to $prefix/libexec/texlive/texbin for MacTeX
   support (https://trac.macports.org/ticket/26784)
 * fix up some dependency problems, including pulling pgf out of
   texlive-pictures so texlive-latex-recommended can depend on it
   (https://trac.macports.org/ticket/25478)
 * add pre-activate hooks to deactivate texlive 2009 ports when
   necessary to avoid conflicts during upgrade
 * remove asymptote and xindy texmf files so that we can have separate
   ports someday
 * many minor changes to packaging

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@73314 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
@drkp
drkp committed Nov 10, 2010
1 parent 9fc337c commit fac8765
Show file tree
Hide file tree
Showing 99 changed files with 927 additions and 723 deletions.
71 changes: 53 additions & 18 deletions _resources/port1.0/group/texlive-1.0.tcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,37 @@ set texlive_texmfmain "${prefix}/share/texmf-texlive"
# well too
set texlive_texmfdist "${prefix}/share/texmf-texlive-dist"

# "local" texmf files, e.g. installed by ports other than texlive
set texlive_texmflocal "${prefix}/share/texmf"
# texmf files installed by ports other than texlive
set texlive_texmfports "${prefix}/share/texmf"

# optional tree for user-installed texmf files
set texlive_texmflocal "${prefix}/share/texmf-local"

# variable runtime data, e.g. formats
set texlive_texmfsysvar "${prefix}/var/db/texmf"

# configuration data from texconfig
set texlive_texmfsysconfig "${prefix}/etc/texmf"

# location of binaries installed by texlive-bin
#
# All TeXLive binaries are built by texlive-bin, but most of them
# aren't usable without the support files installed by other ports:
# for example, xetex needs texlive-xetex, tex4ht needs
# texlive-htmlxml, and just about everything needs texlive-basic. We
# don't want to install useless files into $prefix/bin, so instead
# texlive-bin installs its binaries into this "hidden" directory, and
# other ports "activate" them when they are ready to be used by creating
# symlinks into $prefix/bin.
set texlive_bindir "${prefix}/libexec/texlive/binaries"

# another directory containing symlinks to activated texlive binaries
#
# This is provided to support MacTeX's TeX Distribution preference
# pane: it can select the active TeX distribution by pointing the
# /usr/texbin symlink here
set texlive_mactex_texbindir "${prefix}/libexec/texlive/texbin"

# Remove dependencies on any texlive-documentation-* ports, for use by
# -doc variants
proc texlive.removedocdepends {} {
Expand All @@ -84,12 +106,8 @@ proc texlive.removedocdepends {} {
options texlive.exclude
default texlive.exclude {}

# Skip installing all manpages. A number of texmf ports include
# manpages, but many of them are already installed by texmf-bin.
options texlive.excludemanpages
default texlive.excludemanpages no

options texlive.formats texlive.languages texlive.maps
options texlive.binaries texlive.formats texlive.languages texlive.maps
default texlive.binaries {}
default texlive.formats {}
default texlive.languages {}
default texlive.maps {}
Expand All @@ -104,12 +122,12 @@ proc texlive.texmfport {} {
supported_archs noarch

master_sites http://flute.csail.mit.edu/texlive/
use_bzip2 yes
use_xz yes

global name master_sites
livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex ${name}-(\\d+)\\.tar\\.bz2
livecheck.regex ${name}-(\\d+)\\.tar

depends_lib-append port:texlive-common port:texlive-bin

Expand All @@ -127,6 +145,8 @@ proc texlive.texmfport {} {
build { }

destroot {
xinstall -d ${destroot}${texlive_mactex_texbindir}

set indexlist {"runfiles"}
if {[variant_isset "doc"]} { lappend indexlist "docfiles" }
if {[variant_isset "src"]} { lappend indexlist "srcfiles" }
Expand Down Expand Up @@ -157,14 +177,20 @@ proc texlive.texmfport {} {

# check for manpages and treat specially
if [regexp {^texmf/doc/man/man(\d)/([^/]+)} $line -> section filename] {
if {![tbool texlive.excludemanpages]} {
if [string match "*.$section" $filename] {
# actually a manpage; install it
copy $srcfile ${destroot}${prefix}/share/man/man$section/
if [string match "*.$section" $filename] {
# actually a manpage; install it. If
# texlive-bin installed a manpage with the
# same name, use it instead to make sure the
# documentation matches the binary.
if [file exists ${texlive_bindir}/man${section}/$filename.gz] {
ln -s ${texlive_bindir}/man${section}/$filename.gz \
${destroot}${prefix}/share/man/man$section/
} else {
# not actually a manpage; do nothing
# (e.g. don't install PDF manpages)
copy $srcfile ${destroot}${prefix}/share/man/man$section/
}
} else {
# not actually a manpage; do nothing
# (e.g. don't install PDF manpages)
}
} else {
# not a manpage; install into requested target dir
Expand All @@ -184,6 +210,13 @@ proc texlive.texmfport {} {
}
}

# create symlinks for any binaries activated by the port
foreach bin ${texlive.binaries} {
ui_msg "activating binary $bin"
ln -s ${texlive_bindir}/$bin ${destroot}${prefix}/bin
ln -s ${texlive_bindir}/$bin ${destroot}${texlive_mactex_texbindir}
}

# install a documentation file containing the list of TeX
# packages installed. This also ensures that each port
# provides at least one file, even if there's nothing to
Expand Down Expand Up @@ -228,6 +261,8 @@ proc texlive.texmfport {} {
![file exists ${destroot}${prefix}/bin/$fmtname]} {
ln -s ${prefix}/bin/$fmtengine \
${destroot}${prefix}/bin/$fmtname
ln -s ${prefix}/bin/$fmtengine \
${destroot}${texlive_mactex_texbindir}/$fmtname
}
}

Expand Down Expand Up @@ -277,7 +312,7 @@ proc texlive.texmfport {} {
}

post-activate {
system "${prefix}/bin/mktexlsr"
system "${texlive_bindir}/mktexlsr"
if {${texlive.forceupdatecnf}} {
# If force was specified, update all the config files, and
# regenerate all maps and formats.
Expand Down Expand Up @@ -312,7 +347,7 @@ proc texlive.texmfport {} {
post-deactivate {
# Update ls-R and any config files to reflect that the package
# is now gone
system "${prefix}/bin/mktexlsr"
system "${texlive_bindir}/mktexlsr"
if {${texlive.forceupdatecnf} || ${texlive.languages} != ""} {
system "${prefix}/libexec/texlive-update-cnf language.dat"
system "${prefix}/libexec/texlive-update-cnf language.def"
Expand Down
82 changes: 19 additions & 63 deletions tex/texlive-basic/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ PortSystem 1.0
PortGroup texlive 1.0

name texlive-basic
version 15576
revision 1
version 17228
revision 0

categories tex
maintainers dports
description TeX Live: Essential programs and files
long_description These files are regarded as basic for any TeX system, covering plain TeX macros, Computer Modern fonts, and configuration for common drivers\; no LaTeX.

checksums md5 925a2d2d1622858b15730066326f89f6 \
sha1 b336e42d8e4e2f3103db61ace18256e67e0ab47c \
rmd160 1d817c4ce28f7010dfd001e51800233345736c76
checksums md5 cd34562742f998e23be31c3f90aaf8d5 \
sha1 1547529eac5d2a2fa7015ac7e12a5eb049969efb \
rmd160 d45ce7124c1c3a15991b8988e83587f348076047

depends_lib port:texlive-documentation-base

texlive.formats \
{1 luatex luatex language.def {luatex.ini}} \
{1 dviluatex luatex language.def {dviluatex.ini}} \
{1 luatex luatex language.def,language.dat.lua {luatex.ini}} \
{1 dviluatex luatex language.def,language.dat.lua {dviluatex.ini}} \
{1 mf mf-nowin - {-translate-file=cp227.tcx mf.ini}} \
{1 pdftex pdftex language.def {-translate-file=cp227.tcx *pdfetex.ini}} \
{1 etex pdftex language.def {-translate-file=cp227.tcx *etex.ini}} \
Expand All @@ -38,67 +38,16 @@ texlive.maps \
{MixedMap cmtext-bsr-interpolated.map} \
{MixedMap mflogo.map}

texlive.exclude texmf/doc/man/man1/afm2tfm.1 \
texmf/doc/man/man1/allcm.1 \
texmf/doc/man/man1/allec.1 \
texmf/doc/man/man1/allneeded.1 \
texmf/doc/man/man1/bibtex.1 \
texmf/doc/man/man1/dvi2fax.1 \
texmf/doc/man/man1/dvips.1 \
texmf/doc/man/man1/dvired.1 \
texmf/doc/man/man1/fmtutil-sys.1 \
texmf/doc/man/man1/fmtutil.1 \
texmf/doc/man/man1/fontinst.1 \
texmf/doc/man/man1/gftodvi.1 \
texmf/doc/man/man1/gftopk.1 \
texmf/doc/man/man1/gftype.1 \
texmf/doc/man/man1/gsftopk.1 \
texmf/doc/man/man1/kpseaccess.1 \
texmf/doc/man/man1/kpsepath.1 \
texmf/doc/man/man1/kpsereadlink.1 \
texmf/doc/man/man1/kpsestat.1 \
texmf/doc/man/man1/kpsetool.1 \
texmf/doc/man/man1/kpsewhere.1 \
texmf/doc/man/man1/kpsewhich.1 \
texmf/doc/man/man1/kpsexpand.1 \
texmf/doc/man/man1/gsftopk.1 \
texmf/doc/man/man1/luatex.1 \
texmf/doc/man/man1/makeindex.1 \
texmf/doc/man/man1/mf-nowin.1 \
texmf/doc/man/man1/mf.1 \
texmf/doc/man/man1/mft.1 \
texmf/doc/man/man1/mkindex.1 \
texmf/doc/man/man1/mkocp.1 \
texmf/doc/man/man1/mkofm.1 \
texmf/doc/man/man1/mktexfmt.1 \
texmf/doc/man/man1/mktexlsr.1 \
texmf/doc/man/man1/mktexmf.1 \
texmf/doc/man/man1/mktexpk.1 \
texmf/doc/man/man1/mktextfm.1 \
texmf/doc/man/man1/pdfetex.1 \
texmf/doc/man/man1/pdftex.1 \
texmf/doc/man/man1/pktogf.1 \
texmf/doc/man/man1/pktype.1 \
texmf/doc/man/man1/tcdialog.1 \
texmf/doc/man/man1/tex.1 \
texmf/doc/man/man1/texconfig-sys.1 \
texmf/doc/man/man1/texconfig.1 \
texmf/doc/man/man1/texlinks.1 \
texmf/doc/man/man1/texhash.1 \
texmf/doc/man/man1/updmap-sys.1 \
texmf/doc/man/man1/updmap.1 \
texmf/doc/man/man1/xdvi.1 \
texmf/doc/man/man5/fmtutil.cnf.5 \
texmf/doc/man/man5/updmap.cfg.5 \
texmf/web2c/fmutil.cnf \
texlive.binaries afm2tfm allcm allec allneeded bibtex dvi2fax dvipdfm dvipdfmx dvipdft dvips dvired ebb extractbb fmtutil fmtutil-sys gftodvi gftopk gftype gsftopk kpseaccess kpsepath kpsereadlink kpsestat kpsetool kpsewhere kpsewhich kpsexpand luatex makeindex mf-nowin mft mkindex mkocp mkofm mktexfmt mktexlsr mktexmf mktexpk mktextfm pdftex pktogf pktype simpdftex tcdialog tex texconfig texconfig-dialog texconfig-sys texhash texlinks texlua texluac updmap updmap-sys xdvi

texlive.exclude texmf/web2c/fmutil.cnf \
texmf/web2c/texmf.cnf \
texmf/web2c/updmap.cfg \
texmf/tex/generic/config/language.dat \
texmf/tex/generic/config/language.def

post-destroot {
delete ${destroot}${prefix}/bin/mf
}
patchfiles patch-runfiles_texmf_dvipdfm_config_config.diff \
patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg

pre-activate {
# If texlive 2007 metaport is installed, deactivate it to avoid
Expand All @@ -108,6 +57,13 @@ pre-activate {
&& [rpm-vercomp [lindex $vers 1] 2009] < 0} {
registry_deactivate texlive "" [list ports_nodepcheck 1]
}

# Deactivate texlive-fontutils to avoid conflicts on mft from the
# 2009->2010 update
if {![catch {set vers [lindex [registry_active texlive-fontutils] 0]}]
&& [rpm-vercomp [lindex $vers 1] 16392] < 0} {
registry_deactivate texlive-fontutils "" [list ports_nodepcheck 1]
}
}

texlive.forceupdatecnf yes
Expand Down
11 changes: 11 additions & 0 deletions tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- runfiles/texmf/dvipdfm/config/config.orig 2010-11-09 19:46:22.000000000 -0500
+++ runfiles/texmf/dvipdfm/config/config 2010-11-09 19:46:30.000000000 -0500
@@ -6,7 +6,7 @@
%% keep this the same in dvipdfm and dvipdfmx.
%% can't use zcat because the pipe breaks on Windows; better to have
%% one config file.
-D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
+D "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"

% Distiller config. Uses ghostscript and works on compressed and
% uncompressed files. Use zcat -f <%i instead of zcat -f %i
11 changes: 11 additions & 0 deletions tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- runfiles/texmf/dvipdfmx/dvipdfmx.cfg.orig 2010-11-09 19:47:16.000000000 -0500
+++ runfiles/texmf/dvipdfmx/dvipdfmx.cfg 2010-11-09 19:48:23.000000000 -0500
@@ -142,7 +142,7 @@
%% /usr/local/texlive/2009/texmf-dist/dvips/pstricks/pstricks.pro (for
%% example) needs to be accessed.
%%
-D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile=%o %i -c quit"
+D "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile=%o %i -c quit"

%% Frank Siegert's PStill:
%D "/usr/local/bin/pstill -c -o %o %i"
14 changes: 8 additions & 6 deletions tex/texlive-bibtex-extra/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,21 @@ PortSystem 1.0
PortGroup texlive 1.0

name texlive-bibtex-extra
version 15225
revision 1
version 17995
revision 0

categories tex
maintainers dports
description TeX Live: Extra BibTeX styles
long_description Additional BibTeX styles and bibliography databases.
long_description Additional BibTeX styles and bibliography databases, including BibLaTeX.

checksums md5 43067241f2bef392645c5f4e878e8ff8 \
sha1 ef7d98967bd02e70c893a48dec0bba4cacc76588 \
rmd160 f4d1680c97635095910fe2a6237e525019e1d56f
checksums md5 69f6a6e09ef00edc44f95536690e27cb \
sha1 4f5899c4f23d4cba28b5044d59ef2109f24c03d7 \
rmd160 e955c3982242f6770f3d39dc5739c0443377b39f

depends_lib port:texlive-latex

texlive.binaries bibexport


texlive.texmfport
56 changes: 6 additions & 50 deletions tex/texlive-bin-extra/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,65 +5,21 @@ PortSystem 1.0
PortGroup texlive 1.0

name texlive-bin-extra
version 15618
revision 3
version 18336
revision 0

categories tex
maintainers dports
description TeX Live: TeX auxiliary programs
long_description Various useful, but non-essential, support programs. Includes programs and macros for DVI file manipulation, literate programming, patgen, and the TeX Works Editor.

checksums md5 585285a1dde1b7e682f8fdf138ce7819 \
sha1 e69f18fe119f0b1fc2e011472031f6dd86e23a60 \
rmd160 2eeef746b05b2aefba1402ac5b0db9b9551f1467
checksums md5 0e4b4a0c41e38429b90522d24807e55b \
sha1 7fdea0949bb227ddf9a5c488a7b46e374fc242ee \
rmd160 92958a1eeac00f6400885a24862f8250dad2a50f

depends_lib port:texlive-basic

depends_run port:latexmk
texlive.binaries a2ping arlatex bibtex8 bibtexu bundledoc chktex chkweb ctangle ctie cweave de-macro deweb dt2dv dv2dt dviasm dvibook dviconcat dvicopy dvidvi dvigif dvihp dvilj dvilj2p dvilj4 dvilj4l dvilj6 dvipng dvipos dviselect dvisvgm dvitodvi dvitype e2pall findhyph fragmaster lacheck latex2man latexdiff latexdiff-vc latexrevise listings-ext.sh mkjobtexmf patgen pdf180 pdf270 pdf90 pdfatfi pdfbook pdfclose pdfcrop pdfflip pdfjam pdfjam-pocketmod pdfjam-slides3up pdfjam-slides6up pdfjoin pdfnup pdfopen pdfpun pdftosrc pkfix pkfix-helper pooltype ps4pdf purifyeps rpdfcrop synctex tangle texcount texdiff texdirflatten texdoc texdoctk texloganalyser tie tpic2pdftex weave

texlive.exclude texmf/doc/man/man1/asy.1 \
texmf/doc/man/man1/ctangle.1 \
texmf/doc/man/man1/ctie.1 \
texmf/doc/man/man1/cweave.1 \
texmf/doc/man/man1/cweb.1 \
texmf/doc/man/man1/dt2dv.1 \
texmf/doc/man/man1/dv2dt.1 \
texmf/doc/man/man1/dvibook.1 \
texmf/doc/man/man1/dviconcat.1 \
texmf/doc/man/man1/dvicopy.1 \
texmf/doc/man/man1/dvidvi.1 \
texmf/doc/man/man1/dvihp.1 \
texmf/doc/man/man1/dvilj.1 \
texmf/doc/man/man1/dvilj2p.1 \
texmf/doc/man/man1/dvilj4.1 \
texmf/doc/man/man1/dvilj4l.1 \
texmf/doc/man/man1/dvilj6.1 \
texmf/doc/man/man1/dvipng.1 \
texmf/doc/man/man1/dvipos.1 \
texmf/doc/man/man1/dviselect.1 \
texmf/doc/man/man1/dvitodvi.1 \
texmf/doc/man/man1/dvitype.1 \
texmf/doc/man/man1/e2pall.1 \
texmf/doc/man/man1/getnonfreefonts-sys.1 \
texmf/doc/man/man1/getnonfreefonts.1 \
texmf/doc/man/man1/lacheck.1 \
texmf/doc/man/man1/latexmk.1 \
texmf/doc/man/man1/mkjobtexmf.1 \
texmf/doc/man/man1/patgen.1 \
texmf/doc/man/man1/pdftosrc.1 \
texmf/doc/man/man1/pooltype.1 \
texmf/doc/man/man1/synctex.1 \
texmf/doc/man/man1/tangle.1 \
texmf/doc/man/man1/tex2xindy.1 \
texmf/doc/man/man1/texdoctk.1 \
texmf/doc/man/man1/texindy.1 \
texmf/doc/man/man1/tie.1 \
texmf/doc/man/man1/tpic2pdftex.1 \
texmf/doc/man/man1/weave.1 \
texmf/doc/man/man1/xasy.1 \
texmf/doc/man/man5/synctex.5 \
texmf/doc/man/man1/xindy.1 \
texmf-dist/doc/support/latexmk \
texmf-dist/scripts/latexmk

texlive.texmfport
Loading

0 comments on commit fac8765

Please sign in to comment.