Fix broken font maps, as reported by Richard Bonichon and Laurence Tratt.

Emulate texlinks, so that those pesky symlinks are now in the packing list.
Minor plist tidy-ups that help fix the upgrade (see recent quirks commit).

OK kili@, espie@

print/texlive/README

@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.1 2011/03/08 00:09:42 edd Exp $
+$OpenBSD: README,v 1.2 2011/06/13 16:40:51 edd Exp $
 
 Porting of TeX Live 2010 is now complete. Any remaining bugs will be
 fixed in-tree. This file remains as a reference when the time comes to
@@ -22,6 +22,7 @@ TeX Live 2010 - Porting progress.
    -> fix $HOME ls-R owned root bug:	done
    -> make fmtutil.cnf configs:		not needed this year
  * Implement remaining @xxx directives:	done
+ * emulate texlinks			done
  * Test lots:				done (several months)
  * Link to build as print/texlive:	done
 

print/texlive/base/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.48 2011/05/21 17:37:06 espie Exp $
+# $OpenBSD: Makefile,v 1.49 2011/06/13 16:40:51 edd Exp $
 
 COMMENT =		base binaries for TeXLive typesetting distribution
 
 DISTNAME = 		texlive-${DIST_V}-source
 PKGNAME =		texlive_base-${V}
-REVISION =		1
+REVISION =		2
 
 SHARED_LIBS =		kpathsea	3.0
 SHARED_LIBS +=		ptexenc		0.0
@@ -106,6 +106,19 @@ SUBST_VARS +=		TRUEPREFIX LOCALBASE
 pre-install:
 	mkdir -p ${WRKSRC}/inst
 
+# symlinks that would have been installed by texlinks.
+# texlinks can not do this itself in the fake dir, as it requires
+# a fully hashed texmf tree and working kpse configuration.
+ALEPH_LN =	lamed 
+LUATEX_LN =	dvilualatex dviluatex lualatex
+MPOST_LN =	metafun mfplain
+PDFTEX_LN =	amstex cslatex csplain eplain etex jadetex latex mex \
+		mllatex mltex pdfcslatex pdfcsplain pdfetex pdfjadetex \
+		pdflatex pdfmex pdfxmltex physe phyzzx texsis utf8mex \
+		xmltex
+PTEX_LN =	platex
+XETEX_LN =	xelatex
+
 post-install:
 	rm -Rf ${WRKSRC}/inst
 
@@ -121,4 +134,25 @@ post-install:
 		fi \
 	done
 
+	# emulate texlinks
+	for i in ${ALEPH_LN}; do \
+		ln -s ${TRUEPREFIX}/bin/aleph ${PREFIX}/bin/$$i; \
+	done
+	for i in ${LUATEX_LN}; do \
+		ln -s ${TRUEPREFIX}/bin/luatex ${PREFIX}/bin/$$i; \
+	done
+	for i in ${MPOST_LN}; do \
+		ln -s ${TRUEPREFIX}/bin/mpost ${PREFIX}/bin/$$i; \
+	done
+	for i in ${PDFTEX_LN}; do \
+		ln -s ${TRUEPREFIX}/bin/pdftex ${PREFIX}/bin/$$i; \
+	done
+	for i in ${PTEX_LN}; do \
+		ln -s ${TRUEPREFIX}/bin/ptex ${PREFIX}/bin/$$i; \
+	done
+	for i in ${XETEX_LN}; do \
+		ln -s ${TRUEPREFIX}/bin/xetex ${PREFIX}/bin/$$i; \
+	done
+
 .include <bsd.port.mk>
+

print/texlive/base/pkg/PLIST

@@ -1,11 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.17 2011/05/11 07:45:53 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.18 2011/06/13 16:40:51 edd Exp $
 @conflict teTeX_base-*
 @conflict ht-<2
 @pkgpath print/teTeX/base
 @pkgpath print/teTeX/base,-fmt
-@comment mptopdf must be before texlinks -u
-bin/mptopdf
-@unexec texlinks -u
 bin/a2ping
 bin/afm2afm
 @bin bin/afm2pl
@@ -14,6 +11,7 @@ bin/afm2afm
 bin/allcm
 bin/allec
 bin/allneeded
+bin/amstex
 bin/arlatex
 bin/authorindex
 bin/autoinst
@@ -42,6 +40,8 @@ bin/cefspdflatex
 bin/chkweb
 bin/cmap2enc
 bin/context
+bin/cslatex
+bin/csplain
 @bin bin/ctangle
 @bin bin/ctie
 bin/ctxtools
@@ -64,6 +64,8 @@ bin/dvihp
 @bin bin/dvilj4
 @bin bin/dvilj4l
 bin/dvilj6
+bin/dvilualatex
+bin/dviluatex
 bin/dvipdfm
 @bin bin/dvipdfmx
 bin/dvipdft
@@ -79,9 +81,11 @@ bin/dvitomp
 bin/e2pall
 bin/ebb
 bin/ebong
+bin/eplain
 bin/epspdf
 bin/epspdftk
 bin/epstopdf
+bin/etex
 @bin bin/extconv
 bin/extractbb
 bin/fig4latex
@@ -106,6 +110,7 @@ bin/httex
 bin/httexi
 bin/htxelatex
 bin/htxetex
+bin/jadetex
 @bin bin/kpseaccess
 bin/kpsepath
 @bin bin/kpsereadlink
@@ -115,12 +120,15 @@ bin/kpsewhere
 @bin bin/kpsewhich
 bin/kpsexpand
 @bin bin/lacheck
+bin/lamed
+bin/latex
 bin/latex2man
 bin/latexdiff
 bin/latexdiff-vc
 @comment bin/latexmk
 bin/latexrevise
 bin/listings-ext.sh
+bin/lualatex
 @bin bin/luatex
 bin/luatools
 @bin bin/mag
@@ -129,8 +137,11 @@ bin/makeglossaries
 @bin bin/makejvf
 bin/mathspic
 @bin bin/mendex
+bin/metafun
+bin/mex
 @bin bin/mf
 @bin bin/mf-nowin
+bin/mfplain
 @bin bin/mft
 bin/mk4ht
 bin/mkgrkindex
@@ -145,11 +156,14 @@ bin/mktexlsr
 bin/mktexmf
 bin/mktexpk
 bin/mktextfm
+bin/mllatex
+bin/mltex
 @bin bin/mmafm
 @bin bin/mmpfb
 @bin bin/mpost
 %%SHARED%%
 %%xindy%%
+bin/mptopdf
 bin/mtxrun
 @bin bin/musixflx
 @bin bin/odvicopy
@@ -175,27 +189,37 @@ bin/pdfatfi
 @comment bin/pdfbook
 @bin bin/pdfclose
 bin/pdfcrop
+bin/pdfcslatex
+bin/pdfcsplain
+bin/pdfetex
 @comment bin/pdfflip
+bin/pdfjadetex
 @comment bin/pdfjam
 @comment bin/pdfjam-pocketmod
 @comment bin/pdfjam-slides3up
 @comment bin/pdfjam-slides6up
 @comment bin/pdfjoin
+bin/pdflatex
+bin/pdfmex
 @comment bin/pdfnup
 @bin bin/pdfopen
 @comment bin/pdfpun
 @bin bin/pdftex
 bin/pdfthumb
 @bin bin/pdftosrc
+bin/pdfxmltex
 @bin bin/pdvitype
 bin/perltex
 @bin bin/pfb2pfa
 bin/pfm2kpx
+bin/physe
+bin/phyzzx
 @bin bin/pk2bm
 bin/pkfix
 bin/pkfix-helper
 @bin bin/pktogf
 @bin bin/pktype
+bin/platex
 @bin bin/pltotf
 @bin bin/pooltype
 @bin bin/ppltotf
@@ -249,11 +273,10 @@ bin/texloganalyser
 bin/texlua
 bin/texluac
 bin/texmfstart
+bin/texsis
 @bin bin/tftopl
 bin/thumbpdf
 @bin bin/tie
-@comment bin/tl-link-config
-@comment bin/tl-link-config.beforesubst
 @comment bin/tlmgr
 bin/tpic2pdftex
 @bin bin/ttf2afm
@@ -264,6 +287,7 @@ bin/tpic2pdftex
 bin/ulqda
 bin/updmap
 bin/updmap-sys
+bin/utf8mex
 @bin bin/vftovp
 @bin bin/vlna
 bin/vpe
@@ -274,7 +298,9 @@ bin/vpl2vpl
 bin/xdvi
 @bin bin/xdvi-xaw
 @bin bin/xdvipdfmx
+bin/xelatex
 @bin bin/xetex
+bin/xmltex
 include/kpathsea/
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
@@ -489,7 +515,6 @@ lib/libptexenc.la
 share/doc/pkg-readmes/${FULLPKGNAME}
 share/lcdf-typetools-for-tex-live/
 @exec mktexlsr > /dev/null 2>&1
-@exec texlinks
 @extraunexec rm -Rf %D/share/texmf-var/
 @extraunexec rm -Rf %D/share/texmf-config/
 @comment share/texmf-dist/bibtex/csf/base/88591lat.csf

print/texlive/texmf/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2011/03/09 14:43:59 edd Exp $
+# $OpenBSD: Makefile,v 1.19 2011/06/13 16:40:52 edd Exp $
 
 COMMENT-main =		texlive texmf for laTeX/PdfTeX 
 COMMENT-full =		texlive texmf for XeTeX/ConTeXt and extra macros
@@ -7,13 +7,14 @@ COMMENT-docs =		texlive documentation
 DISTNAME =		texlive-${DIST_V}-texmf
 MASTER_SITES0 =		http://theunixzoo.co.uk/distfiles/
 DISTFILES =		${DISTNAME}${EXTRACT_SUFX} \
-			texmf-var-pregen-2010${EXTRACT_SUFX}:0
+			texmf-var-pregen-2010.1${EXTRACT_SUFX}:0
 
 PKGNAME-main = 		texlive_texmf-minimal-${V}
 PKGNAME-full = 		texlive_texmf-full-${V}
 PKGNAME-docs =	 	texlive_texmf-docs-${V}
 
-REVISION-main =		0
+REVISION-main =		1
+REVISION-full =		0
 
 NO_BUILD =		Yes
 NO_REGRESS =		Yes

print/texlive/texmf/distinfo

@@ -1,10 +1,10 @@
 MD5 (texlive-20100722-texmf.tar.xz) = Et7DoyPE63W5ijFgxi3IZQ==
-MD5 (texmf-var-pregen-2010.tar.xz) = qNdvyLW7EldON2CP9GxnGQ==
+MD5 (texmf-var-pregen-2010.1.tar.xz) = VrbNMlORaiy5XzdYvPQG/g==
 RMD160 (texlive-20100722-texmf.tar.xz) = YIwA8D1MDvCOlX7ABxIybnXu4E4=
-RMD160 (texmf-var-pregen-2010.tar.xz) = i1n0mVovkMvxowFyk0QXro2b+XE=
+RMD160 (texmf-var-pregen-2010.1.tar.xz) = jdgnDV7xK0YCiyuFPn3eN+3tDVQ=
 SHA1 (texlive-20100722-texmf.tar.xz) = 32ugUJcFkvD184y53TbU0NZx+oA=
-SHA1 (texmf-var-pregen-2010.tar.xz) = pjLgp19E0fzxB0NQM64Vq3YQMZw=
+SHA1 (texmf-var-pregen-2010.1.tar.xz) = xzw3UZ69w105P/Svq05i20nWVtM=
 SHA256 (texlive-20100722-texmf.tar.xz) = LTED3JEAqevQDbtQDWeInaLj096J+N8RGA1bSlLgD4U=
-SHA256 (texmf-var-pregen-2010.tar.xz) = na3foQLh9WAqHvo21+vXu6l8JA+MafsszEonH9zqZWY=
+SHA256 (texmf-var-pregen-2010.1.tar.xz) = 6fDlUuDwbkPTJEntM1REVDs/xNqtrWhjy8p6g+jsLlg=
 SIZE (texlive-20100722-texmf.tar.xz) = 1137115288
-SIZE (texmf-var-pregen-2010.tar.xz) = 13799604
+SIZE (texmf-var-pregen-2010.1.tar.xz) = 13086664

print/texlive/texmf/pkg/PLIST-full

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-full,v 1.11 2011/03/08 00:09:42 edd Exp $
+@comment $OpenBSD: PLIST-full,v 1.12 2011/06/13 16:40:52 edd Exp $
 @conflict teTeX_texmf-*
 @conflict texlive_texmf-docs-<2010
 @conflict texlive_texmf-minimal-<2010
@@ -28114,6 +28114,4 @@ share/texmf/xindy/modules/tex/inputenc/latin1.xdy
 share/texmf/xindy/modules/tex/inputenc/latin2.xdy
 share/texmf/xindy/modules/tex/inputenc/latin3.xdy
 @exec mktexlsr > /dev/null 2>&1
-@exec texlinks
 @unexec-delete mktexlsr > /dev/null 2>&1
-@unexec-delete texlinks

print/texlive/texmf/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.8 2011/03/08 00:09:42 edd Exp $
+@comment $OpenBSD: PLIST-main,v 1.9 2011/06/13 16:40:53 edd Exp $
 @conflict teTeX_texmf-*
 @conflict texlive_base-<2010
 @conflict texlive_texmf-docs-<2010
@@ -35003,7 +35003,7 @@ share/texmf/web2c/tcvn-t5.tcx
 share/texmf/web2c/texmf.cnf
 share/texmf/web2c/texmfcnf.lua
 share/texmf/web2c/updmap-hdr.cfg
-@sample share/texmf/web2c/updmap.cfg
+share/texmf/web2c/updmap.cfg
 share/texmf/web2c/viscii-t5.tcx
 share/texmf/xdvi/
 share/texmf/xdvi/XDvi
@@ -35013,13 +35013,10 @@ share/texmf/xdvi/pixmap/toolbar2.xpm
 share/texmf/xdvi/xdvi.cfg
 share/texmf-var/
 share/texmf-var/web2c/
-share/texmf-var/web2c/luatex/
+share/texmf-var/web2c/aleph/
-share/texmf-var/web2c/luatex/dviluatex.fmt
+share/texmf-var/web2c/aleph/aleph.fmt
-share/texmf-var/web2c/luatex/dvilualatex.fmt
+share/texmf-var/web2c/aleph/lamed.fmt
-share/texmf-var/web2c/luatex/lualatex.fmt
-share/texmf-var/web2c/luatex/luatex.fmt
 share/texmf-var/web2c/pdftex/
-share/texmf-var/web2c/pdftex/pdfetex.fmt
 share/texmf-var/web2c/pdftex/amstex.fmt
 share/texmf-var/web2c/pdftex/cont-en.fmt
 share/texmf-var/web2c/pdftex/cslatex.fmt
@@ -35027,6 +35024,8 @@ share/texmf-var/web2c/pdftex/pdfcslatex.fmt
 share/texmf-var/web2c/pdftex/csplain.fmt
 share/texmf-var/web2c/pdftex/pdfcsplain.fmt
 share/texmf-var/web2c/pdftex/eplain.fmt
+share/texmf-var/web2c/pdftex/jadetex.fmt
+share/texmf-var/web2c/pdftex/pdfjadetex.fmt
 share/texmf-var/web2c/pdftex/latex.fmt
 share/texmf-var/web2c/pdftex/pdflatex.fmt
 share/texmf-var/web2c/pdftex/mex.fmt
@@ -35037,18 +35036,26 @@ share/texmf-var/web2c/pdftex/mllatex.fmt
 share/texmf-var/web2c/pdftex/mptopdf.fmt
 share/texmf-var/web2c/pdftex/pdftex.fmt
 share/texmf-var/web2c/pdftex/etex.fmt
+share/texmf-var/web2c/pdftex/pdfetex.fmt
+share/texmf-var/web2c/pdftex/physe.fmt
+share/texmf-var/web2c/pdftex/phyzzx.fmt
+share/texmf-var/web2c/pdftex/texsis.fmt
+share/texmf-var/web2c/pdftex/xmltex.fmt
+share/texmf-var/web2c/pdftex/pdfxmltex.fmt
 share/texmf-var/web2c/xetex/
 share/texmf-var/web2c/xetex/cont-en.fmt
 share/texmf-var/web2c/xetex/xetex.fmt
 share/texmf-var/web2c/xetex/xelatex.fmt
 share/texmf-var/web2c/metapost/
-share/texmf-var/web2c/metapost/mpost.mem
 share/texmf-var/web2c/metapost/metafun.mem
+share/texmf-var/web2c/metapost/mpost.mem
 share/texmf-var/web2c/metapost/mplib-luatex.mem
 share/texmf-var/web2c/metapost/mfplain.mem
-share/texmf-var/web2c/aleph/
+share/texmf-var/web2c/luatex/
-share/texmf-var/web2c/aleph/aleph.fmt
+share/texmf-var/web2c/luatex/dvilualatex.fmt
-share/texmf-var/web2c/aleph/lamed.fmt
+share/texmf-var/web2c/luatex/lualatex.fmt
+share/texmf-var/web2c/luatex/luatex.fmt
+share/texmf-var/web2c/luatex/dviluatex.fmt
 share/texmf-var/web2c/metafont/
 share/texmf-var/web2c/metafont/mf.base
 share/texmf-var/web2c/ptex/
@@ -35076,3 +35083,4 @@ share/texmf-var/fonts/map/dvipdfm/updmap/
 share/texmf-var/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
 share/texmf-var/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
 share/texmf-var/fonts/map/dvipdfm/updmap/dvipdfm.map
+@extra share/texmf-var/ls-R