pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/texlive-tetex Use absolute paths in invoking the...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5c56ac90131a
branches: trunk
changeset: 399444:5c56ac90131a
user: minskim <minskim%pkgsrc.org@localhost>
date: Sun Sep 20 03:33:42 2009 +0000
description:
Use absolute paths in invoking the following commands: fmtutil,
fmtutil-sys, kpsetool, kpsewhere, texconfig, texconfig-dialog,
texconfig-sys, texlinks, updmap, and updmap-sys.
diffstat:
print/texlive-tetex/Makefile | 18 ++--
print/texlive-tetex/distinfo | 13 +++-
print/texlive-tetex/patches/patch-ab | 53 ++++++++++++++-
print/texlive-tetex/patches/patch-ac | 80 +++++++++++++++++++++++
print/texlive-tetex/patches/patch-ad | 19 +++++
print/texlive-tetex/patches/patch-ae | 90 ++++++++++++++++++++++++++
print/texlive-tetex/patches/patch-af | 15 ++++
print/texlive-tetex/patches/patch-ag | 18 +++++
print/texlive-tetex/patches/patch-ah | 16 ++++
print/texlive-tetex/patches/patch-ai | 121 +++++++++++++++++++++++++++++++++++
print/texlive-tetex/patches/patch-aj | 15 ++++
print/texlive-tetex/patches/patch-ak | 40 +++++++++++
12 files changed, 486 insertions(+), 12 deletions(-)
diffs (truncated from 576 to 300 lines):
diff -r b50af2a37b0d -r 5c56ac90131a print/texlive-tetex/Makefile
--- a/print/texlive-tetex/Makefile Sun Sep 20 02:59:57 2009 +0000
+++ b/print/texlive-tetex/Makefile Sun Sep 20 03:33:42 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/09/19 15:31:03 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2009/09/20 03:33:42 minskim Exp $
DISTNAME= texlive-20080816-source
PKGNAME= texlive-tetex-2008
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.lzma
@@ -34,14 +34,16 @@
${PKG_SYSCONFDIR}/web2c/updmap.cfg
FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys
-FIND_PREFIX:= DIALOG_PREFIX=dialog
-.include "../../mk/find-prefix.mk"
-
SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Setting a path to dialog.
+SUBST_MESSAGE.paths= Setting paths to commands.
SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= texconfig-dialog
-SUBST_SED.paths= -e 's,@DIALOG_PREFIX@,${DIALOG_PREFIX},g'
+SUBST_FILES.paths= fmtutil fmtutil-sys kpsetool kpsewhere \
+ texconfig texconfig-dialog texconfig-sys \
+ texlinks updmap updmap-sys
+SUBST_SED.paths= -e 's,@DIALOG@,${LOCALBASE}/bin/dialog,g' \
+ -e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g' \
+ -e 's,@TEXCONFIG@,${PREFIX}/bin/texconfig,g' \
+ -e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
diff -r b50af2a37b0d -r 5c56ac90131a print/texlive-tetex/distinfo
--- a/print/texlive-tetex/distinfo Sun Sep 20 02:59:57 2009 +0000
+++ b/print/texlive-tetex/distinfo Sun Sep 20 03:33:42 2009 +0000
@@ -1,7 +1,16 @@
-$NetBSD: distinfo,v 1.3 2009/09/19 15:31:03 minskim Exp $
+$NetBSD: distinfo,v 1.4 2009/09/20 03:33:42 minskim Exp $
SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
SHA1 (patch-aa) = d8e7deffb731f1ad1f27ab085ef6185cd96d5461
-SHA1 (patch-ab) = c73c30b82530c57c0f832e2ddcf32697e2e50d04
+SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
+SHA1 (patch-ac) = 00a18f7106ac91c8f6e38b27cd607dce28d00cd6
+SHA1 (patch-ad) = 3fde31afd0d136e8f04a373b2ece3f6d7f587495
+SHA1 (patch-ae) = 3fc85a25f2618da91c6531f20a26f9d43f36125b
+SHA1 (patch-af) = 01a16d24be655036e8d7f2ad6448a06faa84cdf9
+SHA1 (patch-ag) = 71dcd936a37628de69bb56f9f17f67e009b4646c
+SHA1 (patch-ah) = 12e49c230b2af8bac83539fb07a954e04e62fbd7
+SHA1 (patch-ai) = f082ca1a7525e7264a92e77d734342fe3861e377
+SHA1 (patch-aj) = 4abe9d57ebafe6b053b84e1eea7fd63a43952e8b
+SHA1 (patch-ak) = 9c2125e681a4ae59f3d05ec92323c42cd928a1a2
diff -r b50af2a37b0d -r 5c56ac90131a print/texlive-tetex/patches/patch-ab
--- a/print/texlive-tetex/patches/patch-ab Sun Sep 20 02:59:57 2009 +0000
+++ b/print/texlive-tetex/patches/patch-ab Sun Sep 20 03:33:42 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/20 03:33:43 minskim Exp $
--- texconfig-dialog.orig 2007-07-16 10:08:10.000000000 -0700
+++ texconfig-dialog
@@ -14,7 +14,56 @@
- tcdialog --title "TeX setup utility" ${1+"$@"}
- runDialogRc=$?
- fi
-+ @DIALOG_PREFIX@/bin/dialog --title "TeX setup utility" ${1+"$@"}
++ @DIALOG@ --title "TeX setup utility" ${1+"$@"}
termCtl clear
(exit $runDialogRc)
return $runDialogRc
+@@ -105,7 +98,7 @@ findDialog()
+ {
+ for bin in whiptail dialog
+ do
+- binLoc=`texconfig findprog $bin`
++ binLoc=`@TEXCONFIG@ findprog $bin`
+ case $binLoc in
+ "") DIALOG_PROG="";;
+ *) DIALOG_PROG=$binLoc; break;;
+@@ -243,7 +236,7 @@ Chosse a mode to be used when metafont g
+ be differences between modes of the same resolution. See the comments in the file modes.mf for more details.
+ \"" \
+ 23 80 14 \
+- `texconfig mode-list` 2>"$tmpmenu"
++ `@TEXCONFIG@ mode-list` 2>"$tmpmenu"
+ }
+
+ menuMode()
+@@ -348,7 +341,7 @@ offset), e.g. 2mm,-0.5in (right 2mm and
+ PAPER)
+ eval runDialog \
+ --menu \'\\n\\nChoose the default papersize definition for dvips.\\n\\n\' \
+- 23 80 8 `texconfig dvips paper-list` \
++ 23 80 8 `@TEXCONFIG@ dvips paper-list` \
+ 2>"$tmpmenu"
+ paper=`cat "$tmpmenu"`
+ if test -n "$paper"; then
+@@ -424,7 +417,7 @@ menuHyphenation()
+ Choose format to set up hyphenation for.
+ " \
+ 23 80 14 \
+- `texconfig hyphen-list | sed 's@\(.*\)@\1 \1@'` 2>"$tmpmenu"
++ `@TEXCONFIG@ hyphen-list | sed 's@\(.*\)@\1 \1@'` 2>"$tmpmenu"
+ p=`cat "$tmpmenu"`
+ case $p in
+ "")
+@@ -454,9 +447,9 @@ eof
+ esac
+
+
+-: ${TEXMFCONFIG=`kpsewhich -var-value=TEXMFCONFIG`}
+-: ${TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
+-: ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
++: ${TEXMFCONFIG=`@KPSEWHICH@ -var-value=TEXMFCONFIG`}
++: ${TEXMFVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`}
++: ${TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`}
+ export TEXMFCONFIG TEXMFVAR TEXMFMAIN
+
+ setupTmpDir
diff -r b50af2a37b0d -r 5c56ac90131a print/texlive-tetex/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/texlive-tetex/patches/patch-ac Sun Sep 20 03:33:42 2009 +0000
@@ -0,0 +1,80 @@
+$NetBSD: patch-ac,v 1.1 2009/09/20 03:33:43 minskim Exp $
+
+--- updmap.orig 2008-05-25 15:24:33.000000000 -0700
++++ updmap
+@@ -597,7 +597,7 @@ fileADOBE()
+ ###############################################################################
+ locateWeb2c()
+ {
+- kpsewhich --format='web2c files' ${1+"$@"}
++ @KPSEWHICH@ --format='web2c files' ${1+"$@"}
+ }
+
+ ###############################################################################
+@@ -617,7 +617,7 @@ locateMap()
+ # The old version of the code; not used at the moment.
+ for map
+ do
+- file=`kpsewhich --format=map "$map"`
++ file=`@KPSEWHICH@ --format=map "$map"`
+ if test -f "$file"; then
+ verboseMsg "$progname: using map file \`$file'"
+ echo "$file"
+@@ -637,10 +637,10 @@ locateMapMigrate()
+ for map
+ do
+ # look up using the new search path
+- file=`kpsewhich --format=map "$map"`
++ file=`@KPSEWHICH@ --format=map "$map"`
+
+ # look up using the old search path
+- file2=`kpsewhich --format='dvips config' "$map"`
++ file2=`@KPSEWHICH@ --format='dvips config' "$map"`
+
+ # Well, the search paths should not overlap. If they do, and if
+ # file1 = file2, we don't want to complain about file2, so:
+@@ -830,7 +830,7 @@ mktexdir()
+ ###############################################################################
+ setupDestDir()
+ {
+- vartexmf=`kpsewhich -var-value=TEXMFVAR`
++ vartexmf=`@KPSEWHICH@ -var-value=TEXMFVAR`
+
+ # dvips
+ if test -z "$dvipsoutputdir"; then
+@@ -861,7 +861,7 @@ setupDestDir()
+ ###############################################################################
+ setupLog()
+ {
+- vartexmf=`kpsewhich -var-value=TEXMFVAR`
++ vartexmf=`@KPSEWHICH@ -var-value=TEXMFVAR`
+ dir=$vartexmf/web2c
+ mktexdir "$dir" >/dev/null 2>&1
+ log="$dir/$progname.log"
+@@ -1055,7 +1055,7 @@ listAvailableMaps()
+ '
+ for line in `egrep '^(#! *)?(Mixed)?Map' "$cnfFile"`; do
+ m=`echo "$line" | sed 's@[ ]*$@@; s@.*[ ]@@'`
+- kpsewhich --format=map "$m" >/dev/null && echo "$line"
++ @KPSEWHICH@ --format=map "$m" >/dev/null && echo "$line"
+ done
+ IFS=$OLDIFS
+ }
+@@ -1068,7 +1068,7 @@ listAvailableMaps()
+ syncWithTrees()
+ {
+ for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's@.* @@'`; do
+- kpsewhich --format=map "$i" >/dev/null || echo "$i"
++ @KPSEWHICH@ --format=map "$i" >/dev/null || echo "$i"
+ done > $tmp1
+ {
+ sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <$tmp1
+@@ -1335,7 +1335,7 @@ main()
+ cnfFileShort=updmap.cfg
+ cnfFile=
+ dvipsoutputdir=; pdftexoutputdir=; dvipdfmoutputdir=
+- : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
++ : ${TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`}
+
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
+ tmp1=$tmpdir/a
diff -r b50af2a37b0d -r 5c56ac90131a print/texlive-tetex/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/texlive-tetex/patches/patch-ad Sun Sep 20 03:33:42 2009 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2009/09/20 03:33:43 minskim Exp $
+
+--- updmap-sys.orig 2006-01-17 13:41:51.000000000 -0800
++++ updmap-sys
+@@ -20,11 +20,11 @@ export PATH
+ # hack around a bug in zsh:
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+
+-v=`kpsewhich -var-value TEXMFSYSVAR`
+-c=`kpsewhich -var-value TEXMFSYSCONFIG`
++v=`@KPSEWHICH@ -var-value TEXMFSYSVAR`
++c=`@KPSEWHICH@ -var-value TEXMFSYSCONFIG`
+
+ TEXMFVAR="$v"
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+
+-exec updmap ${1+"$@"}
++exec @UPDMAP@ ${1+"$@"}
diff -r b50af2a37b0d -r 5c56ac90131a print/texlive-tetex/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/texlive-tetex/patches/patch-ae Sun Sep 20 03:33:42 2009 +0000
@@ -0,0 +1,90 @@
+$NetBSD: patch-ae,v 1.1 2009/09/20 03:33:43 minskim Exp $
+
+--- fmtutil.orig 2008-06-17 11:00:24.000000000 -0700
++++ fmtutil
+@@ -166,7 +166,7 @@ getmatch()
+ initTexmfMain()
+ {
+ case $MT_TEXMFMAIN in
+- "") MT_TEXMFMAIN=`kpsewhich --var-value=TEXMFMAIN`;;
++ "") MT_TEXMFMAIN=`@KPSEWHICH@ --var-value=TEXMFMAIN`;;
+ esac
+ export MT_TEXMFMAIN
+ }
+@@ -178,14 +178,14 @@ initTexmfMain()
+ ###############################################################################
+ cache_vars()
+ {
+- : ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
+- : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
+- : ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`}
+- : ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`}
+- : ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`}
+- : ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`}
+- : ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`}
+- : ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
++ : ${MT_VARTEXFONTS=`@KPSEWHICH@ --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
++ : ${MT_MKTEXNAM=`@KPSEWHICH@ --format='web2c files' mktexnam`}
++ : ${MT_MKTEXNAM_OPT=`@KPSEWHICH@ --format='web2c files' mktexnam.opt`}
++ : ${MT_MKTEXDIR=`@KPSEWHICH@ --format='web2c files' mktexdir`}
++ : ${MT_MKTEXDIR_OPT=`@KPSEWHICH@ --format='web2c files' mktexdir.opt`}
++ : ${MT_MKTEXUPD=`@KPSEWHICH@ --format='web2c files' mktexupd`}
++ : ${MT_MKTEX_CNF=`@KPSEWHICH@ --format='web2c files' mktex.cnf`}
++ : ${MT_MKTEX_OPT=`@KPSEWHICH@ --format='web2c files' mktex.opt`}
+ export MT_VARTEXFONTS MT_MKTEXNAM MT_MKTEXNAM_OPT MT_MKTEXDIR
+ export MT_MKTEXDIR_OPT MT_MKTEXUPD MT_MKTEX_CNF MT_MKTEX_OPT
+ }
+@@ -512,7 +512,7 @@ main()
+
+ # set up destdir:
+ if test -z "$destdir"; then
+- : ${MT_TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
++ : ${MT_TEXMFVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`}
+ destdir=$MT_TEXMFVAR/web2c
+ fi
+ test -d "$destdir" || mktexdir "$destdir" >/dev/null 2>&1
+@@ -617,7 +617,7 @@ parse_line()
+ esac
+
+ # See if we can find $inifile for return code:
+- kpsewhich -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1
++ @KPSEWHICH@ -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1
+ }
+
+ ###############################################################################
+@@ -630,7 +630,7 @@ find_hyphenfile()
+ format="$1"; hyphenation="$2"
+ case $hyphenation in
+ -) ;;
+- *) kpsewhich -progname="$format" -format=tex "$hyphenation";;
++ *) @KPSEWHICH@ -progname="$format" -format=tex "$hyphenation";;
+ esac
+ }
+
Home |
Main Index |
Thread Index |
Old Index