Fix Type1 PS font install directories of print/cmpsfont

and print/amspsfnt.  Some font management software expect
that both of .afm and .pfb files are in the same directory.
Bump PORTREVISION of the related ports.

Suggested by:	Pedro F. Giffuni (giffunip at asme dot org)

7 files changed, 281 insertions, 285 deletions

diff --git a/print/amspsfnt/Makefile b/print/amspsfnt/Makefile
index c0a32ef2968a..d40c7d90df38 100644
--- a/print/amspsfnt/Makefile
+++ b/print/amspsfnt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amspsfnt
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/ams/
 DISTNAME=	amsps
@@ -27,11 +27,10 @@ do-build:
 	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog)
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}/afm
-	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/${FONTSDIR}/afm
-	${MKDIR} ${PREFIX}/${FONTSDIR}/pfb
-	${INSTALL_DATA} ${WRKSRC}/pfb/* ${PREFIX}/${FONTSDIR}/pfb
-	${INSTALL_DATA} ${WRKSRC}/READ.ME ${PREFIX}/${FONTSDIR}
+	${MKDIR} ${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/pfb/* ${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/READ.ME ${PREFIX}/${FONTSDIR}/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/amspsfnt/files/pkg-message.in b/print/amspsfnt/files/pkg-message.in
index ffb343bfe07b..0acc06b40caf 100644
--- a/print/amspsfnt/files/pkg-message.in
+++ b/print/amspsfnt/files/pkg-message.in
@@ -2,10 +2,10 @@
 American Math Society Postscript fonts have been installed!
 ============================================================
 
-Please add	%%PREFIX%%/share/fonts/amspsfont/pfb
+Please add	%%PREFIX%%/share/fonts/amspsfont
 to your X11 fonts path by either:
 
-$ xset fp+  %%PREFIX%%/share/fonts/amspsfont/pfb
+$ xset fp+  %%PREFIX%%/share/fonts/amspsfont
 $ xset fp rehash
 
 or by adding it to your X-server configuration file.
diff --git a/print/amspsfnt/pkg-plist b/print/amspsfnt/pkg-plist
index 49418cccc8d7..2956996481f2 100644
--- a/print/amspsfnt/pkg-plist
+++ b/print/amspsfnt/pkg-plist
@@ -1,77 +1,75 @@
 @comment $FreeBSD$
 share/fonts/amspsfont/READ.ME
-share/fonts/amspsfont/afm/cmbsy5.afm
-share/fonts/amspsfont/afm/cmbsy7.afm
-share/fonts/amspsfont/afm/cmmib5.afm
-share/fonts/amspsfont/afm/cmmib7.afm
-share/fonts/amspsfont/afm/euex10.afm
-share/fonts/amspsfont/afm/eufb10.afm
-share/fonts/amspsfont/afm/eufb5.afm
-share/fonts/amspsfont/afm/eufb7.afm
-share/fonts/amspsfont/afm/eufm10.afm
-share/fonts/amspsfont/afm/eufm5.afm
-share/fonts/amspsfont/afm/eufm7.afm
-share/fonts/amspsfont/afm/eurb10.afm
-share/fonts/amspsfont/afm/eurb5.afm
-share/fonts/amspsfont/afm/eurb7.afm
-share/fonts/amspsfont/afm/eurm10.afm
-share/fonts/amspsfont/afm/eurm5.afm
-share/fonts/amspsfont/afm/eurm7.afm
-share/fonts/amspsfont/afm/eusb10.afm
-share/fonts/amspsfont/afm/eusb5.afm
-share/fonts/amspsfont/afm/eusb7.afm
-share/fonts/amspsfont/afm/eusm10.afm
-share/fonts/amspsfont/afm/eusm5.afm
-share/fonts/amspsfont/afm/eusm7.afm
-share/fonts/amspsfont/afm/msam10.afm
-share/fonts/amspsfont/afm/msam5.afm
-share/fonts/amspsfont/afm/msam7.afm
-share/fonts/amspsfont/afm/msbm10.afm
-share/fonts/amspsfont/afm/msbm5.afm
-share/fonts/amspsfont/afm/msbm7.afm
-share/fonts/amspsfont/afm/wncyb10.afm
-share/fonts/amspsfont/afm/wncyi10.afm
-share/fonts/amspsfont/afm/wncyr10.afm
-share/fonts/amspsfont/afm/wncysc10.afm
-share/fonts/amspsfont/afm/wncyss10.afm
-share/fonts/amspsfont/pfb/cmbsy5.pfb
-share/fonts/amspsfont/pfb/cmbsy7.pfb
-share/fonts/amspsfont/pfb/cmmib5.pfb
-share/fonts/amspsfont/pfb/cmmib7.pfb
-share/fonts/amspsfont/pfb/euex10.pfb
-share/fonts/amspsfont/pfb/eufb10.pfb
-share/fonts/amspsfont/pfb/eufb5.pfb
-share/fonts/amspsfont/pfb/eufb7.pfb
-share/fonts/amspsfont/pfb/eufm10.pfb
-share/fonts/amspsfont/pfb/eufm5.pfb
-share/fonts/amspsfont/pfb/eufm7.pfb
-share/fonts/amspsfont/pfb/eurb10.pfb
-share/fonts/amspsfont/pfb/eurb5.pfb
-share/fonts/amspsfont/pfb/eurb7.pfb
-share/fonts/amspsfont/pfb/eurm10.pfb
-share/fonts/amspsfont/pfb/eurm5.pfb
-share/fonts/amspsfont/pfb/eurm7.pfb
-share/fonts/amspsfont/pfb/eusb10.pfb
-share/fonts/amspsfont/pfb/eusb5.pfb
-share/fonts/amspsfont/pfb/eusb7.pfb
-share/fonts/amspsfont/pfb/eusm10.pfb
-share/fonts/amspsfont/pfb/eusm5.pfb
-share/fonts/amspsfont/pfb/eusm7.pfb
-share/fonts/amspsfont/pfb/msam10.pfb
-share/fonts/amspsfont/pfb/msam5.pfb
-share/fonts/amspsfont/pfb/msam7.pfb
-share/fonts/amspsfont/pfb/msbm10.pfb
-share/fonts/amspsfont/pfb/msbm5.pfb
-share/fonts/amspsfont/pfb/msbm7.pfb
-share/fonts/amspsfont/pfb/wncyb10.pfb
-share/fonts/amspsfont/pfb/wncyi10.pfb
-share/fonts/amspsfont/pfb/wncyr10.pfb
-share/fonts/amspsfont/pfb/wncysc10.pfb
-share/fonts/amspsfont/pfb/wncyss10.pfb
-share/fonts/amspsfont/pfb/Fontmap
-share/fonts/amspsfont/pfb/fonts.dir
-share/fonts/amspsfont/pfb/fonts.scale
-@dirrm share/fonts/amspsfont/afm
-@dirrm share/fonts/amspsfont/pfb
+share/fonts/amspsfont/cmbsy5.afm
+share/fonts/amspsfont/cmbsy7.afm
+share/fonts/amspsfont/cmmib5.afm
+share/fonts/amspsfont/cmmib7.afm
+share/fonts/amspsfont/euex10.afm
+share/fonts/amspsfont/eufb10.afm
+share/fonts/amspsfont/eufb5.afm
+share/fonts/amspsfont/eufb7.afm
+share/fonts/amspsfont/eufm10.afm
+share/fonts/amspsfont/eufm5.afm
+share/fonts/amspsfont/eufm7.afm
+share/fonts/amspsfont/eurb10.afm
+share/fonts/amspsfont/eurb5.afm
+share/fonts/amspsfont/eurb7.afm
+share/fonts/amspsfont/eurm10.afm
+share/fonts/amspsfont/eurm5.afm
+share/fonts/amspsfont/eurm7.afm
+share/fonts/amspsfont/eusb10.afm
+share/fonts/amspsfont/eusb5.afm
+share/fonts/amspsfont/eusb7.afm
+share/fonts/amspsfont/eusm10.afm
+share/fonts/amspsfont/eusm5.afm
+share/fonts/amspsfont/eusm7.afm
+share/fonts/amspsfont/msam10.afm
+share/fonts/amspsfont/msam5.afm
+share/fonts/amspsfont/msam7.afm
+share/fonts/amspsfont/msbm10.afm
+share/fonts/amspsfont/msbm5.afm
+share/fonts/amspsfont/msbm7.afm
+share/fonts/amspsfont/wncyb10.afm
+share/fonts/amspsfont/wncyi10.afm
+share/fonts/amspsfont/wncyr10.afm
+share/fonts/amspsfont/wncysc10.afm
+share/fonts/amspsfont/wncyss10.afm
+share/fonts/amspsfont/cmbsy5.pfb
+share/fonts/amspsfont/cmbsy7.pfb
+share/fonts/amspsfont/cmmib5.pfb
+share/fonts/amspsfont/cmmib7.pfb
+share/fonts/amspsfont/euex10.pfb
+share/fonts/amspsfont/eufb10.pfb
+share/fonts/amspsfont/eufb5.pfb
+share/fonts/amspsfont/eufb7.pfb
+share/fonts/amspsfont/eufm10.pfb
+share/fonts/amspsfont/eufm5.pfb
+share/fonts/amspsfont/eufm7.pfb
+share/fonts/amspsfont/eurb10.pfb
+share/fonts/amspsfont/eurb5.pfb
+share/fonts/amspsfont/eurb7.pfb
+share/fonts/amspsfont/eurm10.pfb
+share/fonts/amspsfont/eurm5.pfb
+share/fonts/amspsfont/eurm7.pfb
+share/fonts/amspsfont/eusb10.pfb
+share/fonts/amspsfont/eusb5.pfb
+share/fonts/amspsfont/eusb7.pfb
+share/fonts/amspsfont/eusm10.pfb
+share/fonts/amspsfont/eusm5.pfb
+share/fonts/amspsfont/eusm7.pfb
+share/fonts/amspsfont/msam10.pfb
+share/fonts/amspsfont/msam5.pfb
+share/fonts/amspsfont/msam7.pfb
+share/fonts/amspsfont/msbm10.pfb
+share/fonts/amspsfont/msbm5.pfb
+share/fonts/amspsfont/msbm7.pfb
+share/fonts/amspsfont/wncyb10.pfb
+share/fonts/amspsfont/wncyi10.pfb
+share/fonts/amspsfont/wncyr10.pfb
+share/fonts/amspsfont/wncysc10.pfb
+share/fonts/amspsfont/wncyss10.pfb
+share/fonts/amspsfont/Fontmap
+share/fonts/amspsfont/fonts.dir
+share/fonts/amspsfont/fonts.scale
 @dirrm share/fonts/amspsfont
 @unexec /bin/rmdir %D/share/fonts 2>/dev/null || /usr/bin/true
diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index b0856a2bc7ae..93c7674f7d23 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmpsfont
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/cm/
 DISTNAME=	cmps
@@ -28,11 +28,12 @@ do-build:
 	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog)
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}/afm
-	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/${FONTSDIR}/afm
-	${MKDIR} ${PREFIX}/${FONTSDIR}/pfb
-	${INSTALL_DATA} ${WRKSRC}/pfb/* ${PREFIX}/${FONTSDIR}/pfb
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/cmsample.tex ${PREFIX}/${FONTSDIR}
+	${MKDIR} ${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/pfb/* ${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} \
+		${WRKSRC}/README ${WRKSRC}/cmsample.tex \
+		${PREFIX}/${FONTSDIR}/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/cmpsfont/files/pkg-message.in b/print/cmpsfont/files/pkg-message.in
index 6abbf2e53d6e..ce7083cc5c41 100644
--- a/print/cmpsfont/files/pkg-message.in
+++ b/print/cmpsfont/files/pkg-message.in
@@ -2,10 +2,10 @@
 Computer Modern Postscript fonts have been installed!
 ============================================================
 
-Please add	%%PREFIX%%/share/fonts/cmpsfont/pfb
+Please add	%%PREFIX%%/share/fonts/cmpsfont
 to your X11 fonts path by either:
 
-$ xset fp+  %%PREFIX%%/share/fonts/cmpsfont/pfb
+$ xset fp+  %%PREFIX%%/share/fonts/cmpsfont
 $ xset fp rehash
 
 or by adding it to your X-server configuration file.
diff --git a/print/cmpsfont/pkg-plist b/print/cmpsfont/pkg-plist
index 57651123bc07..f7edca37ff86 100644
--- a/print/cmpsfont/pkg-plist
+++ b/print/cmpsfont/pkg-plist
@@ -1,198 +1,196 @@
 @comment $FreeBSD$
 share/fonts/cmpsfont/README
-share/fonts/cmpsfont/afm/cmb10.afm
-share/fonts/cmpsfont/afm/cmbsy10.afm
-share/fonts/cmpsfont/afm/cmbx10.afm
-share/fonts/cmpsfont/afm/cmbx12.afm
-share/fonts/cmpsfont/afm/cmbx5.afm
-share/fonts/cmpsfont/afm/cmbx6.afm
-share/fonts/cmpsfont/afm/cmbx7.afm
-share/fonts/cmpsfont/afm/cmbx8.afm
-share/fonts/cmpsfont/afm/cmbx9.afm
-share/fonts/cmpsfont/afm/cmbxsl10.afm
-share/fonts/cmpsfont/afm/cmbxti10.afm
-share/fonts/cmpsfont/afm/cmcsc10.afm
-share/fonts/cmpsfont/afm/cmdunh10.afm
-share/fonts/cmpsfont/afm/cmex10.afm
-share/fonts/cmpsfont/afm/cmff10.afm
-share/fonts/cmpsfont/afm/cmfi10.afm
-share/fonts/cmpsfont/afm/cmfib8.afm
-share/fonts/cmpsfont/afm/cminch.afm
-share/fonts/cmpsfont/afm/cmitt10.afm
-share/fonts/cmpsfont/afm/cmmi10.afm
-share/fonts/cmpsfont/afm/cmmi12.afm
-share/fonts/cmpsfont/afm/cmmi5.afm
-share/fonts/cmpsfont/afm/cmmi6.afm
-share/fonts/cmpsfont/afm/cmmi7.afm
-share/fonts/cmpsfont/afm/cmmi8.afm
-share/fonts/cmpsfont/afm/cmmi9.afm
-share/fonts/cmpsfont/afm/cmmib10.afm
-share/fonts/cmpsfont/afm/cmr10.afm
-share/fonts/cmpsfont/afm/cmr12.afm
-share/fonts/cmpsfont/afm/cmr17.afm
-share/fonts/cmpsfont/afm/cmr5.afm
-share/fonts/cmpsfont/afm/cmr6.afm
-share/fonts/cmpsfont/afm/cmr7.afm
-share/fonts/cmpsfont/afm/cmr8.afm
-share/fonts/cmpsfont/afm/cmr9.afm
-share/fonts/cmpsfont/afm/cmsl10.afm
-share/fonts/cmpsfont/afm/cmsl12.afm
-share/fonts/cmpsfont/afm/cmsl8.afm
-share/fonts/cmpsfont/afm/cmsl9.afm
-share/fonts/cmpsfont/afm/cmsltt10.afm
-share/fonts/cmpsfont/afm/cmss10.afm
-share/fonts/cmpsfont/afm/cmss12.afm
-share/fonts/cmpsfont/afm/cmss17.afm
-share/fonts/cmpsfont/afm/cmss8.afm
-share/fonts/cmpsfont/afm/cmss9.afm
-share/fonts/cmpsfont/afm/cmssbx10.afm
-share/fonts/cmpsfont/afm/cmssdc10.afm
-share/fonts/cmpsfont/afm/cmssi10.afm
-share/fonts/cmpsfont/afm/cmssi12.afm
-share/fonts/cmpsfont/afm/cmssi17.afm
-share/fonts/cmpsfont/afm/cmssi8.afm
-share/fonts/cmpsfont/afm/cmssi9.afm
-share/fonts/cmpsfont/afm/cmssq8.afm
-share/fonts/cmpsfont/afm/cmssqi8.afm
-share/fonts/cmpsfont/afm/cmsy10.afm
-share/fonts/cmpsfont/afm/cmsy5.afm
-share/fonts/cmpsfont/afm/cmsy6.afm
-share/fonts/cmpsfont/afm/cmsy7.afm
-share/fonts/cmpsfont/afm/cmsy8.afm
-share/fonts/cmpsfont/afm/cmsy9.afm
-share/fonts/cmpsfont/afm/cmtcsc10.afm
-share/fonts/cmpsfont/afm/cmtex10.afm
-share/fonts/cmpsfont/afm/cmtex8.afm
-share/fonts/cmpsfont/afm/cmtex9.afm
-share/fonts/cmpsfont/afm/cmti10.afm
-share/fonts/cmpsfont/afm/cmti12.afm
-share/fonts/cmpsfont/afm/cmti7.afm
-share/fonts/cmpsfont/afm/cmti8.afm
-share/fonts/cmpsfont/afm/cmti9.afm
-share/fonts/cmpsfont/afm/cmtt10.afm
-share/fonts/cmpsfont/afm/cmtt12.afm
-share/fonts/cmpsfont/afm/cmtt8.afm
-share/fonts/cmpsfont/afm/cmtt9.afm
-share/fonts/cmpsfont/afm/cmu10.afm
-share/fonts/cmpsfont/afm/cmvtt10.afm
-share/fonts/cmpsfont/afm/lasy10.afm
-share/fonts/cmpsfont/afm/lasy5.afm
-share/fonts/cmpsfont/afm/lasy6.afm
-share/fonts/cmpsfont/afm/lasy7.afm
-share/fonts/cmpsfont/afm/lasy8.afm
-share/fonts/cmpsfont/afm/lasy9.afm
-share/fonts/cmpsfont/afm/lasyb10.afm
-share/fonts/cmpsfont/afm/lcircle1.afm
-share/fonts/cmpsfont/afm/lcirclew.afm
-share/fonts/cmpsfont/afm/lcmss8.afm
-share/fonts/cmpsfont/afm/lcmssb8.afm
-share/fonts/cmpsfont/afm/lcmssi8.afm
-share/fonts/cmpsfont/afm/line10.afm
-share/fonts/cmpsfont/afm/linew10.afm
-share/fonts/cmpsfont/afm/logo10.afm
-share/fonts/cmpsfont/afm/logo8.afm
-share/fonts/cmpsfont/afm/logo9.afm
-share/fonts/cmpsfont/afm/logobf10.afm
-share/fonts/cmpsfont/afm/logosl10.afm
+share/fonts/cmpsfont/cmb10.afm
+share/fonts/cmpsfont/cmbsy10.afm
+share/fonts/cmpsfont/cmbx10.afm
+share/fonts/cmpsfont/cmbx12.afm
+share/fonts/cmpsfont/cmbx5.afm
+share/fonts/cmpsfont/cmbx6.afm
+share/fonts/cmpsfont/cmbx7.afm
+share/fonts/cmpsfont/cmbx8.afm
+share/fonts/cmpsfont/cmbx9.afm
+share/fonts/cmpsfont/cmbxsl10.afm
+share/fonts/cmpsfont/cmbxti10.afm
+share/fonts/cmpsfont/cmcsc10.afm
+share/fonts/cmpsfont/cmdunh10.afm
+share/fonts/cmpsfont/cmex10.afm
+share/fonts/cmpsfont/cmff10.afm
+share/fonts/cmpsfont/cmfi10.afm
+share/fonts/cmpsfont/cmfib8.afm
+share/fonts/cmpsfont/cminch.afm
+share/fonts/cmpsfont/cmitt10.afm
+share/fonts/cmpsfont/cmmi10.afm
+share/fonts/cmpsfont/cmmi12.afm
+share/fonts/cmpsfont/cmmi5.afm
+share/fonts/cmpsfont/cmmi6.afm
+share/fonts/cmpsfont/cmmi7.afm
+share/fonts/cmpsfont/cmmi8.afm
+share/fonts/cmpsfont/cmmi9.afm
+share/fonts/cmpsfont/cmmib10.afm
+share/fonts/cmpsfont/cmr10.afm
+share/fonts/cmpsfont/cmr12.afm
+share/fonts/cmpsfont/cmr17.afm
+share/fonts/cmpsfont/cmr5.afm
+share/fonts/cmpsfont/cmr6.afm
+share/fonts/cmpsfont/cmr7.afm
+share/fonts/cmpsfont/cmr8.afm
+share/fonts/cmpsfont/cmr9.afm
+share/fonts/cmpsfont/cmsl10.afm
+share/fonts/cmpsfont/cmsl12.afm
+share/fonts/cmpsfont/cmsl8.afm
+share/fonts/cmpsfont/cmsl9.afm
+share/fonts/cmpsfont/cmsltt10.afm
+share/fonts/cmpsfont/cmss10.afm
+share/fonts/cmpsfont/cmss12.afm
+share/fonts/cmpsfont/cmss17.afm
+share/fonts/cmpsfont/cmss8.afm
+share/fonts/cmpsfont/cmss9.afm
+share/fonts/cmpsfont/cmssbx10.afm
+share/fonts/cmpsfont/cmssdc10.afm
+share/fonts/cmpsfont/cmssi10.afm
+share/fonts/cmpsfont/cmssi12.afm
+share/fonts/cmpsfont/cmssi17.afm
+share/fonts/cmpsfont/cmssi8.afm
+share/fonts/cmpsfont/cmssi9.afm
+share/fonts/cmpsfont/cmssq8.afm
+share/fonts/cmpsfont/cmssqi8.afm
+share/fonts/cmpsfont/cmsy10.afm
+share/fonts/cmpsfont/cmsy5.afm
+share/fonts/cmpsfont/cmsy6.afm
+share/fonts/cmpsfont/cmsy7.afm
+share/fonts/cmpsfont/cmsy8.afm
+share/fonts/cmpsfont/cmsy9.afm
+share/fonts/cmpsfont/cmtcsc10.afm
+share/fonts/cmpsfont/cmtex10.afm
+share/fonts/cmpsfont/cmtex8.afm
+share/fonts/cmpsfont/cmtex9.afm
+share/fonts/cmpsfont/cmti10.afm
+share/fonts/cmpsfont/cmti12.afm
+share/fonts/cmpsfont/cmti7.afm
+share/fonts/cmpsfont/cmti8.afm
+share/fonts/cmpsfont/cmti9.afm
+share/fonts/cmpsfont/cmtt10.afm
+share/fonts/cmpsfont/cmtt12.afm
+share/fonts/cmpsfont/cmtt8.afm
+share/fonts/cmpsfont/cmtt9.afm
+share/fonts/cmpsfont/cmu10.afm
+share/fonts/cmpsfont/cmvtt10.afm
+share/fonts/cmpsfont/lasy10.afm
+share/fonts/cmpsfont/lasy5.afm
+share/fonts/cmpsfont/lasy6.afm
+share/fonts/cmpsfont/lasy7.afm
+share/fonts/cmpsfont/lasy8.afm
+share/fonts/cmpsfont/lasy9.afm
+share/fonts/cmpsfont/lasyb10.afm
+share/fonts/cmpsfont/lcircle1.afm
+share/fonts/cmpsfont/lcirclew.afm
+share/fonts/cmpsfont/lcmss8.afm
+share/fonts/cmpsfont/lcmssb8.afm
+share/fonts/cmpsfont/lcmssi8.afm
+share/fonts/cmpsfont/line10.afm
+share/fonts/cmpsfont/linew10.afm
+share/fonts/cmpsfont/logo10.afm
+share/fonts/cmpsfont/logo8.afm
+share/fonts/cmpsfont/logo9.afm
+share/fonts/cmpsfont/logobf10.afm
+share/fonts/cmpsfont/logosl10.afm
 share/fonts/cmpsfont/cmsample.tex
-share/fonts/cmpsfont/pfb/cmb10.pfb
-share/fonts/cmpsfont/pfb/cmbsy10.pfb
-share/fonts/cmpsfont/pfb/cmbx10.pfb
-share/fonts/cmpsfont/pfb/cmbx12.pfb
-share/fonts/cmpsfont/pfb/cmbx5.pfb
-share/fonts/cmpsfont/pfb/cmbx6.pfb
-share/fonts/cmpsfont/pfb/cmbx7.pfb
-share/fonts/cmpsfont/pfb/cmbx8.pfb
-share/fonts/cmpsfont/pfb/cmbx9.pfb
-share/fonts/cmpsfont/pfb/cmbxsl10.pfb
-share/fonts/cmpsfont/pfb/cmbxti10.pfb
-share/fonts/cmpsfont/pfb/cmcsc10.pfb
-share/fonts/cmpsfont/pfb/cmdunh10.pfb
-share/fonts/cmpsfont/pfb/cmex10.pfb
-share/fonts/cmpsfont/pfb/cmff10.pfb
-share/fonts/cmpsfont/pfb/cmfi10.pfb
-share/fonts/cmpsfont/pfb/cmfib8.pfb
-share/fonts/cmpsfont/pfb/cminch.pfb
-share/fonts/cmpsfont/pfb/cmitt10.pfb
-share/fonts/cmpsfont/pfb/cmmi10.pfb
-share/fonts/cmpsfont/pfb/cmmi12.pfb
-share/fonts/cmpsfont/pfb/cmmi5.pfb
-share/fonts/cmpsfont/pfb/cmmi6.pfb
-share/fonts/cmpsfont/pfb/cmmi7.pfb
-share/fonts/cmpsfont/pfb/cmmi8.pfb
-share/fonts/cmpsfont/pfb/cmmi9.pfb
-share/fonts/cmpsfont/pfb/cmmib10.pfb
-share/fonts/cmpsfont/pfb/cmr10.pfb
-share/fonts/cmpsfont/pfb/cmr12.pfb
-share/fonts/cmpsfont/pfb/cmr17.pfb
-share/fonts/cmpsfont/pfb/cmr5.pfb
-share/fonts/cmpsfont/pfb/cmr6.pfb
-share/fonts/cmpsfont/pfb/cmr7.pfb
-share/fonts/cmpsfont/pfb/cmr8.pfb
-share/fonts/cmpsfont/pfb/cmr9.pfb
-share/fonts/cmpsfont/pfb/cmsl10.pfb
-share/fonts/cmpsfont/pfb/cmsl12.pfb
-share/fonts/cmpsfont/pfb/cmsl8.pfb
-share/fonts/cmpsfont/pfb/cmsl9.pfb
-share/fonts/cmpsfont/pfb/cmsltt10.pfb
-share/fonts/cmpsfont/pfb/cmss10.pfb
-share/fonts/cmpsfont/pfb/cmss12.pfb
-share/fonts/cmpsfont/pfb/cmss17.pfb
-share/fonts/cmpsfont/pfb/cmss8.pfb
-share/fonts/cmpsfont/pfb/cmss9.pfb
-share/fonts/cmpsfont/pfb/cmssbx10.pfb
-share/fonts/cmpsfont/pfb/cmssdc10.pfb
-share/fonts/cmpsfont/pfb/cmssi10.pfb
-share/fonts/cmpsfont/pfb/cmssi12.pfb
-share/fonts/cmpsfont/pfb/cmssi17.pfb
-share/fonts/cmpsfont/pfb/cmssi8.pfb
-share/fonts/cmpsfont/pfb/cmssi9.pfb
-share/fonts/cmpsfont/pfb/cmssq8.pfb
-share/fonts/cmpsfont/pfb/cmssqi8.pfb
-share/fonts/cmpsfont/pfb/cmsy10.pfb
-share/fonts/cmpsfont/pfb/cmsy5.pfb
-share/fonts/cmpsfont/pfb/cmsy6.pfb
-share/fonts/cmpsfont/pfb/cmsy7.pfb
-share/fonts/cmpsfont/pfb/cmsy8.pfb
-share/fonts/cmpsfont/pfb/cmsy9.pfb
-share/fonts/cmpsfont/pfb/cmtcsc10.pfb
-share/fonts/cmpsfont/pfb/cmtex10.pfb
-share/fonts/cmpsfont/pfb/cmtex8.pfb
-share/fonts/cmpsfont/pfb/cmtex9.pfb
-share/fonts/cmpsfont/pfb/cmti10.pfb
-share/fonts/cmpsfont/pfb/cmti12.pfb
-share/fonts/cmpsfont/pfb/cmti7.pfb
-share/fonts/cmpsfont/pfb/cmti8.pfb
-share/fonts/cmpsfont/pfb/cmti9.pfb
-share/fonts/cmpsfont/pfb/cmtt10.pfb
-share/fonts/cmpsfont/pfb/cmtt12.pfb
-share/fonts/cmpsfont/pfb/cmtt8.pfb
-share/fonts/cmpsfont/pfb/cmtt9.pfb
-share/fonts/cmpsfont/pfb/cmu10.pfb
-share/fonts/cmpsfont/pfb/cmvtt10.pfb
-share/fonts/cmpsfont/pfb/lasy10.pfb
-share/fonts/cmpsfont/pfb/lasy5.pfb
-share/fonts/cmpsfont/pfb/lasy6.pfb
-share/fonts/cmpsfont/pfb/lasy7.pfb
-share/fonts/cmpsfont/pfb/lasy8.pfb
-share/fonts/cmpsfont/pfb/lasy9.pfb
-share/fonts/cmpsfont/pfb/lasyb10.pfb
-share/fonts/cmpsfont/pfb/lcircle1.pfb
-share/fonts/cmpsfont/pfb/lcirclew.pfb
-share/fonts/cmpsfont/pfb/lcmss8.pfb
-share/fonts/cmpsfont/pfb/lcmssb8.pfb
-share/fonts/cmpsfont/pfb/lcmssi8.pfb
-share/fonts/cmpsfont/pfb/line10.pfb
-share/fonts/cmpsfont/pfb/linew10.pfb
-share/fonts/cmpsfont/pfb/logo10.pfb
-share/fonts/cmpsfont/pfb/logo8.pfb
-share/fonts/cmpsfont/pfb/logo9.pfb
-share/fonts/cmpsfont/pfb/logobf10.pfb
-share/fonts/cmpsfont/pfb/logosl10.pfb
-share/fonts/cmpsfont/pfb/Fontmap
-share/fonts/cmpsfont/pfb/fonts.dir
-share/fonts/cmpsfont/pfb/fonts.scale
-@dirrm share/fonts/cmpsfont/afm
-@dirrm share/fonts/cmpsfont/pfb
+share/fonts/cmpsfont/cmb10.pfb
+share/fonts/cmpsfont/cmbsy10.pfb
+share/fonts/cmpsfont/cmbx10.pfb
+share/fonts/cmpsfont/cmbx12.pfb
+share/fonts/cmpsfont/cmbx5.pfb
+share/fonts/cmpsfont/cmbx6.pfb
+share/fonts/cmpsfont/cmbx7.pfb
+share/fonts/cmpsfont/cmbx8.pfb
+share/fonts/cmpsfont/cmbx9.pfb
+share/fonts/cmpsfont/cmbxsl10.pfb
+share/fonts/cmpsfont/cmbxti10.pfb
+share/fonts/cmpsfont/cmcsc10.pfb
+share/fonts/cmpsfont/cmdunh10.pfb
+share/fonts/cmpsfont/cmex10.pfb
+share/fonts/cmpsfont/cmff10.pfb
+share/fonts/cmpsfont/cmfi10.pfb
+share/fonts/cmpsfont/cmfib8.pfb
+share/fonts/cmpsfont/cminch.pfb
+share/fonts/cmpsfont/cmitt10.pfb
+share/fonts/cmpsfont/cmmi10.pfb
+share/fonts/cmpsfont/cmmi12.pfb
+share/fonts/cmpsfont/cmmi5.pfb
+share/fonts/cmpsfont/cmmi6.pfb
+share/fonts/cmpsfont/cmmi7.pfb
+share/fonts/cmpsfont/cmmi8.pfb
+share/fonts/cmpsfont/cmmi9.pfb
+share/fonts/cmpsfont/cmmib10.pfb
+share/fonts/cmpsfont/cmr10.pfb
+share/fonts/cmpsfont/cmr12.pfb
+share/fonts/cmpsfont/cmr17.pfb
+share/fonts/cmpsfont/cmr5.pfb
+share/fonts/cmpsfont/cmr6.pfb
+share/fonts/cmpsfont/cmr7.pfb
+share/fonts/cmpsfont/cmr8.pfb
+share/fonts/cmpsfont/cmr9.pfb
+share/fonts/cmpsfont/cmsl10.pfb
+share/fonts/cmpsfont/cmsl12.pfb
+share/fonts/cmpsfont/cmsl8.pfb
+share/fonts/cmpsfont/cmsl9.pfb
+share/fonts/cmpsfont/cmsltt10.pfb
+share/fonts/cmpsfont/cmss10.pfb
+share/fonts/cmpsfont/cmss12.pfb
+share/fonts/cmpsfont/cmss17.pfb
+share/fonts/cmpsfont/cmss8.pfb
+share/fonts/cmpsfont/cmss9.pfb
+share/fonts/cmpsfont/cmssbx10.pfb
+share/fonts/cmpsfont/cmssdc10.pfb
+share/fonts/cmpsfont/cmssi10.pfb
+share/fonts/cmpsfont/cmssi12.pfb
+share/fonts/cmpsfont/cmssi17.pfb
+share/fonts/cmpsfont/cmssi8.pfb
+share/fonts/cmpsfont/cmssi9.pfb
+share/fonts/cmpsfont/cmssq8.pfb
+share/fonts/cmpsfont/cmssqi8.pfb
+share/fonts/cmpsfont/cmsy10.pfb
+share/fonts/cmpsfont/cmsy5.pfb
+share/fonts/cmpsfont/cmsy6.pfb
+share/fonts/cmpsfont/cmsy7.pfb
+share/fonts/cmpsfont/cmsy8.pfb
+share/fonts/cmpsfont/cmsy9.pfb
+share/fonts/cmpsfont/cmtcsc10.pfb
+share/fonts/cmpsfont/cmtex10.pfb
+share/fonts/cmpsfont/cmtex8.pfb
+share/fonts/cmpsfont/cmtex9.pfb
+share/fonts/cmpsfont/cmti10.pfb
+share/fonts/cmpsfont/cmti12.pfb
+share/fonts/cmpsfont/cmti7.pfb
+share/fonts/cmpsfont/cmti8.pfb
+share/fonts/cmpsfont/cmti9.pfb
+share/fonts/cmpsfont/cmtt10.pfb
+share/fonts/cmpsfont/cmtt12.pfb
+share/fonts/cmpsfont/cmtt8.pfb
+share/fonts/cmpsfont/cmtt9.pfb
+share/fonts/cmpsfont/cmu10.pfb
+share/fonts/cmpsfont/cmvtt10.pfb
+share/fonts/cmpsfont/lasy10.pfb
+share/fonts/cmpsfont/lasy5.pfb
+share/fonts/cmpsfont/lasy6.pfb
+share/fonts/cmpsfont/lasy7.pfb
+share/fonts/cmpsfont/lasy8.pfb
+share/fonts/cmpsfont/lasy9.pfb
+share/fonts/cmpsfont/lasyb10.pfb
+share/fonts/cmpsfont/lcircle1.pfb
+share/fonts/cmpsfont/lcirclew.pfb
+share/fonts/cmpsfont/lcmss8.pfb
+share/fonts/cmpsfont/lcmssb8.pfb
+share/fonts/cmpsfont/lcmssi8.pfb
+share/fonts/cmpsfont/line10.pfb
+share/fonts/cmpsfont/linew10.pfb
+share/fonts/cmpsfont/logo10.pfb
+share/fonts/cmpsfont/logo8.pfb
+share/fonts/cmpsfont/logo9.pfb
+share/fonts/cmpsfont/logobf10.pfb
+share/fonts/cmpsfont/logosl10.pfb
+share/fonts/cmpsfont/Fontmap
+share/fonts/cmpsfont/fonts.dir
+share/fonts/cmpsfont/fonts.scale
 @dirrm share/fonts/cmpsfont
 @unexec /bin/rmdir %D/share/fonts 2> /dev/null || /usr/bin/true
diff --git a/print/teTeX-texmf/Makefile b/print/teTeX-texmf/Makefile
index ab929d0fbeb3..6b7067514e60 100644
--- a/print/teTeX-texmf/Makefile
+++ b/print/teTeX-texmf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	teTeX-texmf
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -58,8 +58,8 @@ EXCLUDE_LIST=	fonts/type1/bluesky/cm/\* \
 		fonts/type1/bluesky/symbols/\* \
 		fonts/type1/bluesky/cyrillic/\*
 
-CMPSFONTDIR=	${LOCALBASE}/share/fonts/cmpsfont/pfb
-AMSPSFONTDIR=	${LOCALBASE}/share/fonts/amspsfont/pfb
+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 \