Rework XORG_CAT= font

Fonts are now generating the fonts.scale and fonts.dir at install time
font-alias is not needed anymore for the above reason
extract font-util and encodings out of XORG_CAT=fonts because they do not
install any fonts
make XORG_CAT=fonts use USES=fonts

4 files changed, 108 insertions, 119 deletions

diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile
index 34f86cd53c75..bf6445757fa4 100644
--- a/japanese/font-jisx0213/Makefile
+++ b/japanese/font-jisx0213/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jisx0213
 PORTVERSION=	20040425
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www12.ocn.ne.jp/~imamura/ \
 		LOCAL/hrs:yagi
@@ -20,30 +20,21 @@ COMMENT=	Japanese jisx0213 fonts
 BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
 		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 
+USES=		fonts
 USE_XORG=	fontutil
-XORG_CAT=	font
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=		${GZCAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	> ${WRKDIR}/$${file%.gz}
 MAKE_ENV=	STAGEDIR=${STAGEDIR} FONTDIR=${LOCALFONTDIR}
-PLIST_SUB=	FONTDIR=${LOCALFONTDIR} XFONTDIR=lib/X11/fonts/${FONTDIR}
-SUB_FILES=	Makefile
+PLIST_SUB=	LOCALFONTSDIR=${LOCALFONTDIR}
+MAKEFILE=	${FILESDIR}/Makefile
 
 LOCALFONTDIR=	share/font-${PORTNAME}
 
-pre-build: apply-slist
-
-do-configure:
-	@${DO_NADA}
-
-post-install-fontdir:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/X11/fonts/${FONTDIR}
-	cd ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR} && ${LN} -s -f \
-	    ${FONTDIR:C,[^/]+,..,g}/../../../${LOCALFONTDIR}/*.pcf.gz .
-	${LOCALBASE}/bin/mkfontscale ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR}
-	${LOCALBASE}/bin/mkfontdir ${STAGEDIR}${PREFIX}/lib/X11/fonts/${FONTDIR}
-
-post-install: post-install-fontdir
+post-install:
+	${MKDIR} ${STAGEDIR}/${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+		../../../../${LOCALFONTDIR}/*.pcf.gz . \
 
 .include <bsd.port.mk>
diff --git a/japanese/font-jisx0213/distinfo b/japanese/font-jisx0213/distinfo
index 99137a7bf98c..44d1608f8d86 100644
--- a/japanese/font-jisx0213/distinfo
+++ b/japanese/font-jisx0213/distinfo
@@ -1,20 +1,20 @@
-SHA256 (xorg/font/jiskan16-2004-1.bdf.gz) = d79a57b81d3626414cb207eafec8d7b94fc2e7efabb5dce9d3ae58416e82ea3d
-SIZE (xorg/font/jiskan16-2004-1.bdf.gz) = 303930
-SHA256 (xorg/font/jiskan16-2000-1.bdf.gz) = 34e05cb59ae562d53b4b8fa5620454e9a060208f76da915c7da844f581e94830
-SIZE (xorg/font/jiskan16-2000-1.bdf.gz) = 303401
-SHA256 (xorg/font/jiskan16-2000-2.bdf.gz) = 14d5db8001d4f289df98ce1371f782e81add21281bf4b7f8cd7041cb1c6306cd
-SIZE (xorg/font/jiskan16-2000-2.bdf.gz) = 92122
-SHA256 (xorg/font/K14-2004-1.bdf.gz) = 3b5a49ebc3673d672cef3353110c8ee7ba277173c967c69b2b6e406aeae5309f
-SIZE (xorg/font/K14-2004-1.bdf.gz) = 256459
-SHA256 (xorg/font/K14-2000-1.bdf.gz) = ceaa15568961fba5b86734b1aa86ebfeee641e2f43c55bde4a419e373bb5bdf9
-SIZE (xorg/font/K14-2000-1.bdf.gz) = 255684
-SHA256 (xorg/font/K14-2000-2.bdf.gz) = 05f1f7729a167b01e9d28d704fdf5cb83a20e69a659acae69e1f08e45eb036a9
-SIZE (xorg/font/K14-2000-2.bdf.gz) = 75139
-SHA256 (xorg/font/K12-1.bdf.gz) = 6095fcca99d24dd0dd749a83f99663f24c2a6972e7848844185ba52afbbdab00
-SIZE (xorg/font/K12-1.bdf.gz) = 212803
-SHA256 (xorg/font/K12-2.bdf.gz) = 5cd4f41095a7c4c2d89bcf85a0a467066cd3824ed80ca4434e02a3968bde0376
-SIZE (xorg/font/K12-2.bdf.gz) = 64099
-SHA256 (xorg/font/jiskan24-2000-1.bdf.gz) = 8de41ed35156ccd77d9930ee91322819bc568d468be99a8e59f905e4bdc5821b
-SIZE (xorg/font/jiskan24-2000-1.bdf.gz) = 516369
-SHA256 (xorg/font/jiskan24-2000-2.bdf.gz) = fe6412ffa9feb11eccad206417864c81bb880b477b9f5693d438d028958cdb1b
-SIZE (xorg/font/jiskan24-2000-2.bdf.gz) = 155750
+SHA256 (jiskan16-2004-1.bdf.gz) = d79a57b81d3626414cb207eafec8d7b94fc2e7efabb5dce9d3ae58416e82ea3d
+SIZE (jiskan16-2004-1.bdf.gz) = 303930
+SHA256 (jiskan16-2000-1.bdf.gz) = 34e05cb59ae562d53b4b8fa5620454e9a060208f76da915c7da844f581e94830
+SIZE (jiskan16-2000-1.bdf.gz) = 303401
+SHA256 (jiskan16-2000-2.bdf.gz) = 14d5db8001d4f289df98ce1371f782e81add21281bf4b7f8cd7041cb1c6306cd
+SIZE (jiskan16-2000-2.bdf.gz) = 92122
+SHA256 (K14-2004-1.bdf.gz) = 3b5a49ebc3673d672cef3353110c8ee7ba277173c967c69b2b6e406aeae5309f
+SIZE (K14-2004-1.bdf.gz) = 256459
+SHA256 (K14-2000-1.bdf.gz) = ceaa15568961fba5b86734b1aa86ebfeee641e2f43c55bde4a419e373bb5bdf9
+SIZE (K14-2000-1.bdf.gz) = 255684
+SHA256 (K14-2000-2.bdf.gz) = 05f1f7729a167b01e9d28d704fdf5cb83a20e69a659acae69e1f08e45eb036a9
+SIZE (K14-2000-2.bdf.gz) = 75139
+SHA256 (K12-1.bdf.gz) = 6095fcca99d24dd0dd749a83f99663f24c2a6972e7848844185ba52afbbdab00
+SIZE (K12-1.bdf.gz) = 212803
+SHA256 (K12-2.bdf.gz) = 5cd4f41095a7c4c2d89bcf85a0a467066cd3824ed80ca4434e02a3968bde0376
+SIZE (K12-2.bdf.gz) = 64099
+SHA256 (jiskan24-2000-1.bdf.gz) = 8de41ed35156ccd77d9930ee91322819bc568d468be99a8e59f905e4bdc5821b
+SIZE (jiskan24-2000-1.bdf.gz) = 516369
+SHA256 (jiskan24-2000-2.bdf.gz) = fe6412ffa9feb11eccad206417864c81bb880b477b9f5693d438d028958cdb1b
+SIZE (jiskan24-2000-2.bdf.gz) = 155750
diff --git a/japanese/font-jisx0213/files/Makefile.in b/japanese/font-jisx0213/files/Makefile
index beed26ca22bf..beed26ca22bf 100644
--- a/japanese/font-jisx0213/files/Makefile.in
+++ b/japanese/font-jisx0213/files/Makefile
diff --git a/japanese/font-jisx0213/pkg-plist b/japanese/font-jisx0213/pkg-plist
index 79f9206b17f8..bf1ae6e7e9b0 100644
--- a/japanese/font-jisx0213/pkg-plist
+++ b/japanese/font-jisx0213/pkg-plist
@@ -1,82 +1,80 @@
-%%FONTDIR%%/K12-1.pcf.gz
-%%FONTDIR%%/K12-1b.pcf.gz
-%%FONTDIR%%/K12-1bi.pcf.gz
-%%FONTDIR%%/K12-1i.pcf.gz
-%%FONTDIR%%/K12-2.pcf.gz
-%%FONTDIR%%/K12-2b.pcf.gz
-%%FONTDIR%%/K12-2bi.pcf.gz
-%%FONTDIR%%/K12-2i.pcf.gz
-%%FONTDIR%%/K14-2000-1.pcf.gz
-%%FONTDIR%%/K14-2000-1b.pcf.gz
-%%FONTDIR%%/K14-2000-1bi.pcf.gz
-%%FONTDIR%%/K14-2000-1i.pcf.gz
-%%FONTDIR%%/K14-2000-2.pcf.gz
-%%FONTDIR%%/K14-2000-2b.pcf.gz
-%%FONTDIR%%/K14-2000-2bi.pcf.gz
-%%FONTDIR%%/K14-2000-2i.pcf.gz
-%%FONTDIR%%/K14-2004-1.pcf.gz
-%%FONTDIR%%/K14-2004-1b.pcf.gz
-%%FONTDIR%%/K14-2004-1bi.pcf.gz
-%%FONTDIR%%/K14-2004-1i.pcf.gz
-%%FONTDIR%%/jiskan16-2000-1.pcf.gz
-%%FONTDIR%%/jiskan16-2000-1b.pcf.gz
-%%FONTDIR%%/jiskan16-2000-1bi.pcf.gz
-%%FONTDIR%%/jiskan16-2000-1i.pcf.gz
-%%FONTDIR%%/jiskan16-2000-2.pcf.gz
-%%FONTDIR%%/jiskan16-2000-2b.pcf.gz
-%%FONTDIR%%/jiskan16-2000-2bi.pcf.gz
-%%FONTDIR%%/jiskan16-2000-2i.pcf.gz
-%%FONTDIR%%/jiskan16-2004-1.pcf.gz
-%%FONTDIR%%/jiskan16-2004-1b.pcf.gz
-%%FONTDIR%%/jiskan16-2004-1bi.pcf.gz
-%%FONTDIR%%/jiskan16-2004-1i.pcf.gz
-%%FONTDIR%%/jiskan24-2000-1.pcf.gz
-%%FONTDIR%%/jiskan24-2000-1b.pcf.gz
-%%FONTDIR%%/jiskan24-2000-1bi.pcf.gz
-%%FONTDIR%%/jiskan24-2000-1i.pcf.gz
-%%FONTDIR%%/jiskan24-2000-2.pcf.gz
-%%FONTDIR%%/jiskan24-2000-2b.pcf.gz
-%%FONTDIR%%/jiskan24-2000-2bi.pcf.gz
-%%FONTDIR%%/jiskan24-2000-2i.pcf.gz
-%%XFONTDIR%%/K12-1.pcf.gz
-%%XFONTDIR%%/K12-1b.pcf.gz
-%%XFONTDIR%%/K12-1bi.pcf.gz
-%%XFONTDIR%%/K12-1i.pcf.gz
-%%XFONTDIR%%/K12-2.pcf.gz
-%%XFONTDIR%%/K12-2b.pcf.gz
-%%XFONTDIR%%/K12-2bi.pcf.gz
-%%XFONTDIR%%/K12-2i.pcf.gz
-%%XFONTDIR%%/K14-2000-1.pcf.gz
-%%XFONTDIR%%/K14-2000-1b.pcf.gz
-%%XFONTDIR%%/K14-2000-1bi.pcf.gz
-%%XFONTDIR%%/K14-2000-1i.pcf.gz
-%%XFONTDIR%%/K14-2000-2.pcf.gz
-%%XFONTDIR%%/K14-2000-2b.pcf.gz
-%%XFONTDIR%%/K14-2000-2bi.pcf.gz
-%%XFONTDIR%%/K14-2000-2i.pcf.gz
-%%XFONTDIR%%/K14-2004-1.pcf.gz
-%%XFONTDIR%%/K14-2004-1b.pcf.gz
-%%XFONTDIR%%/K14-2004-1bi.pcf.gz
-%%XFONTDIR%%/K14-2004-1i.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-1.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-1b.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-1bi.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-1i.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-2.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-2b.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-2bi.pcf.gz
-%%XFONTDIR%%/jiskan16-2000-2i.pcf.gz
-%%XFONTDIR%%/jiskan16-2004-1.pcf.gz
-%%XFONTDIR%%/jiskan16-2004-1b.pcf.gz
-%%XFONTDIR%%/jiskan16-2004-1bi.pcf.gz
-%%XFONTDIR%%/jiskan16-2004-1i.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-1.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-1b.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-1bi.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-1i.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-2.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-2b.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-2bi.pcf.gz
-%%XFONTDIR%%/jiskan24-2000-2i.pcf.gz
-%%XFONTDIR%%/fonts.dir
-%%XFONTDIR%%/fonts.scale
+%%LOCALFONTSDIR%%/K12-1.pcf.gz
+%%LOCALFONTSDIR%%/K12-1b.pcf.gz
+%%LOCALFONTSDIR%%/K12-1bi.pcf.gz
+%%LOCALFONTSDIR%%/K12-1i.pcf.gz
+%%LOCALFONTSDIR%%/K12-2.pcf.gz
+%%LOCALFONTSDIR%%/K12-2b.pcf.gz
+%%LOCALFONTSDIR%%/K12-2bi.pcf.gz
+%%LOCALFONTSDIR%%/K12-2i.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-1.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-1b.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-1bi.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-1i.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-2.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-2b.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-2bi.pcf.gz
+%%LOCALFONTSDIR%%/K14-2000-2i.pcf.gz
+%%LOCALFONTSDIR%%/K14-2004-1.pcf.gz
+%%LOCALFONTSDIR%%/K14-2004-1b.pcf.gz
+%%LOCALFONTSDIR%%/K14-2004-1bi.pcf.gz
+%%LOCALFONTSDIR%%/K14-2004-1i.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-1.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-1b.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-1bi.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-1i.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-2.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-2b.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-2bi.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2000-2i.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2004-1.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2004-1b.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2004-1bi.pcf.gz
+%%LOCALFONTSDIR%%/jiskan16-2004-1i.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-1.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-1b.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-1bi.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-1i.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-2.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-2b.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-2bi.pcf.gz
+%%LOCALFONTSDIR%%/jiskan24-2000-2i.pcf.gz
+%%FONTSDIR%%/K12-1.pcf.gz
+%%FONTSDIR%%/K12-1b.pcf.gz
+%%FONTSDIR%%/K12-1bi.pcf.gz
+%%FONTSDIR%%/K12-1i.pcf.gz
+%%FONTSDIR%%/K12-2.pcf.gz
+%%FONTSDIR%%/K12-2b.pcf.gz
+%%FONTSDIR%%/K12-2bi.pcf.gz
+%%FONTSDIR%%/K12-2i.pcf.gz
+%%FONTSDIR%%/K14-2000-1.pcf.gz
+%%FONTSDIR%%/K14-2000-1b.pcf.gz
+%%FONTSDIR%%/K14-2000-1bi.pcf.gz
+%%FONTSDIR%%/K14-2000-1i.pcf.gz
+%%FONTSDIR%%/K14-2000-2.pcf.gz
+%%FONTSDIR%%/K14-2000-2b.pcf.gz
+%%FONTSDIR%%/K14-2000-2bi.pcf.gz
+%%FONTSDIR%%/K14-2000-2i.pcf.gz
+%%FONTSDIR%%/K14-2004-1.pcf.gz
+%%FONTSDIR%%/K14-2004-1b.pcf.gz
+%%FONTSDIR%%/K14-2004-1bi.pcf.gz
+%%FONTSDIR%%/K14-2004-1i.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1b.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-1i.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2b.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2000-2i.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1b.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1i.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-1.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-1b.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-1bi.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-1i.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-2.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-2b.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-2bi.pcf.gz
+%%FONTSDIR%%/jiskan24-2000-2i.pcf.gz