* Fixes conTeXt found in TeX Live 2011.

* Separates conTeXt into it's own sub-package (texlive_texmf-context).
* Patches in correct paths for texmfcnf.lua
* Creates the luatex cache at install time of texlive_texmf-context.
* Updates documentation relating to the above.
* Use %D in all hashing @exec/@unexec.
* Fix a bogus LOCALBASE, which should have been a TRUEPREFIX.
* Small tidy ups.

OK kili@
This commit is contained in:
edd 2012-01-10 18:04:31 +00:00
parent 587504b607
commit 164e17b9bd
16 changed files with 2281 additions and 2206 deletions

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.4 2011/12/05 23:25:46 sthen Exp $
$OpenBSD: README,v 1.5 2012/01/10 18:04:31 edd Exp $
TeX Live 2011 - Porting progress.
---------------------------------------
@ -8,8 +8,8 @@ TeX Live 2011 - Porting progress.
-> amd64 done
-> i386 done
-> sparc64 done
-> others, anyone? XXX
* Do texmf split (see texmf/files/rblatter) done
* Split out conTeXt (use grep) done
* Move manuals and pdf manuals done
* Remove external deps done
-> texworks done
@ -29,9 +29,7 @@ TeX Live 2011 - Porting progress.
'updmap-sys', rm ls-R and tar up texmf-var
* Apply any security/reliability patches done
Search here: http://tug.org/pipermail/tldistro/
* Test lots: XXX
* @comment manpages conflicting with t1utils done
* Mark manpages with @man in PLIST XXX
--- KNOWN ISSUES ---

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.53 2011/11/26 19:50:50 kili Exp $
# $OpenBSD: Makefile,v 1.54 2012/01/10 18:04:31 edd Exp $
COMMENT = base binaries for TeXLive typesetting distribution
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
REVISION = 0
REVISION = 1
SHARED_LIBS = kpathsea 4.0
SHARED_LIBS += ptexenc 1.0

View File

@ -1,4 +1,4 @@
TeXLive is an easy way to get up and running with TeX. It provides a
TeX Live is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.

View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.6 2011/11/23 12:00:45 edd Exp $
$OpenBSD: README,v 1.7 2012/01/10 18:04:31 edd Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -10,17 +10,24 @@ Texmf Subsets
There are a number of texmf trees in the OpenBSD packages:
texmf-minimal:
A teTeX like tree, suitable for casual TeX users
who do not need many extra macros or ConTeXt (approx 302MB).
A teTeX like tree, suitable for casual TeX users who do not need many
extra macros or ConTeXt (approx 324MB).
texmf-full:
Extra macros and ConTeXt support (approx 163MB).
Extra macros (approx 191MB).
texmf-context:
Macros for the conTeXt typesetter (approx 7MB).
This was separated because conTeXt maintains it's own hashes separate
from that of libkpse. As 99% of users don't use this, these hashes are
generated only when the conTeXt macros are installed.
texmf-doc:
Documentation for all of TeX Live (approx 760MB).
Documentation for all of TeX Live (approx 890MB).
All sizes are compressed package sizes and the texmf package contents do
not overlap.
All sizes are approximate compressed package sizes and the texmf package
contents do not overlap.
There is a *lot* of functionality in texmf-full, so before reportng
"missing" features, please try installing texmf-full first. Eg. xindy

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2011/12/05 23:22:39 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2012/01/10 18:04:31 edd Exp $
COMMENT-main = texlive texmf for laTeX/PdfTeX
COMMENT-full = texlive texmf for XeTeX/ConTeXt and extra macros
COMMENT-context = texlive texmf for conTeXt
COMMENT-docs = texlive documentation
COMMENT-full = texlive texmf for extra macros
COMMENT-main = texlive texmf for basic functionality
DISTNAME = texlive-${DIST_V}-texmf
MASTER_SITES0 = http://spacehopper.org/mirrors/ \
@ -13,7 +14,11 @@ DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
PKGNAME-main = texlive_texmf-minimal-${V}
PKGNAME-full = texlive_texmf-full-${V}
PKGNAME-docs = texlive_texmf-docs-${V}
REVISION-main = 0
PKGNAME-context = texlive_texmf-context-${V}
REVISION-docs = 0
REVISION-full = 0
REVISION-main = 1
NO_BUILD = Yes
NO_REGRESS = Yes
@ -28,15 +33,14 @@ MODRUBY_BUILDDEP = No
MODRUBY_RUNDEP = No
MODPY_BUILDDEP = No
MODPY_RUNDEP = No
RUN_DEPENDS-full += lang/python/${MODPY_VERSION} \
lang/ruby/${MODRUBY_REV}
RUN_DEPENDS-full += lang/python/${MODPY_VERSION}
RUN_DEPENDS-docs = texlive_base-${V}:print/texlive/base \
RUN_DEPENDS-context += texlive_base-${V}:print/texlive/base \
lang/ruby/${MODRUBY_REV}
RUN_DEPENDS-docs += texlive_base-${V}:print/texlive/base \
x11/p5-Tk
MULTI_PACKAGES = -main -full -docs
SUBST_VARS += LOCALBASE
MULTI_PACKAGES = -context -docs -full -main
do-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${WRKDIST}
@ -70,7 +74,9 @@ do-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${WRKDIR}/texmf-var
mv ${WRKDIR}/texmf-var ${PREFIX}/share
# selfauto does not work with our legacy texmf paths, patch in paths.
post-install:
${SUBST_CMD} ${PREFIX}/share/texmf/web2c/texmf.cnf
${SUBST_CMD} ${PREFIX}/share/texmf/web2c/texmfcnf.lua
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: mk_openbsd_plists.sh,v 1.3 2011/11/23 12:00:45 edd Exp $
# $OpenBSD: mk_openbsd_plists.sh,v 1.4 2012/01/10 18:04:31 edd Exp $
#
# This is how the texlive port packing lists were generated.
# Please be aware that a *full* texmf/texmf-dist and texlive.tlpdb from the
@ -38,6 +38,7 @@ cat sets/docs/PLIST | sort > sets/docs/PLIST_final
echo "\ndone - PLISTS in sets/"
echo "now inspect:"
echo " - move conTeXt stuff into it's own packing list"
echo " - share/texmf/scripts/texlive/* probably un-needed"
echo " - *.exe obviously a waste of space"
echo " - search for 'win32' and 'w32' and 'windows'"

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-texmf_web2c_texmf_cnf,v 1.5 2011/11/23 12:00:45 edd Exp $
$OpenBSD: patch-texmf_web2c_texmf_cnf,v 1.6 2012/01/10 18:04:31 edd Exp $
--- texmf/web2c/texmf.cnf.origy Sat Jun 18 23:10:46 2011
+++ texmf/web2c/texmf.cnf Wed Aug 31 17:42:50 2011
@@ -1,6 +1,10 @@
@ -27,7 +27,7 @@ $OpenBSD: patch-texmf_web2c_texmf_cnf,v 1.5 2011/11/23 12:00:45 edd Exp $
-% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
-TEXMFROOT = $SELFAUTOPARENT
+% We use the old teTeX paths in OpenBSD, respect the legacy.
+TEXMFROOT = ${LOCALBASE}/share
+TEXMFROOT = ${TRUEPREFIX}/share
% The tree containing runtime files related to the specific
% distribution and version.

View File

@ -0,0 +1,52 @@
$OpenBSD: patch-texmf_web2c_texmfcnf_lua,v 1.1 2012/01/10 18:04:31 edd Exp $
--- texmf/web2c/texmfcnf.lua.origy Mon Jun 6 12:28:45 2011
+++ texmf/web2c/texmfcnf.lua Mon Dec 26 13:42:48 2011
@@ -3,9 +3,6 @@
-- ConTeXt needs a properly expanded TEXMFLOCAL, so here is a
-- bit of lua code to make that happen
-local texmflocal = resolvers.prefixes.selfautoparent();
-texmflocal = string.gsub(texmflocal, "20%d%d$", "texmf-local");
-
return {
type = "configuration",
@@ -41,10 +38,13 @@ return {
-- "selfautoparent:/texmf/web2c",
-- "selfautoparent:",
-- }
+
+ -- OpenBSD uses the old teTeX path convention
+ TEXMFROOT = "${TRUEPREFIX}/share",
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
- TEXMFSYSVAR = "selfautoparent:texmf-var",
+ TEXMFSYSVAR = "$TEXMFROOT/texmf-var",
TEXMFVAR = "home:.texlive2011/texmf-var",
-- We have only one cache path but there can be more. The first writable one
@@ -61,15 +61,15 @@ return {
-- By using prefixes we don't get expanded paths in the cache __path__
-- entry. This makes the tex root relocatable.
- TEXMFOS = "selfautodir:",
- TEXMFSYSTEM = "selfautoparent:$SELFAUTOSYSTEM",
- TEXMFMAIN = "selfautoparent:texmf",
- TEXMFCONTEXT = "selfautoparent:texmf-dist",
+ TEXMFOS = "$TEXMFROOT",
+ TEXMFSYSTEM = "$TEXMFROOT/texmf-sys",
+ TEXMFMAIN = "$TEXMFROOT/texmf",
+ TEXMFCONTEXT = "$TEXMFROOT/texmf-dist",
- TEXMFLOCAL = texmflocal,
- TEXMFSYSCONFIG = "selfautoparent:texmf-config",
- TEXMFFONTS = "selfautoparent:texmf-fonts",
- TEXMFPROJECT = "selfautoparent:texmf-project",
+ TEXMFLOCAL = "$TEXMFROOT/texmf-local",
+ TEXMFSYSCONFIG = "$TEXMFROOT/texmf-config",
+ TEXMFFONTS = "$TEXMFROOT/texmf-fonts",
+ TEXMFPROJECT = "$TEXMFROOT/texmf-project",
TEXMFHOME = "home:texmf",
-- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf",

View File

@ -0,0 +1,6 @@
TeX Live is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.
This package contains conTeXt macros for use with TeX Live.

View File

@ -1,6 +1,6 @@
TeXLive is an easy way to get up and running with TeX. It provides a
TeX Live is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.
This package contains all documentation for the TeXLive texmf.
This package contains all documentation for the TeX Live.

View File

@ -1,6 +1,6 @@
TeXLive is an easy way to get up and running with TeX. It provides a
TeX Live is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.
This package contains extra macros for the TeXLive texmf.
This package contains extra macros for use with TeX Live.

View File

@ -1,6 +1,6 @@
TeXLive is an easy way to get up and running with TeX. It provides a
TeX Live is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.
This package contains a teTeX-like subset of the TeXLive texmf.
This package contains a teTeX-like subset of the TeX Live texmf.

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.9 2011/11/23 12:00:45 edd Exp $
@comment $OpenBSD: PLIST-docs,v 1.10 2012/01/10 18:04:31 edd Exp $
@conflict teTeX_texmf-doc-*
@conflict texlive_base-<2011
@conflict texlive_texmf-minimal-<2011
@ -24723,5 +24723,5 @@ share/texmf/scripts/texlive/
share/texmf/scripts/texlive/NEWS
share/texmf/scripts/texlive/var/
share/texmf/scripts/texlive/var/texcatalogue.keywords
@exec mktexlsr > /dev/null 2>&1
@unexec-delete mktexlsr > /dev/null 2>&1
@exec %D/bin/mktexlsr > /dev/null 2>&1
@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-full,v 1.14 2011/11/23 12:00:46 edd Exp $
@comment $OpenBSD: PLIST-full,v 1.15 2012/01/10 18:04:32 edd Exp $
@conflict teTeX_texmf-*
@conflict texlive_base-<2011
@conflict texlive_texmf-docs-<2011
@ -20106,7 +20106,6 @@ share/texmf-dist/scripts/svn-multi/
share/texmf-dist/scripts/svn-multi/svn-multi.pl
share/texmf-dist/scripts/tex4ht/
share/texmf-dist/scripts/tex4ht/ht.sh
share/texmf-dist/scripts/tex4ht/htcontext.sh
share/texmf-dist/scripts/tex4ht/htlatex.sh
share/texmf-dist/scripts/tex4ht/htmex.sh
share/texmf-dist/scripts/tex4ht/httex.sh
@ -20129,12 +20128,6 @@ share/texmf-dist/scripts/ulqda/ulqda.pl
share/texmf-dist/scripts/vpe/
share/texmf-dist/scripts/vpe/vpe.pl
share/texmf-dist/tex/
share/texmf-dist/tex/context/
share/texmf-dist/tex/context/third/
share/texmf-dist/tex/context/third/gentium/
share/texmf-dist/tex/context/third/gentium/type-gentium.tex
share/texmf-dist/tex/context/third/semaphor/
share/texmf-dist/tex/context/third/semaphor/t-type-semaf.tex
share/texmf-dist/tex/generic/
share/texmf-dist/tex/generic/2up/
share/texmf-dist/tex/generic/2up/2up.sty
@ -20394,7 +20387,6 @@ share/texmf-dist/tex/generic/tex4ht/color.4ht
share/texmf-dist/tex/generic/tex4ht/colortbl.4ht
share/texmf-dist/tex/generic/tex4ht/combine.4ht
share/texmf-dist/tex/generic/tex4ht/cond4ht.4ht
share/texmf-dist/tex/generic/tex4ht/context.4ht
share/texmf-dist/tex/generic/tex4ht/covington.4ht
share/texmf-dist/tex/generic/tex4ht/cp1250.4ht
share/texmf-dist/tex/generic/tex4ht/cp1252.4ht
@ -31335,5 +31327,5 @@ share/texmf/xindy/modules/tex/inputenc/latin.xdy
share/texmf/xindy/modules/tex/inputenc/latin1.xdy
share/texmf/xindy/modules/tex/inputenc/latin2.xdy
share/texmf/xindy/modules/tex/inputenc/latin3.xdy
@exec mktexlsr > /dev/null 2>&1
@unexec-delete mktexlsr > /dev/null 2>&1
@exec %D/bin/mktexlsr > /dev/null 2>&1
@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1

File diff suppressed because it is too large Load Diff