3 files changed, 89 insertions, 194 deletions

diff --git a/print/amspsfnt/Makefile b/print/amspsfnt/Makefile
index 47db18f47cd0..c0a32ef2968a 100644
--- a/print/amspsfnt/Makefile
+++ b/print/amspsfnt/Makefile
@@ -7,38 +7,31 @@
 
 PORTNAME=	amspsfnt
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/ams/
 DISTNAME=	amsps
 EXTRACT_SUFX=	-unix.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	AMSFonts PostScript Fonts (Adobe Type 1 format)
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
-SUB_FILES=	pkg-message
-
 WRKSRC=		${WRKDIR}/amspsfnt
-TEXDIR?=	${PREFIX}/share/texmf
-AMSFNTDIR=	${TEXDIR}/fonts/ams
+
+FONTSDIR=	share/fonts/amspsfont
+SUB_FILES=	pkg-message
 
 do-build:
 	(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
-.ifndef (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/READ.ME ${DOCSDIR}
-.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}/READ.ME ${PREFIX}/${FONTSDIR}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/amspsfnt/files/pkg-message.in b/print/amspsfnt/files/pkg-message.in
index 6350c66e7e35..ffb343bfe07b 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/texmf/fonts/ams
+Please add	%%PREFIX%%/share/fonts/amspsfont/pfb
 to your X11 fonts path by either:
 
-$ xset fp+  %%PREFIX%%/share/texmf/fonts/ams
+$ xset fp+  %%PREFIX%%/share/fonts/amspsfont/pfb
 $ 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 b9d10f64b231..49418cccc8d7 100644
--- a/print/amspsfnt/pkg-plist
+++ b/print/amspsfnt/pkg-plist
@@ -1,175 +1,77 @@
-lib/afm/cmbsy5.afm
-lib/afm/cmbsy7.afm
-lib/afm/cmmib5.afm
-lib/afm/cmmib7.afm
-lib/afm/euex10.afm
-lib/afm/eufb10.afm
-lib/afm/eufb5.afm
-lib/afm/eufb7.afm
-lib/afm/eufm10.afm
-lib/afm/eufm5.afm
-lib/afm/eufm7.afm
-lib/afm/eurb10.afm
-lib/afm/eurb5.afm
-lib/afm/eurb7.afm
-lib/afm/eurm10.afm
-lib/afm/eurm5.afm
-lib/afm/eurm7.afm
-lib/afm/eusb10.afm
-lib/afm/eusb5.afm
-lib/afm/eusb7.afm
-lib/afm/eusm10.afm
-lib/afm/eusm5.afm
-lib/afm/eusm7.afm
-lib/afm/msam10.afm
-lib/afm/msam5.afm
-lib/afm/msam7.afm
-lib/afm/msbm10.afm
-lib/afm/msbm5.afm
-lib/afm/msbm7.afm
-lib/afm/wncyb10.afm
-lib/afm/wncyi10.afm
-lib/afm/wncyr10.afm
-lib/afm/wncysc10.afm
-lib/afm/wncyss10.afm
-%%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
-share/texmf/dvips/mapfiles.ams/readme.txt
-share/texmf/fonts/ams/tfm/cmbsy5.tfm
-share/texmf/fonts/ams/tfm/cmbsy6.tfm
-share/texmf/fonts/ams/tfm/cmbsy7.tfm
-share/texmf/fonts/ams/tfm/cmbsy8.tfm
-share/texmf/fonts/ams/tfm/cmbsy9.tfm
-share/texmf/fonts/ams/tfm/cmcsc8.tfm
-share/texmf/fonts/ams/tfm/cmcsc9.tfm
-share/texmf/fonts/ams/tfm/cmex7.tfm
-share/texmf/fonts/ams/tfm/cmex8.tfm
-share/texmf/fonts/ams/tfm/cmex9.tfm
-share/texmf/fonts/ams/tfm/cmmib5.tfm
-share/texmf/fonts/ams/tfm/cmmib6.tfm
-share/texmf/fonts/ams/tfm/cmmib7.tfm
-share/texmf/fonts/ams/tfm/cmmib8.tfm
-share/texmf/fonts/ams/tfm/cmmib9.tfm
-share/texmf/fonts/ams/tfm/dummy.tfm
-share/texmf/fonts/ams/tfm/euex10.tfm
-share/texmf/fonts/ams/tfm/euex7.tfm
-share/texmf/fonts/ams/tfm/euex8.tfm
-share/texmf/fonts/ams/tfm/euex9.tfm
-share/texmf/fonts/ams/tfm/eufb10.tfm
-share/texmf/fonts/ams/tfm/eufb5.tfm
-share/texmf/fonts/ams/tfm/eufb6.tfm
-share/texmf/fonts/ams/tfm/eufb7.tfm
-share/texmf/fonts/ams/tfm/eufb8.tfm
-share/texmf/fonts/ams/tfm/eufb9.tfm
-share/texmf/fonts/ams/tfm/eufm10.tfm
-share/texmf/fonts/ams/tfm/eufm5.tfm
-share/texmf/fonts/ams/tfm/eufm6.tfm
-share/texmf/fonts/ams/tfm/eufm7.tfm
-share/texmf/fonts/ams/tfm/eufm8.tfm
-share/texmf/fonts/ams/tfm/eufm9.tfm
-share/texmf/fonts/ams/tfm/eurb10.tfm
-share/texmf/fonts/ams/tfm/eurb5.tfm
-share/texmf/fonts/ams/tfm/eurb6.tfm
-share/texmf/fonts/ams/tfm/eurb7.tfm
-share/texmf/fonts/ams/tfm/eurb8.tfm
-share/texmf/fonts/ams/tfm/eurb9.tfm
-share/texmf/fonts/ams/tfm/eurm10.tfm
-share/texmf/fonts/ams/tfm/eurm5.tfm
-share/texmf/fonts/ams/tfm/eurm6.tfm
-share/texmf/fonts/ams/tfm/eurm7.tfm
-share/texmf/fonts/ams/tfm/eurm8.tfm
-share/texmf/fonts/ams/tfm/eurm9.tfm
-share/texmf/fonts/ams/tfm/eusb10.tfm
-share/texmf/fonts/ams/tfm/eusb5.tfm
-share/texmf/fonts/ams/tfm/eusb6.tfm
-share/texmf/fonts/ams/tfm/eusb7.tfm
-share/texmf/fonts/ams/tfm/eusb8.tfm
-share/texmf/fonts/ams/tfm/eusb9.tfm
-share/texmf/fonts/ams/tfm/eusm10.tfm
-share/texmf/fonts/ams/tfm/eusm5.tfm
-share/texmf/fonts/ams/tfm/eusm6.tfm
-share/texmf/fonts/ams/tfm/eusm7.tfm
-share/texmf/fonts/ams/tfm/eusm8.tfm
-share/texmf/fonts/ams/tfm/eusm9.tfm
-share/texmf/fonts/ams/tfm/msam10.tfm
-share/texmf/fonts/ams/tfm/msam5.tfm
-share/texmf/fonts/ams/tfm/msam6.tfm
-share/texmf/fonts/ams/tfm/msam7.tfm
-share/texmf/fonts/ams/tfm/msam8.tfm
-share/texmf/fonts/ams/tfm/msam9.tfm
-share/texmf/fonts/ams/tfm/msbm10.tfm
-share/texmf/fonts/ams/tfm/msbm5.tfm
-share/texmf/fonts/ams/tfm/msbm6.tfm
-share/texmf/fonts/ams/tfm/msbm7.tfm
-share/texmf/fonts/ams/tfm/msbm8.tfm
-share/texmf/fonts/ams/tfm/msbm9.tfm
-share/texmf/fonts/ams/tfm/wncyb10.tfm
-share/texmf/fonts/ams/tfm/wncyb5.tfm
-share/texmf/fonts/ams/tfm/wncyb6.tfm
-share/texmf/fonts/ams/tfm/wncyb7.tfm
-share/texmf/fonts/ams/tfm/wncyb8.tfm
-share/texmf/fonts/ams/tfm/wncyb9.tfm
-share/texmf/fonts/ams/tfm/wncyi10.tfm
-share/texmf/fonts/ams/tfm/wncyi5.tfm
-share/texmf/fonts/ams/tfm/wncyi6.tfm
-share/texmf/fonts/ams/tfm/wncyi7.tfm
-share/texmf/fonts/ams/tfm/wncyi8.tfm
-share/texmf/fonts/ams/tfm/wncyi9.tfm
-share/texmf/fonts/ams/tfm/wncyr10.tfm
-share/texmf/fonts/ams/tfm/wncyr5.tfm
-share/texmf/fonts/ams/tfm/wncyr6.tfm
-share/texmf/fonts/ams/tfm/wncyr7.tfm
-share/texmf/fonts/ams/tfm/wncyr8.tfm
-share/texmf/fonts/ams/tfm/wncyr9.tfm
-share/texmf/fonts/ams/tfm/wncysc10.tfm
-share/texmf/fonts/ams/tfm/wncyss10.tfm
-share/texmf/fonts/ams/tfm/wncyss8.tfm
-share/texmf/fonts/ams/tfm/wncyss9.tfm
-share/texmf/fonts/ams/type1/Fontmap
-share/texmf/fonts/ams/type1/cmbsy5.pfb
-share/texmf/fonts/ams/type1/cmbsy7.pfb
-share/texmf/fonts/ams/type1/cmmib5.pfb
-share/texmf/fonts/ams/type1/cmmib7.pfb
-share/texmf/fonts/ams/type1/euex10.pfb
-share/texmf/fonts/ams/type1/eufb10.pfb
-share/texmf/fonts/ams/type1/eufb5.pfb
-share/texmf/fonts/ams/type1/eufb7.pfb
-share/texmf/fonts/ams/type1/eufm10.pfb
-share/texmf/fonts/ams/type1/eufm5.pfb
-share/texmf/fonts/ams/type1/eufm7.pfb
-share/texmf/fonts/ams/type1/eurb10.pfb
-share/texmf/fonts/ams/type1/eurb5.pfb
-share/texmf/fonts/ams/type1/eurb7.pfb
-share/texmf/fonts/ams/type1/eurm10.pfb
-share/texmf/fonts/ams/type1/eurm5.pfb
-share/texmf/fonts/ams/type1/eurm7.pfb
-share/texmf/fonts/ams/type1/eusb10.pfb
-share/texmf/fonts/ams/type1/eusb5.pfb
-share/texmf/fonts/ams/type1/eusb7.pfb
-share/texmf/fonts/ams/type1/eusm10.pfb
-share/texmf/fonts/ams/type1/eusm5.pfb
-share/texmf/fonts/ams/type1/eusm7.pfb
-share/texmf/fonts/ams/type1/fonts.dir
-share/texmf/fonts/ams/type1/fonts.scale
-share/texmf/fonts/ams/type1/msam10.pfb
-share/texmf/fonts/ams/type1/msam5.pfb
-share/texmf/fonts/ams/type1/msam7.pfb
-share/texmf/fonts/ams/type1/msbm10.pfb
-share/texmf/fonts/ams/type1/msbm5.pfb
-share/texmf/fonts/ams/type1/msbm7.pfb
-share/texmf/fonts/ams/type1/wncyb10.pfb
-share/texmf/fonts/ams/type1/wncyi10.pfb
-share/texmf/fonts/ams/type1/wncyr10.pfb
-share/texmf/fonts/ams/type1/wncysc10.pfb
-share/texmf/fonts/ams/type1/wncyss10.pfb
-@dirrm share/texmf/fonts/ams/type1
-@dirrm share/texmf/fonts/ams/tfm
-@dirrm share/texmf/fonts/ams
-@unexec rmdir %D/share/texmf/fonts 2>/dev/null || true
-@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 %%DOCSDIR%%
-@dirrm lib/afm
+@comment $FreeBSD$
+share/fonts/amspsfont/READ.ME
+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/pfb/cmbsy5.pfb
+share/fonts/amspsfont/pfb/cmbsy7.pfb
+share/fonts/amspsfont/pfb/cmmib5.pfb
+share/fonts/amspsfont/pfb/cmmib7.pfb
+share/fonts/amspsfont/pfb/euex10.pfb
+share/fonts/amspsfont/pfb/eufb10.pfb
+share/fonts/amspsfont/pfb/eufb5.pfb
+share/fonts/amspsfont/pfb/eufb7.pfb
+share/fonts/amspsfont/pfb/eufm10.pfb
+share/fonts/amspsfont/pfb/eufm5.pfb
+share/fonts/amspsfont/pfb/eufm7.pfb
+share/fonts/amspsfont/pfb/eurb10.pfb
+share/fonts/amspsfont/pfb/eurb5.pfb
+share/fonts/amspsfont/pfb/eurb7.pfb
+share/fonts/amspsfont/pfb/eurm10.pfb
+share/fonts/amspsfont/pfb/eurm5.pfb
+share/fonts/amspsfont/pfb/eurm7.pfb
+share/fonts/amspsfont/pfb/eusb10.pfb
+share/fonts/amspsfont/pfb/eusb5.pfb
+share/fonts/amspsfont/pfb/eusb7.pfb
+share/fonts/amspsfont/pfb/eusm10.pfb
+share/fonts/amspsfont/pfb/eusm5.pfb
+share/fonts/amspsfont/pfb/eusm7.pfb
+share/fonts/amspsfont/pfb/msam10.pfb
+share/fonts/amspsfont/pfb/msam5.pfb
+share/fonts/amspsfont/pfb/msam7.pfb
+share/fonts/amspsfont/pfb/msbm10.pfb
+share/fonts/amspsfont/pfb/msbm5.pfb
+share/fonts/amspsfont/pfb/msbm7.pfb
+share/fonts/amspsfont/pfb/wncyb10.pfb
+share/fonts/amspsfont/pfb/wncyi10.pfb
+share/fonts/amspsfont/pfb/wncyr10.pfb
+share/fonts/amspsfont/pfb/wncysc10.pfb
+share/fonts/amspsfont/pfb/wncyss10.pfb
+share/fonts/amspsfont/pfb/Fontmap
+share/fonts/amspsfont/pfb/fonts.dir
+share/fonts/amspsfont/pfb/fonts.scale
+@dirrm share/fonts/amspsfont/afm
+@dirrm share/fonts/amspsfont/pfb
+@dirrm share/fonts/amspsfont
+@unexec /bin/rmdir %D/share/fonts 2>/dev/null || /usr/bin/true