pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print
Module Name: pkgsrc
Committed By: markd
Date: Sun May 13 10:41:47 UTC 2018
Modified Files:
pkgsrc/print/tex-tetex: Makefile PLIST distinfo
pkgsrc/print/tex-tetex-doc: Makefile PLIST distinfo
pkgsrc/print/tex-tetex/patches: patch-bin_fmtutil
patch-texmf-dist_web2c_updmap.cfg
Added Files:
pkgsrc/print/tex-tetex/patches: patch-bin_texconfig
patch-texmf-dist_texconfig_tcfmgr
Log Message:
tex-tetex{,-doc}: update to 3.0.47198
now includes tex-texconfig
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/tex-tetex/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/tex-tetex/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/tex-tetex/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/tex-tetex-doc/Makefile \
pkgsrc/print/tex-tetex-doc/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-tetex-doc/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-tetex/patches/patch-bin_fmtutil
cvs rdiff -u -r0 -r1.1 pkgsrc/print/tex-tetex/patches/patch-bin_texconfig \
pkgsrc/print/tex-tetex/patches/patch-texmf-dist_texconfig_tcfmgr
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/tex-tetex/Makefile
diff -u pkgsrc/print/tex-tetex/Makefile:1.28 pkgsrc/print/tex-tetex/Makefile:1.29
--- pkgsrc/print/tex-tetex/Makefile:1.28 Wed Jun 21 13:25:33 2017
+++ pkgsrc/print/tex-tetex/Makefile Sun May 13 10:41:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2017/06/21 13:25:33 markd Exp $
+# $NetBSD: Makefile,v 1.29 2018/05/13 10:41:47 markd Exp $
DISTNAME= tetex
-PKGNAME= tex-${DISTNAME}-3.0.44331
-TEXLIVE_REV= 44331
+PKGNAME= tex-${DISTNAME}-3.0.47198
+TEXLIVE_REV= 47198
MAINTAINER= minskim%NetBSD.org@localhost
COMMENT= Supplementary files for updmap
@@ -11,7 +11,6 @@ CONFLICTS= texlive-tetex<=2011nb1
DEPENDS+= dialog>=1.0:../../misc/dialog
DEPENDS+= kpathsea-[0-9]*:../../print/kpathsea
DEPENDS+= tex-kpathsea>=2012nb1:../../print/tex-kpathsea
-DEPENDS+= tex-texconfig>=2013:../../print/tex-texconfig
DEPENDS+= tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra
USE_TOOLS+= perl:run sh:run
@@ -22,19 +21,24 @@ SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= Setting paths to commands.
SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= bin/fmtutil bin/fmtutil-sys bin/kpsetool bin/kpsewhere \
- bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
- bin/updmap bin/updmap-sys
+ bin/texconfig bin/texconfig-dialog bin/texconfig-sys \
+ bin/texlinks bin/updmap bin/updmap-sys \
+ texmf-dist/texconfig/tcfmgr
SUBST_SED.paths+= -e 's,@DIALOG@,${LOCALBASE}/bin/dialog,g'
SUBST_SED.paths+= -e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g'
SUBST_SED.paths+= -e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g'
+SUBST_SED.paths+= -e 's,@MKTEXLSR@,${LOCALBASE}/bin/mktexlsr,g'
+SUBST_SED.paths+= -e 's,@TEXCONF_DIALOG@,${LOCALBASE}/bin/texconfig-dialog,g'
+SUBST_SED.paths+= -e 's,@TEXLINKS@,${LOCALBASE}/bin/texlnks,g'
SUBST_SED.paths+= -e 's,@TEXCONFIG@,${LOCALBASE}/bin/texconfig,g'
SUBST_SED.paths+= -e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
REPLACE_PERL= bin/updmap bin/fmtutil texmf-dist/scripts/texlive/mktexlsr.pl
REPLACE_SH= bin/allcm bin/allneeded bin/dvi2fax bin/dvired \
bin/fmtutil-sys bin/fmtutil-user bin/kpsetool bin/kpsewhere \
- bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
- bin/updmap-sys bin/updmap-user
+ bin/texconfig bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
+ bin/updmap-sys bin/updmap-user \
+ texmf-dist/texconfig/tcfmgr
PKG_SYSCONFSUBDIR= texmf
@@ -49,7 +53,7 @@ TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} ${PRE
post-extract:
${MKDIR} ${WRKSRC}/bin
.for script in fmtutil-sys.sh fmtutil-user.sh texconfig-dialog.sh \
- texconfig-sys.sh texlinks.sh
+ texconfig-sys.sh texconfig.sh texlinks.sh
${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \
${WRKSRC}/bin/${script:S/.sh//}
.endfor
@@ -58,6 +62,7 @@ post-extract:
${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \
${WRKSRC}/bin/${script:S/.pl//:S/.sh//}
.endfor
+ ${CHMOD} +x ${WRKSRC}/texmf-dist/texconfig/tcfmgr
# ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/mktexlsr.pl ${WRKSRC}/bin
# ${RMDIR} -p ${WRKSRC}/texmf-dist/scripts/texlive 2>/dev/null || ${TRUE}
Index: pkgsrc/print/tex-tetex/PLIST
diff -u pkgsrc/print/tex-tetex/PLIST:1.11 pkgsrc/print/tex-tetex/PLIST:1.12
--- pkgsrc/print/tex-tetex/PLIST:1.11 Wed Jun 21 13:25:33 2017
+++ pkgsrc/print/tex-tetex/PLIST Sun May 13 10:41:47 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/06/21 13:25:33 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/05/13 10:41:47 markd Exp $
bin/allcm
bin/allec
bin/allneeded
@@ -12,6 +12,7 @@ bin/kpsetool
bin/kpsewhere
bin/kpsexpand
bin/mktexfmt
+bin/texconfig
bin/texconfig-dialog
bin/texconfig-sys
bin/texlinks
@@ -50,4 +51,10 @@ share/texmf-dist/fonts/map/dvips/tetex/m
share/texmf-dist/fonts/map/dvips/tetex/pdftex35.map
share/texmf-dist/fonts/map/dvips/tetex/ps2pk35.map
share/texmf-dist/scripts/texlive/mktexlsr.pl
+share/texmf-dist/texconfig/README
+share/texmf-dist/texconfig/g/generic
+share/texmf-dist/texconfig/tcfmgr
+share/texmf-dist/texconfig/tcfmgr.map
+share/texmf-dist/texconfig/v/vt100
+share/texmf-dist/texconfig/x/xterm
share/texmf-dist/web2c/updmap.cfg
Index: pkgsrc/print/tex-tetex/distinfo
diff -u pkgsrc/print/tex-tetex/distinfo:1.20 pkgsrc/print/tex-tetex/distinfo:1.21
--- pkgsrc/print/tex-tetex/distinfo:1.20 Wed Jun 21 13:25:33 2017
+++ pkgsrc/print/tex-tetex/distinfo Sun May 13 10:41:47 2018
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.20 2017/06/21 13:25:33 markd Exp $
+$NetBSD: distinfo,v 1.21 2018/05/13 10:41:47 markd Exp $
-SHA1 (tex-tetex-44331/tetex.tar.xz) = 0c858c85e1d016627ab11d02009794a10ef4d560
-RMD160 (tex-tetex-44331/tetex.tar.xz) = 4f499967bfeaf0e0e1ce1bbd35f4db5e0dff672a
-SHA512 (tex-tetex-44331/tetex.tar.xz) = 610f7e7d5dd81d311c45faf612546efffe67a260643846827960974f82d58e7ba2c7dc63ebe91ad797894f45c6783d76111866e7efbd9d256142de90832780f9
-Size (tex-tetex-44331/tetex.tar.xz) = 60352 bytes
-SHA1 (patch-bin_fmtutil) = 9094e3e8572d2f5f77341b92729d5bbb288c05f8
+SHA1 (tex-tetex-47198/tetex.tar.xz) = 1c890e8fceda85ffa8b98de59f20182340b42c68
+RMD160 (tex-tetex-47198/tetex.tar.xz) = a9e3f8373869a7a7ca0b6347549926868681ad7c
+SHA512 (tex-tetex-47198/tetex.tar.xz) = 080523d1b65393d5b24df3494c4b246a1f56fc6eee9df662e898c229ef2874ed8e9a994935b51f6becc9d1c70af013513764762aaa7a32bd14c55d56e9eb1729
+Size (tex-tetex-47198/tetex.tar.xz) = 71040 bytes
+SHA1 (patch-bin_fmtutil) = 8f9ba0248ef7a1b56e73ef3a0ab062e2358e76ae
SHA1 (patch-bin_fmtutil-sys) = 41720ed218bbf9980772dc61ead757a3f0633d6b
SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb
SHA1 (patch-bin_kpsewhere) = d442bf917f9fbd5f6a0bc3c461b01cf4ad03346e
+SHA1 (patch-bin_texconfig) = a856c9467e6a54477621f59016de290137afe2e2
SHA1 (patch-bin_texconfig-dialog) = 6d4522833219687fcbc2b4b91047254fe97052aa
SHA1 (patch-bin_texconfig-sys) = 8d17ef9242da8d3f541501938aa5cb1f20828343
SHA1 (patch-bin_texlinks) = da88d185d7610afae9a84b5d0ce34c8fac957e0b
SHA1 (patch-bin_updmap) = 43553a8f887aec7b83cb746a913f0a5fd94b22da
SHA1 (patch-bin_updmap-sys) = e8b7248482f1e59ad9be556e5bc222fd41bd514c
-SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 9a7b50eb5c400a48af4058b8aa6a920bfbe81b54
+SHA1 (patch-texmf-dist_texconfig_tcfmgr) = f530f1f57a7bec42fcc4ee06dbf6c655f631d635
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = e7dc8e19558680e4c9f239baaf12c80d27c23de7
Index: pkgsrc/print/tex-tetex-doc/Makefile
diff -u pkgsrc/print/tex-tetex-doc/Makefile:1.19 pkgsrc/print/tex-tetex-doc/Makefile:1.20
--- pkgsrc/print/tex-tetex-doc/Makefile:1.19 Wed Sep 6 16:49:45 2017
+++ pkgsrc/print/tex-tetex-doc/Makefile Sun May 13 10:41:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2017/09/06 16:49:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/05/13 10:41:47 markd Exp $
DISTNAME= tetex.doc
-PKGNAME= tex-${DISTNAME:S/./-/}-3.0.44331
-TEXLIVE_REV= 44331
+PKGNAME= tex-${DISTNAME:S/./-/}-3.0.47198
+TEXLIVE_REV= 47198
MAINTAINER= minskim%NetBSD.org@localhost
COMMENT= Documentation for tex-tetex
Index: pkgsrc/print/tex-tetex-doc/distinfo
diff -u pkgsrc/print/tex-tetex-doc/distinfo:1.19 pkgsrc/print/tex-tetex-doc/distinfo:1.20
--- pkgsrc/print/tex-tetex-doc/distinfo:1.19 Wed Jun 21 13:25:33 2017
+++ pkgsrc/print/tex-tetex-doc/distinfo Sun May 13 10:41:47 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2017/06/21 13:25:33 markd Exp $
+$NetBSD: distinfo,v 1.20 2018/05/13 10:41:47 markd Exp $
-SHA1 (tex-tetex-44331/tetex.doc.tar.xz) = aef4eec1a1e9a23c400ab481b8c4b9cc7e7b3c78
-RMD160 (tex-tetex-44331/tetex.doc.tar.xz) = dac7950a78a5d3eec18e0874e83277659b62503f
-SHA512 (tex-tetex-44331/tetex.doc.tar.xz) = d0e83b87f9a844c9961bda9875f8812dd507e8edb9664fe0edb19a775f34cfdd3f096295f5d0c209ecd3c7ef4a11416601c61f0d4db4bef0297ee96d9ae430f2
-Size (tex-tetex-44331/tetex.doc.tar.xz) = 348764 bytes
+SHA1 (tex-tetex-47198/tetex.doc.tar.xz) = cdd9f77affa8aaf7e2e3d9b894e4d19e95273697
+RMD160 (tex-tetex-47198/tetex.doc.tar.xz) = 870506e06e27d43bb6bdd21ffceba2da133a0438
+SHA512 (tex-tetex-47198/tetex.doc.tar.xz) = db698b29cbb1e503f4e49a853c105cf9c39574446ec5eee4cd79d67e8591c59c7322421cd7aa90f514091a0b372083048f18a24a7f26129cbebd6d462ca1e431
+Size (tex-tetex-47198/tetex.doc.tar.xz) = 525292 bytes
Index: pkgsrc/print/tex-tetex-doc/PLIST
diff -u pkgsrc/print/tex-tetex-doc/PLIST:1.5 pkgsrc/print/tex-tetex-doc/PLIST:1.6
--- pkgsrc/print/tex-tetex-doc/PLIST:1.5 Wed Jun 21 13:25:33 2017
+++ pkgsrc/print/tex-tetex-doc/PLIST Sun May 13 10:41:47 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/06/21 13:25:33 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/05/13 10:41:47 markd Exp $
man/man1/allcm.1
man/man1/allec.1
man/man1/allneeded.1
@@ -11,6 +11,8 @@ man/man1/kpsepath.1
man/man1/kpsetool.1
man/man1/kpsewhere.1
man/man1/kpsexpand.1
+man/man1/texconfig-sys.1
+man/man1/texconfig.1
man/man1/texlinks.1
man/man1/updmap-sys.1
man/man1/updmap-user.1
Index: pkgsrc/print/tex-tetex/patches/patch-bin_fmtutil
diff -u pkgsrc/print/tex-tetex/patches/patch-bin_fmtutil:1.4 pkgsrc/print/tex-tetex/patches/patch-bin_fmtutil:1.5
--- pkgsrc/print/tex-tetex/patches/patch-bin_fmtutil:1.4 Thu Jun 16 04:06:16 2016
+++ pkgsrc/print/tex-tetex/patches/patch-bin_fmtutil Sun May 13 10:41:47 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-bin_fmtutil,v 1.4 2016/06/16 04:06:16 markd Exp $
+$NetBSD: patch-bin_fmtutil,v 1.5 2018/05/13 10:41:47 markd Exp $
---- bin/fmtutil.orig 2016-04-22 13:16:07.000000000 +0000
+--- bin/fmtutil.orig 2017-11-21 07:07:45.000000000 +0000
+++ bin/fmtutil
@@ -14,7 +14,7 @@ my $TEXMFROOT;
@@ -11,7 +11,7 @@ $NetBSD: patch-bin_fmtutil,v 1.4 2016/06
if ($?) {
die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
}
-@@ -67,12 +67,12 @@ my @deferred_stdout;
+@@ -70,12 +70,12 @@ TeXLive::TLUtils::prepend_own_path();
# this function checks by itself whether it is running on windows or not
reset_root_home();
@@ -30,7 +30,7 @@ $NetBSD: patch-bin_fmtutil,v 1.4 2016/06
# make sure that on windows *everything* is in lower case for comparison
if (win32()) {
-@@ -239,7 +239,7 @@ sub main {
+@@ -254,7 +254,7 @@ sub main {
for my $e (sort @all_engines) {
my $hf = $alldata->{'merged'}{$f}{$e}{'hyphen'};
next if ($hf eq '-');
@@ -39,7 +39,7 @@ $NetBSD: patch-bin_fmtutil,v 1.4 2016/06
chomp($ff);
if ($ff ne "") {
if ($#all_engines > 0) {
-@@ -473,13 +473,13 @@ sub select_and_rebuild_format {
+@@ -494,13 +494,13 @@ sub select_and_rebuild_format {
if ($fmthyp ne '-') {
if ($whatarg =~ m!^/!) {
# $whatarg is a full path, we need to expand $fmthyp, too
@@ -55,16 +55,16 @@ $NetBSD: patch-bin_fmtutil,v 1.4 2016/06
if ($fmthyplong) {
$fmthyp = $fmthyplong;
} else {
-@@ -557,7 +557,7 @@ sub rebuild_one_format {
- }
-
+@@ -595,7 +595,7 @@ sub rebuild_one_format {
+ else { $prgswitch .= $fmt; }
+
# check for existence of ini file before doing anything else
- if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
+ if (system("@KPSEWHICH@ -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
# we didn't find the ini file, skip
print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
# The original script just skipped it but in TeX Live we expect that
-@@ -578,7 +578,7 @@ sub rebuild_one_format {
+@@ -624,7 +624,7 @@ sub rebuild_one_format {
$texargs = $addargs;
}
if ($pool) {
@@ -73,7 +73,7 @@ $NetBSD: patch-bin_fmtutil,v 1.4 2016/06
if ($poolfile && -f $poolfile) {
print_verbose("attempting to create localized format "
. "using pool=$pool and tcx=$tcx.\n");
-@@ -1002,7 +1002,7 @@ sub determine_config_files {
+@@ -1016,7 +1016,7 @@ sub determine_config_files {
# in the list is the one where changes will be written to.
($changes_config_file) = @{$opts{'cnffile'}};
} else {
@@ -82,7 +82,7 @@ $NetBSD: patch-bin_fmtutil,v 1.4 2016/06
chomp(@all_files);
my @used_files;
for my $f (@all_files) {
-@@ -1012,10 +1012,10 @@ sub determine_config_files {
+@@ -1026,10 +1026,10 @@ sub determine_config_files {
my $TEXMFLOCALVAR;
my @TEXMFLOCAL;
if (win32()) {
Index: pkgsrc/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
diff -u pkgsrc/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg:1.8 pkgsrc/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg:1.9
--- pkgsrc/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg:1.8 Wed Jun 21 13:25:33 2017
+++ pkgsrc/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg Sun May 13 10:41:47 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.8 2017/06/21 13:25:33 markd Exp $
+$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.9 2018/05/13 10:41:47 markd Exp $
---- texmf-dist/web2c/updmap.cfg.orig 2017-03-01 01:06:05.000000000 +0000
+--- texmf-dist/web2c/updmap.cfg.orig 2018-03-14 01:25:13.000000000 +0000
+++ texmf-dist/web2c/updmap.cfg
-@@ -104,323 +104,3 @@ koEmbed baekmuk
+@@ -104,328 +104,3 @@ koEmbed baekmuk
# (end of updmap-hdr.cfg)
@@ -11,6 +11,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c
-Map ArrowsADF.map
-Map BulletsADF.map
-Map Alegreya.map
+-Map algolrevived.map
-MixedMap allrunes.map
-Map euler.map
-MixedMap cm.map
@@ -41,7 +42,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c
-Map uag.map
-Map ybv.map
-Map baskervaldx.map
--Map baskervillef.map
+-Map BaskervilleF.map
-MixedMap bbold.map
-Map belleek.map
-Map bera.map
@@ -79,7 +80,9 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c
-Map cmcyr.map
-Map cmexb.map
-MixedMap cmll.map
+-Map cmsrb.map
-Map Cochineal.map
+-Map Coelacanth.map
-Map comfortaa.map
-Map ComicNeue.map
-Map ComicNeueAngular.map
@@ -211,6 +214,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c
-Map MnSymbol.map
-MixedMap mongolian.map
-Map montserrat.map
+-KanjiMap morisawa5.map
-MixedMap musix.map
-Map mxedruli.map
-Map nanumfonts.map
@@ -219,6 +223,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c
-Map newtx.map
-Map newtxsf.map
-Map newtxtt.map
+-Map niceframe.map
-Map nimbus15.map
-Map norasi-c90.map
-Map noto.map
@@ -238,13 +243,13 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c
-MixedMap plother.map
-MixedMap pltext.map
-Map PlayfairDisplay.map
+-Map plex.map
-Map ap.map
-Map prodint.map
-Map charter.map
-Map fpls.map
-Map pazo.map
-Map utopia.map
--KanjiMap morisawa.map
-KanjiMap ptex-@jaEmbed@@jaVariant@.map
-Map pxfonts.map
-Map pxtx.map
Added files:
Index: pkgsrc/print/tex-tetex/patches/patch-bin_texconfig
diff -u /dev/null pkgsrc/print/tex-tetex/patches/patch-bin_texconfig:1.1
--- /dev/null Sun May 13 10:41:47 2018
+++ pkgsrc/print/tex-tetex/patches/patch-bin_texconfig Sun May 13 10:41:47 2018
@@ -0,0 +1,241 @@
+$NetBSD: patch-bin_texconfig,v 1.1 2018/05/13 10:41:47 markd Exp $
+
+--- bin/texconfig.orig 2017-12-17 23:26:29.000000000 +0000
++++ bin/texconfig
+@@ -94,7 +94,7 @@ echoShowKpseVariable()
+ for eskv
+ do
+ var=$eskv
+- val=`kpsewhich -var-value="$eskv"`
++ val=`@KPSEWHICH@ -var-value="$eskv"`
+ echo "$var=$val"
+ done
+ }
+@@ -126,7 +126,7 @@ echoLocateCfgfile()
+ for elc
+ do
+ case $elc in
+- texmf.cnf) elcLoc=`kpsewhich $elc`;;
++ texmf.cnf) elcLoc=`@KPSEWHICH@ $elc`;;
+ *) elcLoc=`tcfmgr --cmd find --file "$elc"`;;
+ esac
+ case $elcLoc in
+@@ -193,7 +193,7 @@ setupTmpDir()
+ setupTexmfroot()
+ {
+ case $MT_TEXMFROOT in
+- "") MT_TEXMFROOT=`kpsewhich -var-value=TEXMFROOT`;;
++ "") MT_TEXMFROOT=`@KPSEWHICH@ -var-value=TEXMFROOT`;;
+ *) return;;
+ esac
+ }
+@@ -205,7 +205,7 @@ setupTexmfroot()
+ setupTexmfmain()
+ {
+ case $MT_TEXMFMAIN in
+- "") MT_TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`;;
++ "") MT_TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`;;
+ *) return;;
+ esac
+ }
+@@ -216,7 +216,7 @@ setupTexmfmain()
+ setupTexmfdist()
+ {
+ case $MT_TEXMFDIST in
+- "") MT_TEXMFDIST=`kpsewhich -var-value=TEXMFDIST`;;
++ "") MT_TEXMFDIST=`@KPSEWHICH@ -var-value=TEXMFDIST`;;
+ *) return;;
+ esac
+ }
+@@ -227,7 +227,7 @@ setupTexmfdist()
+ setupTexmfvar()
+ {
+ case $MT_TEXMVAR in
+- "") MT_TEXMVAR=`kpsewhich -var-value=TEXMFVAR`;;
++ "") MT_TEXMVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`;;
+ *) return;;
+ esac
+ }
+@@ -238,7 +238,7 @@ setupTexmfvar()
+ setupSystexmf()
+ {
+ case $MT_SYSTEXMF in
+- "") MT_SYSTEXMF=`kpsewhich -var-value=SYSTEXMF`;;
++ "") MT_SYSTEXMF=`@KPSEWHICH@ -var-value=SYSTEXMF`;;
+ *) return;;
+ esac
+ }
+@@ -493,7 +493,7 @@ listDvipsPapers()
+ #
+ getFormatsForHyphen()
+ {
+- fmtutil --catcfg | awk '$3 != "-" {print $1}' | sort
++ @FMTUTIL@ --catcfg | awk '$3 != "-" {print $1}' | sort
+ }
+
+ ###############################################################################
+@@ -621,7 +621,7 @@ TeX Live home page: <http://tug.org/texl
+ echo
+ echo '============================= font map files ============================='
+ for m in psfonts.map pdftex.map ps2pk.map; do
+- echo "$m: `kpsewhich $m`"
++ echo "$m: `@KPSEWHICH@ $m`"
+ done
+ echo
+ echo '=========================== kpathsea variables ==========================='
+@@ -686,7 +686,7 @@ Valid PAPER settings:
+ *)
+ otherPrinter=true
+ otherPrinterName=$2
+- otherPrinterFile=`kpsewhich -format='dvips config' "config.$otherPrinterName"`
++ otherPrinterFile=`@KPSEWHICH@ -format='dvips config' "config.$otherPrinterName"`
+ case $otherPrinterFile in
+ "")
+ echo "$progname: configuration file \`config.$otherPrinterName' for printer \`$otherPrinterName' not found" >&2
+@@ -719,7 +719,7 @@ Valid PAPER settings:
+ ;;
+ *)
+ printerName=$2
+- pFile=`kpsewhich -format='dvips config' "config.$printerName"`
++ pFile=`@KPSEWHICH@ -format='dvips config' "config.$printerName"`
+ case $pFile in
+ "")
+ setupTmpDir
+@@ -756,7 +756,7 @@ Valid PAPER settings:
+ ;;
+ *)
+ printerName=$2
+- pFile=`kpsewhich -format='dvips config' "config.$printerName"`
++ pFile=`@KPSEWHICH@ -format='dvips config' "config.$printerName"`
+ case $pFile in
+ "")
+ echo "$progname: configuration file for printer \`$printerName' (config.$printerName) not found" >&2
+@@ -937,7 +937,7 @@ For more information about these \`featu
+ esac
+ ;;
+ rw)
+- MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS`
++ MT_VARTEXFONTS=`@KPSEWHICH@ -var-value VARTEXFONTS`
+ if test -z "$MT_VARTEXFONTS"; then
+ echo "$progname: failed to set \`font rw'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
+ return
+@@ -963,7 +963,7 @@ For more information about these \`featu
+ fmgrConfigReplace mktex.cnf '^: ..MT_FEATURES=' ": \${MT_FEATURES=appendonlydir:varfonts}"
+ ;;
+ ro)
+- MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS`
++ MT_VARTEXFONTS=`@KPSEWHICH@ -var-value VARTEXFONTS`
+ if test -z "$MT_VARTEXFONTS"; then
+ echo "$progname: failed to set \`font ro'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
+ return
+@@ -1014,10 +1014,10 @@ EOM
+
+ setupTmpDir
+ echo "$progname: analyzing old configuration..." >&2
+- fmtutil --catcfg > $tmpdir/pre
+- fmtutil --edit
++ @FMTUTIL@ --catcfg > $tmpdir/pre
++ @FMTUTIL@ --edit
+ echo "$progname: analyzing new configuration..." >&2
+- fmtutil --catcfg > $tmpdir/post
++ @FMTUTIL@ --catcfg > $tmpdir/post
+
+ if cmp $tmpdir/pre $tmpdir/post >/dev/null 2>&1; then
+ echo "$progname: no new/updated formats available ..." >&2
+@@ -1025,9 +1025,9 @@ EOM
+ echo "$progname: updating formats ..." >&2
+ comm -13 $tmpdir/pre $tmpdir/post > $tmpdir/addOrChange
+ for i in `awk '{print $1}' $tmpdir/addOrChange`; do
+- fmtutil --byfmt "$i" || rc=1
++ @FMTUTIL@ --byfmt "$i" || rc=1
+ done
+- texlinks --multiplatform || rc=1
++ @TEXLINKS@ --multiplatform || rc=1
+ fi
+ ;;
+
+@@ -1067,7 +1067,7 @@ $formatsForHyphenFmt"
+ *)
+ if checkElemInList "$tcBatchHyphenFormat" $formatsForHyphen; then
+
+- tcBatchHyphenFile=`fmtutil --showhyphen "$tcBatchHyphenFormat"`
++ tcBatchHyphenFile=`@FMTUTIL@ --showhyphen "$tcBatchHyphenFormat"`
+ case $tcBatchHyphenFile in
+ "")
+ echo "$progname: could not find hyphen setup file for format \`$tcBatchHyphenFormat'" >&2
+@@ -1124,7 +1124,7 @@ $formatsForHyphenFmt"
+ fi
+ ;;
+ esac
+- fmtutil --byhyphen "$tcBatchHFOut"
++ @FMTUTIL@ --byhyphen "$tcBatchHFOut"
+ fi
+ else
+ echo "$progname: invalid format \`$tcBatchHyphenFormat' specified as argument for \`$progname hyphen'" >&2
+@@ -1142,9 +1142,9 @@ $formatsForHyphenFmt"
+ init)
+ case $2 in
+ "")
+- if fmtutil --all \
+- && texlinks --multiplatform \
+- && updmap; then
++ if @FMTUTIL@ --all \
++ && @TEXLINKS@ --multiplatform \
++ && @UPDMAP@; then
+ :
+ else
+ rc=1
+@@ -1153,7 +1153,7 @@ $formatsForHyphenFmt"
+ *)
+ shift 1
+ for i in "$@"; do
+- fmtutil --byfmt "$i" || rc=1
++ @FMTUTIL@ --byfmt "$i" || rc=1
+ done
+ ;;
+ esac
+@@ -1250,7 +1250,7 @@ Valid PAPER settings:
+ set x `getRes "$tcBatchPdftexMode"`; shift
+ fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1"
+ if $fmgrConfigReplaceChanged; then
+- fmtutil --refresh
++ @FMTUTIL@ --refresh
+ fi
+ else
+ echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2
+@@ -1272,7 +1272,7 @@ Valid PAPER settings:
+ # wChanged=$fmgrConfigReplaceChanged
+ # fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
+ # if $wChanged || $fmgrConfigReplaceChanged; then
+- # fmtutil --refresh
++ # @FMTUTIL@ --refresh
+ # fi
+ # ;;
+ #a4)
+@@ -1281,7 +1281,7 @@ Valid PAPER settings:
+ # wChanged=$fmgrConfigReplaceChanged
+ # fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
+ # if $wChanged || $fmgrConfigReplaceChanged; then
+- # fmtutil --refresh
++ # @FMTUTIL@ --refresh
+ # fi
+ # ;;
+ "") echo "$help" >&2; rc=1;;
+@@ -1301,7 +1301,7 @@ Valid PAPER settings:
+ ;;
+
+ rehash)
+- mktexlsr
++ @MKTEXLSR@
+ ;;
+
+ #
+@@ -1434,7 +1434,7 @@ Valid PAPER settings:
+ ###############################################################################
+ tcInteractive()
+ {
+- texconfig-dialog
++ @TEXCONFIG_DIALOG@
+ }
+
+ ###############################################################################
Index: pkgsrc/print/tex-tetex/patches/patch-texmf-dist_texconfig_tcfmgr
diff -u /dev/null pkgsrc/print/tex-tetex/patches/patch-texmf-dist_texconfig_tcfmgr:1.1
--- /dev/null Sun May 13 10:41:47 2018
+++ pkgsrc/print/tex-tetex/patches/patch-texmf-dist_texconfig_tcfmgr Sun May 13 10:41:47 2018
@@ -0,0 +1,58 @@
+$NetBSD: patch-texmf-dist_texconfig_tcfmgr,v 1.1 2018/05/13 10:41:47 markd Exp $
+
+--- texmf-dist/texconfig/tcfmgr.orig 2010-05-20 18:50:17.000000000 +0000
++++ texmf-dist/texconfig/tcfmgr
+@@ -47,7 +47,7 @@ setupMap()
+ esac
+
+ case $TFC_MAP in
+- "") TFC_MAP=`(kpsewhich -progname=texconfig -format='other text files' tcfmgr.map) 2>/dev/null`;;
++ "") TFC_MAP=`(@KPSEWHICH@ -progname=texconfig -format='other text files' tcfmgr.map) 2>/dev/null`;;
+ esac
+
+ case $TFC_MAP in
+@@ -84,7 +84,7 @@ setupTemp()
+ setupTexmfConfig()
+ {
+ case $TFC_TEXMFCONFIG in
+- "") TFC_TEXMFCONFIG=`(kpsewhich -var-value=TEXMFCONFIG) 2>/dev/null`;;
++ "") TFC_TEXMFCONFIG=`(@KPSEWHICH@ -var-value=TEXMFCONFIG) 2>/dev/null`;;
+ *) (exit 0); return 0;;
+ esac
+ case $TFC_TEXMFCONFIG in
+@@ -95,7 +95,7 @@ setupTexmfConfig()
+ setupMktexDir()
+ {
+ case $TFC_MKTEXDIR in
+- "") TFC_MKTEXDIR=`(kpsewhich --format='web2c files' mktexdir) 2>/dev/null`;;
++ "") TFC_MKTEXDIR=`(@KPSEWHICH@ --format='web2c files' mktexdir) 2>/dev/null`;;
+ esac
+
+ case $TFC_MKTEXDIR in
+@@ -106,7 +106,7 @@ setupMktexDir()
+ setupMktexupd()
+ {
+ case $TFC_MKTEXUPD in
+- "") TFC_MKTEXUPD=`(kpsewhich --format='web2c files' mktexupd) 2>/dev/null`;;
++ "") TFC_MKTEXUPD=`(@KPSEWHICH@ --format='web2c files' mktexupd) 2>/dev/null`;;
+ esac
+
+ case $TFC_MKTEXUPD in
+@@ -193,7 +193,7 @@ check_out()
+ case "$orig" in
+ "")
+ get_info
+- orig=`(kpsewhich -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE") 2>/dev/null`
++ orig=`(@KPSEWHICH@ -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE") 2>/dev/null`
+ ;;
+ *)
+ test -f "$orig" || orig=
+@@ -308,7 +308,7 @@ check_in()
+ find_file()
+ {
+ get_info
+- kpsewhich -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE"
++ @KPSEWHICH@ -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE"
+ }
+
+ help()
Home |
Main Index |
Thread Index |
Old Index