Update kpathsea to 6.0.1.
Changes:
* Trailing comments and whitespace omitted from config values.
* Add .tlu to type lua suffixes, and .dfont to truetype suffixes.
* Prefix program_invocation{,_short}_name with kpse_.
* Finally remove kpse_set_progname (deprecated since 1998).
This commit is contained in:
minskim
parent
0015bb84d3
commit
ca35f0bd10
5 changed files with 80 additions and 66 deletions
|
|
@ -1,8 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.13 2011/03/14 21:29:20 minskim Exp $
|
||||
# $NetBSD: Makefile,v 1.14 2011/07/28 04:25:05 minskim Exp $
|
||||
|
||||
DISTNAME= texlive-20100720-source
|
||||
PKGNAME= kpathsea-6.0.0
|
||||
PKGREVISION= 2
|
||||
DISTNAME= texlive-20110705-source
|
||||
PKGNAME= kpathsea-6.0.1
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.9 2010/11/17 19:27:05 minskim Exp $
|
||||
$NetBSD: distinfo,v 1.10 2011/07/28 04:25:05 minskim Exp $
|
||||
|
||||
SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
|
||||
RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
|
||||
Size (texlive-20100720-source.tar.xz) = 33484212 bytes
|
||||
SHA1 (patch-aa) = 80bf6767822ef0f5cc11d5fc028303351ce6d056
|
||||
SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
|
||||
RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
|
||||
Size (texlive-20110705-source.tar.xz) = 131207904 bytes
|
||||
SHA1 (patch-aa) = 3addf4dd36c92722fb89e62ebda54c1d26933439
|
||||
SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243
|
||||
SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
|
||||
SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40
|
||||
|
|
@ -13,4 +13,5 @@ SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe
|
|||
SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e
|
||||
SHA1 (patch-ai) = 28042f47978fe7df907a5e0d3600ac2e1bd17022
|
||||
SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4
|
||||
SHA1 (patch-ak) = 32f05795006fccba782ec02313159966daa0577a
|
||||
SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c
|
||||
SHA1 (patch-cnf-to-paths.awk) = 8bd54171d039750c9c1f9293019db8dc1cf90d6d
|
||||
|
|
|
|||
|
|
@ -1,48 +1,36 @@
|
|||
$NetBSD: patch-aa,v 1.7 2010/11/17 19:27:05 minskim Exp $
|
||||
$NetBSD: patch-aa,v 1.8 2011/07/28 04:25:06 minskim Exp $
|
||||
|
||||
- Set paths to texmf trees for pkgsrc.
|
||||
- Sync with kpathsea r19875.
|
||||
Set paths to texmf trees for pkgsrc.
|
||||
|
||||
--- texmf.cnf.orig 2010-05-30 21:52:39.000000000 +0000
|
||||
--- texmf.cnf.orig 2011-06-18 22:10:46.000000000 +0000
|
||||
+++ texmf.cnf
|
||||
@@ -53,15 +53,15 @@
|
||||
@@ -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 = $SELFAUTODIR/share
|
||||
|
||||
% The tree containing the runtime files closely related to the specific
|
||||
% program version used:
|
||||
-TEXMFMAIN = $SELFAUTOPARENT/texmf
|
||||
+TEXMFMAIN = @PREFIX@/share/texmf
|
||||
% The tree containing runtime files related to the specific
|
||||
% distribution and version.
|
||||
@@ -59,13 +59,13 @@ TEXMFMAIN = $TEXMFROOT/texmf
|
||||
TEXMFDIST = $TEXMFROOT/texmf-dist
|
||||
|
||||
% The main distribution tree:
|
||||
-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
|
||||
+TEXMFDIST = @PREFIX@/share/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
|
||||
% Local additions to the distribution trees.
|
||||
-TEXMFLOCAL = $TEXMFROOT/../texmf-local
|
||||
+TEXMFLOCAL = @TEXMFLOCAL@
|
||||
|
||||
% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
|
||||
% With teTeX-3.0 or later, this must be set.
|
||||
@@ -69,7 +69,7 @@ TEXMFLOCAL = $SELFAUTOPARENT/../texmf-lo
|
||||
% 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 = @VARBASE@/lib/texmf
|
||||
|
||||
% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
|
||||
% With teTeX-3.0 or later, this must be set.
|
||||
@@ -77,7 +77,7 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
|
||||
% 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 = @PKG_SYSCONFDIR@
|
||||
|
||||
% User texmf trees are allowed as follows.
|
||||
% This used to be HOMETEXMF.
|
||||
@@ -136,7 +136,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
|
||||
% 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
|
||||
@@ -111,7 +111,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
|
||||
% Where generated fonts may be written. This tree is used when the sources
|
||||
% were found in a system tree and either that tree wasn't writable, or the
|
||||
% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
|
||||
|
|
@ -51,20 +39,7 @@ $NetBSD: patch-aa,v 1.7 2010/11/17 19:27:05 minskim Exp $
|
|||
|
||||
% 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
|
||||
@@ -345,10 +345,10 @@ T1FONTS = .;$TEXMF/fonts/type1//;$OSFONT
|
||||
AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
|
||||
|
||||
% TrueType outline fonts.
|
||||
-TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR//
|
||||
+TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
|
||||
|
||||
% Opentype outline fonts.
|
||||
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR//
|
||||
+OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
|
||||
|
||||
% Type 42 outline fonts.
|
||||
T42FONTS = .;$TEXMF/fonts/type42//
|
||||
@@ -463,7 +463,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
|
||||
@@ -442,7 +442,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
|
||||
%
|
||||
% For security reasons, it is better not to include . in this path.
|
||||
%
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ak,v 1.1 2009/09/20 18:50:03 minskim Exp $
|
||||
$NetBSD: patch-ak,v 1.2 2011/07/28 04:25:06 minskim Exp $
|
||||
|
||||
--- mktexlsr.orig 2009-06-03 06:07:21.000000000 -0700
|
||||
--- mktexlsr.orig 2011-06-27 22:27:02.000000000 +0000
|
||||
+++ mktexlsr
|
||||
@@ -70,7 +70,7 @@ while test $# -gt 0; do
|
||||
@@ -78,7 +78,7 @@ while test $# -gt 0; do
|
||||
exit 0
|
||||
elif test "x$1" = x--version || test "x$1" = x-version; then
|
||||
echo "`basename $0` $version"
|
||||
|
|
@ -11,12 +11,12 @@ $NetBSD: patch-ak,v 1.1 2009/09/20 18:50:03 minskim Exp $
|
|||
exit 0
|
||||
elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
|
||||
verbose=true
|
||||
@@ -107,7 +107,7 @@ trap 'cd /; test -z "$db_dir_tmp" || rm
|
||||
OIFS=$IFS # want just a newline
|
||||
IFS='
|
||||
'
|
||||
@@ -127,7 +127,7 @@ old_ls_R_magic='% ls-R -- maintained by
|
||||
if test -s "$treefile"; then
|
||||
set x `sort "$treefile" | uniq`
|
||||
else
|
||||
- set x `kpsewhich --show-path=ls-R | tr : '
|
||||
+ set x `@KPSEWHICH@ --show-path=ls-R | tr : '
|
||||
' | sort | uniq`
|
||||
IFS=$OIFS
|
||||
fi
|
||||
IFS=$saveIFS
|
||||
|
|
|
|||
39
print/kpathsea/patches/patch-cnf-to-paths.awk
Normal file
39
print/kpathsea/patches/patch-cnf-to-paths.awk
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
$NetBSD: patch-cnf-to-paths.awk,v 1.1 2011/07/28 04:25:06 minskim Exp $
|
||||
|
||||
--- cnf-to-paths.awk.orig 2011-05-23 17:48:36.000000000 +0000
|
||||
+++ cnf-to-paths.awk
|
||||
@@ -10,19 +10,6 @@
|
||||
# (whitespace around the = is optional)
|
||||
#
|
||||
/^[ \t]*[A-Z0-9_]+[ \t]*=/ {
|
||||
- # On these lines, there are two cases:
|
||||
- #
|
||||
- # 1) definitions referring to SELFAUTO*, which we want to keep. In
|
||||
- # particular, this is how the compile-time TEXMFCNF gets defined and
|
||||
- # thus how texmf.cnf gets found.
|
||||
- #
|
||||
- # 2) all the others, which we want to convert to a constant
|
||||
- # /nonesuch. That way, the binaries don't get change just because we
|
||||
- # change definitions in texmf.cnf.
|
||||
- #
|
||||
- # The definition of DEFAULT_TEXMF (and other variables)
|
||||
- # that winds up in the final paths.h will not be used.
|
||||
-
|
||||
# Let's extract the identifier and the value from the line. Since
|
||||
# gawk's subexpression matching is an extension, do it with copies.
|
||||
ident = $0;
|
||||
@@ -34,13 +21,7 @@
|
||||
sub(/[ \t]*$/, "", val);
|
||||
#print "got ident", ident, "and val", val >"/dev/stderr";
|
||||
|
||||
- if (val ~ /\$SELFAUTO/) {
|
||||
- # Replace all semicolons with colons in the SELFAUTO paths we're keeping.
|
||||
- # (The path-splitting code should be changed to understand both.)
|
||||
- gsub(/;/, ":", val);
|
||||
- } else {
|
||||
- val = "/nonesuch";
|
||||
- }
|
||||
+ gsub(/;/, ":", val);
|
||||
|
||||
print "#ifndef DEFAULT_" ident;
|
||||
print "#define DEFAULT_" ident " \"" val "\"";
|
||||
Loading…
Reference in a new issue