On Sun, Jan 04, 2015 at 12:57:46PM +0000, Edd Barrett wrote:
> Hey,
>
> Whilst preparing a texlive update, I noticed that the interpreter paths
> are not being correctly substituted into scripts. Here is the fix
> backported to the in-tree tex live 2013.
Same again, but with the missing mtxrun patch. Fixes e.g. pstopdf.
Please check my work carefully.
OK?
Index: base/Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/print/texlive/base/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- base/Makefile 30 Oct 2014 15:33:00 -0000 1.75
+++ base/Makefile 4 Jan 2015 12:10:40 -0000
@@ -4,7 +4,7 @@ COMMENT = base binaries for TeXLive typ
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
-REVISION = 2
+REVISION = 3
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX}
@@ -44,91 +44,11 @@ BUILD_DEPENDS += devel/harfbuzz,-icu
MODULES = textproc/intltool converters/libiconv
# These following modules are mostly for variable substitution in patches
# They are not real dependencies of _base, but of _texmf-full
-MODULES += lang/lua lang/ruby lang/python x11/tk perl
-MODLUA_RUNDEP = No
+MODULES += lang/ruby x11/tk
MODRUBY_REV = 1.8
MODRUBY_BUILDDEP = No
MODRUBY_RUNDEP = No
-MODPY_BUILDDEP = No
-MODPY_RUNDEP = No
-SUBST_VARS += MODRUBY_BINREV MODPY_VERSION MODTK_VERSION
-
-MODPY_ADJ_FILES = texk/texlive/linked_scripts/de-macro/de-macro \
- texk/texlive/linked_scripts/dviasm/dviasm.py \
- texk/texlive/linked_scripts/ebong/ebong.py \
- texk/texlive/linked_scripts/texliveonfly/texliveonfly.py
-
-MODRUBY_ADJ_FILES = convbkmk.rb \
- match_parens
-
-MODPERL_ADJ_FILES = texk/texlive/linked_scripts/texlive/updmap.pl \
- texk/tetex/updmap-single.pl \
- texk/tex4htk/mk4ht.pl \
- texk/texlive/linked_scripts/authorindex/authorindex \
- texk/texlive/linked_scripts/bundledoc/arlatex \
- texk/texlive/linked_scripts/bundledoc/bundledoc \
- texk/texlive/linked_scripts/ctanify/ctanify \
- texk/texlive/linked_scripts/dosepsbin/dosepsbin.pl \
- texk/texlive/linked_scripts/epstopdf/epstopdf.pl \
- texk/texlive/linked_scripts/fig4latex/fig4latex \
- texk/texlive/linked_scripts/fontools/afm2afm \
- texk/texlive/linked_scripts/fontools/autoinst \
- texk/texlive/linked_scripts/fontools/ot2kpx \
- texk/texlive/linked_scripts/glossaries/makeglossaries \
-
texk/texlive/linked_scripts/jfontmaps/updmap-setup-kanji.pl \
- texk/texlive/linked_scripts/latex2man/latex2man \
- texk/texlive/linked_scripts/latexmk/latexmk.pl \
- texk/texlive/linked_scripts/mkgrkindex/mkgrkindex \
- texk/texlive/linked_scripts/mkjobtexmf/mkjobtexmf.pl \
- texk/texlive/linked_scripts/oberdiek/pdfatfi.pl \
- texk/texlive/linked_scripts/pax/pdfannotextractor.pl \
- texk/texlive/linked_scripts/pdfcrop/pdfcrop.pl \
- texk/texlive/linked_scripts/pedigree-perl/pedigree.pl \
- texk/texlive/linked_scripts/perltex/perltex.pl \
- texk/texlive/linked_scripts/pkfix-helper/pkfix-helper \
- texk/texlive/linked_scripts/purifyeps/purifyeps \
- texk/texlive/linked_scripts/sty2dtx/sty2dtx.pl \
- texk/texlive/linked_scripts/tetex/e2pall.pl \
- utils/texdoctk/texdoctk.pl \
- texk/texlive/linked_scripts/texcount/texcount.pl \
- texk/texlive/linked_scripts/texdef/texdef.pl \
- texk/texlive/linked_scripts/texdiff/texdiff \
- texk/texlive/linked_scripts/texlive/tlmgr.pl \
- texk/texlive/tl_scripts/e2pall.pl \
-
texk/texlive/linked_scripts/texloganalyser/texloganalyser \
- utils/xindy/xindy-2.4/user-commands/texindy.in \
- utils/xindy/xindy-2.4/user-commands/xindy.in \
-
texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl \
-
texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl \
- texk/texlive/linked_scripts/latexdiff/latexdiff.pl \
- texk/texlive/linked_scripts/latexdiff/latexdiff-vc.pl \
- texk/texlive/linked_scripts/latexdiff/latexrevise.pl
-
-# None this year, but there have been in the past.
-LUA_ADJ_SCRIPTS =
-
-TEXLUA_ADJ_SCRIPTS = texk/texlive/linked_scripts/cachepic/cachepic.tlu \
- texk/texlive/linked_scripts/checkcites/checkcites.lua \
- texk/texlive/linked_scripts/context/stubs/unix/mtxrun \
- texk/texlive/linked_scripts/epspdf/epspdf.tlu \
-
texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua \
-
texk/texlive/linked_scripts/luaotfload/mkluatexfontdb.lua \
- texk/texlive/linked_scripts/musixtex/musixflx.lua \
- texk/texlive/linked_scripts/musixtex/musixtex.lua \
- texk/texlive/linked_scripts/pfarrei/a5toa4.tlu \
- texk/texlive/linked_scripts/pfarrei/pfarrei.tlu \
- texk/texlive/linked_scripts/pmx/pmx2pdf.lua \
- texk/texlive/linked_scripts/ptex2pdf/ptex2pdf.lua \
- texk/texlive/linked_scripts/texdoc/texdoc.tlu \
- texk/texlive/linked_scripts/texlive/rungs.tlu \
- utils/pmx/pmx2pdf.lua \
-
-SH_ADJ_SCRIPTS =
texk/texlive/linked_scripts/typeoutfileinfo/typeoutfileinfo.sh \
- texk/texlive/linked_scripts/lua2dox/lua2dox_filter \
- texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \
- texk/texlive/linked_scripts/arara/arara.sh \
- texk/texlive/linked_scripts/dtxgen/dtxgen \
- texk/texlive/linked_scripts/listbib/listbib
+SUBST_VARS += MODRUBY_BINREV MODTK_VERSION
# Never set SEPARATE_BUILD
@@ -200,23 +120,6 @@ CONFIGURE_ARGS += --mandir=${PREFIX}/man
--with-system-poppler
SUBST_VARS += TRUEPREFIX LOCALBASE
-
-# substitute paths to script interpreters
-pre-configure:
- ${MODTCL_WISH_ADJ}
${WRKSRC}/texk/texlive/linked_scripts/epspdf/epspdftk.tcl
- cd ${WRKSRC} && \
- for F in ${LUA_ADJ_SCRIPTS}; do \
- perl -pi -e '($$. == 1) && s@^.*$$@#!${MODLUA_BIN}@' $$F; \
- done
- cd ${WRKSRC} && \
- for F in ${TEXLUA_ADJ_SCRIPTS}; do \
- perl -pi -e '($$. == 1) && s@^.*$$@#!${PREFIX}/bin/texlua@'
$$F; \
- done
- cd ${WRKSRC} && \
- for F in ${SH_ADJ_SCRIPTS}; do \
- perl -pi -e '($$. == 1) && s@^.*$$@#!/bin/sh@' $$F; \
- done
- ${SUBST_CMD}
${WRKSRC}/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
# just to silence error - never used
pre-install:
Index: base/patches/patch-texk_texlive_linked_scripts_a2ping_a2ping_pl
===================================================================
RCS file: base/patches/patch-texk_texlive_linked_scripts_a2ping_a2ping_pl
diff -N base/patches/patch-texk_texlive_linked_scripts_a2ping_a2ping_pl
--- base/patches/patch-texk_texlive_linked_scripts_a2ping_a2ping_pl 11 Jan
2014 18:46:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-texk_texlive_linked_scripts_a2ping_a2ping_pl,v 1.1 2014/01/11
18:46:52 edd Exp $
---- texk/texlive/linked_scripts/a2ping/a2ping.pl.origy Thu Sep 12 23:06:08 2013
-+++ texk/texlive/linked_scripts/a2ping/a2ping.pl Thu Sep 12 23:06:33 2013
-@@ -2,7 +2,7 @@
- eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \
- ;exec perl -x -S -- "$0" ${1+"$@"};#'if 0;
- eval 'setenv PERL_BADLANG x;exec perl -x -S -- "$0" $argv:q;#'.q+
--#!perl -w
-+#!/usr/bin/perl -w
- package Htex::a2ping;
$0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1;
- # This Perl script was generated by JustLib2 at Wed Apr 23 09:14:13 2003.
- # Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib
Index: base/patches/patch-texk_texlive_linked_scripts_bibexport_bibexport_sh
===================================================================
RCS file: base/patches/patch-texk_texlive_linked_scripts_bibexport_bibexport_sh
diff -N base/patches/patch-texk_texlive_linked_scripts_bibexport_bibexport_sh
--- base/patches/patch-texk_texlive_linked_scripts_bibexport_bibexport_sh
29 May 2013 20:04:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-texk_texlive_linked_scripts_bibexport_bibexport_sh,v 1.1
2013/05/29 20:04:13 zhuk Exp $
---- texk/texlive/linked_scripts/bibexport/bibexport.sh.origy Tue Mar 26
12:40:50 2013
-+++ texk/texlive/linked_scripts/bibexport/bibexport.sh Tue Mar 26 12:42:29 2013
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- ##
- ## This is file `bibexport.sh',
- ## generated with the docstrip utility.
-@@ -256,7 +256,7 @@ FINALFILE=${OUTPUT};
- if [ ! "${FINALFILE}" ]; then
- FINALFILE="bibexport.bib";
- fi
--TMPFILE="bibexp.`date +%s`";
-+TMPFILE="`mktemp bibexp.XXXXXXXX`";
- if [ -z "${EXT}" ]; then ## we export all entries
- if [ -z "${EXTRA}" ]; then ## we have no extra files
- cat > ${TMPFILE}.aux <<EOF
Index: base/patches/patch-texk_texlive_linked_scripts_installfont_installfont-tl
===================================================================
RCS file:
base/patches/patch-texk_texlive_linked_scripts_installfont_installfont-tl
diff -N
base/patches/patch-texk_texlive_linked_scripts_installfont_installfont-tl
--- base/patches/patch-texk_texlive_linked_scripts_installfont_installfont-tl
11 Jan 2014 18:46:52 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-texk_texlive_linked_scripts_installfont_installfont-tl,v 1.2
2014/01/11 18:46:52 edd Exp $
---- texk/texlive/linked_scripts/installfont/installfont-tl.origy Tue Mar
12 00:01:41 2013
-+++ texk/texlive/linked_scripts/installfont/installfont-tl Thu Aug 29
17:49:54 2013
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/ksh
- #
- # installfont-tl [options]
- #
-@@ -85,7 +85,7 @@ then
- echo -e "`basename $0`: Could not find command line arguments.\nUse the
'--help' option for explanation."
- echo -e "Continue with default script variables? (y/n)"
- read ANSWER
-- if [ $ANSWER = "n" -o $ANSWER = "N" ]
-+ if [ X"$ANSWER" = "Xn" -o X"$ANSWER" = "XN" ]
- then
- exit 1
- fi
-@@ -582,4 +582,4 @@ then
- rmdir ./Backup
- fi
- echo -e "\n\nThe font(s) should be installed now!"
--exit 0
-\ No newline at end of file
-+exit 0
Index:
base/patches/patch-texk_texlive_linked_scripts_latexfileversion_latexfileversion
===================================================================
RCS file:
base/patches/patch-texk_texlive_linked_scripts_latexfileversion_latexfileversion
diff -N
base/patches/patch-texk_texlive_linked_scripts_latexfileversion_latexfileversion
---
base/patches/patch-texk_texlive_linked_scripts_latexfileversion_latexfileversion
29 May 2013 20:04:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD:
patch-texk_texlive_linked_scripts_latexfileversion_latexfileversion,v 1.1
2013/05/29 20:04:13 zhuk Exp $
---- texk/texlive/linked_scripts/latexfileversion/latexfileversion.origy
Tue Mar 26 12:55:21 2013
-+++ texk/texlive/linked_scripts/latexfileversion/latexfileversion Tue Mar
26 12:57:55 2013
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/sh
- ## latexfileversion
- ##
- ## This simple shell script prints the version and date of a LaTeX class or
-@@ -41,8 +41,8 @@ then
- fi
-
- # make temporary directory
--TMPDIR=`mktemp -d /tmp/latexfileversion.XXXXXX` || exit 1
--cd $TMPDIR
-+MYTMPDIR="`mktemp -dt latexfileversion.XXXXXX`" || exit 1
-+cd $MYTMPDIR
-
- # extract basenames for extensions .cls and .sty
- FILE=$1
-@@ -50,7 +50,7 @@ STYLE=${1%%.sty}
- CLASS=${1%%.cls}
-
- # handle .cls files and .sty files seperately
--if [ "$CLASS.cls" == "$FILE" ]
-+if [ X"$CLASS.cls" = X"$FILE" ]
- then
- echo -n "Looking for class file '$CLASS.cls': "
- # generate temporary LaTeX file
-@@ -75,7 +75,7 @@ cat << EOM
- EOM
- ) > latexfileversion.tex
- else
-- if [ "$STYLE.sty" == "$FILE" ]
-+ if [ X"$STYLE.sty" = X"$FILE" ]
- then
- echo -n "Looking for style file '$STYLE.sty': "
- # generate temporary LaTeX file
-@@ -113,6 +113,6 @@ pdflatex -interaction=nonstopmode latexfileversion.tex
- grep -e '^VERSION' latexfileversion.log | sed 's/VERSION //'
-
- # delete temporary directory
--rm -rf $TMPDIR
-+rm -rf $MYTMPDIR
-
- #EOF
Index: base/pkg/README
===================================================================
RCS file: /home/edd/cvsync/ports/print/texlive/base/pkg/README,v
retrieving revision 1.11
diff -u -p -r1.11 README
--- base/pkg/README 11 Jan 2014 18:46:52 -0000 1.11
+++ base/pkg/README 4 Jan 2015 12:12:12 -0000
@@ -94,6 +94,7 @@ As far as I know:
* x11/tk/${MODTK_VERSION} is needed for epspdftk
* lang/ruby/${MODRUBY_LIBREV} is needed for convbkmk, epspdf, and
other stuff.
+ * Some scripts need bash.
If you know more, please mail the package maintainer.
Index: texmf/Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- texmf/Makefile 8 Feb 2014 17:46:18 -0000 1.39
+++ texmf/Makefile 8 Jan 2015 09:10:56 -0000
@@ -9,8 +9,10 @@ COMMENT-buildset = smallest texlive texm
# If you move things out of another texmf into the buildset, don't forget to:
# * Update the buildset conflict markers in PLIST-buildset.
# * Add a more restrictive RUN_DEPEND upon the buildset.
-REVISION-buildset = 2
-REVISION-main = 1
+REVISION-buildset = 3
+REVISION-main = 2
+REVISION-full = 0
+REVISION-context = 0
DISTNAME = texlive-${DIST_V}-texmf
MASTER_SITES0 = http://spacehopper.org/mirrors/ \
@@ -33,7 +35,8 @@ PKG_ARCH = *
BUILD_DEPENDS = archivers/xz
# We dont use auto module deps for these, as MODULES is not per SUBPACKAGE
-MODULES += lang/ruby lang/python
+.include "adj.mk"
+MODULES += lang/ruby lang/python x11/tk perl
MODRUBY_REV = 1.8
MODRUBY_BUILDDEP = No
MODRUBY_RUNDEP = No
@@ -52,6 +55,29 @@ RUN_DEPENDS-docs += texlive_base-${V}:pr
x11/p5-Tk
MULTI_PACKAGES = -context -docs -full -main -buildset
+
+SUBST_VARS += RUBY
+
+# Substitute correct interpreter paths into scripts.
+# Some are done automatically by MODULES
+pre-configure:
+ @# Don't use builtin ruby.port.mk substitution. It uses
+ @# find, which takes an age on such a large directory.
+ for F in ${RUBY_ADJ_FILES}; do \
+ perl -pi -e '($$. == 1) && s@^.*$$@#!${RUBY}@' ${WRKSRC}/$$F; \
+ done
+ for F in ${WISH_ADJ_FILES}; do \
+ ${MODTCL_WISH_ADJ} ${WRKSRC}/$$F; \
+ done
+ for F in ${TEXLUA_ADJ_FILES}; do \
+ perl -pi -e '($$. == 1) && s@^.*$$@#!${PREFIX}/bin/texlua@' \
+ ${WRKSRC}/$$F; \
+ done
+ for F in ${BASH_ADJ_FILES}; do \
+ perl -pi -e '($$. == 1) && s@^.*$$@#!${LOCALBASE}/bin/bash@' \
+ ${WRKSRC}/$$F; \
+ done
+ ${SUBST_CMD} ${WRKSRC}/texmf-dist/scripts/context/stubs/unix/mtxrun
do-install:
mv ${WRKDIST}/texmf-dist ${PREFIX}/share
Index: texmf/adj.mk
===================================================================
RCS file: texmf/adj.mk
diff -N texmf/adj.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texmf/adj.mk 3 Jan 2015 16:18:49 -0000
@@ -0,0 +1,130 @@
+# $OpenBSD$
+
+SCRIPTS_DIR = texmf-dist/scripts
+
+MODPY_ADJ_FILES = ${SCRIPTS_DIR}/ebong/ebong.py \
+ ${SCRIPTS_DIR}/dviasm/dviasm.py \
+ ${SCRIPTS_DIR}/texliveonfly/texliveonfly.py \
+ ${SCRIPTS_DIR}/de-macro/de-macro
+
+RUBY_ADJ_FILES = ${SCRIPTS_DIR}/convbkmk/convbkmk.rb \
+ ${SCRIPTS_DIR}/context/ruby/textools.rb \
+ ${SCRIPTS_DIR}/context/ruby/texmfstart.rb \
+ ${SCRIPTS_DIR}/context/ruby/texexec.rb \
+ ${SCRIPTS_DIR}/context/ruby/rlxtools.rb \
+ ${SCRIPTS_DIR}/context/ruby/imgtopdf.rb \
+ ${SCRIPTS_DIR}/context/ruby/pstopdf.rb \
+ ${SCRIPTS_DIR}/context/ruby/xmltools.rb \
+ ${SCRIPTS_DIR}/context/ruby/ctxtools.rb \
+ ${SCRIPTS_DIR}/context/ruby/pdftools.rb \
+ ${SCRIPTS_DIR}/context/ruby/tmftools.rb \
+ ${SCRIPTS_DIR}/match_parens/match_parens
+
+# Only scripts which don't already use '#!/usr/bin/perl'
+MODPERL_ADJ_FILES = ${SCRIPTS_DIR}/authorindex/authorindex \
+ ${SCRIPTS_DIR}/xindy/texindy.pl \
+ ${SCRIPTS_DIR}/xindy/xindy.pl \
+ ${SCRIPTS_DIR}/flowfram/flowfram.perl \
+ ${SCRIPTS_DIR}/pdfcrop/pdfcrop.pl \
+ ${SCRIPTS_DIR}/chktex/deweb.pl \
+ ${SCRIPTS_DIR}/purifyeps/purifyeps \
+ ${SCRIPTS_DIR}/mkgrkindex/mkgrkindex \
+ ${SCRIPTS_DIR}/latex2man/latex2man \
+ ${SCRIPTS_DIR}/jmlr/makejmlrbook \
+ ${SCRIPTS_DIR}/bundledoc/bundledoc \
+ ${SCRIPTS_DIR}/bundledoc/arlatex \
+ ${SCRIPTS_DIR}/latexdiff/latexdiff.pl \
+ ${SCRIPTS_DIR}/latexdiff/latexrevise.pl \
+ ${SCRIPTS_DIR}/latexdiff/latexdiff-vc.pl \
+ ${SCRIPTS_DIR}/pedigree-perl/pedigree.pl \
+ ${SCRIPTS_DIR}/ps2eps/ps2eps.pl \
+ ${SCRIPTS_DIR}/mkjobtexmf/mkjobtexmf.pl \
+ ${SCRIPTS_DIR}/fig4latex/fig4latex \
+ ${SCRIPTS_DIR}/fontools/ot2kpx \
+ ${SCRIPTS_DIR}/fontools/afm2afm \
+ ${SCRIPTS_DIR}/fontools/autoinst \
+ ${SCRIPTS_DIR}/jfontmaps/kanji-config-updmap.pl \
+ ${SCRIPTS_DIR}/jfontmaps/kanji-fontmap-creator.pl \
+ ${SCRIPTS_DIR}/sty2dtx/sty2dtx.pl \
+ ${SCRIPTS_DIR}/latexmk/latexmk.pl \
+ ${SCRIPTS_DIR}/glossaries/makeglossaries \
+ ${SCRIPTS_DIR}/epstopdf/epstopdf.pl \
+ ${SCRIPTS_DIR}/ctanify/ctanify \
+ ${SCRIPTS_DIR}/texdiff/texdiff \
+ ${SCRIPTS_DIR}/pax/pdfannotextractor.pl \
+ ${SCRIPTS_DIR}/tex4ht/mk4ht.pl \
+ ${SCRIPTS_DIR}/pkfix-helper/pkfix-helper \
+ ${SCRIPTS_DIR}/psutils/psmerge.pl \
+ ${SCRIPTS_DIR}/psutils/fixtpps.pl \
+ ${SCRIPTS_DIR}/psutils/fixdlsrps.pl \
+ ${SCRIPTS_DIR}/psutils/fixwpps.pl \
+ ${SCRIPTS_DIR}/psutils/fixpsditps.pl \
+ ${SCRIPTS_DIR}/psutils/extractres.pl \
+ ${SCRIPTS_DIR}/psutils/fixpspps.pl \
+ ${SCRIPTS_DIR}/psutils/includeres.pl \
+ ${SCRIPTS_DIR}/psutils/fixwfwps.pl \
+ ${SCRIPTS_DIR}/psutils/fixscribeps.pl \
+ ${SCRIPTS_DIR}/psutils/fixwwps.pl \
+ ${SCRIPTS_DIR}/psutils/fixfmps.pl \
+ ${SCRIPTS_DIR}/texloganalyser/texloganalyser \
+ ${SCRIPTS_DIR}/texdef/texdef.pl \
+ ${SCRIPTS_DIR}/perltex/perltex.pl \
+ ${SCRIPTS_DIR}/texdoctk/texdoctk.pl \
+ ${SCRIPTS_DIR}/oberdiek/pdfatfi.pl \
+ ${SCRIPTS_DIR}/dosepsbin/dosepsbin.pl \
+ ${SCRIPTS_DIR}/texcount/texcount.pl \
+ ${SCRIPTS_DIR}/texlive/updmap.pl \
+ ${SCRIPTS_DIR}/texlive/e2pall.pl \
+ ${SCRIPTS_DIR}/texlive/uninstall-win32.pl \
+ ${SCRIPTS_DIR}/texlive/tlmgrgui.pl \
+ ${SCRIPTS_DIR}/texlive/tlmgr.pl
+
+TEXLUA_ADJ_FILES = ${SCRIPTS_DIR}/musixtex/musixtex.lua \
+ ${SCRIPTS_DIR}/musixtex/musixflx.lua \
+ ${SCRIPTS_DIR}/pmx/pmx2pdf.lua \
+ ${SCRIPTS_DIR}/ptex2pdf/ptex2pdf.lua \
+ ${SCRIPTS_DIR}/cachepic/cachepic.tlu \
+ ${SCRIPTS_DIR}/pfarrei/a5toa4.tlu \
+ ${SCRIPTS_DIR}/pfarrei/pfarrei.tlu \
+ ${SCRIPTS_DIR}/splitindex/splitindex.tlu \
+ ${SCRIPTS_DIR}/splitindex/splitindex_main.tlu \
+ ${SCRIPTS_DIR}/context/stubs/mswin/mtxrun.lua \
+ ${SCRIPTS_DIR}/context/stubs/unix/mtxrun \
+ ${SCRIPTS_DIR}/context/lua/mtxrun.lua \
+ ${SCRIPTS_DIR}/context/lua/third/rst/mtx-t-rst.lua \
+ ${SCRIPTS_DIR}/texdoc/texdoc.tlu \
+ ${SCRIPTS_DIR}/luaotfload/mkcharacters \
+ ${SCRIPTS_DIR}/luaotfload/luaotfload-tool.lua \
+ ${SCRIPTS_DIR}/luaotfload/luaotfload-legacy-tool.lua \
+ ${SCRIPTS_DIR}/luaotfload/mkglyphlist \
+ ${SCRIPTS_DIR}/epspdf/epspdf.tlu \
+ ${SCRIPTS_DIR}/m-tx/m-tx.lua \
+ ${SCRIPTS_DIR}/tlgs/gswin32/eps2eps.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/ps2pdf13.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/ps2ps2.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/pdf2dsc.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/ps2ps.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/ps2pdf12.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/pdfopt.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/ps2ascii.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/ps2pdf.tlu \
+ ${SCRIPTS_DIR}/tlgs/gswin32/ps2pdf14.tlu \
+ ${SCRIPTS_DIR}/checkcites/checkcites.lua \
+ ${SCRIPTS_DIR}/texlive/rungs.tlu \
+ ${SCRIPTS_DIR}/texlive/test-tlpdb.tlu \
+ ${SCRIPTS_DIR}/texlive/texconf.tlu \
+ ${SCRIPTS_DIR}/texlive/lua/texlive/getopt.tlu \
+ ${SCRIPTS_DIR}/texlive/lua/texlive/tlpdb.tlu
+
+# Only scripts that have not been patched to work with /bin/sh or /bin/ksh
+BASH_ADJ_FILES = ${SCRIPTS_DIR}/dtxgen/dtxgen \
+ ${SCRIPTS_DIR}/changes/delcmdchanges.bash \
+ ${SCRIPTS_DIR}/shipunov/biokey2html.sh \
+ ${SCRIPTS_DIR}/logicpuzzle/createlpsudoku \
+ ${SCRIPTS_DIR}/logicpuzzle/lpsmag \
+ ${SCRIPTS_DIR}/latexfileversion/latexfileversion \
+ ${SCRIPTS_DIR}/arara/arara.sh \
+ ${SCRIPTS_DIR}/listbib/listbib \
+ ${SCRIPTS_DIR}/lua2dox/lua2dox_filter
+
+WISH_ADJ_FILES = ${SCRIPTS_DIR}/epspdf/epspdftk.tcl
Index: texmf/patches/patch-texmf-dist_scripts_a2ping_a2ping_pl
===================================================================
RCS file: texmf/patches/patch-texmf-dist_scripts_a2ping_a2ping_pl
diff -N texmf/patches/patch-texmf-dist_scripts_a2ping_a2ping_pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texmf/patches/patch-texmf-dist_scripts_a2ping_a2ping_pl 3 Jan 2015
14:32:31 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- texmf-dist/scripts/a2ping/a2ping.pl.origy Wed May 14 00:33:51 2008
++++ texmf-dist/scripts/a2ping/a2ping.pl Sat Jan 3 14:30:25 2015
+@@ -2,7 +2,7 @@
+ eval '(exit $?0)' && eval 'PERL_BADLANG=x;export PERL_BADLANG;: \
+ ;exec perl -x -S -- "$0" ${1+"$@"};#'if 0;
+ eval 'setenv PERL_BADLANG x;exec perl -x -S -- "$0" $argv:q;#'.q+
+-#!perl -w
++#!/usr/bin/perl -w
+ package Htex::a2ping;
$0=~/(.*)/s;unshift@INC,'.';do($1);die$@if$@;__END__+if !1;
+ # This Perl script was generated by JustLib2 at Wed Apr 23 09:14:13 2003.
+ # Don't touch/remove any lines above; http://www.inf.bme.hu/~pts/justlib
Index: texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh
===================================================================
RCS file: texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh
diff -N texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texmf/patches/patch-texmf-dist_scripts_bibexport_bibexport_sh 4 Jan
2015 12:31:23 -0000
@@ -0,0 +1,45 @@
+$OpenBSD$
+--- texmf-dist/scripts/bibexport/bibexport.sh.origy Tue Mar 12 00:01:41 2013
++++ texmf-dist/scripts/bibexport/bibexport.sh Sun Jan 4 12:29:41 2015
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ##
+ ## This is file `bibexport.sh',
+ ## generated with the docstrip utility.
+@@ -38,7 +38,7 @@
+ ## Grave accent \` Left brace \{ Vertical bar \|
+ ## Right brace \} Tilde \~}
+ ##
+-function checkversion()
++checkversion()
+ {
+ kpsewhich expcites.bst > /dev/null ||
+ echo "-----------
+@@ -50,7 +50,7 @@ function checkversion()
+ script.
+ -----------"
+ }
+-function usage()
++usage()
+ {
+ echo "bibexport: a tool to extract BibTeX entries out of .bib files.
+ usage: `basename $0` [-h|v|n|c|a|d|s|t] [-b|e|es|ec|o|r file] file...
+@@ -76,7 +76,7 @@ Advanced options:
+ -d, --debug create intermediate files but don't run BibTeX";
+ exit 0;
+ }
+-function opttoolate()
++opttoolate()
+ {
+ if [ ${TOOLATE} -ne 0 ]; then
+ echo "No option is allowed after the input files";
+@@ -256,7 +256,7 @@ FINALFILE=${OUTPUT};
+ if [ ! "${FINALFILE}" ]; then
+ FINALFILE="bibexport.bib";
+ fi
+-TMPFILE="bibexp.`date +%s`";
++TMPFILE="`mktemp bibexp.XXXXXXXX`";
+ if [ -z "${EXT}" ]; then ## we export all entries
+ if [ -z "${EXTRA}" ]; then ## we have no extra files
+ cat > ${TMPFILE}.aux <<EOF
Index: texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun
===================================================================
RCS file: texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun
diff -N texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texmf/patches/patch-texmf-dist_scripts_context_stubs_unix_mtxrun 8 Jan
2015 09:09:51 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- texmf-dist/scripts/context/stubs/unix/mtxrun.origy Thu Jan 8 09:04:00 2015
++++ texmf-dist/scripts/context/stubs/unix/mtxrun Thu Jan 8 09:09:41 2015
+@@ -16281,11 +16281,11 @@ messages = messages or { } -- for the moment
+ runners = runners or { } -- global (might become local)
+
+ runners.applications = {
+- ["lua"] = "luatex --luaonly",
+- ["luc"] = "luatex --luaonly",
+- ["pl"] = "perl",
+- ["py"] = "python",
+- ["rb"] = "ruby",
++ ["lua"] = "${LOCALBASE}/bin/luatex --luaonly",
++ ["luc"] = "${LOCALBASE}/bin/luatex --luaonly",
++ ["pl"] = "/usr/bin/perl",
++ ["py"] = "${MODPY_BIN}",
++ ["rb"] = "${RUBY}",
+ }
+
+ runners.suffixes = {
Index: texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl
===================================================================
RCS file: texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl
diff -N texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texmf/patches/patch-texmf-dist_scripts_installfont_installfont-tl 4 Jan
2015 12:31:26 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+--- texmf-dist/scripts/installfont/installfont-tl.origy Tue Mar 12
00:01:41 2013
++++ texmf-dist/scripts/installfont/installfont-tl Sun Jan 4 12:31:05 2015
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/ksh
+ #
+ # installfont-tl [options]
+ #
+@@ -36,7 +36,7 @@ INSTALLAS="rmdefault"
+ SMFFSTY="%"
+ LOG="false"
+ #
+-function printHelp()
++printHelp()
+ {
+ echo -e \
+ " `basename $0` [options]\n"\
+@@ -74,7 +74,7 @@ function printHelp()
+ " for more information"
+ exit 0;
+ }
+-function printVersion()
++printVersion()
+ {
+ echo "This is version $VERSION of `basename $0`"
+ exit 0;
+@@ -85,7 +85,7 @@ then
+ echo -e "`basename $0`: Could not find command line arguments.\nUse the
'--help' option for explanation."
+ echo -e "Continue with default script variables? (y/n)"
+ read ANSWER
+- if [ $ANSWER = "n" -o $ANSWER = "N" ]
++ if [ X"$ANSWER" = "Xn" -o X"$ANSWER" = "XN" ]
+ then
+ exit 1
+ fi
+@@ -582,4 +582,4 @@ then
+ rmdir ./Backup
+ fi
+ echo -e "\n\nThe font(s) should be installed now!"
+-exit 0
+\ No newline at end of file
++exit 0
Index: texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion
===================================================================
RCS file:
texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion
diff -N texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texmf/patches/patch-texmf-dist_scripts_latexfileversion_latexfileversion
3 Jan 2015 14:32:27 -0000
@@ -0,0 +1,46 @@
+$OpenBSD$
+--- texmf-dist/scripts/latexfileversion/latexfileversion.origy Tue Mar 12
00:01:41 2013
++++ texmf-dist/scripts/latexfileversion/latexfileversion Sat Jan 3
14:31:52 2015
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ ## latexfileversion
+ ##
+ ## This simple shell script prints the version and date of a LaTeX class or
+@@ -41,8 +41,8 @@ then
+ fi
+
+ # make temporary directory
+-TMPDIR=`mktemp -d /tmp/latexfileversion.XXXXXX` || exit 1
+-cd $TMPDIR
++MYTMPDIR="`mktemp -dt latexfileversion.XXXXXX`" || exit 1
++cd $MYTMPDIR
+
+ # extract basenames for extensions .cls and .sty
+ FILE=$1
+@@ -50,7 +50,7 @@ STYLE=${1%%.sty}
+ CLASS=${1%%.cls}
+
+ # handle .cls files and .sty files seperately
+-if [ "$CLASS.cls" == "$FILE" ]
++if [ X"$CLASS.cls" = X"$FILE" ]
+ then
+ echo -n "Looking for class file '$CLASS.cls': "
+ # generate temporary LaTeX file
+@@ -75,7 +75,7 @@ cat << EOM
+ EOM
+ ) > latexfileversion.tex
+ else
+- if [ "$STYLE.sty" == "$FILE" ]
++ if [ X"$STYLE.sty" = X"$FILE" ]
+ then
+ echo -n "Looking for style file '$STYLE.sty': "
+ # generate temporary LaTeX file
+@@ -113,6 +113,6 @@ pdflatex -interaction=nonstopmode latexfileversion.tex
+ grep -e '^VERSION' latexfileversion.log | sed 's/VERSION //'
+
+ # delete temporary directory
+-rm -rf $TMPDIR
++rm -rf $MYTMPDIR
+
+ #EOF
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
