From 6cae78c2cfe342d6893c15835b97298dabe34373 Mon Sep 17 00:00:00 2001
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Tue, 8 Apr 2008 17:10:17 +0000
Subject: Upgrade to 1.17, switch to mkfontscale / mkfontdir and run fc-cache.

---
 x11-fonts/code2000/Makefile  | 29 ++++++++++++-----------------
 x11-fonts/code2000/distinfo  |  6 +++---
 x11-fonts/code2000/pkg-plist |  2 ++
 3 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'x11-fonts/code2000')

diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 3649ecfd2df6..6a1161ba690d 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	code2000
-PORTVERSION=	1.16
-PORTREVISION=	2
+PORTVERSION=	1.17
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://code2000.net/
 DISTFILES=	${PORTNAME:U}${EXTRACT_SUFX:U}
@@ -16,7 +15,9 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}_${PORTREVISION}
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Shareware demo Unicode TrueType font
 
-BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
+BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir	\
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 RESTRICTED=	Only unmodified original package can be distributed
 
@@ -31,9 +32,10 @@ SUB_LIST=	FONTSDIR=${FONTSDIR}
 
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-TTFONTSDIR?=	${X11BASE}/lib/X11/fonts/TrueType
 
-TTMKFDIR_CMD?=	${X11BASE}/bin/ttmkfdir
+MKFONTSCL_CMD=	${X11BASE}/bin/mkfontscale
+MKFONTDIR_CMD=	${X11BASE}/bin/mkfontdir
+FCCACHE_CMD=	${X11BASE}/bin/fc-cache -f -v
 
 post-extract: move-fonts rename-license
 
@@ -44,24 +46,17 @@ move-fonts:
 rename-license:
 	${MV} ${WRKDIR}/CODE2000.HTM ${WRKSRC}/${FONTNAME}.html
 
-do-build: make-fonts.scale make-fonts.dir
-
-make-fonts.scale:
-	cd ${WRKSRC} && ${TTMKFDIR_CMD} -c -f JJK -d .
-	${CAT} -n ${WRKSRC}/fonts.scale | ${SED} -e ' \
-		s,^     1,100000,; \
-		s,JJK,${FONTNAME},; \
-	' | ${SORT} -r | ${CUT} -c 8- > ${WRKSRC}/fonts.scale.new
-	${MV} ${WRKSRC}/fonts.scale.new ${WRKSRC}/fonts.scale
-
-make-fonts.dir:
-	${CP} ${WRKSRC}/fonts.scale ${WRKSRC}/fonts.dir
+do-build:
+	cd ${WRKSRC} &&	${MKFONTSCL_CMD}
+	cd ${WRKSRC} &&	${MKFONTDIR_CMD}
 
 do-install:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${FONTSDIR}
 
 post-install:
+	@${ECHO_MSG} "===> Running fc-cache"
+	-${FCCACHE_CMD} ${FONTSDIR}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/x11-fonts/code2000/distinfo b/x11-fonts/code2000/distinfo
index a359408d2cbb..94289b4072d2 100644
--- a/x11-fonts/code2000/distinfo
+++ b/x11-fonts/code2000/distinfo
@@ -1,3 +1,3 @@
-MD5 (code2000-1.16_2/CODE2000.ZIP) = d297dcf4d28e9a494c4d7eb5f36411df
-SHA256 (code2000-1.16_2/CODE2000.ZIP) = 3903565600336112c108d58f35dc73dcd17d4cc7a06010508611d877d911ce5a
-SIZE (code2000-1.16_2/CODE2000.ZIP) = 3710725
+MD5 (code2000-1.17_0/CODE2000.ZIP) = 8acd7fcd7ecbc15db88f5c07bff48a2c
+SHA256 (code2000-1.17_0/CODE2000.ZIP) = eea463528f68ad84987a2adcf99f534c83f80dbfa960cbb6b2099ecb8746668e
+SIZE (code2000-1.17_0/CODE2000.ZIP) = 3860746
diff --git a/x11-fonts/code2000/pkg-plist b/x11-fonts/code2000/pkg-plist
index ca1bea296472..6af6963e8869 100644
--- a/x11-fonts/code2000/pkg-plist
+++ b/x11-fonts/code2000/pkg-plist
@@ -3,5 +3,7 @@
 %%FONTSDIR%%/code2000.ttf
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/fonts.scale
+@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
 @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTSDIR%%
+@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
-- 
cgit v1.2.3