summaryrefslogtreecommitdiff
path: root/print/teTeX-bin
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-12-24 12:51:31 +0000
committerjmmv <jmmv>2003-12-24 12:51:31 +0000
commitc271007e8ba2fc1401cd45a3a06a02b252d6e5c9 (patch)
treee5d5155d787fcaf5f5fc96bc03d6bd9cfb50d27a /print/teTeX-bin
parent0c5dc664c632e8f7f43f482c44b8a1a2cf195bba (diff)
downloadpkgsrc-c271007e8ba2fc1401cd45a3a06a02b252d6e5c9.tar.gz
Update teTeX packages to 2.0.2 (really merge teTeX2 into teTeX). The 2.x
branch becomes the default teTeX package.
Diffstat (limited to 'print/teTeX-bin')
-rw-r--r--print/teTeX-bin/Makefile85
-rw-r--r--print/teTeX-bin/Makefile.common62
-rw-r--r--print/teTeX-bin/PLIST688
-rw-r--r--print/teTeX-bin/distinfo27
-rw-r--r--print/teTeX-bin/kpathsea.buildlink2.mk4
-rw-r--r--print/teTeX-bin/patches/patch-aa30
-rw-r--r--print/teTeX-bin/patches/patch-ab13
-rw-r--r--print/teTeX-bin/patches/patch-ac12
-rw-r--r--print/teTeX-bin/patches/patch-ad12
-rw-r--r--print/teTeX-bin/patches/patch-ae13
-rw-r--r--print/teTeX-bin/patches/patch-af22
-rw-r--r--print/teTeX-bin/patches/patch-ag13
-rw-r--r--print/teTeX-bin/patches/patch-ah98
-rw-r--r--print/teTeX-bin/patches/patch-ai92
-rw-r--r--print/teTeX-bin/patches/patch-aj12
-rw-r--r--print/teTeX-bin/patches/patch-ak49
-rw-r--r--print/teTeX-bin/patches/patch-al132
-rw-r--r--print/teTeX-bin/patches/patch-am40
-rw-r--r--print/teTeX-bin/patches/patch-an13
-rw-r--r--print/teTeX-bin/patches/patch-ao18
-rw-r--r--print/teTeX-bin/patches/patch-ap78
-rw-r--r--print/teTeX-bin/patches/patch-aq24
22 files changed, 520 insertions, 1017 deletions
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index e1076323a4e..12ec02a77d8 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,92 +1,36 @@
-# $NetBSD: Makefile,v 1.50 2003/11/07 16:20:26 gavan Exp $
+# $NetBSD: Makefile,v 1.51 2003/12/24 12:51:31 jmmv Exp $
-DISTNAME= teTeX-src-1.0.7
-PKGNAME= teTeX-bin-1.0.7
-PKGREVISION= 3
-WRKSRC= ${WRKDIR}/teTeX-1.0
+DISTNAME= tetex-src-${TETEX_BIN_VERS}
+PKGNAME= teTeX-bin-${TETEX_BIN_VERS}
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
+MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
-MAINTAINER= hubertf@NetBSD.org
+MAINTAINER= kei@NetBSD.org
HOMEPAGE= http://www.tug.org/tetex/
-COMMENT= TeX distribution for UNIX compatible systems - executables
+COMMENT= TeX distribution for UNIX compatible systems - executables, version 2
+
+CONFLICTS+= teTeX2-bin-[0-9]*
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-DEPENDS+= teTeX-share>=1.0.2nb1:../teTeX-share
+DEPENDS+= teTeX-share>=2.0.2:../teTeX-share
DEPENDS+= dialog-0.6z*:../../misc/dialog
CONFLICTS+= omega-[0-9]*
-DIST_SUBDIR= teTeX
-ALL_TARGET= all
-INSTALL_TARGET= install strip
-
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-USE_GCC_SHLIB= yes
-USE_GMAKE= yes
-USE_X11= yes
-CFLAGS+= -Dunix
+INFO_FILES= latex.info dvips.info web2c.info kpathsea.info
-INFO_FILES= latex.info dvips.info web2c.info kpathsea.info
+REPLACE_PERL= texk/xdvik/t1mapper \
+ texk/oxdvik/t1mapper
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-GNU_CONFIGURE= yes
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/texk/config.guess
-CONFIG_GUESS_OVERRIDE+= ${WRKSRC}/config/config.guess
-CONFIG_GUESS_OVERRIDE+= ${WRKSRC}/libs/ncurses/config.guess
-CONFIG_GUESS_OVERRIDE+= ${WRKSRC}/texinfo/config.guess
-CONFIG_SUB_OVERRIDE= ${WRKSRC}/texk/config.sub
-CONFIG_SUB_OVERRIDE+= ${WRKSRC}/config/config.sub
-CONFIG_SUB_OVERRIDE+= ${WRKSRC}/libs/ncurses/config.sub
-CONFIG_SUB_OVERRIDE+= ${WRKSRC}/texinfo/config.sub
-CONFIGURE_ARGS+= --without-texinfo
-CONFIGURE_ARGS+= --without-dialog
-CONFIGURE_ARGS+= --disable-multiplatform
-CONFIGURE_ARGS+= --enable-ipc
-CONFIGURE_ARGS+= --with-epsfwin
-CONFIGURE_ARGS+= --with-hp2627win
-CONFIGURE_ARGS+= --with-mftalkwin
-CONFIGURE_ARGS+= --with-x11
-CONFIGURE_ARGS+= --with-libwww-config=${LOCALBASE}/bin/libwww-config
-CONFIGURE_ARGS+= --with-system-pnglib
-CONFIGURE_ARGS+= --with-pnglib-include=${BUILDLINK_PREFIX.png}/include
-CONFIGURE_ARGS+= --with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
-CONFIGURE_ARGS+= --with-system-zlib
-CONFIGURE_ARGS+= --with-zlib-include=${BUILDLINK_PREFIX.zlib}/include
-CONFIGURE_ARGS+= --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
-
.include "../../mk/bsd.prefs.mk"
# sysutils/coreutils installs a 'readlink' program, so conflict with it if
# GNU_PROGRAM_PREFIX == ''
.if ${GNU_PROGRAM_PREFIX} == ""
-CONFLICTS+= coreutils-[0-9]*
+CONFLICTS+= coreutils-[0-9]*
.endif
-.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
-CONFIGURE_ARGS+= --enable-a4
-.endif
-
-.if ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+= --enable-auto-core
-.endif
-
-.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} == "6"
-# Darwin 6.x's default (3.1ish) g++ has a bug that breaks the xpdf build
-CXX= g++2
-.endif
-
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
-
-TEXFONTSDIR= /var/spool/texfonts
-OWN_DIRS= ${TEXFONTSDIR}
-OWN_DIRS_PERMS= ${TEXFONTSDIR}/pk ${ROOT_USER} ${ROOT_GROUP} 1777
-OWN_DIRS_PERMS+= ${TEXFONTSDIR}/source ${ROOT_USER} ${ROOT_GROUP} 1777
-OWN_DIRS_PERMS+= ${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
-
post-install:
@${RM} ${PREFIX}/share/texmf/web2c/*.log
.if defined(PAPERSIZE)
@@ -101,7 +45,6 @@ post-install:
${LOCALBASE}/bin/texconfig font vardir /var/spool/texfonts
${LOCALBASE}/bin/texconfig font options appendonlydir varfonts
-.include "../../graphics/png/buildlink2.mk"
-.include "../../www/libwww/buildlink2.mk"
+.include "../../print/teTeX-bin/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
new file mode 100644
index 00000000000..6355edd4255
--- /dev/null
+++ b/print/teTeX-bin/Makefile.common
@@ -0,0 +1,62 @@
+# $NetBSD: Makefile.common,v 1.1 2003/12/24 12:51:31 jmmv Exp $
+
+TETEX_BIN_VERS= 2.0.2
+DIST_SUBDIR= teTeX
+ALL_TARGET= all
+INSTALL_TARGET= install strip
+
+USE_BUILDLINK2= yes
+USE_GMAKE= yes
+USE_PKGINSTALL= yes
+USE_X11= yes
+CFLAGS+= -Dunix
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --without-texinfo
+CONFIGURE_ARGS+= --without-dialog
+CONFIGURE_ARGS+= --disable-multiplatform
+CONFIGURE_ARGS+= --enable-ipc
+CONFIGURE_ARGS+= --with-epsfwin
+CONFIGURE_ARGS+= --with-hp2627win
+CONFIGURE_ARGS+= --with-mftalkwin
+CONFIGURE_ARGS+= --with-x11
+CONFIGURE_ARGS+= --with-system-wwwlib
+CONFIGURE_ARGS+= --with-libwww-config=${LOCALBASE}/bin/libwww-config
+CONFIGURE_ARGS+= --with-system-ncurses
+CONFIGURE_ARGS+= --with-ncurses-include=${BUILDLINK_PREFIX.ncurses}/include
+CONFIGURE_ARGS+= --with-ncurses-libdir=${BUILDLINK_PREFIX.ncurses}/lib
+CONFIGURE_ARGS+= --with-system-pnglib
+CONFIGURE_ARGS+= --with-pnglib-include=${BUILDLINK_PREFIX.png}/include
+CONFIGURE_ARGS+= --with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+= --with-system-t1lib
+CONFIGURE_ARGS+= --with-t1lib-include=${BUILDLINK_PREFIX.t1lib}/include
+CONFIGURE_ARGS+= --with-t1lib-libdir=${BUILDLINK_PREFIX.t1lib}/lib
+CONFIGURE_ARGS+= --with-system-zlib
+CONFIGURE_ARGS+= --with-zlib-include=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+= --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(PAPERSIZE) && ${PAPERSIZE} != "A4"
+CONFIGURE_ARGS+= --disable-a4
+.endif
+
+.if ${OPSYS} != "SunOS"
+CONFIGURE_ARGS+= --enable-auto-core
+.endif
+
+CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+ INSTALL_DATA="${INSTALL_DATA}"
+
+TEXFONTSDIR= /var/spool/texfonts
+OWN_DIRS= ${TEXFONTSDIR}
+OWN_DIRS_PERMS= ${TEXFONTSDIR}/pk ${ROOT_USER} ${ROOT_GROUP} 1777
+OWN_DIRS_PERMS+= ${TEXFONTSDIR}/source ${ROOT_USER} ${ROOT_GROUP} 1777
+OWN_DIRS_PERMS+= ${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
+
+.include "../../www/libwww/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../fonts/t1lib/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
diff --git a/print/teTeX-bin/PLIST b/print/teTeX-bin/PLIST
index ee9effe3908..f8e86c67a89 100644
--- a/print/teTeX-bin/PLIST
+++ b/print/teTeX-bin/PLIST
@@ -1,345 +1,381 @@
-@comment $NetBSD: PLIST,v 1.4 2003/08/04 22:02:30 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/24 12:51:31 jmmv Exp $
@comment There are three files in this package that teTeX-share installs
@comment and that teTeX-bin modifies. Take care of this:
-lib/libkpathsea.a
-info/latex.info-3
-info/latex.info-2
-info/latex.info-1
-info/latex.info
-info/dvips.info-4
-info/dvips.info-3
-info/dvips.info-2
-info/dvips.info-1
+bin/MakeTeXPK
+bin/access
+bin/afm2tfm
+bin/allcm
+bin/allec
+bin/allneeded
+bin/bibtex
+bin/ctangle
+bin/cweave
+bin/dmp
+bin/dvi2fax
+bin/dvicopy
+bin/dvihp
+bin/dvilj
+bin/dvilj2p
+bin/dvilj4
+bin/dvilj4l
+bin/dvilj6
+bin/dvipdfm
+bin/dvipdft
+bin/dvips
+bin/dvired
+bin/dvitomp
+bin/dvitype
+bin/e2pall
+bin/ebb
+bin/einitex
+bin/elatex
+bin/epstopdf
+bin/etex
+bin/evirtex
+bin/fdf2tan
+bin/fmtutil
+bin/fontexport
+bin/fontimport
+bin/fontinst
+bin/gftodvi
+bin/gftopk
+bin/gftype
+bin/gsftopk
+bin/inimf
+bin/inimpost
+bin/iniomega
+bin/initex
+bin/kpsepath
+bin/kpsestat
+bin/kpsetool
+bin/kpsewhich
+bin/kpsexpand
+bin/lambda
+bin/latex
+bin/mag
+bin/makeindex
+bin/makempx
+bin/makempy
+bin/mf
+bin/mf-nowin
+bin/mft
+bin/mfw
+bin/mkfontdesc
+bin/mkindex
+bin/mkocp
+bin/mkofm
+bin/mktexfmt
+bin/mktexlsr
+bin/mktexmf
+bin/mktexpk
+bin/mktextfm
+bin/mpost
+bin/mpto
+bin/mptopdf
+bin/newer
+bin/odvicopy
+bin/odvips
+bin/odvitype
+bin/ofm2opl
+bin/omega
+bin/omfonts
+bin/opl2ofm
+bin/otangle
+bin/otp2ocp
+bin/outocp
+bin/ovf2ovp
+bin/ovp2ovf
+bin/oxdvi
+bin/oxdvi.bin
+bin/patgen
+bin/pdfeinitex
+bin/pdfelatex
+bin/pdfetex
+bin/pdfevirtex
+bin/pdfinitex
+bin/pdflatex
+bin/pdftex
+bin/pdftosrc
+bin/pdfvirtex
+bin/pfb2pfa
+bin/pk2bm
+bin/pktogf
+bin/pktype
+bin/pltotf
+bin/pooltype
+bin/ps2frag
+bin/ps2pk
+bin/pslatex
+bin/readlink
+bin/rubibtex
+bin/rumakeindex
+bin/t1mapper
+bin/tangle
+bin/tex
+bin/texconfig
+bin/texdoc
+bin/texdoctk
+bin/texexec
+bin/texfind
+bin/texfont
+bin/texhash
+bin/texi2pdf
+bin/texlinks
+bin/texshow
+bin/texutil
+bin/tftopl
+bin/thumbpdf
+bin/tie
+bin/ttf2afm
+bin/updmap
+bin/vftovp
+bin/virmf
+bin/virmpost
+bin/viromega
+bin/virtex
+bin/vptovf
+bin/weave
+bin/xdvi
+bin/xdvi.bin
+bin/xdvizilla
+include/kpathsea/absolute.h
+include/kpathsea/c-auto.h
+include/kpathsea/c-ctype.h
+include/kpathsea/c-dir.h
+include/kpathsea/c-errno.h
+include/kpathsea/c-fopen.h
+include/kpathsea/c-limits.h
+include/kpathsea/c-memstr.h
+include/kpathsea/c-minmax.h
+include/kpathsea/c-namemx.h
+include/kpathsea/c-pathch.h
+include/kpathsea/c-pathmx.h
+include/kpathsea/c-proto.h
+include/kpathsea/c-stat.h
+include/kpathsea/c-std.h
+include/kpathsea/c-unistd.h
+include/kpathsea/c-vararg.h
+include/kpathsea/cnf.h
+include/kpathsea/concatn.h
+include/kpathsea/config.h
+include/kpathsea/db.h
+include/kpathsea/debug.h
+include/kpathsea/default.h
+include/kpathsea/expand.h
+include/kpathsea/fn.h
+include/kpathsea/fontmap.h
+include/kpathsea/getopt.h
+include/kpathsea/hash.h
+include/kpathsea/kpathsea.h
+include/kpathsea/lib.h
+include/kpathsea/line.h
+include/kpathsea/magstep.h
+include/kpathsea/paths.h
+include/kpathsea/pathsearch.h
+include/kpathsea/proginit.h
+include/kpathsea/progname.h
+include/kpathsea/readable.h
+include/kpathsea/str-list.h
+include/kpathsea/str-llist.h
+include/kpathsea/systypes.h
+include/kpathsea/tex-file.h
+include/kpathsea/tex-glyph.h
+include/kpathsea/tex-hush.h
+include/kpathsea/tex-make.h
+include/kpathsea/tilde.h
+include/kpathsea/truncate.h
+include/kpathsea/types.h
+include/kpathsea/variable.h
+include/kpathsea/xopendir.h
+include/kpathsea/xstat.h
info/dvips.info
-info/web2c.info-4
-info/web2c.info-3
-info/web2c.info-2
-info/web2c.info-1
-info/web2c.info
+info/dvips.info-1
+info/dvips.info-2
+info/dvips.info-3
+info/dvips.info-4
info/kpathsea.info
-include/kpathsea/xstat.h
-include/kpathsea/xopendir.h
-include/kpathsea/win32lib.h
-include/kpathsea/variable.h
-include/kpathsea/types.h
-include/kpathsea/truncate.h
-include/kpathsea/tilde.h
-include/kpathsea/tex-make.h
-include/kpathsea/tex-hush.h
-include/kpathsea/tex-glyph.h
-include/kpathsea/tex-file.h
-include/kpathsea/systypes.h
-include/kpathsea/str-llist.h
-include/kpathsea/str-list.h
-include/kpathsea/readable.h
-include/kpathsea/progname.h
-include/kpathsea/proginit.h
-include/kpathsea/pathsearch.h
-include/kpathsea/paths.h
-include/kpathsea/magstep.h
-include/kpathsea/line.h
-include/kpathsea/lib.h
-include/kpathsea/kpathsea.h
-include/kpathsea/hash.h
-include/kpathsea/getopt.h
-include/kpathsea/fontmap.h
-include/kpathsea/fn.h
-include/kpathsea/expand.h
-include/kpathsea/default.h
-include/kpathsea/debug.h
-include/kpathsea/db.h
-include/kpathsea/config.h
-include/kpathsea/concatn.h
-include/kpathsea/cnf.h
-include/kpathsea/c-vararg.h
-include/kpathsea/c-unistd.h
-include/kpathsea/c-std.h
-include/kpathsea/c-stat.h
-include/kpathsea/c-proto.h
-include/kpathsea/c-pathmx.h
-include/kpathsea/c-pathch.h
-include/kpathsea/c-namemx.h
-include/kpathsea/c-minmax.h
-include/kpathsea/c-memstr.h
-include/kpathsea/c-limits.h
-include/kpathsea/c-fopen.h
-include/kpathsea/c-errno.h
-include/kpathsea/c-dir.h
-include/kpathsea/c-ctype.h
-include/kpathsea/c-auto.h
-include/kpathsea/absolute.h
-@dirrm include/kpathsea
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/linot-cd.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/itc.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/softkey.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/skey1555.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/skey1250.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/yandy.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/wolfram.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/width.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/weight.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/variant.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/urw.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/typeface.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/texfonts.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/special.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/supplier.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/monotype.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/linotype.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/dtc.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/bitstrea.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/apple.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/fontname/adobe.map
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/base/crop.pro
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/base/color.pro
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/base/finclude.pro
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/base/special.pro
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/base/texc.pro
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/base/texps.pro
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/base/tex.pro
-@comment also in teTeX-share; touched but unmodified: share/texmf/dvips/gsftopk/render.ps
-share/texmf/web2c/plain.mem
-share/texmf/web2c/mpost.mem
-share/texmf/web2c/mfw.base
-share/texmf/web2c/plain.base
-share/texmf/web2c/mf.base
-share/texmf/web2c/tex.fmt
-share/texmf/web2c/pdflatex.fmt
-share/texmf/web2c/pdftex.fmt
-share/texmf/web2c/pdfetex.efmt
-share/texmf/web2c/pdfelatex.efmt
-share/texmf/web2c/plain.fmt
-share/texmf/web2c/omega.fmt
-share/texmf/web2c/latex.fmt
-share/texmf/web2c/lambda.fmt
-share/texmf/web2c/etex.efmt
-share/texmf/web2c/elatex.efmt
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/cp8bit.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/kam-t1.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/kam-cs.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/maz-pl.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/il2-t1.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/il2-pl.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/il2-cs.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/il1-t1.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/cp852-pl.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/cp852-cs.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/cp1250t1.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/cp1250pl.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/cp1250cs.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/amiga-pl.tcx
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/pdfetex.pool
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mp.pool
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mf.pool
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/pdftex.pool
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/omega.pool
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/etex.pool
-share/texmf/web2c/fmtutil.cnf
-share/texmf/web2c/mktex.cnf
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktexupd
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktexnam.opt
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktexnam
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktexdir.opt
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktexdir
-@comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktex.opt
-man/man1/xdvi.1
+info/latex.info
+info/latex.info-1
+info/latex.info-2
+info/latex.info-3
+info/web2c.info
+info/web2c.info-1
+info/web2c.info-2
+info/web2c.info-3
+info/web2c.info-4
+lib/libkpathsea.a
man/man1/MakeTeXPK.1
+man/man1/access.1
+man/man1/afm2tfm.1
+man/man1/allcm.1
+man/man1/allec.1
+man/man1/allneeded.1
+man/man1/amstex.1
+man/man1/bibtex.1
+man/man1/cont-de.1
man/man1/cont-en.1
man/man1/cont-nl.1
-man/man1/cont-de.1
-man/man1/pdflatex.1
-man/man1/pdfvirtex.1
-man/man1/pdfinitex.1
-man/man1/lambda.1
-man/man1/viromega.1
-man/man1/iniomega.1
-man/man1/virmpost.1
-man/man1/inimpost.1
-man/man1/virmf.1
-man/man1/inimf.1
+man/man1/cweb.1
+man/man1/dmp.1
+man/man1/dvi2fax.1
+man/man1/dvicopy.1
+man/man1/dvihp.1
+man/man1/dvilj.1
+man/man1/dvipdfm.1
+man/man1/dvips.1
+man/man1/dvired.1
+man/man1/dvitomp.1
+man/man1/dvitype.1
+man/man1/e2pall.1
+man/man1/einitex.1
man/man1/elatex.1
+man/man1/eplain.1
+man/man1/epstopdf.1
+man/man1/etex.1
man/man1/evirtex.1
-man/man1/einitex.1
-man/man1/virtex.1
-man/man1/initex.1
-man/man1/texhash.1
-man/man1/allec.1
-man/man1/fontimport.1
man/man1/fontexport.1
-man/man1/dvired.1
-man/man1/allneeded.1
-man/man1/allcm.1
-man/man1/ps2frag.1
-man/man1/texconfig.1
-man/man1/ps2pk.1
-man/man1/pk2bm.1
-man/man1/pfb2pfa.1
+man/man1/fontimport.1
+man/man1/fontinst.1
+man/man1/gftodvi.1
+man/man1/gftopk.1
+man/man1/gftype.1
+man/man1/gsftopk.1
+man/man1/inimf.1
+man/man1/inimpost.1
+man/man1/iniomega.1
+man/man1/initex.1
+man/man1/kpsepath.1
+man/man1/kpsestat.1
+man/man1/kpsetool.1
+man/man1/kpsewhich.1
+man/man1/kpsexpand.1
+man/man1/lambda.1
+man/man1/latex.1
man/man1/mag.1
man/man1/makeindex.1
-man/man1/gsftopk.1
-man/man1/afm2tfm.1
-man/man1/dvips.1
-man/man1/dvilj.1
-man/man1/tie.1
-man/man1/weave.1
-man/man1/vptovf.1
-man/man1/vftovp.1
-man/man1/tftopl.1
-man/man1/tex.1
-man/man1/tangle.1
-man/man1/pooltype.1
-man/man1/pltotf.1
-man/man1/pktype.1
-man/man1/pktogf.1
-man/man1/pdftex.1
-man/man1/patgen.1
-man/man1/omega.1
-man/man1/newer.1
-man/man1/mpto.1
-man/man1/mpost.1
-man/man1/mft.1
-man/man1/mf.1
man/man1/makempx.1
-man/man1/latex.1
-man/man1/gftype.1
-man/man1/gftopk.1
-man/man1/gftodvi.1
-man/man1/etex.1
-man/man1/eplain.1
-man/man1/dvitype.1
-man/man1/dvicopy.1
-man/man1/dmp.1
-man/man1/bibtex.1
-man/man1/amstex.1
+man/man1/mf.1
+man/man1/mft.1
+man/man1/mkindex.1
+man/man1/mktexlsr.1
+man/man1/mktexmf.1
man/man1/mktexpk.1
man/man1/mktextfm.1
-man/man1/mktexmf.1
-man/man1/mktexlsr.1
+man/man1/mpost.1
+man/man1/mpto.1
+man/man1/newer.1
+man/man1/omega.1
+man/man1/patgen.1
+man/man1/pdfetex.1
+man/man1/pdfinitex.1
+man/man1/pdflatex.1
+man/man1/pdftex.1
+man/man1/pdfvirtex.1
+man/man1/pfb2pfa.1
+man/man1/pk2bm.1
+man/man1/pktogf.1
+man/man1/pktype.1
+man/man1/pltotf.1
+man/man1/pooltype.1
+man/man1/ps2frag.1
+man/man1/ps2pk.1
+man/man1/pslatex.1
man/man1/readlink.1
-man/man1/kpsewhich.1
-man/man1/kpsestat.1
-man/man1/access.1
-bin/lambda
-bin/pdfelatex
-bin/pdflatex
-bin/elatex
-bin/latex
-bin/xdvi
-bin/xdvi.bin
-bin/texhash
-bin/kpsexpand
-bin/kpsepath
-bin/allec
-bin/thumbpdf
-bin/texi2pdf
-bin/epstopdf
-bin/e2pall
-bin/texshow
-bin/texexec
-bin/texutil
-bin/texlinks
-bin/texdoc
-bin/fmtutil
-bin/rumakeindex
-bin/rubibtex
-bin/fontinst
-bin/MakeTeXPK
-bin/mkfontdesc
-bin/kpsetool
-bin/fontimport
-bin/fontexport
-bin/allneeded
-bin/allcm
-bin/pslatex
-bin/dvired
-bin/texconfig
-bin/ps2frag
-bin/dvi2fax
-bin/ps2pk
-bin/pk2bm
-bin/mag
-bin/pfb2pfa
-bin/oxdvi
-bin/oxdvi.bin
-bin/odvips
-bin/mkindex
-bin/makeindex
-bin/gsftopk
-bin/dvips
-bin/afm2tfm
-bin/dvilj6
-bin/dvihp
-bin/dvilj4l
-bin/dvilj4
-bin/dvilj2p
-bin/dvilj
-bin/virmpost
-bin/inimpost
-bin/virmf
-bin/inimf
-bin/pdfevirtex
-bin/pdfeinitex
-bin/pdfvirtex
-bin/pdfinitex
-bin/viromega
-bin/iniomega
-bin/evirtex
-bin/einitex
-bin/virtex
-bin/initex
-bin/mkofm
-bin/mkocp
-bin/outocp
-bin/otp2ocp
-bin/weave
-bin/vptovf
-bin/vftovp
-bin/ttf2afm
-bin/tftopl
-bin/tex
-bin/tangle
-bin/pooltype
-bin/pltotf
-bin/pktype
-bin/pktogf
-bin/pdfetex
-bin/pdftex
-bin/patgen
-bin/otangle
-bin/ovp2ovf
-bin/ovf2ovp
-bin/opl2ofm
-bin/omega
-bin/ofm2opl
-bin/odvitype
-bin/odvicopy
-bin/mpost
-bin/mft
-bin/mfw
-bin/mf
-bin/gftype
-bin/gftopk
-bin/gftodvi
-bin/etex
-bin/dvitype
-bin/dvitomp
-bin/dvicopy
-bin/bibtex
-bin/tie
-bin/makempx
-bin/dmp
-bin/newer
-bin/mpto
-bin/readlink
-bin/access
-bin/kpsestat
-bin/kpsewhich
-bin/mktexlsr
-bin/mktextfm
-bin/mktexmf
-bin/mktexpk
+man/man1/rubibtex.1
+man/man1/rumakeindex.1
+man/man1/t1mapper.1
+man/man1/tangle.1
+man/man1/tex.1
+man/man1/texconfig.1
+man/man1/texdoc.1
+man/man1/texdoctk.1
+man/man1/texexec.1
+man/man1/texhash.1
+man/man1/texi2pdf.1
+man/man1/texshow.1
+man/man1/texutil.1
+man/man1/tftopl.1
+man/man1/thumbpdf.1
+man/man1/tie.1
+man/man1/updmap.1
+man/man1/vftovp.1
+man/man1/virmf.1
+man/man1/virmpost.1
+man/man1/viromega.1
+man/man1/virtex.1
+man/man1/vptovf.1
+man/man1/weave.1
+man/man1/xdvi.1
+man/man1/xdvizilla.1
+man/man5/fmtutil.cnf.5
+man/man8/fmtutil.8
+man/man8/mkfontdesc.8
+man/man8/texlinks.8
+share/texmf/doc/tetex/TETEXDOC.dvi
+share/texmf/doc/tetex/TETEXDOC.pdf
+share/texmf/doc/tetex/TETEXDOC.ps
+share/texmf/doc/tetex/teTeX-FAQ
+share/texmf/dvips/base/color.pro
+share/texmf/dvips/base/crop.pro
+share/texmf/dvips/base/finclude.pro
+share/texmf/dvips/base/hps.pro
+share/texmf/dvips/base/special.pro
+share/texmf/dvips/base/tex.pro
+share/texmf/dvips/base/texc.pro
+share/texmf/dvips/base/texps.pro
+share/texmf/dvips/gsftopk/render.ps
+share/texmf/texconfig/README
+share/texmf/texconfig/g/generic
+share/texmf/texconfig/generic
+share/texmf/texconfig/v/vt100
+share/texmf/texconfig/x/xterm
+share/texmf/web2c/cont-en.efmt
+share/texmf/web2c/elatex.efmt
+share/texmf/web2c/etex-pl.pool
+share/texmf/web2c/etex.efmt
+share/texmf/web2c/etex.pool
+share/texmf/web2c/fmtutil.cnf
+share/texmf/web2c/lambda.oft
+share/texmf/web2c/latex.fmt
+share/texmf/web2c/metafun.mem
+share/texmf/web2c/mf-nowin.base
+share/texmf/web2c/mf.base
+share/texmf/web2c/mf.pool
+share/texmf/web2c/mfw.base
+share/texmf/web2c/mktex.cnf
+share/texmf/web2c/mktex.opt
+share/texmf/web2c/mktexdir
+share/texmf/web2c/mktexdir.opt
+share/texmf/web2c/mktexnam
+share/texmf/web2c/mktexnam.opt
+share/texmf/web2c/mktexupd
+share/texmf/web2c/mp.pool
+share/texmf/web2c/mpost.mem
+share/texmf/web2c/mptopdf.efmt
+share/texmf/web2c/omega.oft
+share/texmf/web2c/omega.pool
+share/texmf/web2c/pdfelatex.efmt
+share/texmf/web2c/pdfetex-pl.pool
+share/texmf/web2c/pdfetex.efmt
+share/texmf/web2c/pdfetex.pool
+share/texmf/web2c/pdflatex.fmt
+share/texmf/web2c/pdftex-pl.pool
+share/texmf/web2c/pdftex.fmt
+share/texmf/web2c/pdftex.pool
+share/texmf/web2c/plain.base
+share/texmf/web2c/plain.fmt
+share/texmf/web2c/plain.mem
+share/texmf/web2c/tex-pl.pool
+share/texmf/web2c/tex.fmt
+share/texmf/web2c/tex.pool
+share/texmf/web2c/texmf.cnf
+share/texmf/xdvi/xdvi.cfg
+@dirrm share/texmf/texconfig/x
+@dirrm share/texmf/texconfig/v
+@dirrm share/texmf/texconfig/g
+@dirrm share/texmf/texconfig
+@dirrm share/texmf/dvips/gsftopk
+@dirrm include/kpathsea
@comment The next file is changed by various sub-pkgs (hugetex, ...)
@exec %D/bin/mktexlsr
@unexec ${RM} -f %D/share/texmf/ls-R
diff --git a/print/teTeX-bin/distinfo b/print/teTeX-bin/distinfo
index 76c50ff32e6..f61b2235017 100644
--- a/print/teTeX-bin/distinfo
+++ b/print/teTeX-bin/distinfo
@@ -1,21 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/10/10 01:11:20 danw Exp $
+$NetBSD: distinfo,v 1.4 2003/12/24 12:51:31 jmmv Exp $
-SHA1 (teTeX/teTeX-src-1.0.7.tar.gz) = ce6ff8a3bffe1fcb04349ad9dd0300e3f410d826
-Size (teTeX/teTeX-src-1.0.7.tar.gz) = 8040192 bytes
-SHA1 (patch-aa) = 513d1f17c0877394919679ad8064f12345064f04
-SHA1 (patch-ab) = 535bd62875a5fab3fd62a356a51a3467a3865f06
-SHA1 (patch-ac) = e26e5696af3887e1a81bc106e0a5a30ddecdc77e
-SHA1 (patch-ad) = dbe002d474d8bdf9ffc7533b61e774be295f479d
-SHA1 (patch-ae) = 3a066e54caaa0a685211456fe297b032a4fb1c2f
-SHA1 (patch-af) = 535ee45a39254d607038bbcc9cd2baee76376bca
-SHA1 (patch-ag) = e403247453a96740c16976cfd2a4f0d899ad977d
-SHA1 (patch-ah) = 7459e52361d4c7387596bdea91bc25f609e0b9c8
-SHA1 (patch-ai) = c86f437382f6ef8167d88e632d9c7ad99121684b
-SHA1 (patch-aj) = e0f196128598bd1b312d409a28ce8962439775b6
-SHA1 (patch-ak) = b00dd7434cfcab239ce46d81e675892c9f0a8da4
-SHA1 (patch-al) = fcb8623abde5fb789aafa4e10e516d0205e0e32f
-SHA1 (patch-am) = 385a56bb5b3203092ed0609b7e49ea0bb549c2bf
-SHA1 (patch-an) = b054e4e96efb52765c6734a51eea9e44ae83cee7
-SHA1 (patch-ao) = f23cd3f747a1371b6bf1ee1e63b1479b4b7b21a4
-SHA1 (patch-ap) = adc18658e73468d30ad2c2d8f24952e6a536c7d5
-SHA1 (patch-aq) = fe1b1ebbb7e72f4606878965e81cc1701101921b
+SHA1 (teTeX/tetex-src-2.0.2.tar.gz) = 6445206b14d659458ee352df78d2c2daf8e88ab3
+Size (teTeX/tetex-src-2.0.2.tar.gz) = 11745933 bytes
+SHA1 (patch-ac) = 7e96a7a14090a6b3009d3562b18ee8383d50d3e0
+SHA1 (patch-ad) = 377f52b45ea66b88f682aaa7f0dd72dee8f986fb
+SHA1 (patch-ap) = 40543e9a2fb87d296557f3a8bd9a7207b2331a8e
+SHA1 (patch-aq) = f90ed07b2de340c55c6d987fdaa59d7ed6d46e0f
diff --git a/print/teTeX-bin/kpathsea.buildlink2.mk b/print/teTeX-bin/kpathsea.buildlink2.mk
index 61160572373..a8d658d9188 100644
--- a/print/teTeX-bin/kpathsea.buildlink2.mk
+++ b/print/teTeX-bin/kpathsea.buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: kpathsea.buildlink2.mk,v 1.1 2002/09/21 01:50:37 jlam Exp $
+# $NetBSD: kpathsea.buildlink2.mk,v 1.2 2003/12/24 12:51:31 jmmv Exp $
.if !defined(KPATHSEA_BUILDLINK2_MK)
KPATHSEA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kpathsea
-BUILDLINK_DEPENDS.kpathsea?= teTeX-bin>=1.0.7nb2
+BUILDLINK_DEPENDS.kpathsea?= teTeX-bin>=2.0.2
BUILDLINK_PKGSRCDIR.kpathsea?= ../../print/teTeX-bin
BUILDLINK_DEPMETHOD.kpathsea?= build
diff --git a/print/teTeX-bin/patches/patch-aa b/print/teTeX-bin/patches/patch-aa
deleted file mode 100644
index 253158d1634..00000000000
--- a/print/teTeX-bin/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/10/10 01:11:20 danw Exp $
-
-Note that POSIX uses SIGCHLD ...! - HF
-
---- texk/web2c/window/mftalk.c.orig Thu Jul 15 16:52:02 1999
-+++ texk/web2c/window/mftalk.c Thu Jul 15 16:52:44 1999
-@@ -102,7 +102,11 @@
- fatal (setmode, setmode (cs_pipe[1], O_BINARY) == -1);
- #endif
-
-+#ifndef SIGCLD
-+ old = signal (SIGCHLD, child_died);
-+#else
- old = signal (SIGCLD, child_died);
-+#endif
- fatal (old, old == SIG_ERR);
-
- sprintf (height, "-h%d", screendepth);
-@@ -145,7 +149,11 @@
- fatal (close, close (sc_pipe[1]) == -1);
- fatal (close, close (cs_pipe[0]) == -1);
- fatal (close, close (cs_pipe[1]) == -1);
-+#ifndef SIGCLD
-+ fatal (signal, signal (SIGCHLD, old) == SIG_ERR);
-+#else
- fatal (signal, signal (SIGCLD, old) == SIG_ERR);
-+#endif
- break;
- default:
- res = read (cs_pipe[0], &ack, sizeof (int));
diff --git a/print/teTeX-bin/patches/patch-ab b/print/teTeX-bin/patches/patch-ab
deleted file mode 100644
index 09ac3b7b4d0..00000000000
--- a/print/teTeX-bin/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/08/12 20:23:34 tron Exp $
-
---- texk/make/common.mk.orig Fri Jul 16 14:30:41 1999
-+++ texk/make/common.mk Fri Jul 16 14:31:02 1999
-@@ -30,7 +30,7 @@
- # Installation.
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_SCRIPT = $(INSTALL_PROGRAM)
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_LIBTOOL_LIBS = INSTALL_DATA='$(INSTALL_DATA)' $(LIBTOOL) install-lib
- INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog
diff --git a/print/teTeX-bin/patches/patch-ac b/print/teTeX-bin/patches/patch-ac
index d87e36a7824..13ded76575f 100644
--- a/print/teTeX-bin/patches/patch-ac
+++ b/print/teTeX-bin/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 1999/08/12 20:41:55 tron Exp $
+$NetBSD: patch-ac,v 1.2 2003/12/24 12:51:31 jmmv Exp $
---- texk/oxdvik/Makefile.in.orig Sat May 8 18:03:37 1999
-+++ texk/oxdvik/Makefile.in Thu Aug 12 22:25:08 1999
-@@ -19,7 +19,7 @@
+--- texk/oxdvik/Makefile.in.orig Mon Feb 3 03:53:12 2003
++++ texk/oxdvik/Makefile.in Fri Feb 21 10:20:33 2003
+@@ -20,7 +20,7 @@
x_ext_lib = @x_ext_lib@
# Follow the library order used in X11R6 itself:
# -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
--x_link = $(LDLIBWWW) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs)
-+x_link = $(LDLIBWWW) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -lz
+-x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs)
++x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -lz
LDLIBWWW=@LDLIBWWW@
LIBWWWCPPFLAGS=@LIBWWWCPPFLAGS@
diff --git a/print/teTeX-bin/patches/patch-ad b/print/teTeX-bin/patches/patch-ad
index 11f2f5fe39d..d09f7254bc9 100644
--- a/print/teTeX-bin/patches/patch-ad
+++ b/print/teTeX-bin/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 1999/08/12 20:41:55 tron Exp $
+$NetBSD: patch-ad,v 1.2 2003/12/24 12:51:31 jmmv Exp $
---- texk/xdvik/Makefile.in.orig Sat May 8 17:56:37 1999
-+++ texk/xdvik/Makefile.in Thu Aug 12 22:24:20 1999
-@@ -19,7 +19,7 @@
+--- texk/xdvik/Makefile.in.orig Mon Feb 3 03:53:22 2003
++++ texk/xdvik/Makefile.in Fri Feb 21 10:22:23 2003
+@@ -20,7 +20,7 @@
x_ext_lib = @x_ext_lib@
# Follow the library order used in X11R6 itself:
# -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
--x_link = $(LDLIBWWW) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs)
-+x_link = $(LDLIBWWW) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -lz
+-x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs)
++x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -lz
LDLIBWWW=@LDLIBWWW@
LIBWWWCPPFLAGS=@LIBWWWCPPFLAGS@
diff --git a/print/teTeX-bin/patches/patch-ae b/print/teTeX-bin/patches/patch-ae
deleted file mode 100644
index ff1d14cd214..00000000000
--- a/print/teTeX-bin/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/08/17 23:01:33 tron Exp $
-
---- Makefile.in.orig Wed Jun 16 07:46:57 1999
-+++ Makefile.in Wed Aug 18 00:41:39 1999
-@@ -58,7 +58,7 @@
-
- #### End of system configuration section. ####
-
--ALLPROGS = access afm2tfm bibtex dialog dmp dvicopy dvilj dvilj2p dvilj4 \
-+ALLPROGS = access afm2tfm bibtex dmp dvicopy dvilj dvilj2p dvilj4 \
- dvilj4l dvips dvitomp dvitype etex gftodvi gftopk gftype gsftopk \
- install-info kpsestat kpsewhich mag makeindex makeinfo mf mfw \
- mft mpost mpto newer odvicopy odvips odvitype ofm2opl omega opl2ofm \
diff --git a/print/teTeX-bin/patches/patch-af b/print/teTeX-bin/patches/patch-af
deleted file mode 100644
index de3a54b3b9d..00000000000
--- a/print/teTeX-bin/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/10/04 23:21:44 simonb Exp $
-
---- texk/ps2pkm/arith.c.orig Sat Jan 24 23:11:27 1998
-+++ texk/ps2pkm/arith.c Thu Sep 30 13:33:46 1999
-@@ -203,7 +203,7 @@
- divisor >>= 1;
-
- if ((u1u2 >> (LONGSIZE - shift)) != 0 && shift != 0)
-- abort("DLdiv: dividend too large");
-+ t1_abort("DLdiv: dividend too large");
- u1u2 = (u1u2 << shift) + ((shift == 0) ? 0 : u3u4 >> (LONGSIZE - shift));
- u3u4 <<= shift;
-
-@@ -266,7 +266,7 @@
- */
- u1u2 = t;
- if (HIGHDIGIT(u1u2) != 0)
-- abort("divide algorithm error");
-+ t1_abort("divide algorithm error");
- u1u2 = ASSEMBLE(u1u2, LOWDIGIT(u3));
- u3 = LOWDIGIT(u3u4);
- q3q4 = ASSEMBLE(q3q4, qhat);
diff --git a/print/teTeX-bin/patches/patch-ag b/print/teTeX-bin/patches/patch-ag
deleted file mode 100644
index f616449ffeb..00000000000
--- a/print/teTeX-bin/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/10/04 23:21:44 simonb Exp $
-
---- texk/ps2pkm/curves.c.orig Wed Jan 28 20:44:07 1998
-+++ texk/ps2pkm/curves.c Thu Sep 30 13:33:49 1999
-@@ -213,7 +213,7 @@
-
- if ( TOOBIG(xB) || TOOBIG(yB) || TOOBIG(xC) || TOOBIG(yC)
- || TOOBIG(xD) || TOOBIG(yD) )
-- abort("Beziers this big not yet supported");
-+ t1_abort("Beziers this big not yet supported");
-
- return(StepBezierRecurse(&Info,
- (fractpel) 0, (fractpel) 0, xB, yB, xC, yC, xD, yD));
diff --git a/print/teTeX-bin/patches/patch-ah b/print/teTeX-bin/patches/patch-ah
deleted file mode 100644
index 5320d2e3808..00000000000
--- a/print/teTeX-bin/patches/patch-ah
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/10/04 23:21:45 simonb Exp $
-
---- texk/ps2pkm/hints.c.orig Sat Jan 24 23:11:28 1998
-+++ texk/ps2pkm/hints.c Thu Sep 30 13:34:00 1999
-@@ -167,7 +167,7 @@
- }
- else /* error */
- {
-- abort("ComputeHint: invalid orientation");
-+ t1_abort("ComputeHint: invalid orientation");
- }
-
- IfTrace4((HintDebug > 1),
-@@ -201,7 +201,7 @@
- }
- else /* error */
- {
-- abort("ComputeHint: invalid hinttype");
-+ t1_abort("ComputeHint: invalid hinttype");
- }
-
- IfTrace1((HintDebug > 1)," hintValue=%p", hintValue);
-@@ -218,7 +218,7 @@
- }
- else /* error */
- {
-- abort("ComputeHint: invalid orientation");
-+ t1_abort("ComputeHint: invalid orientation");
- }
- }
-
-@@ -267,7 +267,7 @@
- }
- else /* error */
- {
-- abort("ProcessHint: invalid label");
-+ t1_abort("ProcessHint: invalid label");
- }
- }
- else if (hP->adjusttype == 'r') /* Reverse */
-@@ -283,18 +283,18 @@
- }
- else /* error */
- {
-- abort("ProcessHint: label is not in use");
-+ t1_abort("ProcessHint: label is not in use");
- }
- }
- else /* error */
- {
-- abort("ProcessHint: invalid label");
-+ t1_abort("ProcessHint: invalid label");
- }
-
- }
- else /* error */
- {
-- abort("ProcessHint: invalid adjusttype");
-+ t1_abort("ProcessHint: invalid adjusttype");
- }
- IfTrace3((HintDebug > 1)," label=%d, thisHint=(%p,%p)\n",
- hP->label, thisHint.x, thisHint.y);
-@@ -386,7 +386,7 @@
- else
- return(XofY(edge, y));
-
-- abort("bad subpath chain");
-+ t1_abort("bad subpath chain");
- /*NOTREACHED*/
- }
- /*
-@@ -467,7 +467,7 @@
- else if (ISBOTTOM(e1->flag) && y == e1->ymax)
- return(!ISDOWN(e2->flag));
- else
-- abort("ImpliedHorizontalLine: why ask?");
-+ t1_abort("ImpliedHorizontalLine: why ask?");
- /*NOTREACHED*/
- }
-
-@@ -506,7 +506,7 @@
- if (!ISBREAK(edge, next))
- continue;
- if (edge->ymax < next->ymin)
-- abort("disjoint subpath?");
-+ t1_abort("disjoint subpath?");
- /*
- 'edge' now contains an edgelist at the bottom of an edge, and 'next'
- contains the next subsequent edgelist in the subpath, which must be at
-@@ -567,7 +567,7 @@
-
- break1->subpath = break2->subpath;
- if (ISBREAK(break1, break1->subpath))
-- abort("unable to fix subpath break?");
-+ t1_abort("unable to fix subpath break?");
-
- break2->subpath = next;
-
diff --git a/print/teTeX-bin/patches/patch-ai b/print/teTeX-bin/patches/patch-ai
deleted file mode 100644
index b07b84eee2d..00000000000
--- a/print/teTeX-bin/patches/patch-ai
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/10/04 23:21:45 simonb Exp $
-
---- texk/ps2pkm/objects.c.orig Tue Feb 24 22:54:33 1998
-+++ texk/ps2pkm/objects.c Thu Sep 30 13:34:16 1999
-@@ -300,14 +300,14 @@
- size = (size + sizeof(LONG) - 1) & -sizeof(LONG);
- extra = (extra + sizeof(LONG) - 1) & -sizeof(LONG);
- if (size + extra <= 0)
-- abort("Non-positive allocate?");
-+ t1_abort("Non-positive allocate?");
- r = (struct xobject *) Xalloc(size + extra);
-
- while (r == NULL) {
- if (!GimeSpace()) {
- IfTrace1(TRUE, "malloc attempted %d bytes.\n",
- size + extra);
-- abort("We have REALLY run out of memory");
-+ t1_abort("We have REALLY run out of memory");
- }
- r = (struct xobject *) Xalloc(size + extra);
- }
-@@ -358,7 +358,7 @@
- register struct xobject *obj; /* structure to free */
- {
- if (obj->type == INVALIDTYPE)
-- abort("Free of already freed object?");
-+ t1_abort("Free of already freed object?");
- obj->type = INVALIDTYPE;
-
- if (MemoryDebug > 1) {
-@@ -777,7 +777,7 @@
- char name[NAMESIZE]; /* buffer to store my copy of 'username' */
-
- if (strlen(username) >= NAMESIZE)
-- abort("Pragmatics name too large");
-+ t1_abort("Pragmatics name too large");
- strcpy(name, username);
- for (p = name; *p != '\0'; p++)
- *p = toupper(*p);
-@@ -941,7 +941,7 @@
- return;
-
- default:
-- abort("Consume: too many objects");
-+ t1_abort("Consume: too many objects");
- }
- }
- #endif /* WIN32 */
-@@ -967,7 +967,7 @@
- ObjectPostMortem(obj);
-
- if (MustCrash)
-- abort("Terminating because of CrashOnUserError...");
-+ t1_abort("Terminating because of CrashOnUserError...");
- else
- ErrorMessage = typemsg;
-
-@@ -1062,14 +1062,14 @@
- if (obj != NULL)
- ObjectPostMortem(obj);
- if (MustCrash)
-- abort("Terminating because of CrashOnUserError...");
-+ t1_abort("Terminating because of CrashOnUserError...");
- else
- ErrorMessage = str;
- return(ret);
- }
-
- /*
--:h3.abort() - Crash Due to Error
-+:h3.t1_abort() - Crash Due to Error
-
- We divide by zero, and if that doesn't work, call exit(), the results of
- which is system dependent (and thus is part of the Hourglass required
-@@ -1078,7 +1078,7 @@
- static int test = 0;
-
- /*ARGSUSED*/
--void abort(str)
-+void t1_abort(str)
- char *str;
- {
- LineIOTrace = TRUE;
-@@ -1120,7 +1120,7 @@
- /* All other calls to malloc are defined to Xalloc. */
-
- if (sizeof(SHORT) != 2 || sizeof(LONG) != 4)
-- abort("Fundamental TYPE1IMAGER assumptions invalid in this port");
-+ t1_abort("Fundamental TYPE1IMAGER assumptions invalid in this port");
- InitSpaces();
- InitFonts();
- InitFiles();
diff --git a/print/teTeX-bin/patches/patch-aj b/print/teTeX-bin/patches/patch-aj
deleted file mode 100644
index 9cee947b212..00000000000
--- a/print/teTeX-bin/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/10/04 23:21:45 simonb Exp $
-
---- texk/ps2pkm/objects.h.orig Tue Mar 16 18:16:08 1999
-+++ texk/ps2pkm/objects.h Thu Sep 30 13:35:40 1999
-@@ -61,7 +61,6 @@
- /*END SHARED*/
- /*SHARED*/
-
--#define abort(line) t1_abort(line)
- #define Allocate(n,t,s) t1_Allocate(n,t,s)
- #define Free(obj) t1_Free(obj)
- #define NonObjectFree(a) Xfree(a)
diff --git a/print/teTeX-bin/patches/patch-ak b/print/teTeX-bin/patches/patch-ak
deleted file mode 100644
index ba85af45ab8..00000000000
--- a/print/teTeX-bin/patches/patch-ak
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/10/04 23:21:46 simonb Exp $
-
---- texk/ps2pkm/paths.c.orig Sat Jan 24 23:11:28 1998
-+++ texk/ps2pkm/paths.c Thu Sep 30 13:34:23 1999
-@@ -798,7 +798,7 @@
- break;
-
- default:
-- abort("Reverse: bad path segment");
-+ t1_abort("Reverse: bad path segment");
- }
- /*
- We need to reverse the order of segments too, so we break this segment
-@@ -932,7 +932,7 @@
- for (p=p0; p->link->link != NULL; p=p->link) { ; }
-
- if (!LASTCLOSED(p->link->flag))
-- abort("UnClose: no LASTCLOSED");
-+ t1_abort("UnClose: no LASTCLOSED");
-
- Free(SplitPath(p0, p));
- p0->flag &= ~ISCLOSED(ON);
-@@ -1033,7 +1033,7 @@
-
- default:
- IfTrace1(TRUE,"path = %z\n", p);
-- abort("PathTransform: invalid segment");
-+ t1_abort("PathTransform: invalid segment");
- }
- oldx += savex;
- oldy += savey;
-@@ -1185,7 +1185,7 @@
- break;
-
- default:
-- abort("QueryPath: unknown segment");
-+ t1_abort("QueryPath: unknown segment");
- }
- if (coerced)
- KillPath(path);
-@@ -1325,7 +1325,7 @@
- case HINTTYPE:
- break;
- default:
-- abort("QueryBounds: unknown type");
-+ t1_abort("QueryBounds: unknown type");
- }
-
- if (x < min.x) min.x = x;
diff --git a/print/teTeX-bin/patches/patch-al b/print/teTeX-bin/patches/patch-al
deleted file mode 100644
index ca2a867ca92..00000000000
--- a/print/teTeX-bin/patches/patch-al
+++ /dev/null
@@ -1,132 +0,0 @@
-$NetBSD: patch-al,v 1.1 1999/10/04 23:21:46 simonb Exp $
-
---- texk/ps2pkm/regions.c.orig Fri Mar 26 07:11:59 1999
-+++ texk/ps2pkm/regions.c Thu Sep 30 13:34:44 1999
-@@ -242,7 +242,7 @@
- register struct edgelist *next; /* loop variable */
-
- if (area->references < 0)
-- abort("KillRegion: negative reference count");
-+ t1_abort("KillRegion: negative reference count");
- if ( (--(area->references) > 1) ||
- ( (area->references == 1) && !ISPERMANENT(area->flag) ) )
- return;
-@@ -308,7 +308,7 @@
- IfTrace2((RegionDebug),"....new edge: ymin=%d, ymax=%d ",
- (LONG)ymin, (LONG) ymax);
- if (ymin >= ymax)
-- abort("newedge: height not positive");
-+ t1_abort("newedge: height not positive");
- /*
- We are going to copy the xvalues into a newly allocated area. It
- helps performance if the values are all "long" aligned. We can test
-@@ -567,7 +567,7 @@
- break;
-
- default:
-- abort("Interior: path type error");
-+ t1_abort("Interior: path type error");
- }
- /*
- We're done with this segment. Advance to the next path segment in
-@@ -633,7 +633,7 @@
- } while (area != NULL && area->ymin == y);
-
- if (count != 0)
-- abort("Unwind: uneven edges");
-+ t1_abort("Unwind: uneven edges");
- }
- }
- /*
-@@ -691,7 +691,7 @@
- }
-
- if (ymax < ymin)
-- abort("negative sized edge?");
-+ t1_abort("negative sized edge?");
-
-
- /* FIXME: there are not as much parameters as here. */
-@@ -942,9 +942,9 @@
- if (y < list->ymin)
- break;
- if (y >= list->ymax)
-- abort("splitedge: above top of list");
-+ t1_abort("splitedge: above top of list");
- if (y == list->ymin)
-- abort("splitedge: would be null");
-+ t1_abort("splitedge: would be null");
-
- r = (struct edgelist *)Allocate(sizeof(struct edgelist), list, 0);
- /*
-@@ -984,7 +984,7 @@
- Then, we return the caller a pointer to 'new':
- */
- if (new == NULL)
-- abort("null splitedge");
-+ t1_abort("null splitedge");
- lastlist->link = NULL;
- last->link = list;
- IfTrace1((RegionDebug > 1),"yields %x\n", new);
-@@ -1006,7 +1006,7 @@
- #endif
- {
- if (BOTTOM(top) > TOP(bottom))
-- abort("vertjoin not disjoint");
-+ t1_abort("vertjoin not disjoint");
-
- for (; top->link != NULL; top=top->link) { ; }
-
-@@ -1114,7 +1114,7 @@
-
- h0 = h = edge->ymax - edge->ymin;
- if (h <= 0)
-- abort("SwathUnion: 0 height swath?");
-+ t1_abort("SwathUnion: 0 height swath?");
-
- before = before0;
- after = before->link;
-@@ -1378,7 +1378,7 @@
-
- for (p = beg; p != right; p = p->link) {
- if (p->link == NULL && right != NULL)
-- abort("discard(): ran off end");
-+ t1_abort("discard(): ran off end");
- IfTrace1((RegionDebug > 0),"discarding %x\n", p);
- p->ymin = p->ymax = 32767;
- end = p;
-@@ -1466,7 +1466,7 @@
-
- for (edge=region->anchor; VALIDEDGE(edge); edge=next) {
- if (edge->link == NULL)
-- abort("UnJumble: unpaired edge?");
-+ t1_abort("UnJumble: unpaired edge?");
- next = edge->link->link;
- edge->link->link = NULL;
- anchor = SortSwath(anchor, edge, t1_SwathUnion);
-@@ -1504,9 +1504,9 @@
- if (xmin != xmax || (xmin != R->xmin && xmax != R->xmax))
- R->flag &= ~ISRECTANGULAR(ON);
- if (xmin < e->xmin || xmax > e->xmax)
-- abort("Tighten: existing edge bound was bad");
-+ t1_abort("Tighten: existing edge bound was bad");
- if (xmin < R->xmin || xmax > R->xmax)
-- abort("Tighten: existing region bound was bad");
-+ t1_abort("Tighten: existing region bound was bad");
- e->xmin = xmin;
- e->xmax = xmax;
- }
-@@ -1755,11 +1755,11 @@
- int oldmin,oldmax;
- {
- if (edge->type != EDGETYPE)
-- abort("EDGE ERROR: non EDGETYPE in list");
-+ t1_abort("EDGE ERROR: non EDGETYPE in list");
- /*
- The following check is not valid if the region is jumbled so I took it
- out:
- */
- /* if (edge->ymin < oldmax && edge->ymin != oldmin)
-- abort("EDGE ERROR: overlapping swaths"); */
-+ t1_abort("EDGE ERROR: overlapping swaths"); */
- }
diff --git a/print/teTeX-bin/patches/patch-am b/print/teTeX-bin/patches/patch-am
deleted file mode 100644
index b472dd001e5..00000000000
--- a/print/teTeX-bin/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.1 1999/10/04 23:21:47 simonb Exp $
-
---- texk/ps2pkm/spaces.c.orig Sun Feb 7 09:00:18 1999
-+++ texk/ps2pkm/spaces.c Thu Sep 30 13:34:51 1999
-@@ -207,7 +207,7 @@
- int rc = -1; /* return code for QueryDeviceState */
-
- if (rc != 0) /* we only bother with this check once */
-- abort("Context: QueryDeviceState didn't work");
-+ t1_abort("Context: QueryDeviceState didn't work");
-
- M[0][0] = M[1][0] = M[0][1] = M[1][1] = 0.0;
-
-@@ -225,7 +225,7 @@
- M[1][0] = -Yres; M[0][1] = -Xres;
- break;
- default:
-- abort("QueryDeviceState returned invalid orientation");
-+ t1_abort("QueryDeviceState returned invalid orientation");
- }
- return(FindContext(M));
- }
-@@ -249,7 +249,7 @@
-
- if (i >= nextcontext) {
- if (i >= MAXCONTEXTS)
-- abort("Context: out of them");
-+ t1_abort("Context: out of them");
- LONGCOPY(contexts[i].normal, M, sizeof(contexts[i].normal));
- MatrixInvert(M, contexts[i].inverse);
- nextcontext++;
-@@ -886,7 +886,7 @@
-
- D = M[1][1] * M[0][0] - M[1][0] * M[0][1];
- if (D == 0.0)
-- abort("MatrixInvert: can't");
-+ t1_abort("MatrixInvert: can't");
-
- Mprime[0][0] = tyy / D;
- Mprime[1][0] = -txy / D;
diff --git a/print/teTeX-bin/patches/patch-an b/print/teTeX-bin/patches/patch-an
deleted file mode 100644
index 5f68bbb2e60..00000000000
--- a/print/teTeX-bin/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 1999/10/04 23:21:47 simonb Exp $
-
---- texk/ps2pkm/t1funcs.c.orig Fri Mar 26 07:13:10 1999
-+++ texk/ps2pkm/t1funcs.c Thu Sep 30 13:34:55 1999
-@@ -506,7 +506,7 @@
- break;
- }
- default:
-- abort("xiFill: unknown format");
-+ t1_abort("xiFill: unknown format");
- }
- }
-
diff --git a/print/teTeX-bin/patches/patch-ao b/print/teTeX-bin/patches/patch-ao
deleted file mode 100644
index 7ac78e75a8b..00000000000
--- a/print/teTeX-bin/patches/patch-ao
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ao,v 1.1 1999/10/04 23:21:48 simonb Exp $
-
---- texk/ps2pkm/t1stub.c.orig Sat Jan 24 23:11:28 1998
-+++ texk/ps2pkm/t1stub.c Thu Sep 30 13:35:07 1999
-@@ -28,12 +28,10 @@
- * SOFTWARE.
- */
-
--#include "objects.h" /* get #define for abort() */
--
- xiStub()
- {
- printf("xiStub called\n");
-- abort("xiStub called");
-+ t1_abort("xiStub called");
- }
-
- #ifdef WIN32
diff --git a/print/teTeX-bin/patches/patch-ap b/print/teTeX-bin/patches/patch-ap
index 2295bd55565..c558ffa708f 100644
--- a/print/teTeX-bin/patches/patch-ap
+++ b/print/teTeX-bin/patches/patch-ap
@@ -1,46 +1,48 @@
-$NetBSD: patch-ap,v 1.4 2000/04/15 22:10:06 mycroft Exp $
+$NetBSD: patch-ap,v 1.5 2003/12/24 12:51:31 jmmv Exp $
---- texk/tetex/texconfig.orig Fri Jun 25 15:59:21 1999
-+++ texk/tetex/texconfig Sat Apr 15 11:49:13 2000
-@@ -31,8 +31,6 @@
- # Thomas Esser, te@informatik.uni-hannover.de
- # Copyright: Thomas Esser, 1994, 1995, 1996, 1997, 1999. Public domain.
+--- texk/tetex/texconfig.orig 2003-03-01 10:13:18.000000000 +0100
++++ texk/tetex/texconfig
+@@ -7,8 +7,6 @@
+ # Thomas Esser, te@dbs.uni-hannover.de
+ # Copyright: Thomas Esser, 1994, 1995, 1996, 1997, 1999, 2002. Public domain.
-# You may override DIALOG_TERMINFO and DIALOG_TERM in your environment.
-
- progname=`basename $0`
- tmpdir=${TMP-/tmp}/texconf$$
- tmpmenu=$tmpdir/menu.out
-@@ -122,27 +120,10 @@
-
- cls() { test -z "$NO_CLEAR" && clear; }
+ version=teTeX
+ #version='TeX Live'
+@@ -192,29 +190,11 @@ abort()
+ cleanup
+ exit 1
+ }
+-
-# Some systems have their own dialog. Use it then and do not use
-# faked TERM and TERMINFO variables when calling that dialog.
-find_dialogtype()
-{
-- own_dialog=false
- { u=`uname -s`; } 2>/dev/null
- case "$u" in
- FreeBSD|Linux)
-- DIALOG_PROG=/usr/bin/dialog
-- test -x "$DIALOG_PROG" && own_dialog=true;;
+- test -f /usr/bin/whiptail && DIALOG_PROG=/usr/bin/whiptail
+- test -f /usr/bin/dialog && DIALOG_PROG=/usr/bin/dialog
+- test -f /bin/dialog && DIALOG_PROG=/bin/dialog
+- ;;
- esac
-}
--
+
run_dialog()
{
- test -z "$NO_CLEAR" && clear
-- if $own_dialog; then
-- $DIALOG_PROG --title "$version setup utility" "$@"
+ test -z "$NO_CLEAR" && tty >/dev/null 2>&1 && clear;
+- if test -n "$DIALOG_PROG"; then
+- $DIALOG_PROG --title "$version setup utility" ${1+"$@"}
- else
-- TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO dialog --title "$version setup utility" "$@"
+- TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO tcdialog --title "$version setup utility" ${1+"$@"}
- fi
+ dialog --title "$version setup utility" "$@"
}
check_environ()
-@@ -219,22 +200,6 @@
+@@ -293,22 +273,6 @@ fonts_rw()
echo "Done." >&2
}
@@ -57,21 +59,30 @@ $NetBSD: patch-ap,v 1.4 2000/04/15 22:10:06 mycroft Exp $
-
-$progname failed. Program aborted.
-eof
-- exit 1
+- exit_return 1
-}
-
fix_pager_more()
{
case "$PAGER" in
-@@ -1507,7 +1472,6 @@
- #------------------ begin: initialisation -----------------------------------
+@@ -1454,7 +1418,7 @@ echo_file_location()
+ do_print_setup()
+ {
+ echo '==================== binaries found by searching $PATH ==================='
+- echo_locate_binary tex etex dvipdfm pdftex omega mf mpost tcdialog dvips xdvi kpsewhich mktexpk mktextfm
++ echo_locate_binary tex etex dvipdfm pdftex omega mf mpost dialog dvips xdvi kpsewhich mktexpk mktextfm
+ echo
+ echo '=========================== Kpathsea variables ==========================='
+ echo_show_variable TEXMF TEXMFMAIN VARTEXMF
+@@ -1737,7 +1701,6 @@ esac
+ needsCleanup=false
find_echo
find_fmt
-find_dialogtype
check_environ
require_binary kpsewhich pwd
-@@ -1574,8 +1538,6 @@
+@@ -1813,8 +1776,6 @@ test -z "$TC_DFT_UPDMAP_CFG" && TC_DFT_U
# The fallback directory for private scripts and config files.
: ${TEXMF=`kpsewhich -expand-var '$TEXMF'`}
@@ -79,10 +90,19 @@ $NetBSD: patch-ap,v 1.4 2000/04/15 22:10:06 mycroft Exp $
-: ${DIALOG_TERM=generic}
formats=$TC_VARTEXMF/web2c
- bases=$TC_VARTEXMF/web2c
-@@ -1712,7 +1674,6 @@
- fmtutil --missing
- texlinks ${SILENT_TEXLINKS+-s}
+ xdvi_app_dir=$TC_VARTEXMF/xdvi
+@@ -1955,7 +1916,7 @@ cd "$tmpdir" || exit_return 1
+ EDIT=${VISUAL-${EDITOR-$std_editor}}
+ PAGER=${PAGER-$std_pager}
+
+-check_for_binary tcdialog >/dev/null || test -n "$DIALOG_PROG"
++check_for_binary dialog >/dev/null || test -n "$DIALOG_PROG"
+ dialogok=$?
+
+ # we have called some shellfunctions, so for HP-UX's shell, we need
+@@ -1975,7 +1936,6 @@ fi
+ # fmtutil --missing
+ # texlinks --multiplatform
-check_terminal
cat <<eof
diff --git a/print/teTeX-bin/patches/patch-aq b/print/teTeX-bin/patches/patch-aq
index 29e2af0f447..d160bddfc63 100644
--- a/print/teTeX-bin/patches/patch-aq
+++ b/print/teTeX-bin/patches/patch-aq
@@ -1,16 +1,16 @@
-$NetBSD: patch-aq,v 1.3 2000/09/12 16:45:48 jlam Exp $
+$NetBSD: patch-aq,v 1.4 2003/12/24 12:51:31 jmmv Exp $
---- texk/tetex/Makefile.in.orig Tue Apr 6 14:51:18 1999
-+++ texk/tetex/Makefile.in
-@@ -5,9 +5,9 @@
- ac_include ../make/common.mk
- ac_include ../make/programs.mk
+--- texk/tetex/Makefile.in.orig Thu Feb 27 14:57:21 2003
++++ texk/tetex/Makefile.in Sat Mar 15 12:44:15 2003
+@@ -8,9 +8,9 @@
+ man5dir = $(mandir)/man5
+ man8dir = $(mandir)/man8
--SCRIPTS= dvi2fax ps2frag texconfig dvired pslatex texi2html allcm allneeded fontexport fontimport kpsetool mkfontdesc MakeTeXPK fontinst rubibtex rumakeindex fmtutil texdoc texlinks texutil texexec texshow
-+SCRIPTS= dvi2fax ps2frag texconfig dvired pslatex allcm allneeded fontexport fontimport kpsetool mkfontdesc MakeTeXPK fontinst rubibtex rumakeindex fmtutil texdoc texlinks texutil texexec texshow
+-SCRIPTS= dvi2fax ps2frag texconfig dvired pslatex texi2html allcm allneeded fontexport fontimport kpsetool mkfontdesc MakeTeXPK fontinst rubibtex rumakeindex fmtutil texdoc texlinks texexec texdoctk updmap
++SCRIPTS= dvi2fax ps2frag texconfig dvired pslatex allcm allneeded fontexport fontimport kpsetool mkfontdesc MakeTeXPK fontinst rubibtex rumakeindex fmtutil texdoc texlinks texexec texdoctk updmap
PDFSCRIPTS=e2pall epstopdf texi2pdf thumbpdf
--manpgs=texi2html texconfig ps2frag allcm allneeded dvired fontexport fontimport allec
-+manpgs=texconfig ps2frag allcm allneeded dvired fontexport fontimport allec
+-manpgs= allcm allec allneeded dvi2fax dvired e2pall epstopdf fontexport fontimport fontinst kpsetool ps2frag pslatex rubibtex rumakeindex texconfig texdoc texexec texi2html texi2pdf texshow texutil thumbpdf texdoctk updmap
++manpgs= allcm allec allneeded dvi2fax dvired e2pall epstopdf fontexport fontimport fontinst kpsetool ps2frag pslatex rubibtex rumakeindex texconfig texdoc texexec texi2pdf texshow texutil thumbpdf texdoctk updmap
+
INFOFILES= latex.info latex.info-1 latex.info-2 latex.info-3
- all: $(SCRIPTS) $(PDFSCRIPTS)
- default: all
+ POOLFILES = etex-pl.pool pdfetex-pl.pool pdftex-pl.pool tex-pl.pool