- Fix USE_SYSTRACE=Yes builds.

- LOCALBASE -> TRUEPREFIX

- Add a separate script (tl-link-config) to decide which config to
symlink. Fixes the situation where -base gets bumped and so the minimal
fmtutil.cnf gets incorrectly linked when really the -full config is
needed.

from maintainer Edd Barrett.
This commit is contained in:
sthen 2009-04-23 00:18:17 +00:00
parent 933ba70163
commit 5ddde6614a
8 changed files with 112 additions and 42 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2009/02/22 19:05:17 kili Exp $
# $OpenBSD: Makefile,v 1.23 2009/04/23 00:18:17 sthen Exp $
COMMENT = base binaries for TeXLive typesetting distribution
DIST_V = 20080816
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}p9
PKGNAME = texlive_base-${V}p10
SHARED_LIBS = kpathsea 1.0
WANTLIB = m X11 ICE freetype Xt pthread c Xext fontconfig \
@ -67,6 +67,8 @@ CONFIGURE_ARGS += --with-fontconfig=${X11BASE} \
--with-old-mac-fonts \
--without-xindy
SUBST_VARS += TRUEPREFIX
# Could do with bsd.port.mk understanding lzma
# Also annoyingly loads of .orig files confuse update-patches
do-extract:
@ -77,10 +79,11 @@ do-extract:
post-install:
${INSTALL_DATA} ${FILESDIR}/fmtutil.cnf-minimal \
${PREFIX}/share/texmf/web2c
${INSTALL_DATA} ${FILESDIR}/fmtutil.cnf-full \
${PREFIX}/share/texmf/web2c
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/texlive
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD \
${PREFIX}/share/doc/texlive
${INSTALL_SCRIPT} ${FILESDIR}/tl-link-config \
${PREFIX}/bin
${SUBST_CMD} ${PREFIX}/bin/tl-link-config
.include <bsd.port.mk>

View File

@ -0,0 +1,16 @@
#!/bin/sh
# $OpenBSD: tl-link-config,v 1.1 2009/04/23 00:18:18 sthen Exp $
#
# This script looks at what TeX Live trees you have installed on
# your OpenBSD system and links the right config file.
#
# It gets called as an @exec/@unexec of packages which require
# different fmtutil.cnf's, namely -base and -full.
fmtutil=${TRUEPREFIX}/share/texmf/web2c/fmtutil.cnf
if [ -e "${fmtutil}-full" ]; then
ln -sf ${fmtutil}-full $fmtutil
else
ln -sf ${fmtutil}-minimal $fmtutil
fi

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-texk_cjkutils_conv_Makefile_in,v 1.3 2009/04/23 00:18:18 sthen Exp $
--- texk/cjkutils/conv/Makefile.in.orig Sun Apr 5 18:29:23 2009
+++ texk/cjkutils/conv/Makefile.in Sun Apr 5 18:30:12 2009
@@ -26,7 +26,7 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_PROGRAM) $$p $(bindir); done
+ for p in $(programs); do $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir); done
uninstall-exec:
for p in $(programs); do $(RM) $(bindir)/$$p; done

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-texk_cjkutils_scripts_Makefile_in,v 1.3 2009/04/23 00:18:18 sthen Exp $
--- texk/cjkutils/scripts/Makefile.in.orig Fri Feb 1 11:23:16 2008
+++ texk/cjkutils/scripts/Makefile.in Sun Apr 5 19:35:09 2009
@@ -17,9 +17,9 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
- ln -sf gbklatex $(scriptdir)/bg5+latex
- ln -sf gbkpdflatex $(scriptdir)/bg5+pdflatex
+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(scriptdir); done
+ ln -sf gbklatex $(DESTDIR)/$(scriptdir)/bg5+latex
+ ln -sf gbkpdflatex $(DESTDIR)/$(scriptdir)/bg5+pdflatex
uninstall-exec:
for p in $(scripts); do $(RM) $(scriptdir)/$$p; done

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2009/02/22 19:05:17 kili Exp $
@comment $OpenBSD: PLIST,v 1.11 2009/04/23 00:18:18 sthen Exp $
@conflict teTeX_base-*
@conflict ht-<2
@conflict texlive_texmf-minimal-<2008p1
@ -11,8 +11,22 @@ bin/a2ping
bin/allcm
bin/allec
bin/allneeded
bin/bg5+latex
bin/bg5+pdflatex
@bin bin/bg5conv
bin/bg5latex
bin/bg5pdflatex
@bin bin/bibtex
@bin bin/bibtex8
@bin bin/cef5conv
bin/cef5latex
bin/cef5pdflatex
@bin bin/cefconv
bin/ceflatex
bin/cefpdflatex
@bin bin/cefsconv
bin/cefslatex
bin/cefspdflatex
@bin bin/cfftot1
bin/context
@bin bin/ctangle
@ -54,10 +68,13 @@ bin/epspdf
bin/epspdftk
bin/epstopdf
bin/exatools
@bin bin/extconv
bin/extractbb
bin/fmtutil
bin/fmtutil-sys
bin/fontinst
bin/gbklatex
bin/gbkpdflatex
bin/getnonfreefonts
bin/getnonfreefonts-sys
@bin bin/gftodvi
@ -83,7 +100,7 @@ bin/kpsewhere
bin/kpsexpand
@bin bin/lacheck
@bin bin/luatex
@bin bin/luatools
bin/luatools
@bin bin/mag
bin/makeglossaries
@bin bin/makeindex
@ -159,6 +176,9 @@ bin/rumakeindex
bin/rungs
bin/runtools
bin/simpdftex
@bin bin/sjisconv
bin/sjislatex
bin/sjispdflatex
@bin bin/synctex
@bin bin/t1dotlessj
@bin bin/t1lint
@ -189,6 +209,7 @@ bin/texutil
@bin bin/tftopl
bin/thumbpdf
@bin bin/tie
bin/tl-link-config
bin/tlmgr
bin/tmftools
bin/tpic2pdftex
@ -479,7 +500,7 @@ share/texmf/texconfig/v/vt100
share/texmf/texconfig/x/
share/texmf/texconfig/x/xterm
@comment share/texmf/web2c/
share/texmf/web2c/fmtutil.cnf-full
@comment share/texmf/web2c/fmtutil.cnf
share/texmf/web2c/fmtutil.cnf-minimal
share/texmf/web2c/mktex.opt
share/texmf/web2c/mktexdir
@ -583,15 +604,15 @@ texmf/scripts/texlive/getnonfreefonts.pl
texmf/scripts/texlive/rungs.tlu
texmf/scripts/texlive/texdoc.tlu
texmf/scripts/texlive/tlmgr.pl
@exec ln -sf %D/share/texmf/web2c/fmtutil.cnf-minimal %D/share/texmf/web2c/fmtutil.cnf
@exec %D/bin/tl-link-config
@exec mktexlsr > /dev/null 2>&1
@exec texlinks
@exec fmtutil-sys --all > /dev/null 2>&1
@exec updmap-sys --syncwithtrees > /dev/null 2>&1
@extraunexec rm -Rf %D/share/texmf-var/
@extraunexec rm -Rf %D/share/texmf-config/
@extra share/texmf/ls-R
@extra share/texmf-dist/ls-R
@extra share/texmf-var/ls-R
@extra share/texmf-config/ls-R
@extra share/texmf/web2c/fmtutil.cnf
@extraunexec rm -Rf %D/share/texmf-var/
@extraunexec rm -Rf %D/share/texmf-config/

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2009/02/22 19:05:17 kili Exp $
# $OpenBSD: Makefile,v 1.6 2009/04/23 00:18:18 sthen Exp $
COMMENT-main = texlive texmf for laTeX/PdfTeX
COMMENT-full = texlive texmf for XeTeX/ConTeXt and extra macros
@ -9,7 +9,7 @@ DISTNAME = texlive-${DIST_V}-texmf
PKGNAME = texlive_texmf-${V}
PKGNAME-main = texlive_texmf-minimal-${V}p1
PKGNAME-full = texlive_texmf-full-${V}p1
PKGNAME-full = texlive_texmf-full-${V}p2
PKGNAME-docs = texlive_texmf-docs-${V}p1
EXTRACT_SUFX = .tar.lzma
@ -25,7 +25,6 @@ RUN_DEPENDS-docs = :texlive_base-${V}:print/texlive/base
MULTI_PACKAGES = -main -full -docs
# Could do with bsd.port.mk understanding lzma
# Also annoyingly loads of .orig files confuse update-patches
do-extract:
cd ${WRKDIR} && \
lzma -dc ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xf -
@ -39,5 +38,7 @@ do-install:
post-install:
mv ${PREFIX}/share/texmf/web2c/updmap.cfg \
${PREFIX}/share/texmf/web2c/updmap.cfg-dist
${INSTALL_DATA} ${FILESDIR}/fmtutil.cnf-full \
${PREFIX}/share/texmf/web2c
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Jul 6 03:35:07 2008
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2008, the final fmtutil.cnf is generated by
@ -36,11 +36,11 @@
# start with "#! " in this file.
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
aleph aleph - *aleph.ini
lamed aleph language.dat *lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
# Change "amstex.ini" to "bamstex.ini" and "-" to "language.dat"
# if you want babel support in amstex:
amstex pdftex - -translate-file=cp227.tcx *amstex.ini
@ -48,7 +48,7 @@ amstex pdftex - -translate-file=cp227.tcx *amstex.ini
# if you want babel support in pdfamstex:
#! pdfamstex pdftex - -translate-file=cp227.tcx *pdfamstex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
# As a special case, texlinks ignores these, but fmtutil still builds them.
# The context startup scripts do not dynamically build the formats.
#
@ -66,91 +66,91 @@ cont-en xetex cont-usr.tex -8bit *cont-en.ini
mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
metafun mpost - -translate-file=cp227.tcx metafun.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
#! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
#! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
#! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
# Change "eplain.ini" to "ebplain.ini" and "-" to "language.dat"
# if you want babel support in eplain:
eplain pdftex - -translate-file=cp227.tcx *eplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
jadetex pdftex language.dat &latex jadetex.ini
pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
# ----------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
#luatex luatex - luatex.ini
#pdfluatex luatex - pdfluatex.ini
#
#lualatex luatex language.dat lualatex.ini
#pdflualatex luatex language.dat pdflualatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
mf mf-nowin - -translate-file=cp227.tcx mf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
mpost mpost - -translate-file=cp227.tcx mpost.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
omega omega - omega.ini
lambda omega language.dat lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
# The pdftex engine always includes the e-TeX extensions.
etex pdftex language.def -translate-file=cp227.tcx *etex.ini
pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
pdftex pdftex - -translate-file=cp227.tcx *pdfetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
physe pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
phyzzx pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
# Change "tex.ini -> bplain.ini" and "- -> language.dat"
# if you want babel support in tex. Add -translate-file=cp227.tcx before
# tex.ini if you want to make all characters directly "printable" for
# any \write (instead of ^^xy).
tex tex - tex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
texsis pdftex - -translate-file=cp227.tcx texsis.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
utf8mex pdftex mexconf.tex -enc *utf8mex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
# XeTeX-based formats.
xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# $Id: fmtutil.cnf-full,v 1.1 2009/04/23 00:18:18 sthen Exp $
xmltex pdftex language.dat &latex xmltex.ini
pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-full,v 1.4 2009/02/22 19:05:17 kili Exp $
@comment $OpenBSD: PLIST-full,v 1.5 2009/04/23 00:18:18 sthen Exp $
@conflict teTeX_texmf-*
@pkgpath print/texlive/texmf-full
share/texmf/web2c/fmtutil.cnf-full
share/texmf-dist/bibtex/bib/IEEEtran/IEEEabrv.bib
share/texmf-dist/bibtex/bib/IEEEtran/IEEEexample.bib
share/texmf-dist/bibtex/bib/IEEEtran/IEEEfull.bib
@ -20028,12 +20029,12 @@ share/texmf/texdoctk/texdocrc.defaults
share/texmf/texdoctk/texdoctk.dat
share/texmf/ttf2pk/VPS.rpl
share/texmf/ttf2pk/ttf2pk.cfg
@exec ln -sf %D/share/texmf/web2c/fmtutil.cnf-full %D/share/texmf/web2c/fmtutil.cnf
@exec %D/bin/tl-link-config
@exec mktexlsr > /dev/null 2>&1
@exec fmtutil-sys --all > /dev/null 2>&1
@exec updmap-sys --syncwithtrees > /dev/null 2>&1
@exec texlinks
@unexec ln -sf %D/share/texmf/web2c/fmtutil.cnf-minimal %D/share/texmf/web2c/fmtutil.cnf
@unexec %D/bin/tl-link-config
@unexec mktexlsr > /dev/null 2>&1
@unexec fmtutil-sys --all > /dev/null 2>&1
@unexec updmap-sys --syncwithtrees > /dev/null 2>&1