Hi,
On Tue, Apr 07, 2009 at 09:24:53AM +0100, Stuart Henderson wrote:
> from texmf/Makefile:
>
> # Also annoyingly loads of .orig files confuse update-patches
>
> to help here, you can either use PATCHORIG, see bsd.port.mk(5), or add
> this to a suitable target:
>
> find . -name '*.orig' -print0 | xargs -0 rm
>
This is a copy and pasto error from -base, which has a similar find
line. It does not apply to the texmf. I have removed this line.
With regards to @pkgpath for teTeX, I don't mind, but some people may be
choosing to run teTeX instead of TeX Live. Do what you think is right :)
Antoine:
The SUBST_VARS line was not entirely useless, as by default only
^LOCALBASE is in there, however I agree that it should be TRUEPREFIX
instead. I have updated this on the attached diff.
Make sure you move the fmtutil.cnf-full from base/files into
texmf/files, like before and patch with -E.
Thanks
--
Best Regards
Edd Barrett
(Freelance software developer / technical writer / open-source developer)
http://students.dec.bmth.ac.uk/ebarrett
? texmf/files/fmtutil.cnf-full
Index: base/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- base/Makefile 22 Feb 2009 19:05:17 -0000 1.22
+++ base/Makefile 7 Apr 2009 10:43:02 -0000
@@ -4,7 +4,7 @@
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 @@
--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 @@
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>
Index: base/files/fmtutil.cnf-full
===================================================================
RCS file: base/files/fmtutil.cnf-full
diff -N base/files/fmtutil.cnf-full
--- base/files/fmtutil.cnf-full 21 Oct 2008 20:57:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,156 +0,0 @@
-# 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 $
-# Originally written by Thomas Esser, 1998. Public domain.
-#
-# As of TeX Live 2008, the final fmtutil.cnf is generated by
-# tlmgr generate fmtutil. You can use
-# tlmgr generate fmtutil -localcfg /some/file to make local additions.
-# See tlmgr --help for more info.
-#
-# The format of the table is:
-#
-# format engine pattern-file arguments
-#
-# The last part of "arguments" must be the name of the file to run
-# initex (or another ini-engine) on. For historical reasons, that
-# filename may be preceded by a *, which is ignored.
-#
-# fmtutil always passes the -ini option to the engine.
-#
-# If no pattern-file is desired, use -.
-#
-# Either spaces or tabs can be used as separators.
-#
-# Other notes :
-# 1) tex and amstex just load hyphen.tex. No customization.
-# You can have your own customized (via babel's hyphen.cfg)
-# formats on top of plain by using "bplain.tex" instead of
-# plain.tex (see e.g. bplain.ini file for bplain format).
-#
-# 2) etex-based formats load language.def, not language.dat.
-#
-# 3) The symbolic link to the right engines (e.g. bplain -> tex)
-# is generated by the "texlinks" script.
-#
-# 4) usual comments start with "# ", whereas disabled configurations
-# start with "#! " in this file.
-
-# ------------------------------------------------------------------
-# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven 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 $
-# 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
-# Change "pdfamstex.ini" to "pdfbamstex.ini" and "-" "language.dat"
-# 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 $
-# As a special case, texlinks ignores these, but fmtutil still builds them.
-# The context startup scripts do not dynamically build the formats.
-#
-# Unfortunately, dynamically building both the pdftex and xetex cont-en
-# fails, due to engine confusion; but it works with fmtutil --all, etc.
-#
-#! 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-nl pdftex cont-usr.tex -8bit *cont-nl.ini
-#! cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini
-#
-# mptopdf needs metafun.
-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 $
-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 $
-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 $
-#! 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 $
-#! 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 $
-#! 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 $
-# 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 $
-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 $
-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 $
-#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 $
-mf mf-nowin - -translate-file=cp227.tcx mf.ini
-# ------------------------------------------------------------------
-# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
-mpost mpost - -translate-file=cp227.tcx mpost.mp
-# ------------------------------------------------------------------
-# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven 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 $
-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 $
-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 $
-# 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 $
-physe pdftex - physe.ini
-# ------------------------------------------------------------------
-# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
-phyzzx pdftex - physe.ini
-# ------------------------------------------------------------------
-# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven 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 $
-texsis pdftex - -translate-file=cp227.tcx texsis.ini
-# ------------------------------------------------------------------
-# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
-utf8mex pdftex mexconf.tex -enc *utf8mex.ini
-# ------------------------------------------------------------------
-# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven 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 $
-xmltex pdftex language.dat &latex xmltex.ini
-pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini
Index: base/files/tl-link-config
===================================================================
RCS file: base/files/tl-link-config
diff -N base/files/tl-link-config
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ base/files/tl-link-config 7 Apr 2009 10:43:05 -0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $OpenBSD$
+#
+# 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
Index: base/patches/patch-texk_cjkutils_conv_Makefile_in
===================================================================
RCS file: base/patches/patch-texk_cjkutils_conv_Makefile_in
diff -N base/patches/patch-texk_cjkutils_conv_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ base/patches/patch-texk_cjkutils_conv_Makefile_in 7 Apr 2009 10:43:05
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- 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
+
Index: base/patches/patch-texk_cjkutils_scripts_Makefile_in
===================================================================
RCS file: base/patches/patch-texk_cjkutils_scripts_Makefile_in
diff -N base/patches/patch-texk_cjkutils_scripts_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ base/patches/patch-texk_cjkutils_scripts_Makefile_in 7 Apr 2009
10:43:05 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- 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
+
Index: base/pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/texlive/base/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- base/pkg/PLIST 22 Feb 2009 19:05:17 -0000 1.10
+++ base/pkg/PLIST 7 Apr 2009 10:43:05 -0000
@@ -11,8 +11,22 @@
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/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/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/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 bin/tftopl
bin/thumbpdf
@bin bin/tie
+bin/tl-link-config
bin/tlmgr
bin/tmftools
bin/tpic2pdftex
@@ -479,7 +500,7 @@
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/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/
Index: texmf/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- texmf/Makefile 22 Feb 2009 19:05:17 -0000 1.5
+++ texmf/Makefile 7 Apr 2009 10:43:05 -0000
@@ -9,7 +9,7 @@
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 @@
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 @@
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>
Index: texmf/pkg/PLIST-full
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-full,v
retrieving revision 1.4
diff -u -r1.4 PLIST-full
--- texmf/pkg/PLIST-full 22 Feb 2009 19:05:17 -0000 1.4
+++ texmf/pkg/PLIST-full 7 Apr 2009 10:43:34 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-full,v 1.4 2009/02/22 19:05:17 kili 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/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
