- add category x11-fonts;

- add a pkg-message;

- pet portlint.

Submitted by:	Pedro F. Giffuni

6 files changed, 65 insertions, 26 deletions

diff --git a/print/amspsfnt/Makefile b/print/amspsfnt/Makefile
index 18d5da9e81d4..47db18f47cd0 100644
--- a/print/amspsfnt/Makefile
+++ b/print/amspsfnt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amspsfnt
 PORTVERSION=	1.0
-CATEGORIES=	print
+CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/ams/
 DISTNAME=	amsps
 EXTRACT_SUFX=	-unix.tar.gz
@@ -15,28 +15,32 @@ EXTRACT_SUFX=	-unix.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	AMSFonts PostScript Fonts (Adobe Type 1 format)
 
-BUILD_DEPENDS=	$(LOCALBASE)/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
+BUILD_DEPENDS=	${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
-WRKSRC=		$(WRKDIR)/amspsfnt
-TEXDIR=		$(PREFIX)/share/texmf
-AMSFNTDIR=	$(TEXDIR)/fonts/ams
+SUB_FILES=	pkg-message
+
+WRKSRC=		${WRKDIR}/amspsfnt
+TEXDIR?=	${PREFIX}/share/texmf
+AMSFNTDIR=	${TEXDIR}/fonts/ams
 
 do-build:
-	(cd ${WRKSRC}/pfb; $(LOCALBASE)/bin/type1inst -nolog -q)
+	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog)
 
 do-install:
-	@${MKDIR} $(AMSFNTDIR)/tfm
-	$(INSTALL_DATA) ${WRKSRC}/tfm/* $(AMSFNTDIR)/tfm
-	@${MKDIR} $(AMSFNTDIR)/type1
-	$(INSTALL_DATA) ${WRKSRC}/pfb/* $(AMSFNTDIR)/type1
-	@${MKDIR} $(TEXDIR)/dvips/mapfiles.ams
-	$(INSTALL_DATA) ${WRKSRC}/mapfiles/* $(TEXDIR)/dvips/mapfiles.ams
-	@${MKDIR} $(PREFIX)/lib/afm
-	$(INSTALL_DATA) ${WRKSRC}/afm/* $(PREFIX)/lib/afm
-
+	@${MKDIR} ${AMSFNTDIR}/tfm
+	${INSTALL_DATA} ${WRKSRC}/tfm/* ${AMSFNTDIR}/tfm
+	@${MKDIR} ${AMSFNTDIR}/type1
+	${INSTALL_DATA} ${WRKSRC}/pfb/* ${AMSFNTDIR}/type1
+	@${MKDIR} ${TEXDIR}/dvips/mapfiles.ams
+	${INSTALL_DATA} ${WRKSRC}/mapfiles/* ${TEXDIR}/dvips/mapfiles.ams
+	@${MKDIR} ${PREFIX}/lib/afm
+	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/lib/afm
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	$(INSTALL_DATA) ${WRKSRC}/READ.ME ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/READ.ME ${DOCSDIR}
 .endif
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/print/amspsfnt/files/pkg-message.in b/print/amspsfnt/files/pkg-message.in
new file mode 100644
index 000000000000..6350c66e7e35
--- /dev/null
+++ b/print/amspsfnt/files/pkg-message.in
@@ -0,0 +1,15 @@
+============================================================
+American Math Society Postscript fonts have been installed!
+============================================================
+
+Please add	%%PREFIX%%/share/texmf/fonts/ams
+to your X11 fonts path by either:
+
+$ xset fp+  %%PREFIX%%/share/texmf/fonts/ams
+$ xset fp rehash
+
+or by adding it to your X-server configuration file.
+Other utilities, like ghostscript, may also need
+additional configuration.
+
+============================================================
diff --git a/print/amspsfnt/pkg-plist b/print/amspsfnt/pkg-plist
index 9cbc75d1212c..b9d10f64b231 100644
--- a/print/amspsfnt/pkg-plist
+++ b/print/amspsfnt/pkg-plist
@@ -32,7 +32,7 @@ lib/afm/wncyi10.afm
 lib/afm/wncyr10.afm
 lib/afm/wncysc10.afm
 lib/afm/wncyss10.afm
-%%PORTDOCS%%share/doc/amspsfnt/READ.ME
+%%PORTDOCS%%%%DOCSDIR%%/READ.ME
 share/texmf/dvips/mapfiles.ams/psfonts.ams
 share/texmf/dvips/mapfiles.ams/psfonts.amx
 share/texmf/dvips/mapfiles.ams/psfonts.amz
@@ -171,5 +171,5 @@ share/texmf/fonts/ams/type1/wncyss10.pfb
 @dirrm share/texmf/dvips/mapfiles.ams
 @unexec rmdir %D/share/texmf/dvips 2>/dev/null || true
 @unexec rmdir %D/share/texmf 2>/dev/null || true
-%%PORTDOCS%%@dirrm share/doc/amspsfnt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/afm
diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index b1d673333d71..9bd7026d2751 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	cmpsfont
 PORTVERSION=	1.0
 PORTREVISION=	1
-CATEGORIES=	print
+CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/cm/
 DISTNAME=	cmps
 EXTRACT_SUFX=	-unix.tar.gz
@@ -18,13 +18,15 @@ COMMENT=	Computer Modern PostScript Fonts (Adobe Type 1 format)
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
+SUB_FILES=	pkg-message
+
 WRKSRC=		${WRKDIR}/cmpsfont
-TEXDIR=		${PREFIX}/share/texmf
+TEXDIR?=	${PREFIX}/share/texmf
 
 IGNORE=		is already included in the teTeX distribution
 
 do-build:
-	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog -q)
+	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog)
 
 do-install:
 	@${MKDIR} ${TEXDIR}/fonts/type1
@@ -33,8 +35,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/lib/afm
 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/cmpsfont
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmpsfont
+	@${MKDIR} ${DOCSDIR}/cmpsfont
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/cmpsfont
 .endif
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/print/cmpsfont/files/pkg-message.in b/print/cmpsfont/files/pkg-message.in
new file mode 100644
index 000000000000..acd2ba04e7b8
--- /dev/null
+++ b/print/cmpsfont/files/pkg-message.in
@@ -0,0 +1,15 @@
+============================================================
+Computer Modern Postscript fonts have been installed!
+============================================================
+
+Please add	%%PREFIX%%/share/texmf/fonts/type1
+to your X11 fonts path by either:
+
+$ xset fp+  %%PREFIX%%/share/texmf/fonts/type1
+$ xset fp rehash
+
+or by adding it to your X-server configuration file.
+Other utilities, like ghostscript, will probably also need
+configuration.
+
+============================================================
diff --git a/print/cmpsfont/pkg-plist b/print/cmpsfont/pkg-plist
index 2a5c0d8a2bb7..b22322a5ec33 100644
--- a/print/cmpsfont/pkg-plist
+++ b/print/cmpsfont/pkg-plist
@@ -92,7 +92,7 @@ lib/afm/logo8.afm
 lib/afm/logo9.afm
 lib/afm/logobf10.afm
 lib/afm/logosl10.afm
-%%PORTDOCS%%share/doc/cmpsfont/README
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/texmf/fonts/type1/Fontmap
 share/texmf/fonts/type1/cmb10.pfb
 share/texmf/fonts/type1/cmbsy10.pfb
@@ -191,5 +191,5 @@ share/texmf/fonts/type1/logo9.pfb
 share/texmf/fonts/type1/logobf10.pfb
 share/texmf/fonts/type1/logosl10.pfb
 @dirrm lib/afm
-%%PORTDOCS%%@dirrm share/doc/cmpsfont
-@unexec rmdir share/texmf/fonts/type1 2>/dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/share/texmf/fonts/type1 2>/dev/null || true