Convert to USES=fonts

2 files changed, 114 insertions, 122 deletions

diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile
index cfaab5f5290a..96d4828abb5f 100644
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@@ -2,25 +2,21 @@
 
 PORTNAME=	jmk-x11-fonts
 PORTVERSION=	3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.jmknoble.net/fonts/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Jim Knoble's font package for X
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 
-USES=		imake
+USES=		fonts imake
 
-FONTDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+FONTSDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/jmk-x11-fonts/pkg-plist b/x11-fonts/jmk-x11-fonts/pkg-plist
index c3590bb1d3c1..508e7e7c9489 100644
--- a/x11-fonts/jmk-x11-fonts/pkg-plist
+++ b/x11-fonts/jmk-x11-fonts/pkg-plist
@@ -1,112 +1,108 @@
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/modd-iso8859-1-06x11-bold.pcf.gz
-%%FONTDIR%%/modd-iso8859-1-06x11.pcf.gz
-%%FONTDIR%%/modd-iso8859-1-06x13-bold.pcf.gz
-%%FONTDIR%%/modd-iso8859-1-06x13.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-05x10.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-05x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-06x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-06x13.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-08x15.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-10x20.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-1-12x24.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-05x10.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-05x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-06x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-06x13.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-08x15.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-10x20.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-15-12x24.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-05x10.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-05x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-06x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-06x13.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-08x15.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-10x20.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-2-12x24.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-05x10.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-05x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-06x11.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-06x13.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-08x15.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-10x20.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-alt-iso8859-9-12x24.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-05x10.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-05x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-06x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-06x13.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-08x15.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-10x20.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-12x24.pcf.gz
-%%FONTDIR%%/neep-iso8859-1-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-05x10.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-05x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-06x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-06x13.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-08x15.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-10x20.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-15-12x24.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-05x10.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-05x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-06x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-06x13.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-08x15.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-10x20.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-2-12x24.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-05x10.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-05x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-05x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-06x11-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-06x11.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-06x13-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-06x13.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-08x15-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-08x15.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-10x20.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-10x20-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-12x24-bold.pcf.gz
-%%FONTDIR%%/neep-iso8859-9-12x24.pcf.gz
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
-@dirrm %%FONTDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTDIR%% || true
+%%FONTSDIR%%/modd-iso8859-1-06x11-bold.pcf.gz
+%%FONTSDIR%%/modd-iso8859-1-06x11.pcf.gz
+%%FONTSDIR%%/modd-iso8859-1-06x13-bold.pcf.gz
+%%FONTSDIR%%/modd-iso8859-1-06x13.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-05x10.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-05x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-06x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-06x13.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-08x15.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-10x20.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-1-12x24.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-05x10.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-05x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-06x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-06x13.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-08x15.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-10x20.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-15-12x24.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-05x10.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-05x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-06x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-06x13.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-08x15.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-10x20.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-2-12x24.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-05x10.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-05x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-06x11.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-06x13.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-08x15.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-10x20.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-alt-iso8859-9-12x24.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-05x10.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-05x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-06x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-06x13.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-08x15.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-10x20.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-12x24.pcf.gz
+%%FONTSDIR%%/neep-iso8859-1-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-05x10.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-05x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-06x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-06x13.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-08x15.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-10x20.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-15-12x24.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-05x10.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-05x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-06x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-06x13.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-08x15.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-10x20.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-2-12x24.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-05x10.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-05x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-05x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-06x11-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-06x11.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-06x13-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-06x13.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-08x15-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-08x15.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-10x20.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-10x20-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-12x24-bold.pcf.gz
+%%FONTSDIR%%/neep-iso8859-9-12x24.pcf.gz