3 files changed, 28 insertions, 37 deletions

diff --git a/russian/artwiz-ru/Makefile b/russian/artwiz-ru/Makefile
index 02c127258c53..6d2c0e886794 100644
--- a/russian/artwiz-ru/Makefile
+++ b/russian/artwiz-ru/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	artwiz-ru
 PORTVERSION=	20041031
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	russian x11-fonts
 MASTER_SITES=	http://dev.gentoo.org/~sergey/ \
 		${MASTER_SITE_LOCAL}
@@ -13,23 +13,14 @@ DISTNAME=	artwiz_ru
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Russian Artwiz fonts
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES=		tar:bzip2
+USES=		fonts tar:bzip2
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/fonts
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-
-post-patch:
-	@${SED} -e 's,LOCALBASE,${LOCALBASE},g' \
-		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+SUB_FILES=	pkg-message
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pcf ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/russian/artwiz-ru/files/pkg-message.in b/russian/artwiz-ru/files/pkg-message.in
index 04de2512ddae..e3812ed04bf4 100644
--- a/russian/artwiz-ru/files/pkg-message.in
+++ b/russian/artwiz-ru/files/pkg-message.in
@@ -1,8 +1,8 @@
 ============================================================
-You'll have to add LOCALBASE/lib/X11/fonts/artwiz-ru
+You'll have to add LOCALBASE/share/fonts/artwiz-ru
 to your X font path by either:
 
-$ xset fp+ LOCALBASE/lib/X11/fonts/artwiz-ru
+$ xset fp+ LOCALBASE/share/fonts/artwiz-ru
 $ xset fp rehash
 
 or by adding it to your X-server configuration file and 
diff --git a/russian/artwiz-ru/pkg-plist b/russian/artwiz-ru/pkg-plist
index fecb59cd862a..03de6396d4e6 100644
--- a/russian/artwiz-ru/pkg-plist
+++ b/russian/artwiz-ru/pkg-plist
@@ -1,21 +1,21 @@
-lib/X11/fonts/artwiz-ru/anorexia-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/anorexia-microsoft-cp1251.pcf
-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/gelly-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/gelly-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/gelly.pcf
-lib/X11/fonts/artwiz-ru/glisp-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/glisp-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/glisp.pcf
-lib/X11/fonts/artwiz-ru/mints-mild-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/mints-mild-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/mints-mild.pcf
-lib/X11/fonts/artwiz-ru/nu-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/nu-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/nu.pcf
-lib/X11/fonts/artwiz-ru/snap-koi8-r.pcf
-lib/X11/fonts/artwiz-ru/snap-microsoft-cp1251.pcf
-lib/X11/fonts/artwiz-ru/snap.pcf
+%%FONTSDIR%%/anorexia-koi8-r.pcf
+%%FONTSDIR%%/anorexia-microsoft-cp1251.pcf
+%%FONTSDIR%%/anorexia.pcf
+%%FONTSDIR%%/cure-koi8-r.pcf
+%%FONTSDIR%%/cure-microsoft-cp1251.pcf
+%%FONTSDIR%%/cure.pcf
+%%FONTSDIR%%/gelly-koi8-r.pcf
+%%FONTSDIR%%/gelly-microsoft-cp1251.pcf
+%%FONTSDIR%%/gelly.pcf
+%%FONTSDIR%%/glisp-koi8-r.pcf
+%%FONTSDIR%%/glisp-microsoft-cp1251.pcf
+%%FONTSDIR%%/glisp.pcf
+%%FONTSDIR%%/mints-mild-koi8-r.pcf
+%%FONTSDIR%%/mints-mild-microsoft-cp1251.pcf
+%%FONTSDIR%%/mints-mild.pcf
+%%FONTSDIR%%/nu-koi8-r.pcf
+%%FONTSDIR%%/nu-microsoft-cp1251.pcf
+%%FONTSDIR%%/nu.pcf
+%%FONTSDIR%%/snap-koi8-r.pcf
+%%FONTSDIR%%/snap-microsoft-cp1251.pcf
+%%FONTSDIR%%/snap.pcf