* Move all the handling of files that are user-modifiable or generated

  at run-time into the INSTALL/DEINSTALL scripts instead.  This includes
  running: mktexlsr, fmtutil, texlinks, and updmap.  The INSTALL script
  now unpacks a separate scriptlet +TETEX that can be called independently
  to fix up the teTeX installation in case it gets messed up.

* USE_TOOLS+=bison instead of a direct BUILD_DEPENDS on the bison package.

* List info file entries directly in the PLIST.

Bump PKGREVISION to 8.

9 files changed, 216 insertions, 90 deletions

diff --git a/print/teTeX3-bin/DEINSTALL b/print/teTeX3-bin/DEINSTALL
new file mode 100644
index 00000000000..b986ed0f27a
--- /dev/null
+++ b/print/teTeX3-bin/DEINSTALL
@@ -0,0 +1,8 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/04/05 16:04:01 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${TEST} ! -x ./+TETEX ||
+		./+TETEX REMOVE ${PKG_METADATA_DIR}
+	;;
+esac
diff --git a/print/teTeX3-bin/INSTALL b/print/teTeX3-bin/INSTALL
new file mode 100644
index 00000000000..f66a155953c
--- /dev/null
+++ b/print/teTeX3-bin/INSTALL
@@ -0,0 +1,143 @@
+# $NetBSD: INSTALL,v 1.1 2006/04/05 16:04:01 jlam Exp $
+
+case "${STAGE}" in
+POST-INSTALL)
+	${TEST} ! -x ./+TETEX ||
+		./+TETEX ADD ${PKG_METADATA_DIR}
+	;;
+esac
+
+#
+# Generate a +TETEX script that updates the teTeX installation
+# based on user-modifiable configuration files.
+#
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+TETEX)
+	${CAT} > ./+TETEX << 'EOF'
+#!@SH@
+#
+# +TETEX - teTeX installation update script
+#
+# Usage: ./+TETEX ADD|REMOVE [metadatadir]
+
+CAT="@CAT@"
+ECHO="@ECHO@"
+GREP="@GREP@"
+PWD_CMD="@PWD_CMD@"
+RM="@RM@"
+RMDIR="@RMDIR@"
+TEST="@TEST@"
+TRUE="@TRUE@"
+
+SELF=$0
+ACTION=$1
+PKG_METADATA_DIR="${2-`${PWD_CMD}`}"
+: ${PKGNAME=${PKG_METADATA_DIR##*/}}
+: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}}
+: ${PKG_PREFIX=@PREFIX@}
+
+TEXFONTS_DIR="@TEXFONTSDIR@"
+TEXMF_DATADIR="${PKG_PREFIX}/share/texmf"
+TEXMF_VARDIR="${PKG_PREFIX}/share/texmf-var"
+
+exitcode=0
+case $ACTION in
+ADD)
+	# Create ls-R databases in all of the usual TeX directories.
+	${TEST} ! -x ${PKG_PREFIX}/bin/mktexlsr ||
+		${PKG_PREFIX}/bin/mktexlsr
+
+	# Update teTeX installation to support different TeX formats.
+	${TEST} ! -x ${PKG_PREFIX}/bin/fmtutil-sys ||
+		${PKG_PREFIX}/bin/fmtutil-sys --all
+	${TEST} ! -x ${PKG_PREFIX}/bin/texlinks ||
+		${PKG_PREFIX}/bin/texlinks
+
+	# Update the font map files for TeX output drivers.
+	${TEST} ! -x ${PKG_PREFIX}/bin/updmap-sys ||
+		${PKG_PREFIX}/bin/updmap-sys
+	;;
+
+REMOVE)
+	# Remove the ls-R databases from the usual TeX directories
+	# generated by mktexlsr.
+	#
+	${RM} -f ${TEXFONTS_DIR}/ls-R
+	${RM} -f ${TEXMF_DATADIR}/ls-R
+	${RM} -f ${TEXMF_VARDIR}/ls-R
+
+	# We inspect both the user-modified and distributed fmtutil.cnf
+	# files because we want to ensure we remove bits corresponding
+	# to both files.
+	#
+	FMTUTIL_CNF=
+	for cnf in fmtutil.cnf.dist fmtutil.cnf; do
+		file="${TEXMF_DATADIR}/web2c/$cnf"
+		${TEST} ! -f "$file" ||
+			FMTUTIL_CNF="${FMTUTIL_CNF} $file"
+	done
+	
+	# Remove fmt, mem, and log files generated by fmtutil-sys.
+	${TEST} -z "${FMTUTIL_CNF}" ||
+	${CAT} ${FMTUTIL_CNF} | ${GREP} "^[^#]" |
+	while read format junk; do
+		${RM} -f ${TEXMF_VARDIR}/web2c/$format.base
+		${RM} -f ${TEXMF_VARDIR}/web2c/$format.fmt
+		${RM} -f ${TEXMF_VARDIR}/web2c/$format.log
+		${RM} -f ${TEXMF_VARDIR}/web2c/$format.mem
+	done
+
+	# Remove engines generated by texlinks.  This is related to the
+	# install_link() function in texlinks.
+	#
+	${TEST} -z "${FMTUTIL_CNF}" ||
+	${CAT} ${FMTUTIL_CNF} | ${GREP} "^[^#]" |
+	while read format engine junk; do
+		case "$format" in
+		cont-??|metafun|mptopdf)
+			;;
+		*)
+			 ${TEST} "$format" = "$engine" ||
+				${RM} -f ${PKG_PREFIX}/bin/$format
+			;;
+		esac
+	done
+
+	# Remove font map files generated by updmap-sys.  The list of
+	# files is taken from the updmap man page and matches the
+	# "output files" for updmap.
+	#
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap/dvipdfm.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/builtin35.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/download35.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/ps2pk.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/psfonts.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/psfonts_pk.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/dvips/updmap/psfonts_t1.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/pdftex/updmap/pdftex.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/pdftex/updmap/pdftex_dl14.map
+	${RM} -f ${TEXMF_VARDIR}/fonts/map/pdftex/updmap/pdftex_ndl14.map
+	${RM} -f ${TEXMF_VARDIR}/web2c/updmap.log
+
+	# Remove stray directores.
+	for dir in							\
+		${TEXMF_VARDIR}/web2c					\
+		${TEXMF_VARDIR}/fonts/map/dvipdfm/updmap		\
+		${TEXMF_VARDIR}/fonts/map/dvips/updmap			\
+		${TEXMF_VARDIR}/fonts/map/pdftex/updmap
+	do
+		${RMDIR} -p "$dir" 2>/dev/null || ${TRUE}
+	done
+	;;
+
+*)
+	${ECHO} "Usage: ./+TETEX ADD|REMOVE [metadatadir]"
+	;;
+esac
+exit $exitcode
+EOF
+	${CHMOD} +x ./+TETEX
+	;;
+esac
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 312e2fa9110..20879ff28f7 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/05 16:04:01 jlam Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -10,15 +10,15 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.tug.org/tetex/
 COMMENT=	TeX distribution for UNIX compatible systems - binaries
 
-BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 DEPENDS+=	teTeX-texmf>=3.0:../../print/teTeX3-texmf
 DEPENDS+=	dialog>=0.6z:../../misc/dialog
 
 # games/omega previously installed an omega executable too
 CONFLICTS+=	omega<0.90.4nb1
 
-INFO_FILES=	latex.info dvips.info web2c.info kpathsea.info
+INFO_FILES=	# PLIST
 
+USE_TOOLS+=	bison
 REPLACE_PERL=	texk/xdvik/t1mapper \
 		texk/oxdvik/t1mapper
 
@@ -33,8 +33,13 @@ LOWER_PAPERSIZE=	${LOWER_PAPERSIZE_cmd:sh}
 TEXCONFIG=	${SETENV} TEXMFCONFIG=${PREFIX}/share/texmf \
 		${PREFIX}/bin/texconfig
 
+CONF_FILES+=	${PREFIX}/share/texmf/web2c/fmtutil.cnf.dist		\
+		${PREFIX}/share/texmf/web2c/fmtutil.cnf
+CONF_FILES+=	${PREFIX}/share/texmf/web2c/texmf.cnf.dist		\
+		${PREFIX}/share/texmf/web2c/texmf.cnf
+OWN_DIRS+=	${PREFIX}/share/texmf-var
+
 post-install:
-	@${RM} -f ${PREFIX}/share/texmf/web2c/*.log
 .if defined(PAPERSIZE)
 	${TEXCONFIG} dvips paper ${LOWER_PAPERSIZE}
 .  if ${PAPERSIZE} == "Letter"
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index e9eed6653eb..7eaa8a40be5 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/12/29 06:22:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/04/05 16:04:01 jlam Exp $
 
 TETEX_BIN_VERS=		3.0
 DIST_SUBDIR=		teTeX
@@ -48,8 +48,9 @@ CONFIGURE_ENV+=	INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} \
 		INSTALL_DATA=${INSTALL_DATA:Q}
 
 TEXFONTSDIR=		${VARBASE}/spool/texfonts
-OWN_DIRS=		${TEXFONTSDIR}
-OWN_DIRS_PERMS=		${TEXFONTSDIR}/pk ${ROOT_USER} ${ROOT_GROUP} 1777
+FILES_SUBST+=		TEXFONTSDIR=${TEXFONTSDIR}
+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
 
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index 9420770dcb4..eb993d0026d 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/11/15 07:00:08 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/05 16:04:01 jlam Exp $
 bin/a2ping
 bin/afm2tfm
 bin/aleph
@@ -29,7 +29,6 @@ bin/dvitype
 bin/e2pall
 bin/ebb
 bin/epstopdf
-bin/etex
 bin/fdf2tan
 bin/fdf2tex
 bin/fmtutil
@@ -47,9 +46,6 @@ bin/kpsetool
 bin/kpsewhere
 bin/kpsewhich
 bin/kpsexpand
-bin/lambda
-bin/lamed
-bin/latex
 bin/mag
 bin/makeindex
 bin/makempx
@@ -85,8 +81,6 @@ bin/oxdvi
 bin/patgen
 bin/pdfcrop
 bin/pdfetex
-bin/pdflatex
-bin/pdftex
 bin/pdfxtex
 bin/pfb2pfa
 bin/pk2bm
@@ -177,6 +171,10 @@ include/kpathsea/types.h
 include/kpathsea/variable.h
 include/kpathsea/xopendir.h
 include/kpathsea/xstat.h
+info/latex.info
+info/dvips.info
+info/web2c.info
+info/kpathsea.info
 lib/libkpathsea.la
 man/man1/afm2tfm.1
 man/man1/allcm.1
@@ -297,49 +295,6 @@ man/man1/weave.1
 man/man1/xdvi.1
 man/man1/xdvizilla.1
 man/man5/fmtutil.cnf.5
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvipdfm/updmap/dvipdfm.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvips/updmap/builtin35.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvips/updmap/download35.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvips/updmap/ps2pk.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvips/updmap/psfonts.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvips/updmap/psfonts_pk.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/dvips/updmap/psfonts_t1.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/pdftex/updmap/pdftex.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/pdftex/updmap/pdftex_dl14.map
-@unexec ${RM} -f %D/share/texmf-var/fonts/map/pdftex/updmap/pdftex_ndl14.map
-share/texmf-var/web2c/aleph.fmt
-share/texmf-var/web2c/aleph.log
-share/texmf-var/web2c/cont-en.fmt
-share/texmf-var/web2c/cont-en.log
-share/texmf-var/web2c/etex.fmt
-share/texmf-var/web2c/etex.log
-share/texmf-var/web2c/lambda.fmt
-share/texmf-var/web2c/lambda.log
-share/texmf-var/web2c/lamed.fmt
-share/texmf-var/web2c/lamed.log
-share/texmf-var/web2c/latex.fmt
-share/texmf-var/web2c/latex.log
-share/texmf-var/web2c/metafun.log
-share/texmf-var/web2c/metafun.mem
-share/texmf-var/web2c/mf.base
-share/texmf-var/web2c/mf.log
-share/texmf-var/web2c/mpost.log
-share/texmf-var/web2c/mpost.mem
-share/texmf-var/web2c/mptopdf.fmt
-share/texmf-var/web2c/mptopdf.log
-share/texmf-var/web2c/omega.fmt
-share/texmf-var/web2c/omega.log
-share/texmf-var/web2c/pdfetex.fmt
-share/texmf-var/web2c/pdfetex.log
-share/texmf-var/web2c/pdflatex.fmt
-share/texmf-var/web2c/pdflatex.log
-share/texmf-var/web2c/pdftex.fmt
-share/texmf-var/web2c/pdftex.log
-share/texmf-var/web2c/tex.fmt
-share/texmf-var/web2c/tex.log
-@unexec ${RM} -f %D/share/texmf-var/web2c/updmap.log
 share/texmf/doc/tetex/TETEXDOC.dvi
 share/texmf/doc/tetex/TETEXDOC.pdf
 share/texmf/doc/tetex/TETEXDOC.ps
@@ -362,7 +317,7 @@ share/texmf/texconfig/tcfmgr.map
 share/texmf/texconfig/v/vt100
 share/texmf/texconfig/x/xterm
 share/texmf/web2c/aleph.pool
-share/texmf/web2c/fmtutil.cnf
+share/texmf/web2c/fmtutil.cnf.dist
 share/texmf/web2c/mf.pool
 share/texmf/web2c/mktex.opt
 share/texmf/web2c/mktexdir
@@ -376,7 +331,7 @@ share/texmf/web2c/pdfetex-pl.pool
 share/texmf/web2c/pdfetex.pool
 share/texmf/web2c/pdfxtex.pool
 share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf
+share/texmf/web2c/texmf.cnf.dist
 share/texmf/xdvi/XDvi
 share/texmf/xdvi/pixmaps/toolbar.xpm
 share/texmf/xdvi/pixmaps/toolbar2.xpm
@@ -391,21 +346,5 @@ share/texmf/xdvi/xdvi.cfg
 @dirrm share/texmf/dvips/gsftopk
 @dirrm share/texmf/dvips/base
 @comment In teTeX-texmf:   @dirrm share/texmf/doc/tetex
-@dirrm share/texmf-var/web2c
-@unexec ${RM} -f %D/share/texmf-var/ls-R
-@dirrm share/texmf-var/fonts/map/pdftex/updmap
-@dirrm share/texmf-var/fonts/map/pdftex
-@dirrm share/texmf-var/fonts/map/dvips/updmap
-@dirrm share/texmf-var/fonts/map/dvips
-@dirrm share/texmf-var/fonts/map/dvipdfm/updmap
-@dirrm share/texmf-var/fonts/map/dvipdfm
-@dirrm share/texmf-var/fonts/map
-@dirrm share/texmf-var/fonts
-@dirrm share/texmf-var
 @comment In teTeX-texmf:   @dirrm share/texmf
 @dirrm include/kpathsea
-@comment The next file is changed by various sub-pkgs (hugetex, ...)
-@exec %D/bin/mktexlsr
-@exec %D/bin/updmap-sys
-@unexec ${RM} -f %D/share/texmf/ls-R
-@unexec ${RM} -rf %D/share/texmf-config
diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index 1a2bd0a3342..271d9611b7e 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/01/27 23:13:54 tonio Exp $
+$NetBSD: distinfo,v 1.6 2006/04/05 16:04:01 jlam Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
@@ -16,5 +16,5 @@ SHA1 (patch-aj) = e9e62bdb9f956f0f8a9dc4fe9988309b7c6aa767
 SHA1 (patch-ak) = ba06c10c1151173e04f3a6cc44d44a89f1933bb8
 SHA1 (patch-al) = e1fc74bd6ea05176dfac4e99958f0e1281b89b3b
 SHA1 (patch-ap) = 0ca7341b416842fbc00a935d6cfdb0531c4169ba
-SHA1 (patch-aq) = 4cd35bfbd559c4aed53826af45fb4b8985527004
-SHA1 (patch-ar) = c171e42d0104b69e47a085f625455f16ba14d6c1
+SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
+SHA1 (patch-ar) = 7f0c6cdca69b73bad1c8f8298e417ede1cd89d77
diff --git a/print/teTeX3-bin/patches/patch-aq b/print/teTeX3-bin/patches/patch-aq
index a422e21a814..dff263dd828 100644
--- a/print/teTeX3-bin/patches/patch-aq
+++ b/print/teTeX3-bin/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.1 2006/01/27 23:13:54 tonio Exp $
+$NetBSD: patch-aq,v 1.2 2006/04/05 16:04:01 jlam Exp $
 
---- Makefile.in.orig	Sun Jan 30 00:12:25 2005
+--- Makefile.in.orig	2005-01-29 18:12:25.000000000 -0500
 +++ Makefile.in
 @@ -51,7 +51,7 @@ default: all
  install: all 
@@ -11,26 +11,31 @@ $NetBSD: patch-aq,v 1.1 2006/01/27 23:13:54 tonio Exp $
                  $(MAKE) $@) || exit 1; \
  	done
  	if test -d $(texmf) && test -f $(srcdir)/release-tetex-src.txt; then \
-@@ -64,29 +64,29 @@ install: all 
+@@ -63,30 +63,30 @@ install: all 
+ 	test -f texk/web2c/omegafonts/omfonts && \
  	  cd texk/web2c/omegafonts; $(MAKE) install-links
  	$(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
- 	- if test -f $(scriptdir)/mktexlsr; then \
+-	- if test -f $(scriptdir)/mktexlsr; then \
 -	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++	- if false && test -f $(scriptdir)/mktexlsr; then \
 +	  TEXMFMAIN=$(texmf) PATH="$(scriptdir):$(bindir):$(PATH)" \
  	    $(scriptdir)/mktexlsr; \
  	else :; fi
- 	- if test -f $(scriptdir)/fmtutil-sys; then \
+-	- if test -f $(scriptdir)/fmtutil-sys; then \
 -	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++	- if false && test -f $(scriptdir)/fmtutil-sys; then \
 +	  TEXMFMAIN=$(texmf) PATH="$(scriptdir):$(bindir):$(PATH)" \
  	    $(scriptdir)/fmtutil-sys --all; \
  	else :; fi
- 	- if test -f $(scriptdir)/texlinks; then \
+-	- if test -f $(scriptdir)/texlinks; then \
 -	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++	- if false && test -f $(scriptdir)/texlinks; then \
 +	  TEXMFMAIN=$(texmf) PATH="$(scriptdir):$(bindir):$(PATH)" \
  	    $(scriptdir)/texlinks; \
  	else :; fi
- 	- if test -f $(scriptdir)/updmap-sys \
+-	- if test -f $(scriptdir)/updmap-sys \
 -	  && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++	- if false && test -f $(scriptdir)/updmap-sys \
 +	  && TEXMFMAIN=$(texmf) PATH="$(scriptdir):$(bindir):$(PATH)" \
  	       $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
  	then \
@@ -47,11 +52,14 @@ $NetBSD: patch-aq,v 1.1 2006/01/27 23:13:54 tonio Exp $
                $(MAKE) $@) || exit 1; \
  	done
  @FMU@
-@@ -95,7 +95,7 @@ install-exec:
+@@ -94,8 +94,8 @@ install-exec:
+ # temporary fix for missing links
  	test -f texk/web2c/omegafonts/omfonts && \
  	  cd texk/web2c/omegafonts; $(MAKE) install-links
- 	- if test -f $(scriptdir)/texlinks; then \
+-	- if test -f $(scriptdir)/texlinks; then \
 -	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++	- if false && test -f $(scriptdir)/texlinks; then \
 +	  TEXMFMAIN=$(texmf) PATH="$(scriptdir):$(bindir):$(PATH)" \
  	    $(scriptdir)/texlinks; \
  	else :; fi
+ 
diff --git a/print/teTeX3-bin/patches/patch-ar b/print/teTeX3-bin/patches/patch-ar
index 9bbe2cf1ec0..a5550c9bf9b 100644
--- a/print/teTeX3-bin/patches/patch-ar
+++ b/print/teTeX3-bin/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.1 2006/01/27 23:13:54 tonio Exp $
+$NetBSD: patch-ar,v 1.2 2006/04/05 16:04:01 jlam Exp $
 
---- texk/web2c/Makefile.in.orig	Sun Feb  6 11:56:56 2005
+--- texk/web2c/Makefile.in.orig	2005-02-06 05:56:56.000000000 -0500
 +++ texk/web2c/Makefile.in
 @@ -600,7 +600,7 @@ tex-check: trip tex.fmt
  	TEXMFCNF=../kpathsea \
@@ -11,3 +11,12 @@ $NetBSD: patch-ar,v 1.1 2006/01/27 23:13:54 tonio Exp $
  	  WEB2C=$(kpathsea_srcdir) TMPDIR=.. \
  	  ./tex --progname=tex '\nonstopmode\font\foo=nonesuch\end'
  clean:: tex-clean
+@@ -986,7 +986,7 @@ install-data:: $(web2cdir)
+ 	cd man && $(MAKE) $(install_makeargs) install-data
+ 	$(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext)
+ 	$(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext)
+-	$(INSTALL_DATA) fmtutil.cnf $(web2cdir)/fmtutil.cnf
++	$(INSTALL_DATA) fmtutil.cnf $(web2cdir)/fmtutil.cnf.dist
+ 
+ # Dummy target.
+ uninstall uninstall-exec uninstall-data:
diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as
new file mode 100644
index 00000000000..3b39cefb87b
--- /dev/null
+++ b/print/teTeX3-bin/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2006/04/05 16:04:01 jlam Exp $
+
+--- texk/kpathsea/Makefile.in.orig	2005-01-30 11:56:30.000000000 -0500
++++ texk/kpathsea/Makefile.in
+@@ -198,7 +198,7 @@ install-data: texmf.cnf kpathsea.info in
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
+ 	if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
+ 	   || test ! -r $(web2cdir)/texmf.cnf; then \
+-	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
++	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf.dist; \
+ 	else true; fi
+ 	test -r ./kpathsea.info || cd $(srcdir) && for i in kpathsea.i*; do \
+ 	  $(INSTALL_DATA) $$i $(infodir)/$$i; done