svn commit: r381629 - head/x11-fonts/code2000

[Baptiste Daroussin]

Author: bapt
Date: Thu Mar 19 17:33:11 2015
New Revision: 381629
URL: https://svnweb.freebsd.org/changeset/ports/381629
QAT: https://qat.redports.org/buildarchive/r381629/

Log:
  Convert to USES=fonts
  Various cleanup

Modified:
  head/x11-fonts/code2000/Makefile
  head/x11-fonts/code2000/pkg-plist

Modified: head/x11-fonts/code2000/Makefile
==============================================================================
--- head/x11-fonts/code2000/Makefile	Thu Mar 19 17:29:27 2015	(r381628)
+++ head/x11-fonts/code2000/Makefile	Thu Mar 19 17:33:11 2015	(r381629)
@@ -3,6 +3,7 @@
 
 PORTNAME=	code2000
 PORTVERSION=	1.171
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry/${DIST_SUBDIR}
@@ -12,24 +13,13 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	thierry at FreeBSD.org
 COMMENT=	Shareware demo Unicode TrueType font
 
-BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir	\
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
-USES=		zip
-
-PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
+USES=		fonts zip
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_LIST=	FONTSDIR=${FONTSDIR}
 
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
-FCCACHE_CMD=	${LOCALBASE}/bin/fc-cache -f -v
+NO_BUILD=	yes
 
 post-extract: move-fonts rename-license
 
@@ -40,10 +30,6 @@ move-fonts:
 rename-license:
 	${MV} ${WRKDIR}/CODE2000.HTM ${WRKSRC}/${FONTNAME}.html
 
-do-build:
-	cd ${WRKSRC} &&	${MKFONTSCL_CMD}
-	cd ${WRKSRC} &&	${MKFONTDIR_CMD}
-
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${FONTSDIR}

Modified: head/x11-fonts/code2000/pkg-plist
==============================================================================
--- head/x11-fonts/code2000/pkg-plist	Thu Mar 19 17:29:27 2015	(r381628)
+++ head/x11-fonts/code2000/pkg-plist	Thu Mar 19 17:33:11 2015	(r381629)
@@ -1,8 +1,2 @@
 %%FONTSDIR%%/code2000.html
 %%FONTSDIR%%/code2000.ttf
-%%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/fonts.scale
- at exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
- at unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || true
- at unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null || true
- at dirrm %%FONTSDIR%%