3 files changed, 208 insertions, 210 deletions

diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index 9bd7026d2751..b0856a2bc7ae 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	cmpsfont
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/cm/
 DISTNAME=	cmps
 EXTRACT_SUFX=	-unix.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Computer Modern PostScript Fonts (Adobe Type 1 format)
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
@@ -21,23 +21,18 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/cmpsfont
-TEXDIR?=	${PREFIX}/share/texmf
 
-IGNORE=		is already included in the teTeX distribution
+FONTSDIR=	share/fonts/${PORTNAME}
 
 do-build:
 	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog)
 
 do-install:
-	@${MKDIR} ${TEXDIR}/fonts/type1
-	${INSTALL_DATA} ${WRKSRC}/pfb/* ${TEXDIR}/fonts/type1
-	@${MKDIR} ${PREFIX}/lib/afm
-	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/lib/afm
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/cmpsfont
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/cmpsfont
-.endif
+	${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}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/cmpsfont/files/pkg-message.in b/print/cmpsfont/files/pkg-message.in
index acd2ba04e7b8..6abbf2e53d6e 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/texmf/fonts/type1
+Please add	%%PREFIX%%/share/fonts/cmpsfont/pfb
 to your X11 fonts path by either:
 
-$ xset fp+  %%PREFIX%%/share/texmf/fonts/type1
+$ xset fp+  %%PREFIX%%/share/fonts/cmpsfont/pfb
 $ 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 b22322a5ec33..57651123bc07 100644
--- a/print/cmpsfont/pkg-plist
+++ b/print/cmpsfont/pkg-plist
@@ -1,195 +1,198 @@
-lib/afm/cmb10.afm
-lib/afm/cmbsy10.afm
-lib/afm/cmbx10.afm
-lib/afm/cmbx12.afm
-lib/afm/cmbx5.afm
-lib/afm/cmbx6.afm
-lib/afm/cmbx7.afm
-lib/afm/cmbx8.afm
-lib/afm/cmbx9.afm
-lib/afm/cmbxsl10.afm
-lib/afm/cmbxti10.afm
-lib/afm/cmcsc10.afm
-lib/afm/cmdunh10.afm
-lib/afm/cmex10.afm
-lib/afm/cmff10.afm
-lib/afm/cmfi10.afm
-lib/afm/cmfib8.afm
-lib/afm/cminch.afm
-lib/afm/cmitt10.afm
-lib/afm/cmmi10.afm
-lib/afm/cmmi12.afm
-lib/afm/cmmi5.afm
-lib/afm/cmmi6.afm
-lib/afm/cmmi7.afm
-lib/afm/cmmi8.afm
-lib/afm/cmmi9.afm
-lib/afm/cmmib10.afm
-lib/afm/cmr10.afm
-lib/afm/cmr12.afm
-lib/afm/cmr17.afm
-lib/afm/cmr5.afm
-lib/afm/cmr6.afm
-lib/afm/cmr7.afm
-lib/afm/cmr8.afm
-lib/afm/cmr9.afm
-lib/afm/cmsl10.afm
-lib/afm/cmsl12.afm
-lib/afm/cmsl8.afm
-lib/afm/cmsl9.afm
-lib/afm/cmsltt10.afm
-lib/afm/cmss10.afm
-lib/afm/cmss12.afm
-lib/afm/cmss17.afm
-lib/afm/cmss8.afm
-lib/afm/cmss9.afm
-lib/afm/cmssbx10.afm
-lib/afm/cmssdc10.afm
-lib/afm/cmssi10.afm
-lib/afm/cmssi12.afm
-lib/afm/cmssi17.afm
-lib/afm/cmssi8.afm
-lib/afm/cmssi9.afm
-lib/afm/cmssq8.afm
-lib/afm/cmssqi8.afm
-lib/afm/cmsy10.afm
-lib/afm/cmsy5.afm
-lib/afm/cmsy6.afm
-lib/afm/cmsy7.afm
-lib/afm/cmsy8.afm
-lib/afm/cmsy9.afm
-lib/afm/cmtcsc10.afm
-lib/afm/cmtex10.afm
-lib/afm/cmtex8.afm
-lib/afm/cmtex9.afm
-lib/afm/cmti10.afm
-lib/afm/cmti12.afm
-lib/afm/cmti7.afm
-lib/afm/cmti8.afm
-lib/afm/cmti9.afm
-lib/afm/cmtt10.afm
-lib/afm/cmtt12.afm
-lib/afm/cmtt8.afm
-lib/afm/cmtt9.afm
-lib/afm/cmu10.afm
-lib/afm/cmvtt10.afm
-lib/afm/lasy10.afm
-lib/afm/lasy5.afm
-lib/afm/lasy6.afm
-lib/afm/lasy7.afm
-lib/afm/lasy8.afm
-lib/afm/lasy9.afm
-lib/afm/lasyb10.afm
-lib/afm/lcircle1.afm
-lib/afm/lcirclew.afm
-lib/afm/lcmss8.afm
-lib/afm/lcmssb8.afm
-lib/afm/lcmssi8.afm
-lib/afm/line10.afm
-lib/afm/linew10.afm
-lib/afm/logo10.afm
-lib/afm/logo8.afm
-lib/afm/logo9.afm
-lib/afm/logobf10.afm
-lib/afm/logosl10.afm
-%%PORTDOCS%%%%DOCSDIR%%/README
-share/texmf/fonts/type1/Fontmap
-share/texmf/fonts/type1/cmb10.pfb
-share/texmf/fonts/type1/cmbsy10.pfb
-share/texmf/fonts/type1/cmbx10.pfb
-share/texmf/fonts/type1/cmbx12.pfb
-share/texmf/fonts/type1/cmbx5.pfb
-share/texmf/fonts/type1/cmbx6.pfb
-share/texmf/fonts/type1/cmbx7.pfb
-share/texmf/fonts/type1/cmbx8.pfb
-share/texmf/fonts/type1/cmbx9.pfb
-share/texmf/fonts/type1/cmbxsl10.pfb
-share/texmf/fonts/type1/cmbxti10.pfb
-share/texmf/fonts/type1/cmcsc10.pfb
-share/texmf/fonts/type1/cmdunh10.pfb
-share/texmf/fonts/type1/cmex10.pfb
-share/texmf/fonts/type1/cmff10.pfb
-share/texmf/fonts/type1/cmfi10.pfb
-share/texmf/fonts/type1/cmfib8.pfb
-share/texmf/fonts/type1/cminch.pfb
-share/texmf/fonts/type1/cmitt10.pfb
-share/texmf/fonts/type1/cmmi10.pfb
-share/texmf/fonts/type1/cmmi12.pfb
-share/texmf/fonts/type1/cmmi5.pfb
-share/texmf/fonts/type1/cmmi6.pfb
-share/texmf/fonts/type1/cmmi7.pfb
-share/texmf/fonts/type1/cmmi8.pfb
-share/texmf/fonts/type1/cmmi9.pfb
-share/texmf/fonts/type1/cmmib10.pfb
-share/texmf/fonts/type1/cmr10.pfb
-share/texmf/fonts/type1/cmr12.pfb
-share/texmf/fonts/type1/cmr17.pfb
-share/texmf/fonts/type1/cmr5.pfb
-share/texmf/fonts/type1/cmr6.pfb
-share/texmf/fonts/type1/cmr7.pfb
-share/texmf/fonts/type1/cmr8.pfb
-share/texmf/fonts/type1/cmr9.pfb
-share/texmf/fonts/type1/cmsl10.pfb
-share/texmf/fonts/type1/cmsl12.pfb
-share/texmf/fonts/type1/cmsl8.pfb
-share/texmf/fonts/type1/cmsl9.pfb
-share/texmf/fonts/type1/cmsltt10.pfb
-share/texmf/fonts/type1/cmss10.pfb
-share/texmf/fonts/type1/cmss12.pfb
-share/texmf/fonts/type1/cmss17.pfb
-share/texmf/fonts/type1/cmss8.pfb
-share/texmf/fonts/type1/cmss9.pfb
-share/texmf/fonts/type1/cmssbx10.pfb
-share/texmf/fonts/type1/cmssdc10.pfb
-share/texmf/fonts/type1/cmssi10.pfb
-share/texmf/fonts/type1/cmssi12.pfb
-share/texmf/fonts/type1/cmssi17.pfb
-share/texmf/fonts/type1/cmssi8.pfb
-share/texmf/fonts/type1/cmssi9.pfb
-share/texmf/fonts/type1/cmssq8.pfb
-share/texmf/fonts/type1/cmssqi8.pfb
-share/texmf/fonts/type1/cmsy10.pfb
-share/texmf/fonts/type1/cmsy5.pfb
-share/texmf/fonts/type1/cmsy6.pfb
-share/texmf/fonts/type1/cmsy7.pfb
-share/texmf/fonts/type1/cmsy8.pfb
-share/texmf/fonts/type1/cmsy9.pfb
-share/texmf/fonts/type1/cmtcsc10.pfb
-share/texmf/fonts/type1/cmtex10.pfb
-share/texmf/fonts/type1/cmtex8.pfb
-share/texmf/fonts/type1/cmtex9.pfb
-share/texmf/fonts/type1/cmti10.pfb
-share/texmf/fonts/type1/cmti12.pfb
-share/texmf/fonts/type1/cmti7.pfb
-share/texmf/fonts/type1/cmti8.pfb
-share/texmf/fonts/type1/cmti9.pfb
-share/texmf/fonts/type1/cmtt10.pfb
-share/texmf/fonts/type1/cmtt12.pfb
-share/texmf/fonts/type1/cmtt8.pfb
-share/texmf/fonts/type1/cmtt9.pfb
-share/texmf/fonts/type1/cmu10.pfb
-share/texmf/fonts/type1/cmvtt10.pfb
-share/texmf/fonts/type1/fonts.dir
-share/texmf/fonts/type1/fonts.scale
-share/texmf/fonts/type1/lasy10.pfb
-share/texmf/fonts/type1/lasy5.pfb
-share/texmf/fonts/type1/lasy6.pfb
-share/texmf/fonts/type1/lasy7.pfb
-share/texmf/fonts/type1/lasy8.pfb
-share/texmf/fonts/type1/lasy9.pfb
-share/texmf/fonts/type1/lasyb10.pfb
-share/texmf/fonts/type1/lcircle1.pfb
-share/texmf/fonts/type1/lcirclew.pfb
-share/texmf/fonts/type1/lcmss8.pfb
-share/texmf/fonts/type1/lcmssb8.pfb
-share/texmf/fonts/type1/lcmssi8.pfb
-share/texmf/fonts/type1/line10.pfb
-share/texmf/fonts/type1/linew10.pfb
-share/texmf/fonts/type1/logo10.pfb
-share/texmf/fonts/type1/logo8.pfb
-share/texmf/fonts/type1/logo9.pfb
-share/texmf/fonts/type1/logobf10.pfb
-share/texmf/fonts/type1/logosl10.pfb
-@dirrm lib/afm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/texmf/fonts/type1 2>/dev/null || true
+@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/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
+@dirrm share/fonts/cmpsfont
+@unexec /bin/rmdir %D/share/fonts 2> /dev/null || /usr/bin/true