Update port due to changed distfile:

o most fonts have been updated
o added a few fonts
o renamed READ.ME to README
o removed mapfiles

Also:
o properly support NOPORTDOCS
o bump PORTREVISION
o fix a few portlint warnings

3 files changed, 21 insertions, 27 deletions

diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index f9b7632088b1..d375490df220 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmpsfont
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/cm/
 DISTNAME=	cmps
@@ -14,25 +15,23 @@ EXTRACT_SUFX=	-unix.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	$(LOCALBASE)/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
+BUILD_DEPENDS=	${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
-WRKSRC=		$(WRKDIR)/cmpsfont
-TEXDIR=		$(PREFIX)/share/texmf
+WRKSRC=		${WRKDIR}/cmpsfont
+TEXDIR=		${PREFIX}/share/texmf
 
 do-build:
-	(cd ${WRKSRC}/pfb; $(LOCALBASE)/bin/type1inst -nolog -q)
+	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog -q)
 
 do-install:
-	@${MKDIR} $(TEXDIR)/fonts/type1
-	$(INSTALL_DATA) ${WRKSRC}/pfb/* $(TEXDIR)/fonts/type1
-	@${MKDIR} $(TEXDIR)/dvips/mapfiles
-	$(INSTALL_DATA) ${WRKSRC}/mapfiles/* $(TEXDIR)/dvips/mapfiles
-	@${MKDIR} $(PREFIX)/lib/afm
-	$(INSTALL_DATA) ${WRKSRC}/afm/* $(PREFIX)/lib/afm
-
-.if !defined(NOPORTSDOC)
-	@${MKDIR} $(PREFIX)/share/doc/cmpsfont
-	$(INSTALL_DATA) ${WRKSRC}/READ.ME $(PREFIX)/share/doc/cmpsfont
+	@${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} ${PREFIX}/share/doc/cmpsfont
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmpsfont
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/cmpsfont/distinfo b/print/cmpsfont/distinfo
index 036a4f682224..53c1b8455c22 100644
--- a/print/cmpsfont/distinfo
+++ b/print/cmpsfont/distinfo
@@ -1 +1 @@
-MD5 (cmps-unix.tar.gz) = 81e2e556f17290c22561b4579f416dd3
+MD5 (cmps-unix.tar.gz) = 5ff364064bb2e399f9a2f4babb8af5cf
diff --git a/print/cmpsfont/pkg-plist b/print/cmpsfont/pkg-plist
index 47135ca0afee..2a5c0d8a2bb7 100644
--- a/print/cmpsfont/pkg-plist
+++ b/print/cmpsfont/pkg-plist
@@ -1,3 +1,4 @@
+lib/afm/cmb10.afm
 lib/afm/cmbsy10.afm
 lib/afm/cmbx10.afm
 lib/afm/cmbx12.afm
@@ -6,6 +7,7 @@ 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
@@ -90,15 +92,8 @@ 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
+%%PORTDOCS%%share/doc/cmpsfont/README
 share/texmf/fonts/type1/Fontmap
-share/texmf/fonts/type1/fonts.dir
-share/texmf/fonts/type1/fonts.scale
 share/texmf/fonts/type1/cmb10.pfb
 share/texmf/fonts/type1/cmbsy10.pfb
 share/texmf/fonts/type1/cmbx10.pfb
@@ -174,6 +169,8 @@ 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
@@ -193,8 +190,6 @@ share/texmf/fonts/type1/logo8.pfb
 share/texmf/fonts/type1/logo9.pfb
 share/texmf/fonts/type1/logobf10.pfb
 share/texmf/fonts/type1/logosl10.pfb
-share/doc/cmpsfont/READ.ME
-@dirrm share/texmf/dvips/mapfiles
 @dirrm lib/afm
-@dirrm share/texmf/fonts/type1
-@dirrm share/doc/cmpsfont
+%%PORTDOCS%%@dirrm share/doc/cmpsfont
+@unexec rmdir share/texmf/fonts/type1 2>/dev/null || true