--- pscyr/Makefile	Fri Mar  7 09:09:25 2003
+++ pscyr/Makefile	Thu Mar 24 17:16:45 2005
@@ -8,6 +8,7 @@ 
 PORTNAME=	PSCyr
 PATCH_LEVEL=	2
 PORTVERSION=	0.4c${PATCH_LEVEL}
+PORTREVISION=	1
 CATEGORIES=	russian print
 MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/psfonts/ \
 		ftp://ftp.vsu.ru/pub/tex/font-packs/pscyr/
@@ -17,24 +18,24 @@ 
 MAINTAINER=	kappa@freebsd.org.ua
 COMMENT=	Cyrillic PostScript Type1 fonts for use with TeX
 
-RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base
 # no other TeX is sufficient
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+MAKE_ENV=	TEXMFDIR=${LOCALBASE}/share/texmf
+PLIST_SUB=	UPDMAP_SYS=${UPDMAP_SYS} \
+		MKTEXLSR=${MKTEXLSR}
 
-post-patch:
-	@${CP} ${WRKDIR}/install.sh ${WRKDIR}/install.sh.orig;
-	@${SED} -e 's/^mv /${INSTALL_DATA} /' \
-		${WRKDIR}/install.sh.orig > ${WRKDIR}/install.sh
+UPDMAP_SYS?=	${LOCALBASE}/bin/updmap-sys
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
 do-install:
-	(cd ${WRKDIR}; ${SH} install.sh ${PREFIX})
+	(cd ${WRKDIR}; ${SETENV} ${MAKE_ENV} ${SH} install.sh)
 
 post-install:
-	${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL ${PREFIX}
-
-post-deinstall:
-	${SH} ${PKGDIR}/pkg-deinstall ${PKGNAME} POST-DEINSTALL ${PREFIX}
+	${MKTEXLSR}
+	${UPDMAP_SYS} --quiet --nomkmap --enable Map=pscyr.map
+	${UPDMAP_SYS} --quiet --enable Map=pscyr2.map
 
 .include <bsd.port.mk>
--- pscyr/files/patch-install.sh	Mon Jul  2 13:04:28 2001
+++ pscyr/files/patch-install.sh	Thu Mar 24 14:44:13 2005
@@ -1,31 +1,47 @@ 
---- install.sh	Mon Mar  5 23:38:33 2001
-+++ install.sh	Sat Jun 30 10:23:15 2001
-@@ -3,8 +3,10 @@
+--- install.sh.orig	Fri Jun 22 14:20:56 2001
++++ install.sh	Wed Mar 23 17:45:52 2005
+@@ -3,27 +3,32 @@
  # Before running the script, choose how you'll update the pscyr.map file
  # (see below).
  
 -TEXMF=`kpsewhich -expand-var='$TEXMFMAIN'`
 -mkdir -p $TEXMF/{tex/latex,fonts/tfm/public,fonts/vf/public,fonts/type1/public,fonts/afm/public,doc/fonts}/pscyr
-+TEXMF=$1/share/texmf
-+for idir in tex/latex fonts/tfm/public fonts/vf/public fonts/type1/public fonts/afm/public doc/fonts
-+	do mkdir -p $TEXMF/$idir/pscyr
+-mv dvips/base/* $TEXMF/dvips/base
+-mv dvips/config/* $TEXMF/dvips/config
+-mv tex/latex/pscyr/* $TEXMF/tex/latex/pscyr
+-mv fonts/tfm/public/pscyr/* $TEXMF/fonts/tfm/public/pscyr
+-mv fonts/vf/public/pscyr/* $TEXMF/fonts/vf/public/pscyr
+-mv fonts/type1/public/pscyr/* $TEXMF/fonts/type1/public/pscyr
+-mv fonts/afm/public/pscyr/* $TEXMF/fonts/afm/public/pscyr
+-mv LICENSE doc/README.koi doc/PROBLEMS $TEXMF/doc/fonts/pscyr
++for idir in tex/latex fonts/tfm/public fonts/vf/public \
++	fonts/type1/public fonts/afm/public \
++	fonts/enc/dvips fonts/map/dvips fonts/map/dvipdfm doc/fonts
++  	do mkdir -p ${TEXMFDIR}/$idir/pscyr
 +done
- mv dvips/base/* $TEXMF/dvips/base
- mv dvips/config/* $TEXMF/dvips/config
- mv tex/latex/pscyr/* $TEXMF/tex/latex/pscyr
-@@ -14,8 +16,8 @@
- mv fonts/afm/public/pscyr/* $TEXMF/fonts/afm/public/pscyr
- mv LICENSE doc/README.koi $TEXMF/doc/fonts/pscyr
  
 -VARTEXFONTS=`kpsewhich -expand-var='$VARTEXFONTS'`
 -rm -f $VARTEXFONTS/pk/modeless/public/pscyr/*
++${BSD_INSTALL_DATA} dvips/base/t2a.enc ${TEXMFDIR}/fonts/enc/dvips/pscyr
++${BSD_INSTALL_DATA} dvips/config/pscyr.map ${TEXMFDIR}/fonts/map/dvips/pscyr
++${BSD_INSTALL_DATA} dvipdfm/base/pscyr2.map ${TEXMFDIR}/fonts/map/dvipdfm/pscyr
++${BSD_INSTALL_DATA} tex/latex/pscyr/* ${TEXMFDIR}/tex/latex/pscyr
++${BSD_INSTALL_DATA} fonts/tfm/public/pscyr/* ${TEXMFDIR}/fonts/tfm/public/pscyr
++${BSD_INSTALL_DATA} fonts/vf/public/pscyr/* ${TEXMFDIR}/fonts/vf/public/pscyr
++${BSD_INSTALL_DATA} fonts/type1/public/pscyr/* ${TEXMFDIR}/fonts/type1/public/pscyr
++${BSD_INSTALL_DATA} fonts/afm/public/pscyr/* ${TEXMFDIR}/fonts/afm/public/pscyr
++${BSD_INSTALL_DATA} LICENSE doc/README.koi doc/PROBLEMS ${TEXMFDIR}/doc/fonts/pscyr
++
 +#VARTEXFONTS=`kpsewhich -expand-var='$VARTEXFONTS'`
 +#rm -f $VARTEXFONTS/pk/modeless/public/pscyr/*
  
  # Next, we need to update psfonts.map.  The simplest (but not the best)
  # method is to uncomment the following two lines.  A better solution is
-@@ -25,5 +27,5 @@
- #cd $TEXMF/dvips/config
+ # to add the line "pscyr.map" to the extra_module section of updmap script
+ # and then run it.
+ #
+-#cd $TEXMF/dvips/config
++#cd ${TEXMFDIR}/dvips/config
  #cat pscyr.map >> psfonts.map
  
 -mktexlsr
--- pscyr/pkg-deinstall	Mon Jul  2 13:04:24 2001
+++ pscyr/pkg-deinstall	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@ 
-#!/bin/sh
-
-# either $PKG_PREFIX or $3 should be set
-PREFIX=${PKG_PREFIX:-$3}
-
-case $2 in
-	POST-DEINSTALL)
-		perl -i -pe 's/pscyr\.map\n//m' ${PREFIX}/share/texmf/dvips/config/updmap
-		(cd ${PREFIX}/share/texmf/dvips/config/; sh updmap)
-		mktexlsr
-		;;
-esac
--- pscyr/pkg-install	Mon Jul  2 13:04:24 2001
+++ pscyr/pkg-install	Thu Jan  1 03:00:00 1970
@@ -1,13 +0,0 @@ 
-#!/bin/sh
-
-# either $PKG_PREFIX or $3 should be set
-PREFIX=${PKG_PREFIX:-$3}
-
-case $2 in
-	POST-INSTALL)
-		rm -f `kpsewhich -expand-var='$VARTEXFONTS'`/pk/modeless/public/pscyr/*
-		perl -i -pe 's/^(extra_modules="$)/$1\npscyr.map/m' ${PREFIX}/share/texmf/dvips/config/updmap
-		(cd ${PREFIX}/share/texmf/dvips/config/; sh updmap)
-		mktexlsr
-		;;
-esac
--- pscyr/pkg-plist	Tue Sep 18 10:37:56 2001
+++ pscyr/pkg-plist	Thu Mar 24 14:44:13 2005
@@ -1,8 +1,15 @@ 
+@comment $FreeBSD$
 share/texmf/doc/fonts/pscyr/LICENSE
 share/texmf/doc/fonts/pscyr/PROBLEMS
 share/texmf/doc/fonts/pscyr/README.koi
-share/texmf/dvips/base/t2a.enc
-share/texmf/dvips/config/pscyr.map
+@unexec %%UPDMAP_SYS%% --quiet --nomkmap --disable pscyr.map
+@unexec %%UPDMAP_SYS%% --quiet --disable pscyr2.map
+share/texmf/fonts/enc/dvips/pscyr/t2a.enc
+@dirrm share/texmf/fonts/enc/dvips/pscyr
+share/texmf/fonts/map/dvips/pscyr/pscyr.map
+@dirrm share/texmf/fonts/map/dvips/pscyr
+share/texmf/fonts/map/dvipdfm/pscyr/pscyr2.map
+@dirrm share/texmf/fonts/map/dvipdfm/pscyr
 share/texmf/fonts/afm/public/pscyr/acade1.afm
 share/texmf/fonts/afm/public/pscyr/acade2.afm
 share/texmf/fonts/afm/public/pscyr/acade3.afm
@@ -325,3 +332,7 @@ 
 @dirrm share/texmf/fonts/tfm/public/pscyr
 @dirrm share/texmf/fonts/afm/public/pscyr
 @dirrm share/texmf/doc/fonts/pscyr
+@exec %%MKTEXLSR%%
+@exec %%UPDMAP_SYS%% --quiet --nomkmap --enable Map=pscyr.map
+@exec %%UPDMAP_SYS%% --quiet --enable Map=pscyr2.map
+@unexec %%MKTEXLSR%%