svn commit: r381633 - head/x11-fonts/cyberbit-ttfonts

[Baptiste Daroussin]

Author: bapt
Date: Thu Mar 19 17:44:05 2015
New Revision: 381633
URL: https://svnweb.freebsd.org/changeset/ports/381633
QAT: https://qat.redports.org/buildarchive/r381633/

Log:
  Convert to USES=fonts
  Various cleanup

Modified:
  head/x11-fonts/cyberbit-ttfonts/Makefile
  head/x11-fonts/cyberbit-ttfonts/pkg-plist

Modified: head/x11-fonts/cyberbit-ttfonts/Makefile
==============================================================================
--- head/x11-fonts/cyberbit-ttfonts/Makefile	Thu Mar 19 17:40:36 2015	(r381632)
+++ head/x11-fonts/cyberbit-ttfonts/Makefile	Thu Mar 19 17:44:05 2015	(r381633)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cyberbit-ttfonts
 PORTVERSION=	2.0.20050220
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://ftp.netscape.com/pub/communicator/extras/fonts/windows/ \
 		http://aol-4.vo.llnwd.net/pub/communicator/extras/fonts/windows/ \
@@ -17,19 +17,13 @@ EXTRACT_ONLY=	Cyberbit.ZIP
 MAINTAINER=	freebsd at skysmurf.nl
 COMMENT=	Bitstream Cyberbit is a TrueType font that covers Unicode 2.0
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 RESTRICTED=	Redistribution not permitted; single user license only.
 
-USES=		zip
+USES=		fonts zip
 
-FONTDIR=	lib/X11/fonts/Cyberbit
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+FONTSDIR=	lib/X11/fonts/Cyberbit
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_LIST=	FONTDIR=${PREFIX}/${FONTDIR}
 
 WRKSRC=		${WRKDIR}
 
@@ -37,19 +31,11 @@ PORTDOCS=	97CyberBase.Doc 97CyberBit.Doc
 		CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm
 
 OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-MKFONTSCALE=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR=	${LOCALBASE}/bin/mkfontdir
-
-do-build:
-	cd ${WRKSRC} && ${MKFONTSCALE} && ${MKFONTDIR}
+NO_BUILD=	yes
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/Cyberbit.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.* ${STAGEDIR}${PREFIX}/${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Cyberbit.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${doc} ${STAGEDIR}${DOCSDIR}

Modified: head/x11-fonts/cyberbit-ttfonts/pkg-plist
==============================================================================
--- head/x11-fonts/cyberbit-ttfonts/pkg-plist	Thu Mar 19 17:40:36 2015	(r381632)
+++ head/x11-fonts/cyberbit-ttfonts/pkg-plist	Thu Mar 19 17:44:05 2015	(r381633)
@@ -1,5 +1 @@
-%%FONTDIR%%/Cyberbit.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
- at unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
- at dirrm %%FONTDIR%%
+%%FONTSDIR%%/Cyberbit.ttf