- Use consistent installation directories.

- Bump PORTREVISION.

3 files changed, 82 insertions, 79 deletions

diff --git a/print/amspsfnt/Makefile b/print/amspsfnt/Makefile
index 83c7a978e7cd..96a4f59f5831 100644
--- a/print/amspsfnt/Makefile
+++ b/print/amspsfnt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amspsfnt
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/ams/
 DISTNAME=	amsps
@@ -34,15 +34,16 @@ FONTSDIR=	share/fonts/amspsfont
 
 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}/READ.ME ${PREFIX}/${FONTSDIR}/
 
 .if !defined(WITHOUT_X11)
diff --git a/print/amspsfnt/files/pkg-message.in b/print/amspsfnt/files/pkg-message.in
index 0acc06b40caf..f1e8423248eb 100644
--- a/print/amspsfnt/files/pkg-message.in
+++ b/print/amspsfnt/files/pkg-message.in
@@ -2,10 +2,10 @@
 American Math Society Postscript fonts have been installed!
 ============================================================
 
-Please add	%%PREFIX%%/share/fonts/amspsfont
+Please add	%%PREFIX%%/share/fonts/amspsfont/type1
 to your X11 fonts path by either:
 
-$ xset fp+  %%PREFIX%%/share/fonts/amspsfont
+$ xset fp+  %%PREFIX%%/share/fonts/amspsfont/type1
 $ xset fp rehash
 
 or by adding it to your X-server configuration file.
diff --git a/print/amspsfnt/pkg-plist b/print/amspsfnt/pkg-plist
index 1194334dd82e..171df00f0b50 100644
--- a/print/amspsfnt/pkg-plist
+++ b/print/amspsfnt/pkg-plist
@@ -1,75 +1,77 @@
 @comment $FreeBSD$
 share/fonts/amspsfont/READ.ME
-share/fonts/amspsfont/cmbsy5.afm
-share/fonts/amspsfont/cmbsy7.afm
-share/fonts/amspsfont/cmmib5.afm
-share/fonts/amspsfont/cmmib7.afm
-share/fonts/amspsfont/euex10.afm
-share/fonts/amspsfont/eufb10.afm
-share/fonts/amspsfont/eufb5.afm
-share/fonts/amspsfont/eufb7.afm
-share/fonts/amspsfont/eufm10.afm
-share/fonts/amspsfont/eufm5.afm
-share/fonts/amspsfont/eufm7.afm
-share/fonts/amspsfont/eurb10.afm
-share/fonts/amspsfont/eurb5.afm
-share/fonts/amspsfont/eurb7.afm
-share/fonts/amspsfont/eurm10.afm
-share/fonts/amspsfont/eurm5.afm
-share/fonts/amspsfont/eurm7.afm
-share/fonts/amspsfont/eusb10.afm
-share/fonts/amspsfont/eusb5.afm
-share/fonts/amspsfont/eusb7.afm
-share/fonts/amspsfont/eusm10.afm
-share/fonts/amspsfont/eusm5.afm
-share/fonts/amspsfont/eusm7.afm
-share/fonts/amspsfont/msam10.afm
-share/fonts/amspsfont/msam5.afm
-share/fonts/amspsfont/msam7.afm
-share/fonts/amspsfont/msbm10.afm
-share/fonts/amspsfont/msbm5.afm
-share/fonts/amspsfont/msbm7.afm
-share/fonts/amspsfont/wncyb10.afm
-share/fonts/amspsfont/wncyi10.afm
-share/fonts/amspsfont/wncyr10.afm
-share/fonts/amspsfont/wncysc10.afm
-share/fonts/amspsfont/wncyss10.afm
-share/fonts/amspsfont/cmbsy5.pfb
-share/fonts/amspsfont/cmbsy7.pfb
-share/fonts/amspsfont/cmmib5.pfb
-share/fonts/amspsfont/cmmib7.pfb
-share/fonts/amspsfont/euex10.pfb
-share/fonts/amspsfont/eufb10.pfb
-share/fonts/amspsfont/eufb5.pfb
-share/fonts/amspsfont/eufb7.pfb
-share/fonts/amspsfont/eufm10.pfb
-share/fonts/amspsfont/eufm5.pfb
-share/fonts/amspsfont/eufm7.pfb
-share/fonts/amspsfont/eurb10.pfb
-share/fonts/amspsfont/eurb5.pfb
-share/fonts/amspsfont/eurb7.pfb
-share/fonts/amspsfont/eurm10.pfb
-share/fonts/amspsfont/eurm5.pfb
-share/fonts/amspsfont/eurm7.pfb
-share/fonts/amspsfont/eusb10.pfb
-share/fonts/amspsfont/eusb5.pfb
-share/fonts/amspsfont/eusb7.pfb
-share/fonts/amspsfont/eusm10.pfb
-share/fonts/amspsfont/eusm5.pfb
-share/fonts/amspsfont/eusm7.pfb
-share/fonts/amspsfont/msam10.pfb
-share/fonts/amspsfont/msam5.pfb
-share/fonts/amspsfont/msam7.pfb
-share/fonts/amspsfont/msbm10.pfb
-share/fonts/amspsfont/msbm5.pfb
-share/fonts/amspsfont/msbm7.pfb
-share/fonts/amspsfont/wncyb10.pfb
-share/fonts/amspsfont/wncyi10.pfb
-share/fonts/amspsfont/wncyr10.pfb
-share/fonts/amspsfont/wncysc10.pfb
-share/fonts/amspsfont/wncyss10.pfb
-%%PLIST_X11%%share/fonts/amspsfont/Fontmap
-%%PLIST_X11%%share/fonts/amspsfont/fonts.dir
-%%PLIST_X11%%share/fonts/amspsfont/fonts.scale
+share/fonts/amspsfont/afm/cmbsy5.afm
+share/fonts/amspsfont/afm/cmbsy7.afm
+share/fonts/amspsfont/afm/cmmib5.afm
+share/fonts/amspsfont/afm/cmmib7.afm
+share/fonts/amspsfont/afm/euex10.afm
+share/fonts/amspsfont/afm/eufb10.afm
+share/fonts/amspsfont/afm/eufb5.afm
+share/fonts/amspsfont/afm/eufb7.afm
+share/fonts/amspsfont/afm/eufm10.afm
+share/fonts/amspsfont/afm/eufm5.afm
+share/fonts/amspsfont/afm/eufm7.afm
+share/fonts/amspsfont/afm/eurb10.afm
+share/fonts/amspsfont/afm/eurb5.afm
+share/fonts/amspsfont/afm/eurb7.afm
+share/fonts/amspsfont/afm/eurm10.afm
+share/fonts/amspsfont/afm/eurm5.afm
+share/fonts/amspsfont/afm/eurm7.afm
+share/fonts/amspsfont/afm/eusb10.afm
+share/fonts/amspsfont/afm/eusb5.afm
+share/fonts/amspsfont/afm/eusb7.afm
+share/fonts/amspsfont/afm/eusm10.afm
+share/fonts/amspsfont/afm/eusm5.afm
+share/fonts/amspsfont/afm/eusm7.afm
+share/fonts/amspsfont/afm/msam10.afm
+share/fonts/amspsfont/afm/msam5.afm
+share/fonts/amspsfont/afm/msam7.afm
+share/fonts/amspsfont/afm/msbm10.afm
+share/fonts/amspsfont/afm/msbm5.afm
+share/fonts/amspsfont/afm/msbm7.afm
+share/fonts/amspsfont/afm/wncyb10.afm
+share/fonts/amspsfont/afm/wncyi10.afm
+share/fonts/amspsfont/afm/wncyr10.afm
+share/fonts/amspsfont/afm/wncysc10.afm
+share/fonts/amspsfont/afm/wncyss10.afm
+share/fonts/amspsfont/type1/cmbsy5.pfb
+share/fonts/amspsfont/type1/cmbsy7.pfb
+share/fonts/amspsfont/type1/cmmib5.pfb
+share/fonts/amspsfont/type1/cmmib7.pfb
+share/fonts/amspsfont/type1/euex10.pfb
+share/fonts/amspsfont/type1/eufb10.pfb
+share/fonts/amspsfont/type1/eufb5.pfb
+share/fonts/amspsfont/type1/eufb7.pfb
+share/fonts/amspsfont/type1/eufm10.pfb
+share/fonts/amspsfont/type1/eufm5.pfb
+share/fonts/amspsfont/type1/eufm7.pfb
+share/fonts/amspsfont/type1/eurb10.pfb
+share/fonts/amspsfont/type1/eurb5.pfb
+share/fonts/amspsfont/type1/eurb7.pfb
+share/fonts/amspsfont/type1/eurm10.pfb
+share/fonts/amspsfont/type1/eurm5.pfb
+share/fonts/amspsfont/type1/eurm7.pfb
+share/fonts/amspsfont/type1/eusb10.pfb
+share/fonts/amspsfont/type1/eusb5.pfb
+share/fonts/amspsfont/type1/eusb7.pfb
+share/fonts/amspsfont/type1/eusm10.pfb
+share/fonts/amspsfont/type1/eusm5.pfb
+share/fonts/amspsfont/type1/eusm7.pfb
+share/fonts/amspsfont/type1/msam10.pfb
+share/fonts/amspsfont/type1/msam5.pfb
+share/fonts/amspsfont/type1/msam7.pfb
+share/fonts/amspsfont/type1/msbm10.pfb
+share/fonts/amspsfont/type1/msbm5.pfb
+share/fonts/amspsfont/type1/msbm7.pfb
+share/fonts/amspsfont/type1/wncyb10.pfb
+share/fonts/amspsfont/type1/wncyi10.pfb
+share/fonts/amspsfont/type1/wncyr10.pfb
+share/fonts/amspsfont/type1/wncysc10.pfb
+share/fonts/amspsfont/type1/wncyss10.pfb
+%%PLIST_X11%%share/fonts/amspsfont/type1/Fontmap
+%%PLIST_X11%%share/fonts/amspsfont/type1/fonts.dir
+%%PLIST_X11%%share/fonts/amspsfont/type1/fonts.scale
+@dirrm share/fonts/amspsfont/afm
+@dirrm share/fonts/amspsfont/type1
 @dirrm share/fonts/amspsfont
-@unexec /bin/rmdir %D/share/fonts 2>/dev/null || /usr/bin/true
+@dirrmtry share/fonts