3 files changed, 24 insertions, 37 deletions

diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index 4d78fd88a9af..53bd4f6bcf02 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	artwiz-aleczapka-se
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/artwizaleczapka/iso-8859-1/${PORTVERSION}
 
@@ -11,21 +11,16 @@ MAINTAINER=	herbert.skuhra@gmx.at
 COMMENT=	Set of (improved) artwiz fonts
 
 NO_BUILD=	yes
-USES=	tar:bzip2
-PKGMESSAGE=	${WRKDIR}/pkg-message
+USES=	fonts tar:bzip2
+SUB_FILES=	pkg-message
 
 FONTS=	anorexia.se aqui.se cure.se drift.se edges.se fkp.se gelly.se \
 	glisp-bold.se glisp.se kates.se lime.se mints-mild.se \
 	mints-strong.se nu.se smoothansi.se snap.se
-FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
-FILES=	${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias ${WRKSRC}/fonts.dir
+FILES=	${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${FONTDIR}
-
-post-install:
-	@${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
-		${PKGDIR}/pkg-message >${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/artwiz-aleczapka-se/pkg-message b/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in
index c4cd0b845dfb..68a0e7225b1f 100644
--- a/x11-fonts/artwiz-aleczapka-se/pkg-message
+++ b/x11-fonts/artwiz-aleczapka-se/files/pkg-message.in
@@ -6,11 +6,6 @@
 
  Add the following line to the "Files" section and restart XFree86.
 
- FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se"
-
- Additionally you have to do:
- 
- # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se
- # fc-cache -v .  
+ FontPath "%%FONTSDIR%%"
 
 ------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-aleczapka-se/pkg-plist b/x11-fonts/artwiz-aleczapka-se/pkg-plist
index 0c2101c9ada6..91fff9a0f447 100644
--- a/x11-fonts/artwiz-aleczapka-se/pkg-plist
+++ b/x11-fonts/artwiz-aleczapka-se/pkg-plist
@@ -1,20 +1,17 @@
-lib/X11/fonts/artwiz-aleczapka-se/anorexia.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/aqui.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/cure.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/drift.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/edges.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/fkp.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/gelly.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/glisp-bold.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/glisp.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/kates.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/lime.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/mints-mild.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/mints-strong.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/nu.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/smoothansi.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/snap.se.pcf
-lib/X11/fonts/artwiz-aleczapka-se/fonts.alias
-@unexec rm -f %D/lib/X11/fonts/artwiz-aleczapka-se/fonts.cache-1
-lib/X11/fonts/artwiz-aleczapka-se/fonts.dir
-@dirrm lib/X11/fonts/artwiz-aleczapka-se
+%%FONTSDIR%%/anorexia.se.pcf
+%%FONTSDIR%%/aqui.se.pcf
+%%FONTSDIR%%/cure.se.pcf
+%%FONTSDIR%%/drift.se.pcf
+%%FONTSDIR%%/edges.se.pcf
+%%FONTSDIR%%/fkp.se.pcf
+%%FONTSDIR%%/gelly.se.pcf
+%%FONTSDIR%%/glisp-bold.se.pcf
+%%FONTSDIR%%/glisp.se.pcf
+%%FONTSDIR%%/kates.se.pcf
+%%FONTSDIR%%/lime.se.pcf
+%%FONTSDIR%%/mints-mild.se.pcf
+%%FONTSDIR%%/mints-strong.se.pcf
+%%FONTSDIR%%/nu.se.pcf
+%%FONTSDIR%%/smoothansi.se.pcf
+%%FONTSDIR%%/snap.se.pcf
+%%FONTSDIR%%/fonts.alias