- Use consistent installation directories.

- Bump PORTREVISION.

3 files changed, 202 insertions, 199 deletions

diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index 4e0893fa8d2..c030dbe0bcb 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmpsfont
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/cm/
 DISTNAME=	cmps
@@ -34,15 +34,16 @@ FONTSDIR=	share/fonts/${PORTNAME}
 
 do-build:
 .if !defined(WITHOUT_X11)
-	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog)
+	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog -quiet)
 .else
 	@${DO_NADA}
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/${FONTSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/pfb/* ${PREFIX}/${FONTSDIR}/
+	${MKDIR} ${PREFIX}/${FONTSDIR}/afm
+	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/${FONTSDIR}/afm
+	${MKDIR} ${PREFIX}/${FONTSDIR}/type1
+	${INSTALL_DATA} ${WRKSRC}/pfb/* ${PREFIX}/${FONTSDIR}/type1
 	${INSTALL_DATA} \
 		${WRKSRC}/README ${WRKSRC}/cmsample.tex \
 		${PREFIX}/${FONTSDIR}/
diff --git a/print/cmpsfont/files/pkg-message.in b/print/cmpsfont/files/pkg-message.in
index ce7083cc5c4..e9a3b511691 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
+Please add	%%PREFIX%%/share/fonts/cmpsfont/type1
 to your X11 fonts path by either:
 
-$ xset fp+  %%PREFIX%%/share/fonts/cmpsfont
+$ xset fp+  %%PREFIX%%/share/fonts/cmpsfont/type1
 $ 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 32e92fe1eff..b1dd15e5f1a 100644
--- a/print/cmpsfont/pkg-plist
+++ b/print/cmpsfont/pkg-plist
@@ -1,196 +1,198 @@
 @comment $FreeBSD$
 share/fonts/cmpsfont/README
-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/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
-%%PLIST_X11%%share/fonts/cmpsfont/Fontmap
-%%PLIST_X11%%share/fonts/cmpsfont/fonts.dir
-%%PLIST_X11%%share/fonts/cmpsfont/fonts.scale
+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/type1/cmb10.pfb
+share/fonts/cmpsfont/type1/cmbsy10.pfb
+share/fonts/cmpsfont/type1/cmbx10.pfb
+share/fonts/cmpsfont/type1/cmbx12.pfb
+share/fonts/cmpsfont/type1/cmbx5.pfb
+share/fonts/cmpsfont/type1/cmbx6.pfb
+share/fonts/cmpsfont/type1/cmbx7.pfb
+share/fonts/cmpsfont/type1/cmbx8.pfb
+share/fonts/cmpsfont/type1/cmbx9.pfb
+share/fonts/cmpsfont/type1/cmbxsl10.pfb
+share/fonts/cmpsfont/type1/cmbxti10.pfb
+share/fonts/cmpsfont/type1/cmcsc10.pfb
+share/fonts/cmpsfont/type1/cmdunh10.pfb
+share/fonts/cmpsfont/type1/cmex10.pfb
+share/fonts/cmpsfont/type1/cmff10.pfb
+share/fonts/cmpsfont/type1/cmfi10.pfb
+share/fonts/cmpsfont/type1/cmfib8.pfb
+share/fonts/cmpsfont/type1/cminch.pfb
+share/fonts/cmpsfont/type1/cmitt10.pfb
+share/fonts/cmpsfont/type1/cmmi10.pfb
+share/fonts/cmpsfont/type1/cmmi12.pfb
+share/fonts/cmpsfont/type1/cmmi5.pfb
+share/fonts/cmpsfont/type1/cmmi6.pfb
+share/fonts/cmpsfont/type1/cmmi7.pfb
+share/fonts/cmpsfont/type1/cmmi8.pfb
+share/fonts/cmpsfont/type1/cmmi9.pfb
+share/fonts/cmpsfont/type1/cmmib10.pfb
+share/fonts/cmpsfont/type1/cmr10.pfb
+share/fonts/cmpsfont/type1/cmr12.pfb
+share/fonts/cmpsfont/type1/cmr17.pfb
+share/fonts/cmpsfont/type1/cmr5.pfb
+share/fonts/cmpsfont/type1/cmr6.pfb
+share/fonts/cmpsfont/type1/cmr7.pfb
+share/fonts/cmpsfont/type1/cmr8.pfb
+share/fonts/cmpsfont/type1/cmr9.pfb
+share/fonts/cmpsfont/type1/cmsl10.pfb
+share/fonts/cmpsfont/type1/cmsl12.pfb
+share/fonts/cmpsfont/type1/cmsl8.pfb
+share/fonts/cmpsfont/type1/cmsl9.pfb
+share/fonts/cmpsfont/type1/cmsltt10.pfb
+share/fonts/cmpsfont/type1/cmss10.pfb
+share/fonts/cmpsfont/type1/cmss12.pfb
+share/fonts/cmpsfont/type1/cmss17.pfb
+share/fonts/cmpsfont/type1/cmss8.pfb
+share/fonts/cmpsfont/type1/cmss9.pfb
+share/fonts/cmpsfont/type1/cmssbx10.pfb
+share/fonts/cmpsfont/type1/cmssdc10.pfb
+share/fonts/cmpsfont/type1/cmssi10.pfb
+share/fonts/cmpsfont/type1/cmssi12.pfb
+share/fonts/cmpsfont/type1/cmssi17.pfb
+share/fonts/cmpsfont/type1/cmssi8.pfb
+share/fonts/cmpsfont/type1/cmssi9.pfb
+share/fonts/cmpsfont/type1/cmssq8.pfb
+share/fonts/cmpsfont/type1/cmssqi8.pfb
+share/fonts/cmpsfont/type1/cmsy10.pfb
+share/fonts/cmpsfont/type1/cmsy5.pfb
+share/fonts/cmpsfont/type1/cmsy6.pfb
+share/fonts/cmpsfont/type1/cmsy7.pfb
+share/fonts/cmpsfont/type1/cmsy8.pfb
+share/fonts/cmpsfont/type1/cmsy9.pfb
+share/fonts/cmpsfont/type1/cmtcsc10.pfb
+share/fonts/cmpsfont/type1/cmtex10.pfb
+share/fonts/cmpsfont/type1/cmtex8.pfb
+share/fonts/cmpsfont/type1/cmtex9.pfb
+share/fonts/cmpsfont/type1/cmti10.pfb
+share/fonts/cmpsfont/type1/cmti12.pfb
+share/fonts/cmpsfont/type1/cmti7.pfb
+share/fonts/cmpsfont/type1/cmti8.pfb
+share/fonts/cmpsfont/type1/cmti9.pfb
+share/fonts/cmpsfont/type1/cmtt10.pfb
+share/fonts/cmpsfont/type1/cmtt12.pfb
+share/fonts/cmpsfont/type1/cmtt8.pfb
+share/fonts/cmpsfont/type1/cmtt9.pfb
+share/fonts/cmpsfont/type1/cmu10.pfb
+share/fonts/cmpsfont/type1/cmvtt10.pfb
+share/fonts/cmpsfont/type1/lasy10.pfb
+share/fonts/cmpsfont/type1/lasy5.pfb
+share/fonts/cmpsfont/type1/lasy6.pfb
+share/fonts/cmpsfont/type1/lasy7.pfb
+share/fonts/cmpsfont/type1/lasy8.pfb
+share/fonts/cmpsfont/type1/lasy9.pfb
+share/fonts/cmpsfont/type1/lasyb10.pfb
+share/fonts/cmpsfont/type1/lcircle1.pfb
+share/fonts/cmpsfont/type1/lcirclew.pfb
+share/fonts/cmpsfont/type1/lcmss8.pfb
+share/fonts/cmpsfont/type1/lcmssb8.pfb
+share/fonts/cmpsfont/type1/lcmssi8.pfb
+share/fonts/cmpsfont/type1/line10.pfb
+share/fonts/cmpsfont/type1/linew10.pfb
+share/fonts/cmpsfont/type1/logo10.pfb
+share/fonts/cmpsfont/type1/logo8.pfb
+share/fonts/cmpsfont/type1/logo9.pfb
+share/fonts/cmpsfont/type1/logobf10.pfb
+share/fonts/cmpsfont/type1/logosl10.pfb
+%%PLIST_X11%%share/fonts/cmpsfont/type1/Fontmap
+%%PLIST_X11%%share/fonts/cmpsfont/type1/fonts.dir
+%%PLIST_X11%%share/fonts/cmpsfont/type1/fonts.scale
+@dirrm share/fonts/cmpsfont/afm
+@dirrm share/fonts/cmpsfont/type1
 @dirrm share/fonts/cmpsfont
-@unexec /bin/rmdir %D/share/fonts 2> /dev/null || /usr/bin/true
+@dirrmtry share/fonts