2 files changed, 98 insertions, 98 deletions

diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index 6b3be9ca5554..8cfc4c9cff79 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 September 1998
 # Whom:			giffunip
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/13 16:15:33 taoka Exp $
 #
 
 DISTNAME=	cmps
@@ -27,8 +27,8 @@ do-install:
 	$(INSTALL_DATA) ${WRKSRC}/pfb/* $(TEXDIR)/fonts/type1
 	@${MKDIR} $(TEXDIR)/dvips/mapfiles
 	$(INSTALL_DATA) ${WRKSRC}/mapfiles/* $(TEXDIR)/dvips/mapfiles
-	@${MKDIR} $(TEXDIR)/fonts/afm
-	$(INSTALL_DATA) ${WRKSRC}/afm/* $(TEXDIR)/fonts/afm
+	@${MKDIR} $(PREFIX)/lib/afm
+	$(INSTALL_DATA) ${WRKSRC}/afm/* $(PREFIX)/lib/afm
 
 .if !defined(NOPORTSDOC)
 	@${MKDIR} $(PREFIX)/share/doc/cmpsfont
diff --git a/print/cmpsfont/pkg-plist b/print/cmpsfont/pkg-plist
index 09face5345b9..47135ca0afee 100644
--- a/print/cmpsfont/pkg-plist
+++ b/print/cmpsfont/pkg-plist
@@ -1,101 +1,101 @@
+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/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
+lib/afm/cmb10.afm
+lib/afm/cmbxsl10.afm
 share/texmf/dvips/mapfiles/psfonts.cm
 share/texmf/dvips/mapfiles/psfonts.cmx
 share/texmf/dvips/mapfiles/psfonts.cmz
 share/texmf/dvips/mapfiles/readme.txt
-share/texmf/fonts/afm/cmbsy10.afm
-share/texmf/fonts/afm/cmbx10.afm
-share/texmf/fonts/afm/cmbx12.afm
-share/texmf/fonts/afm/cmbx5.afm
-share/texmf/fonts/afm/cmbx6.afm
-share/texmf/fonts/afm/cmbx7.afm
-share/texmf/fonts/afm/cmbx8.afm
-share/texmf/fonts/afm/cmbx9.afm
-share/texmf/fonts/afm/cmbxti10.afm
-share/texmf/fonts/afm/cmcsc10.afm
-share/texmf/fonts/afm/cmdunh10.afm
-share/texmf/fonts/afm/cmex10.afm
-share/texmf/fonts/afm/cmff10.afm
-share/texmf/fonts/afm/cmfi10.afm
-share/texmf/fonts/afm/cmfib8.afm
-share/texmf/fonts/afm/cminch.afm
-share/texmf/fonts/afm/cmitt10.afm
-share/texmf/fonts/afm/cmmi10.afm
-share/texmf/fonts/afm/cmmi12.afm
-share/texmf/fonts/afm/cmmi5.afm
-share/texmf/fonts/afm/cmmi6.afm
-share/texmf/fonts/afm/cmmi7.afm
-share/texmf/fonts/afm/cmmi8.afm
-share/texmf/fonts/afm/cmmi9.afm
-share/texmf/fonts/afm/cmmib10.afm
-share/texmf/fonts/afm/cmr10.afm
-share/texmf/fonts/afm/cmr12.afm
-share/texmf/fonts/afm/cmr17.afm
-share/texmf/fonts/afm/cmr5.afm
-share/texmf/fonts/afm/cmr6.afm
-share/texmf/fonts/afm/cmr7.afm
-share/texmf/fonts/afm/cmr8.afm
-share/texmf/fonts/afm/cmr9.afm
-share/texmf/fonts/afm/cmsl10.afm
-share/texmf/fonts/afm/cmsl12.afm
-share/texmf/fonts/afm/cmsl8.afm
-share/texmf/fonts/afm/cmsl9.afm
-share/texmf/fonts/afm/cmsltt10.afm
-share/texmf/fonts/afm/cmss10.afm
-share/texmf/fonts/afm/cmss12.afm
-share/texmf/fonts/afm/cmss17.afm
-share/texmf/fonts/afm/cmss8.afm
-share/texmf/fonts/afm/cmss9.afm
-share/texmf/fonts/afm/cmssbx10.afm
-share/texmf/fonts/afm/cmssdc10.afm
-share/texmf/fonts/afm/cmssi10.afm
-share/texmf/fonts/afm/cmssi12.afm
-share/texmf/fonts/afm/cmssi17.afm
-share/texmf/fonts/afm/cmssi8.afm
-share/texmf/fonts/afm/cmssi9.afm
-share/texmf/fonts/afm/cmssq8.afm
-share/texmf/fonts/afm/cmssqi8.afm
-share/texmf/fonts/afm/cmsy10.afm
-share/texmf/fonts/afm/cmsy5.afm
-share/texmf/fonts/afm/cmsy6.afm
-share/texmf/fonts/afm/cmsy7.afm
-share/texmf/fonts/afm/cmsy8.afm
-share/texmf/fonts/afm/cmsy9.afm
-share/texmf/fonts/afm/cmtcsc10.afm
-share/texmf/fonts/afm/cmtex10.afm
-share/texmf/fonts/afm/cmtex8.afm
-share/texmf/fonts/afm/cmtex9.afm
-share/texmf/fonts/afm/cmti10.afm
-share/texmf/fonts/afm/cmti12.afm
-share/texmf/fonts/afm/cmti7.afm
-share/texmf/fonts/afm/cmti8.afm
-share/texmf/fonts/afm/cmti9.afm
-share/texmf/fonts/afm/cmtt10.afm
-share/texmf/fonts/afm/cmtt12.afm
-share/texmf/fonts/afm/cmtt8.afm
-share/texmf/fonts/afm/cmtt9.afm
-share/texmf/fonts/afm/cmu10.afm
-share/texmf/fonts/afm/cmvtt10.afm
-share/texmf/fonts/afm/lasy10.afm
-share/texmf/fonts/afm/lasy5.afm
-share/texmf/fonts/afm/lasy6.afm
-share/texmf/fonts/afm/lasy7.afm
-share/texmf/fonts/afm/lasy8.afm
-share/texmf/fonts/afm/lasy9.afm
-share/texmf/fonts/afm/lasyb10.afm
-share/texmf/fonts/afm/lcircle1.afm
-share/texmf/fonts/afm/lcirclew.afm
-share/texmf/fonts/afm/lcmss8.afm
-share/texmf/fonts/afm/lcmssb8.afm
-share/texmf/fonts/afm/lcmssi8.afm
-share/texmf/fonts/afm/line10.afm
-share/texmf/fonts/afm/linew10.afm
-share/texmf/fonts/afm/logo10.afm
-share/texmf/fonts/afm/logo8.afm
-share/texmf/fonts/afm/logo9.afm
-share/texmf/fonts/afm/logobf10.afm
-share/texmf/fonts/afm/logosl10.afm
-share/texmf/fonts/afm/cmb10.afm
-share/texmf/fonts/afm/cmbxsl10.afm
 share/texmf/fonts/type1/Fontmap
 share/texmf/fonts/type1/fonts.dir
 share/texmf/fonts/type1/fonts.scale
@@ -195,6 +195,6 @@ share/texmf/fonts/type1/logobf10.pfb
 share/texmf/fonts/type1/logosl10.pfb
 share/doc/cmpsfont/READ.ME
 @dirrm share/texmf/dvips/mapfiles
-@dirrm share/texmf/fonts/afm
+@dirrm lib/afm
 @dirrm share/texmf/fonts/type1
 @dirrm share/doc/cmpsfont