Use format.mk and map.mk in texlive-tetex to update TeX formats and

font maps for dvips and dvipdfm.  In this way, configuration files
(fmtutil.cnf and updmap.cfg) are properly installed under
PKG_SYSCONFDIR, not under PREFIX.

Bump PKGREVISION for teTeX-texmf and teTeX-bin.

5 files changed, 68 insertions, 161 deletions

diff --git a/print/teTeX3-bin/INSTALL b/print/teTeX3-bin/INSTALL
index a9685af9cc8..5b8633d2463 100644
--- a/print/teTeX3-bin/INSTALL
+++ b/print/teTeX3-bin/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.9 2009/01/08 22:09:35 minskim Exp $
+# $NetBSD: INSTALL,v 1.10 2009/01/26 21:17:05 minskim Exp $
 
 PATH="@PREFIX@"/bin:"${PATH}"
 export PATH
@@ -44,88 +44,23 @@ exitcode=0
 case $ACTION in
 ADD)
 	# 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)
-	# 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 config files generated by +TEXCONFIG.
-	${RM} -f @PKG_SYSCONFDIR@/dvips/config/config.ps
-	${RM} -f @PKG_SYSCONFDIR@/xdvi/XDvi
+	${RM} -f @PKG_SYSCONFBASE@/texmf/dvips/config/config.ps
+	${RM} -f @PKG_SYSCONFBASE@/texmf/xdvi/XDvi
 
 	# 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			\
-		@PKG_SYSCONFDIR@/dvips/config			\
-		@PKG_SYSCONFDIR@/xdvi
+		@PKG_SYSCONFBASE@/texmf/dvips/config			\
+		@PKG_SYSCONFBASE@/texmf/xdvi
 	do
 		${RMDIR} -p "$dir" 2>/dev/null || ${TRUE}
 	done
-	@MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFDIR@
+	@MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFBASE@/texmf
 	;;
 
 *)
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index 7bdafd6d656..515dd455412 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2009/01/08 22:09:35 minskim Exp $
+# $NetBSD: Makefile,v 1.35 2009/01/26 21:17:05 minskim Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -13,7 +13,7 @@ COMMENT=	TeX distribution for UNIX compatible systems - binaries
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	teTeX-texmf>=3.0nb3:../../print/teTeX3-texmf
-DEPENDS+=	dialog>=0.6z:../../misc/dialog
+DEPENDS+=	texlive-tetex-[0-9]*:../../wip/texlive-tetex
 
 # games/omega previously installed an omega executable too
 CONFLICTS+=	omega<0.90.4nb1
@@ -37,10 +37,6 @@ LOWER_PAPERSIZE_cmd=	${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'
 LOWER_PAPERSIZE=	${LOWER_PAPERSIZE_cmd:sh}
 FILES_SUBST+=		PAPERSIZE=${LOWER_PAPERSIZE:Q}
 
-PKG_SYSCONFSUBDIR=	texmf
-
-CONF_FILES+=	${PREFIX}/share/texmf/web2c/fmtutil.cnf.dist		\
-		${PREFIX}/share/texmf/web2c/fmtutil.cnf
 OWN_DIRS+=	${VARBASE}/lib/texmf ${PREFIX}/share/texmf-local
 .for d in pk source tfm
 OWN_DIRS_PERMS+=	${VARBASE}/lib/texmf/fonts/${d} \
@@ -52,11 +48,62 @@ INSTALL_MAKE_FLAGS+=	texmf=${DESTDIR}${PREFIX}/share/texmf
 INSTALL_MAKE_FLAGS+=	infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
 INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
+INSTALLATION_DIRS+=	share/texmf/fmtutil
+
 TEX_TEXMF_DIRS=	${PREFIX}/share/texmf
 
+TEX_FORMAT_NAMES+=	tetex
+TEX_MAP_FILES+=		antp.map
+TEX_MAP_FILES+=		cork-antt.map
+TEX_MAP_FILES+=		cs-antt.map
+TEX_MAP_FILES+=		exp-antt.map
+TEX_MAP_FILES+=		greek-antt.map
+TEX_MAP_FILES+=		qx-antt.map
+TEX_MAP_FILES+=		t2a-antt.map
+TEX_MAP_FILES+=		t2b-antt.map
+TEX_MAP_FILES+=		t2c-antt.map
+TEX_MAP_FILES+=		t5-antt.map
+TEX_MAP_FILES+=		texnansi-antt.map
+TEX_MAP_FILES+=		wncy-antt.map
+TEX_MAP_FILES+=		qbk.map
+TEX_MAP_FILES+=		qcr.map
+TEX_MAP_FILES+=		qhv.map
+TEX_MAP_FILES+=		qpl.map
+TEX_MAP_FILES+=		qtm.map
+TEX_MAP_FILES+=		qzc.map
+TEX_MAP_FILES+=		charter.map
+TEX_MAP_FILES+=		cmcyr.map
+TEX_MAP_FILES+=		contnav.map
+TEX_MAP_FILES+=		cork-lm.map
+TEX_MAP_FILES+=		qx-lm.map
+TEX_MAP_FILES+=		texnansi-lm.map
+TEX_MAP_FILES+=		ts1-lm.map
+TEX_MAP_FILES+=		marvosym.map
+TEX_MAP_FILES+=		mathpple.map
+TEX_MAP_FILES+=		omega.map
+TEX_MAP_FILES+=		pazo.map
+TEX_MAP_FILES+=		pxfonts.map
+TEX_MAP_FILES+=		txfonts.map
+TEX_MAP_FILES+=		xypic.map
+TEX_MAP_FILES+=		mt-belleek.map
+TEX_MAP_FILES+=		urwvn.map
+TEX_MAP_FILES+=		dstroke.map
+TEX_MAP_FILES+=		fpls.map
+TEX_MIXEDMAP_FILES+=	ttcmex.map
+TEX_MIXEDMAP_FILES+=	bsr.map
+TEX_MIXEDMAP_FILES+=	bsr-interpolated.map
+TEX_MIXEDMAP_FILES+=	cs.map
+TEX_MIXEDMAP_FILES+=	hoekwater.map
+TEX_MIXEDMAP_FILES+=	pl.map
+TEX_MIXEDMAP_FILES+=	ccpl.map
+TEX_MIXEDMAP_FILES+=	eurosym.map
+TEX_MIXEDMAP_FILES+=	vnr.map
+
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
 .include "../../print/teTeX3-bin/Makefile.common"
+.include "../../wip/texlive-tetex/format.mk"
+.include "../../wip/texlive-tetex/map.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST
index b0d440eb5b4..becdff1cb8e 100644
--- a/print/teTeX3-bin/PLIST
+++ b/print/teTeX3-bin/PLIST
@@ -1,16 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2009/01/08 22:09:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/01/26 21:17:05 minskim Exp $
 bin/a2ping
 bin/afm2tfm
 bin/aleph
-bin/allcm
-bin/allec
-bin/allneeded
 bin/bibtex
 bin/ctangle
 bin/ctie
 bin/cweave
 bin/dmp
-bin/dvi2fax
 bin/dvicopy
 bin/dvigif
 bin/dvihp
@@ -23,7 +19,6 @@ bin/dvipdfm
 bin/dvipdft
 bin/dvipng
 bin/dvips
-bin/dvired
 bin/dvitomp
 bin/dvitype
 bin/e2pall
@@ -31,17 +26,10 @@ bin/ebb
 bin/epstopdf
 bin/fdf2tan
 bin/fdf2tex
-bin/fmtutil
-bin/fmtutil-sys
-bin/fontinst
 bin/gftodvi
 bin/gftopk
 bin/gftype
 bin/gsftopk
-bin/kpsepath
-bin/kpsetool
-bin/kpsewhere
-bin/kpsexpand
 bin/mag
 bin/makeindex
 bin/makempx
@@ -52,7 +40,6 @@ bin/mft
 bin/mkindex
 bin/mkocp
 bin/mkofm
-bin/mktexfmt
 bin/mpost
 bin/mpto
 bin/mptopdf
@@ -80,24 +67,14 @@ bin/pktogf
 bin/pktype
 bin/pltotf
 bin/pooltype
-bin/ps2frag
 bin/ps2pk
-bin/ps4pdf
-bin/pslatex
-bin/rubibtex
-bin/rumakeindex
 bin/tangle
 bin/tex
-bin/texconfig
-bin/texconfig-dialog
-bin/texconfig-sys
 bin/texdoc
 bin/texdoctk
 bin/texexec
 bin/texfind
 bin/texfont
-bin/texhash
-bin/texlinks
 bin/texshow
 bin/texutil
 bin/tftopl
@@ -105,8 +82,6 @@ bin/thumbpdf
 bin/tie
 bin/ttf2afm
 bin/uniqleaf
-bin/updmap
-bin/updmap-sys
 bin/vftovp
 bin/vptovf
 bin/weave
@@ -117,9 +92,6 @@ info/latex.info
 info/dvips.info
 info/web2c.info
 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/ctangle.1
@@ -127,7 +99,6 @@ man/man1/ctie.1
 man/man1/cweave.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
@@ -139,52 +110,32 @@ man/man1/dvipdfm.1
 man/man1/dvipdft.1
 man/man1/dvipng.1
 man/man1/dvips.1
-man/man1/dvired.1
 man/man1/dvitomp.1
 man/man1/dvitype.1
-man/man1/e2pall.1
 man/man1/ebb.1
 man/man1/eplain.1
-man/man1/epstopdf.1
 man/man1/etex.1
 man/man1/fdf2tex.1
-man/man1/fmtutil-sys.1
-man/man1/fmtutil.1
-man/man1/fontinst.1
 man/man1/gftodvi.1
 man/man1/gftopk.1
 man/man1/gftype.1
 man/man1/gsftopk.1
-man/man1/kpsepath.1
-man/man1/kpsetool.1
-man/man1/kpsewhere.1
-man/man1/kpsexpand.1
 man/man1/lambda.1
 man/man1/latex.1
 man/man1/mag.1
 man/man1/makeindex.1
 man/man1/makempx.1
-man/man1/makempy.1
 man/man1/mf-nowin.1
 man/man1/mf.1
 man/man1/mft.1
 man/man1/mkindex.1
-man/man1/mkocp.1
-man/man1/mkofm.1
-man/man1/mktexfmt.1
 man/man1/mpost.1
 man/man1/mpto.1
 man/man1/newer.1
 man/man1/odvicopy.1
 man/man1/odvips.1
 man/man1/odvitype.1
-man/man1/ofm2opl.1
 man/man1/omega.1
-man/man1/opl2ofm.1
-man/man1/otp2ocp.1
-man/man1/outocp.1
-man/man1/ovf2ovp.1
-man/man1/ovp2ovf.1
 man/man1/oxdvi.1
 man/man1/patgen.1
 man/man1/pdfetex.1
@@ -197,36 +148,18 @@ 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/rubibtex.1
-man/man1/rumakeindex.1
 man/man1/tangle.1
 man/man1/tex.1
-man/man1/texconfig-sys.1
-man/man1/texconfig.1
 man/man1/texdoc.1
-man/man1/texdoctk.1
-man/man1/texexec.1
-man/man1/texfind.1
-man/man1/texfont.1
-man/man1/texhash.1
-man/man1/texlinks.1
 man/man1/texshow.1
-man/man1/texutil.1
 man/man1/tftopl.1
-man/man1/thumbpdf.1
 man/man1/tie.1
-man/man1/ttf2afm.1
-man/man1/updmap-sys.1
-man/man1/updmap.1
 man/man1/vftovp.1
 man/man1/vptovf.1
 man/man1/weave.1
 man/man1/xdvi.1
 man/man1/xdvizilla.1
-man/man5/fmtutil.cnf.5
 share/texmf/doc/tetex/TETEXDOC.dvi
 share/texmf/doc/tetex/TETEXDOC.pdf
 share/texmf/doc/tetex/TETEXDOC.ps
@@ -240,16 +173,9 @@ 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/fmtutil/format.tetex.cnf
 share/texmf/release-tetex-src.txt
-share/texmf/texconfig/README
-share/texmf/texconfig/g/generic
-share/texmf/texconfig/generic
-share/texmf/texconfig/tcfmgr
-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.dist
 share/texmf/web2c/mf.pool
 share/texmf/web2c/mp.pool
 share/texmf/web2c/omega.pool
diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index 78cbeb71863..339fe6a0c6f 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.15 2009/01/21 22:06:54 schwarz Exp $
+$NetBSD: distinfo,v 1.16 2009/01/26 21:17:05 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
 Size (teTeX/tetex-src-3.0.tar.gz) = 12749314 bytes
 SHA1 (patch-aa) = afdcbf2dafe053db174ca456806667dbe2cc79c2
 SHA1 (patch-ab) = caaf91dbbd8fa94fabf7b4f6fe6e0a97c7a6071a
-SHA1 (patch-ac) = af7d8c65cece55b7f37e7cf3c99c85e75cb911a1
 SHA1 (patch-ad) = 23d8e8729bc10748cceba5be3272484ab50f34e6
 SHA1 (patch-ae) = 68825699db129b82f476c37ba3b6e20a8831ad6e
 SHA1 (patch-af) = d5fd0e1b30b1ea9fd96fe5983088df5a723f04b7
@@ -18,9 +17,9 @@ SHA1 (patch-al) = e1fc74bd6ea05176dfac4e99958f0e1281b89b3b
 SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
 SHA1 (patch-ao) = 3aa5c8ac2eaf79a2a350febe102872b529f534a9
-SHA1 (patch-ap) = 0ca7341b416842fbc00a935d6cfdb0531c4169ba
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
-SHA1 (patch-ar) = 7f0c6cdca69b73bad1c8f8298e417ede1cd89d77
+SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b
+SHA1 (patch-as) = e67aa6558648480ba686f84e08cee3670c79fbd1
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
diff --git a/print/teTeX3-bin/patches/patch-ar b/print/teTeX3-bin/patches/patch-ar
index a5550c9bf9b..1119690d052 100644
--- a/print/teTeX3-bin/patches/patch-ar
+++ b/print/teTeX3-bin/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.2 2006/04/05 16:04:01 jlam Exp $
+$NetBSD: patch-ar,v 1.3 2009/01/26 21:17:05 minskim Exp $
 
---- texk/web2c/Makefile.in.orig	2005-02-06 05:56:56.000000000 -0500
+--- texk/web2c/Makefile.in.orig	2005-02-06 02:56:56.000000000 -0800
 +++ texk/web2c/Makefile.in
 @@ -600,7 +600,7 @@ tex-check: trip tex.fmt
  	TEXMFCNF=../kpathsea \
@@ -16,7 +16,7 @@ $NetBSD: patch-ar,v 1.2 2006/04/05 16:04:01 jlam Exp $
  	$(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
++	$(INSTALL_DATA) fmtutil.cnf $(prefix)/share/texmf/fmtutil/format.tetex.cnf
  
  # Dummy target.
  uninstall uninstall-exec uninstall-data: