From owner-svn-ports-head@FreeBSD.ORG Thu Mar 19 17:44:06 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D81C5AEC; Thu, 19 Mar 2015 17:44:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A992681D; Thu, 19 Mar 2015 17:44:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JHi6ah075979; Thu, 19 Mar 2015 17:44:06 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JHi6qN075977; Thu, 19 Mar 2015 17:44:06 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503191744.t2JHi6qN075977@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 19 Mar 2015 17:44:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381633 - head/x11-fonts/cyberbit-ttfonts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2015 17:44:06 -0000 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@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 - -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 -@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true -@dirrm %%FONTDIR%% +%%FONTSDIR%%/Cyberbit.ttf