3 files changed, 8 insertions, 14 deletions
diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 1518be4cb108..02c127258c53 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -16,24 +16,20 @@ COMMENT=	Russian Artwiz fonts
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 NO_BUILD=	yes
+
 WRKSRC=		${WRKDIR}/fonts
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}
+FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
 
-NO_STAGE=	yes
 post-patch:
-	@${SED} -e 's,LOCALBASE,${LOCALBASE},g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${SED} -e 's,LOCALBASE,${LOCALBASE},g' \
+		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 
 do-install:
-	${MKDIR} ${FONTDIR}
-	for f in ${WRKSRC}/*; do \
-		${INSTALL_DATA} $$f ${FONTDIR}; \
-		done
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf ${STAGEDIR}${FONTDIR}
 
 .include <bsd.port.mk>
diff --git a/russian/artwiz-ru/pkg-descr b/russian/artwiz-ru/pkg-descr
index df4d54daf728..06e844c65a04 100644
--- a/russian/artwiz-ru/pkg-descr
+++ b/russian/artwiz-ru/pkg-descr
@@ -2,4 +2,4 @@ Russian version of the artwiz fonts.
 
 Supported encodings: ISO10646-1, KOI8-R and CP1251
 
-WWW:	http://dev.gentoo.org/~sergey/artwiz.html
+WWW: http://dev.gentoo.org/~sergey/artwiz.html
diff --git a/russian/artwiz-ru/pkg-plist b/russian/artwiz-ru/pkg-plist
index fec1ab871340..aec4388a590c 100644
--- a/russian/artwiz-ru/pkg-plist
+++ b/russian/artwiz-ru/pkg-plist
@@ -4,8 +4,6 @@ lib/X11/fonts/artwiz-ru/anorexia.pcf
 lib/X11/fonts/artwiz-ru/cure-koi8-r.pcf
 lib/X11/fonts/artwiz-ru/cure-microsoft-cp1251.pcf
 lib/X11/fonts/artwiz-ru/cure.pcf
-lib/X11/fonts/artwiz-ru/fonts.alias
-lib/X11/fonts/artwiz-ru/fonts.dir
 lib/X11/fonts/artwiz-ru/gelly-koi8-r.pcf
 lib/X11/fonts/artwiz-ru/gelly-microsoft-cp1251.pcf
 lib/X11/fonts/artwiz-ru/gelly.pcf