diff -ruN /usr/ports/russian/pscyr/Makefile pscyr/Makefile
--- /usr/ports/russian/pscyr/Makefile	Fri Mar  7 09:09:25 2003
+++ pscyr/Makefile	Fri Jan 28 19:45:36 2005
@@ -6,10 +6,11 @@
 #
 
 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.sai.msu.su/pub/misc/fonts/cyrillic/psfonts/ \
 		ftp://ftp.vsu.ru/pub/tex/font-packs/pscyr/
 DISTFILES=	${PORTNAME}-${PORTVERSION:S/${PATCH_LEVEL}$/-patch&/}-tex.tar.gz \
 		${PORTNAME}-${PORTVERSION:S/${PATCH_LEVEL}$/-patch&/}-type1.tar.gz
@@ -17,16 +18,18 @@
 MAINTAINER=	kappa@freebsd.org.ua
 COMMENT=	Cyrillic PostScript Type1 fonts for use with TeX
 
-RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX
-# no other TeX is sufficient
+RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base
+# no other TeX will do
+
+PATCH_LEVEL=	2
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
+USE_REINPLACE=	yes
+
 post-patch:
-	@${CP} ${WRKDIR}/install.sh ${WRKDIR}/install.sh.orig;
-	@${SED} -e 's/^mv /${INSTALL_DATA} /' \
-		${WRKDIR}/install.sh.orig > ${WRKDIR}/install.sh
+	@${REINPLACE_CMD} -e 's/^mv /${INSTALL_DATA} /' ${WRKDIR}/install.sh
 
 do-install:
 	(cd ${WRKDIR}; ${SH} install.sh ${PREFIX})
diff -ruN /usr/ports/russian/pscyr/pkg-deinstall pscyr/pkg-deinstall
--- /usr/ports/russian/pscyr/pkg-deinstall	Mon Jul  2 13:04:24 2001
+++ pscyr/pkg-deinstall	Fri Jan 28 20:26:13 2005
@@ -5,8 +5,10 @@
 
 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
+		TEMPFILE=`mktemp -t u`
+		cp ${PREFIX}/share/texmf-var/web2c/updmap.cfg ${TEMPFILE}
+		sed -nE '/^Map pscyr\.map|# PSCyr/!p' < ${TEMPFILE} > ${PREFIX}/share/texmf-var/web2c/updmap.cfg
+		rm ${TEMPFILE}
+		PATH=${PATH}:${PREFIX} ${PREFIX}/bin/updmap
 		;;
 esac
diff -ruN /usr/ports/russian/pscyr/pkg-install pscyr/pkg-install
--- /usr/ports/russian/pscyr/pkg-install	Mon Jul  2 13:04:24 2001
+++ pscyr/pkg-install	Fri Jan 28 20:42:22 2005
@@ -5,9 +5,12 @@
 
 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
+		rm -f `${PREFIX}/bin/kpsewhich -expand-var='$VARTEXFONTS'`/pk/modeless/public/pscyr/*
+		cat << 'EOF' >> ${PREFIX}/share/texmf-var/web2c/updmap.cfg 
+# PSCyr
+Map pscyr.map
+EOF
+		${PREFIX}/bin/mktexlsr
+		PATH=${PATH}:${PREFIX} ${PREFIX}/bin/updmap
 		;;
 esac