- Replace symlinks to CM Type 1 font files with ones to the

  font directories.
- Bump PORTREVISION.

2 files changed, 12 insertions, 174 deletions

diff --git a/print/teTeX-texmf/Makefile b/print/teTeX-texmf/Makefile
index d52b5eedf8bc..dad627999323 100644
--- a/print/teTeX-texmf/Makefile
+++ b/print/teTeX-texmf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	teTeX-texmf
 PORTVERSION=	3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -58,36 +58,6 @@ EXCLUDE_LIST=	fonts/type1/bluesky/cm/\* \
 		fonts/type1/bluesky/symbols/\* \
 		fonts/type1/bluesky/cyrillic/\*
 
-CMPSFONTDIR=	${LOCALBASE}/share/fonts/cmpsfont
-AMSPSFONTDIR=	${LOCALBASE}/share/fonts/amspsfont
-
-CMFONTS=	cmb10.pfb cmbsy10.pfb cmbx10.pfb cmbx12.pfb cmbx5.pfb \
-		cmbx6.pfb cmbx7.pfb cmbx8.pfb cmbx9.pfb cmbxsl10.pfb \
-		cmbxti10.pfb cmcsc10.pfb cmdunh10.pfb cmex10.pfb cmff10.pfb \
-		cmfi10.pfb cmfib8.pfb cminch.pfb cmitt10.pfb cmmi10.pfb \
-		cmmi12.pfb cmmi5.pfb cmmi6.pfb cmmi7.pfb cmmi8.pfb cmmi9.pfb \
-		cmmib10.pfb cmr10.pfb cmr12.pfb cmr17.pfb cmr5.pfb cmr6.pfb \
-		cmr7.pfb cmr8.pfb cmr9.pfb cmsl10.pfb cmsl12.pfb cmsl8.pfb \
-		cmsl9.pfb cmsltt10.pfb cmss10.pfb cmss12.pfb cmss17.pfb \
-		cmss8.pfb cmss9.pfb cmssbx10.pfb cmssdc10.pfb cmssi10.pfb \
-		cmssi12.pfb cmssi17.pfb cmssi8.pfb cmssi9.pfb cmssq8.pfb \
-		cmssqi8.pfb cmsy10.pfb cmsy5.pfb cmsy6.pfb cmsy7.pfb \
-		cmsy8.pfb cmsy9.pfb cmtcsc10.pfb cmtex10.pfb cmtex8.pfb \
-		cmtex9.pfb cmti10.pfb cmti12.pfb cmti7.pfb cmti8.pfb \
-		cmti9.pfb cmtt10.pfb cmtt12.pfb cmtt8.pfb cmtt9.pfb \
-		cmu10.pfb cmvtt10.pfb
-LATEXFONTS=	lasy10.pfb lasy5.pfb lasy6.pfb lasy7.pfb lasy8.pfb lasy9.pfb \
-		lasyb10.pfb lcircle1.pfb lcirclew.pfb lcmss8.pfb lcmssb8.pfb \
-		lcmssi8.pfb line10.pfb linew10.pfb logo10.pfb logo8.pfb \
-		logo9.pfb logobf10.pfb logosl10.pfb
-CMEXTRAFONTS=	cmbsy5.pfb cmbsy7.pfb cmmib5.pfb cmmib7.pfb
-EULERFONTS=	eurm10.pfb eusb10.pfb eufb10.pfb eurb5.pfb eurb7.pfb \
-		eurb10.pfb eurm5.pfb eusb5.pfb eurm7.pfb eusb7.pfb \
-		eusm10.pfb eufb5.pfb eufb7.pfb eusm5.pfb eusm7.pfb \
-		eufm10.pfb euex10.pfb eufm5.pfb eufm7.pfb
-SYMBOLSFONTS=	msbm10.pfb msam5.pfb msam7.pfb msbm5.pfb msbm7.pfb msam10.pfb
-CYRILLICFONTS=	wncyss10.pfb wncyb10.pfb wncyi10.pfb wncyr10.pfb wncysc10.pfb
-
 do-install:
 	${MKDIR} ${PREFIX}/${TEXMFDISTDIR}
 	cd ${PREFIX}/${TEXMFDISTDIR} && \
@@ -96,15 +66,12 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/cslatex.ini ${PREFIX}/${TEXMFDISTDIR}/tex/cslatex/cslatex.ini
 	${INSTALL_DATA} ${FILESDIR}/csplain.ini ${PREFIX}/${TEXMFDISTDIR}/tex/csplain/csplain.ini
 	${INSTALL_DATA} ${FILESDIR}/t1code.tex ${PREFIX}/${TEXMFDISTDIR}/tex/csplain/t1code.tex
-.for F in CM LATEX
-	${MKDIR} ${PREFIX}/${TEXMFDISTDIR}/fonts/type1/bluesky/${F:L}
-	cd ${PREFIX}/${TEXMFDISTDIR}/fonts/type1/bluesky/${F:L} && \
-		${LN} -s -f ${${F}FONTS:S,^,${CMPSFONTDIR}/,} .
-.endfor
-.for F in CMEXTRA EULER SYMBOLS CYRILLIC
-	${MKDIR} ${PREFIX}/${TEXMFDISTDIR}/fonts/type1/bluesky/${F:L}
-	cd ${PREFIX}/${TEXMFDISTDIR}/fonts/type1/bluesky/${F:L} && \
-		${LN} -s -f ${${F}FONTS:S,^,${AMSPSFONTDIR}/,} .
+.for T in afm type1
+	${MKDIR} ${PREFIX}/${TEXMFDISTDIR}/fonts/${T}/bluesky
+	cd ${PREFIX}/${TEXMFDISTDIR}/fonts/${T}/bluesky && \
+		${LN} -s -f ${LOCALBASE}/share/fonts/cmpsfont/${T} ./cm
+	cd ${PREFIX}/${TEXMFDISTDIR}/fonts/${T}/bluesky && \
+		${LN} -s -f ${LOCALBASE}/share/fonts/amspsfont/${T} ./ams
 .endfor
 	cd ${PREFIX}/${TEXMFDISTDIR}/dvips/pstricks && \
 		${PATCH} --quiet < ${WRKDIR}/PSTricks.patch && \
diff --git a/print/teTeX-texmf/pkg-plist b/print/teTeX-texmf/pkg-plist
index d65681602bcf..07cd674957c3 100644
--- a/print/teTeX-texmf/pkg-plist
+++ b/print/teTeX-texmf/pkg-plist
@@ -3867,6 +3867,8 @@
 %%TEXMFDISTDIR%%/fonts/afm/bitstrea/charter/bchbi8a.afm
 %%TEXMFDISTDIR%%/fonts/afm/bitstrea/charter/bchr8a.afm
 %%TEXMFDISTDIR%%/fonts/afm/bitstrea/charter/bchri8a.afm
+%%TEXMFDISTDIR%%/fonts/afm/bluesky/cm
+%%TEXMFDISTDIR%%/fonts/afm/bluesky/ams
 %%TEXMFDISTDIR%%/fonts/afm/public/antp/antpb.afm
 %%TEXMFDISTDIR%%/fonts/afm/public/antp/antpbi.afm
 %%TEXMFDISTDIR%%/fonts/afm/public/antp/antpr.afm
@@ -9010,134 +9012,8 @@
 %%TEXMFDISTDIR%%/fonts/type1/bitstrea/charter/bchbi8a.pfb
 %%TEXMFDISTDIR%%/fonts/type1/bitstrea/charter/bchr8a.pfb
 %%TEXMFDISTDIR%%/fonts/type1/bitstrea/charter/bchri8a.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmb10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbsy10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbx10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbx12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbx5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbx6.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbx7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbx8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbx9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbxsl10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmbxti10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmcsc10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmdunh10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmex10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmff10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmfi10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmfib8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cminch.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmitt10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmi10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmi12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmi5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmi6.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmi7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmi8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmi9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmmib10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr17.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr6.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmr9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsl10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsl12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsl8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsl9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsltt10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmss10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmss12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmss17.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmss8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmss9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssbx10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssdc10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssi10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssi12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssi17.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssi8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssi9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssq8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmssqi8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsy10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsy5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsy6.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsy7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsy8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmsy9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtcsc10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtex10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtex8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtex9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmti10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmti12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmti7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmti8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmti9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtt10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtt12.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtt8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmtt9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmu10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm/cmvtt10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cmextra/cmbsy5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cmextra/cmbsy7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cmextra/cmmib5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cmextra/cmmib7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cyrillic/wncyb10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cyrillic/wncyi10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cyrillic/wncyr10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cyrillic/wncysc10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/cyrillic/wncyss10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/euex10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eufb10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eufb5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eufb7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eufm10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eufm5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eufm7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eurb10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eurb5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eurb7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eurm10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eurm5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eurm7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eusb10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eusb5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eusb7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eusm10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eusm5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/euler/eusm7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lasy10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lasy5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lasy6.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lasy7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lasy8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lasy9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lasyb10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lcircle1.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lcirclew.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lcmss8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lcmssb8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/lcmssi8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/line10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/linew10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/logo10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/logo8.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/logo9.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/logobf10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/latex/logosl10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/symbols/msam10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/symbols/msam5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/symbols/msam7.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/symbols/msbm10.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/symbols/msbm5.pfb
-%%TEXMFDISTDIR%%/fonts/type1/bluesky/symbols/msbm7.pfb
+%%TEXMFDISTDIR%%/fonts/type1/bluesky/cm
+%%TEXMFDISTDIR%%/fonts/type1/bluesky/ams
 %%TEXMFDISTDIR%%/fonts/type1/hoekwater/context/contnav.pfb
 %%TEXMFDISTDIR%%/fonts/type1/hoekwater/mflogo/logo10.pfb
 %%TEXMFDISTDIR%%/fonts/type1/hoekwater/mflogo/logo8.pfb
@@ -14248,12 +14124,6 @@
 @dirrm %%TEXMFDISTDIR%%/fonts/type1/hoekwater/mflogo
 @dirrm %%TEXMFDISTDIR%%/fonts/type1/hoekwater/context
 @dirrm %%TEXMFDISTDIR%%/fonts/type1/hoekwater
-@dirrm %%TEXMFDISTDIR%%/fonts/type1/bluesky/symbols
-@dirrm %%TEXMFDISTDIR%%/fonts/type1/bluesky/latex
-@dirrm %%TEXMFDISTDIR%%/fonts/type1/bluesky/euler
-@dirrm %%TEXMFDISTDIR%%/fonts/type1/bluesky/cyrillic
-@dirrm %%TEXMFDISTDIR%%/fonts/type1/bluesky/cmextra
-@dirrm %%TEXMFDISTDIR%%/fonts/type1/bluesky/cm
 @dirrm %%TEXMFDISTDIR%%/fonts/type1/bluesky
 @dirrm %%TEXMFDISTDIR%%/fonts/type1/bitstrea/charter
 @dirrm %%TEXMFDISTDIR%%/fonts/type1/bitstrea
@@ -14499,6 +14369,7 @@
 @dirrm %%TEXMFDISTDIR%%/fonts/afm/public/antt
 @dirrm %%TEXMFDISTDIR%%/fonts/afm/public/antp
 @dirrm %%TEXMFDISTDIR%%/fonts/afm/public
+@dirrm %%TEXMFDISTDIR%%/fonts/afm/bluesky
 @dirrm %%TEXMFDISTDIR%%/fonts/afm/bitstrea/charter
 @dirrm %%TEXMFDISTDIR%%/fonts/afm/bitstrea
 @dirrm %%TEXMFDISTDIR%%/fonts/afm/adobe/zapfding