4 files changed, 41 insertions, 38 deletions

diff --git a/print/latex-mathabx/Makefile b/print/latex-mathabx/Makefile
index 87325bed0c5e..28ce0a07a121 100644
--- a/print/latex-mathabx/Makefile
+++ b/print/latex-mathabx/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	latex-mathabx
-PORTVERSION=	1.0.20031201
-PORTREVISION=	1
+PORTVERSION=	1.0.20050518
+PORTREVISION=	0
 CATEGORIES=	print
-MASTER_SITES=	http://auemath.aichi-edu.ac.jp/~khotta/ghost/disk1/
+MASTER_SITES=	http://auemath.aichi-edu.ac.jp/~khotta/ghost/abx/
 DISTFILES=	mathabx${EXTRACT_SUFX} abxtype1${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -21,39 +21,46 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 
 USE_ZIP=	YES
 NO_BUILD=	YES
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+PLIST_SUB=	TEXMFLOCALDIR=${TEXMFLOCALDIR} \
+		MKTEXLSR=${MKTEXLSR} \
+		UPDMAP_SYS="${UPDMAP_SYS}" \
 		CLASSDIR=${CLASSDIR} MFDIR=${MFDIR} \
 		TYPE1DIR=${TYPE1DIR} DVIPSDIR=${DVIPSDIR}
+WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
-TEXMF=		share/texmf
-TEXMFLOCAL=	share/texmf-local
-TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
+TEXMFDIR=	share/texmf
+TEXMFLOCALDIR=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
+UPDMAP_SYS=	${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \
+		${LOCALBASE}/bin/updmap-sys
 
-CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
+CLASSDIR=	${TEXMFLOCALDIR}/tex/latex/${PORTNAME:S/^latex-//}
 CLASS_FILES=	mathabx.dcl mathabx.sty mathabx.tex testmac.tex
 
-MFDIR=		${TEXMFLOCAL}/fonts/source/public/${PORTNAME:S/^latex-//}
+MFDIR=		${TEXMFLOCALDIR}/fonts/source/public/${PORTNAME:S/^latex-//}
 MF_FILES=	matha10.mf matha12.mf matha5.mf matha6.mf matha7.mf \
 		matha8.mf matha9.mf mathacnt.mf mathadrv.mf matharrw.mf \
-		mathastr.mf mathasym.mf mathb10.mf mathb12.mf mathb5.mf \
+		mathastr.mf mathastrotest10.mf mathastrotestdrv.mf \
+		mathasym.mf mathb10.mf mathb12.mf mathb5.mf \
 		mathb6.mf mathb7.mf mathb8.mf mathb9.mf mathbase.mf \
-		mathbdel.mf mathbdrv.mf mathbigs.mf mathbsym.mf mathcall.mf \
-		mathextr.mf mathfine.mf mathgrey.mf mathhbrw.mf mathineq.mf \
+		mathbdel.mf mathbdrv.mf mathbigs.mf mathbsym.mf mathc10.mf \
+		mathcall.mf mathcallgreek.mf mathcdrv.mf mathfine.mf \
+		mathgrey.mf mathhbrw.mf mathineq.mf \
 		mathltlk.mf mathmbcb.mf mathprmt.mf mathsmsy.mf mathsubs.mf \
-		mathsymb.mf matht10.mf mathu10.mf mathudrv.mf mathusym.mf \
+		mathsymb.mf mathu10.mf mathudrv.mf mathusym.mf \
 		mathux10.mf mathuxdrv.mf mathx10.mf mathx12.mf mathx5.mf \
 		mathx6.mf mathx7.mf mathx8.mf mathx9.mf mathxdrv.mf maydigit.mf
 
-TYPE1DIR=	${TEXMFLOCAL}/fonts/type1/${PORTNAME:S/^latex-//}
+TYPE1DIR=	${TEXMFLOCALDIR}/fonts/type1/${PORTNAME:S/^latex-//}
 TYPE1_FILES=	matha10.pfb matha12.pfb matha5.pfb matha6.pfb matha7.pfb \
-		matha8.pfb matha9.pfb mathb10.pfb mathb12.pfb mathb5.pfb \
-		mathb6.pfb mathb7.pfb mathb8.pfb mathb9.pfb mathu10.pfb \
-		mathux10.pfb mathx10.pfb mathx12.pfb mathx5.pfb mathx6.pfb \
-		mathx7.pfb mathx8.pfb mathx9.pfb
+		matha8.pfb matha9.pfb mathastrotest10.pfb \
+		mathb10.pfb mathb12.pfb mathb5.pfb \
+		mathb6.pfb mathb7.pfb mathb8.pfb mathb9.pfb mathc10.pfb \
+		mathu10.pfb mathux10.pfb mathx10.pfb mathx12.pfb \
+		mathx5.pfb mathx6.pfb mathx7.pfb mathx8.pfb mathx9.pfb
 
-DVIPSDIR=	${TEXMFLOCAL}/dvips/${PORTNAME:S/^latex-//}
+DVIPSDIR=	${TEXMFLOCALDIR}/fonts/map/dvips/mathabx
 DVIPS_FILES=	mathabx.map
 
 do-install:
@@ -73,7 +80,6 @@ do-install:
 
 post-install:
 	${MKTEXLSR}
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},;s,%%TEXMF%%,${TEXMF},'\
-		${PKGMESSAGE}
+	${UPDMAP_SYS} --enable Map=mathabx.map
 
 .include <bsd.port.mk>
diff --git a/print/latex-mathabx/distinfo b/print/latex-mathabx/distinfo
index 8952cdce7478..bc6495d470e8 100644
--- a/print/latex-mathabx/distinfo
+++ b/print/latex-mathabx/distinfo
@@ -1,4 +1,4 @@
-MD5 (mathabx.zip) = 5cf5061985b5adf0562f119cb6b6db5a
-SIZE (mathabx.zip) = 143986
-MD5 (abxtype1.zip) = efcefb7dd3d73fd445d6212a06729da9
-SIZE (abxtype1.zip) = 1845706
+MD5 (mathabx.zip) = 861a7604ae9fc432d507d9aaccc363b3
+SIZE (mathabx.zip) = 168780
+MD5 (abxtype1.zip) = a8c3ff9d789a3e3d741621b3a42d2350
+SIZE (abxtype1.zip) = 1910891
diff --git a/print/latex-mathabx/pkg-message b/print/latex-mathabx/pkg-message
deleted file mode 100644
index 836f8b060f44..000000000000
--- a/print/latex-mathabx/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-
-----------------------
-How To Use Math series
-----------------------
-
-dvips:
-	Add a line "p +mathabx.map" into
-	%%PREFIX%%/%%TEXMF%%-config/dvips/config/config.ps.
-
-(NOTE: This instruction depends on the directory layout of teTeX distribution.)
diff --git a/print/latex-mathabx/pkg-plist b/print/latex-mathabx/pkg-plist
index a8636ead4fb4..c8fe5a393aef 100644
--- a/print/latex-mathabx/pkg-plist
+++ b/print/latex-mathabx/pkg-plist
@@ -16,6 +16,8 @@
 %%MFDIR%%/mathadrv.mf
 %%MFDIR%%/matharrw.mf
 %%MFDIR%%/mathastr.mf
+%%MFDIR%%/mathastrotest10.mf
+%%MFDIR%%/mathastrotestdrv.mf
 %%MFDIR%%/mathasym.mf
 %%MFDIR%%/mathb10.mf
 %%MFDIR%%/mathb12.mf
@@ -29,8 +31,10 @@
 %%MFDIR%%/mathbdrv.mf
 %%MFDIR%%/mathbigs.mf
 %%MFDIR%%/mathbsym.mf
+%%MFDIR%%/mathc10.mf
 %%MFDIR%%/mathcall.mf
-%%MFDIR%%/mathextr.mf
+%%MFDIR%%/mathcallgreek.mf
+%%MFDIR%%/mathcdrv.mf
 %%MFDIR%%/mathfine.mf
 %%MFDIR%%/mathgrey.mf
 %%MFDIR%%/mathhbrw.mf
@@ -41,7 +45,6 @@
 %%MFDIR%%/mathsmsy.mf
 %%MFDIR%%/mathsubs.mf
 %%MFDIR%%/mathsymb.mf
-%%MFDIR%%/matht10.mf
 %%MFDIR%%/mathu10.mf
 %%MFDIR%%/mathudrv.mf
 %%MFDIR%%/mathusym.mf
@@ -64,6 +67,7 @@
 %%TYPE1DIR%%/matha7.pfb
 %%TYPE1DIR%%/matha8.pfb
 %%TYPE1DIR%%/matha9.pfb
+%%TYPE1DIR%%/mathastrotest10.pfb
 %%TYPE1DIR%%/mathb10.pfb
 %%TYPE1DIR%%/mathb12.pfb
 %%TYPE1DIR%%/mathb5.pfb
@@ -71,6 +75,7 @@
 %%TYPE1DIR%%/mathb7.pfb
 %%TYPE1DIR%%/mathb8.pfb
 %%TYPE1DIR%%/mathb9.pfb
+%%TYPE1DIR%%/mathc10.pfb
 %%TYPE1DIR%%/mathu10.pfb
 %%TYPE1DIR%%/mathux10.pfb
 %%TYPE1DIR%%/mathx10.pfb
@@ -84,4 +89,6 @@
 %%DVIPSDIR%%/mathabx.map
 @dirrm %%DVIPSDIR%%
 @exec %%MKTEXLSR%%
+@exec %%UPDMAP_SYS%% --enable Map=mathabx.map
 @unexec %%MKTEXLSR%%
+@unexec %%UPDMAP_SYS%% --disable mathabx.map