2 files changed, 49 insertions, 53 deletions

diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 03ceceb5237d..6b80a6deb4bc 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -2,27 +2,24 @@
 
 PORTNAME=	nucleus
 PORTVERSION=	0.77
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/xfonts/OldFiles
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Another font package for X
 
+USES=		fonts
+
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-
 do-build:
 	@cd ${WRKSRC}/src && ./compile
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.gz ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/*.gz ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/nucleus/pkg-plist b/x11-fonts/nucleus/pkg-plist
index 43503fc012d1..6407fd02086a 100644
--- a/x11-fonts/nucleus/pkg-plist
+++ b/x11-fonts/nucleus/pkg-plist
@@ -1,45 +1,44 @@
-%%FONTDIR%%/achilles-12-m-r-inline.pcf.gz
-%%FONTDIR%%/achilles-12-m-r.pcf.gz
-%%FONTDIR%%/asimov-12-m-r.pcf.gz
-%%FONTDIR%%/cantor-16-m-r-sc.pcf.gz
-%%FONTDIR%%/cantor-16-m-r.pcf.gz
-%%FONTDIR%%/escher-14-m-r.pcf.gz
-%%FONTDIR%%/gagarin-14-m-i.pcf.gz
-%%FONTDIR%%/gagarin-14-m-r-sc.pcf.gz
-%%FONTDIR%%/gagarin-14-m-r.pcf.gz
-%%FONTDIR%%/gamow-10-b-i.pcf.gz
-%%FONTDIR%%/gamow-10-b-r.pcf.gz
-%%FONTDIR%%/gamow-10-m-i.pcf.gz
-%%FONTDIR%%/gamow-10-m-r-sc.pcf.gz
-%%FONTDIR%%/gamow-10-m-r.pcf.gz
-%%FONTDIR%%/gamow-12-b-i.pcf.gz
-%%FONTDIR%%/gamow-12-b-r.pcf.gz
-%%FONTDIR%%/gamow-12-m-i.pcf.gz
-%%FONTDIR%%/gamow-12-m-r-iso10646.pcf.gz
-%%FONTDIR%%/gamow-12-m-r-sc.pcf.gz
-%%FONTDIR%%/gamow-12-m-r.pcf.gz
-%%FONTDIR%%/gamow-14-b-i-sc.pcf.gz
-%%FONTDIR%%/gamow-14-b-i.pcf.gz
-%%FONTDIR%%/gamow-14-b-r-alt.pcf.gz
-%%FONTDIR%%/gamow-14-b-r-sc-alt.pcf.gz
-%%FONTDIR%%/gamow-14-b-r.pcf.gz
-%%FONTDIR%%/gamow-14-m-i-sc.pcf.gz
-%%FONTDIR%%/gamow-14-m-i.pcf.gz
-%%FONTDIR%%/gamow-14-m-r.pcf.gz
-%%FONTDIR%%/lomonosov-14-m-r.pcf.gz
-%%FONTDIR%%/lucidaterminal-14-b-r.pcf.gz
-%%FONTDIR%%/lucidaterminal-14-m-r.pcf.gz
-%%FONTDIR%%/marathon-12-m-r-alt.pcf.gz
-%%FONTDIR%%/marathon-12-m-r-sc-alt.pcf.gz
-%%FONTDIR%%/marathon-14-b-r-sc.pcf.gz
-%%FONTDIR%%/marathon-14-b-r.pcf.gz
-%%FONTDIR%%/marathon-14-m-r-sc.pcf.gz
-%%FONTDIR%%/marathon-14-m-r.pcf.gz
-%%FONTDIR%%/terminal-14-m-r-sc.pcf.gz
-%%FONTDIR%%/terminal-14-m-r.pcf.gz
-%%FONTDIR%%/terminal-26-m-r-iso10646.pcf.gz
-%%FONTDIR%%/terminal-26-m-r.pcf.gz
-%%FONTDIR%%/terminal-32-m-r-iso10646.pcf.gz
-%%FONTDIR%%/terminal-32-m-r.pcf.gz
-%%FONTDIR%%/trachtenberg-14-m-r.pcf.gz
-@fontsdir %%FONTDIR%%
+%%FONTSDIR%%/achilles-12-m-r-inline.pcf.gz
+%%FONTSDIR%%/achilles-12-m-r.pcf.gz
+%%FONTSDIR%%/asimov-12-m-r.pcf.gz
+%%FONTSDIR%%/cantor-16-m-r-sc.pcf.gz
+%%FONTSDIR%%/cantor-16-m-r.pcf.gz
+%%FONTSDIR%%/escher-14-m-r.pcf.gz
+%%FONTSDIR%%/gagarin-14-m-i.pcf.gz
+%%FONTSDIR%%/gagarin-14-m-r-sc.pcf.gz
+%%FONTSDIR%%/gagarin-14-m-r.pcf.gz
+%%FONTSDIR%%/gamow-10-b-i.pcf.gz
+%%FONTSDIR%%/gamow-10-b-r.pcf.gz
+%%FONTSDIR%%/gamow-10-m-i.pcf.gz
+%%FONTSDIR%%/gamow-10-m-r-sc.pcf.gz
+%%FONTSDIR%%/gamow-10-m-r.pcf.gz
+%%FONTSDIR%%/gamow-12-b-i.pcf.gz
+%%FONTSDIR%%/gamow-12-b-r.pcf.gz
+%%FONTSDIR%%/gamow-12-m-i.pcf.gz
+%%FONTSDIR%%/gamow-12-m-r-iso10646.pcf.gz
+%%FONTSDIR%%/gamow-12-m-r-sc.pcf.gz
+%%FONTSDIR%%/gamow-12-m-r.pcf.gz
+%%FONTSDIR%%/gamow-14-b-i-sc.pcf.gz
+%%FONTSDIR%%/gamow-14-b-i.pcf.gz
+%%FONTSDIR%%/gamow-14-b-r-alt.pcf.gz
+%%FONTSDIR%%/gamow-14-b-r-sc-alt.pcf.gz
+%%FONTSDIR%%/gamow-14-b-r.pcf.gz
+%%FONTSDIR%%/gamow-14-m-i-sc.pcf.gz
+%%FONTSDIR%%/gamow-14-m-i.pcf.gz
+%%FONTSDIR%%/gamow-14-m-r.pcf.gz
+%%FONTSDIR%%/lomonosov-14-m-r.pcf.gz
+%%FONTSDIR%%/lucidaterminal-14-b-r.pcf.gz
+%%FONTSDIR%%/lucidaterminal-14-m-r.pcf.gz
+%%FONTSDIR%%/marathon-12-m-r-alt.pcf.gz
+%%FONTSDIR%%/marathon-12-m-r-sc-alt.pcf.gz
+%%FONTSDIR%%/marathon-14-b-r-sc.pcf.gz
+%%FONTSDIR%%/marathon-14-b-r.pcf.gz
+%%FONTSDIR%%/marathon-14-m-r-sc.pcf.gz
+%%FONTSDIR%%/marathon-14-m-r.pcf.gz
+%%FONTSDIR%%/terminal-14-m-r-sc.pcf.gz
+%%FONTSDIR%%/terminal-14-m-r.pcf.gz
+%%FONTSDIR%%/terminal-26-m-r-iso10646.pcf.gz
+%%FONTSDIR%%/terminal-26-m-r.pcf.gz
+%%FONTSDIR%%/terminal-32-m-r-iso10646.pcf.gz
+%%FONTSDIR%%/terminal-32-m-r.pcf.gz
+%%FONTSDIR%%/trachtenberg-14-m-r.pcf.gz