Date: Tue, 15 Jul 2014 18:48:29 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361995 - in head/x11-fonts/cyberbit-ttfonts: . files Message-ID: <201407151848.s6FImT86036366@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Jul 15 18:48:29 2014 New Revision: 361995 URL: http://svnweb.freebsd.org/changeset/ports/361995 QAT: https://qat.redports.org/buildarchive/r361995/ Log: x11-fonts/cyberbit-ttfonts: stage, assign maintainership to submitter, cleanup - Stage - Assign maintainership to submitter - Fix grammar in COMMENT - Cleanup installation - Cleanup docs - Use pkg-message instead of ${ECHO_CMD} PR: 191854 Submitted by: A.J. "Fonz" van Werven <freebsd@skysmurf.nl> Added: head/x11-fonts/cyberbit-ttfonts/files/pkg-message.in (contents, props changed) Deleted: head/x11-fonts/cyberbit-ttfonts/files/fonts.dir.cyberbit head/x11-fonts/cyberbit-ttfonts/pkg-deinstall head/x11-fonts/cyberbit-ttfonts/pkg-install 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 Tue Jul 15 18:47:08 2014 (r361994) +++ head/x11-fonts/cyberbit-ttfonts/Makefile Tue Jul 15 18:48:29 2014 (r361995) @@ -7,54 +7,52 @@ PORTREVISION= 2 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/ \ - ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/ -DISTFILES= Cyberbit.ZIP + ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/ \ + http://www.skysmurf.nl/comp/FreeBSD/distfiles/cyberbit/ +DISTFILES= Cyberbit.ZIP 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \ + CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm DIST_SUBDIR= cyberbit EXTRACT_ONLY= Cyberbit.ZIP -MAINTAINER= ports@FreeBSD.org -COMMENT= Bitstream Cyberbit is a TrueType font covers Unicode 2.0 +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 -NO_BUILD= yes -FONTSDIR= lib/X11/fonts/TrueType -MAKE_ENV= FONTSDIR=${FONTSDIR} -PLIST_SUB= FONTSDIR=${FONTSDIR} +FONTDIR= lib/X11/fonts/Cyberbit +PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" + +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_LIST= FONTDIR=${PREFIX}/${FONTDIR} + WRKSRC= ${WRKDIR} +PORTDOCS= 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \ + CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm + OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \ - CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm -.endif +MKFONTSCALE= ${LOCALBASE}/bin/mkfontscale +MKFONTDIR= ${LOCALBASE}/bin/mkfontdir + +do-build: + cd ${WRKSRC} && ${MKFONTSCALE} && ${MKFONTDIR} do-install: -.if !exists(${PREFIX}/${FONTSDIR}) - @${ECHO} "*********************************************************" - @${ECHO} "Please add ${PREFIX}/${FONTSDIR} to your font path" - @${ECHO} "and load 'xtt' module in /etc/x11/xorg.conf." - @${ECHO} "*********************************************************" - ${MKDIR} ${PREFIX}/${FONTSDIR} -.endif - ${INSTALL_DATA} ${WRKSRC}/*.ttf \ - ${FILESDIR}/fonts.dir.cyberbit \ - ${PREFIX}/${FONTSDIR} -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/97CyberBase.Doc ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/97CyberBit.Doc ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/97CyberCJK.Doc ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/CYBERBIT.DOC ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/CYBERCJK.DOC ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/READMEfirst.txt ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ReadMe.htm ${DOCSDIR} -.endif - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR} + ${INSTALL_DATA} ${WRKSRC}/Cyberbit.ttf ${STAGEDIR}${PREFIX}/${FONTDIR} + ${INSTALL_DATA} ${WRKSRC}/fonts.* ${STAGEDIR}${PREFIX}/${FONTDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${doc} ${STAGEDIR}${DOCSDIR} +.endfor + .include <bsd.port.mk> Added: head/x11-fonts/cyberbit-ttfonts/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/cyberbit-ttfonts/files/pkg-message.in Tue Jul 15 18:48:29 2014 (r361995) @@ -0,0 +1,10 @@ +You can start using the font(s) by following these instructions: + +Eiter type the following in an X terminal: + xset fp+ %%FONTDIR%% + xset fp rehash + +Or, more permanently, add the following line to the "Files" section of your +X.Org configuration file: + FontPath "%%FONTDIR%%/" +and make sure you have the "freetype" module loaded, then restart X. Modified: head/x11-fonts/cyberbit-ttfonts/pkg-plist ============================================================================== --- head/x11-fonts/cyberbit-ttfonts/pkg-plist Tue Jul 15 18:47:08 2014 (r361994) +++ head/x11-fonts/cyberbit-ttfonts/pkg-plist Tue Jul 15 18:48:29 2014 (r361995) @@ -1,11 +1,5 @@ -%%FONTSDIR%%/fonts.dir.cyberbit -%%FONTSDIR%%/Cyberbit.ttf -@dirrmtry %%FONTSDIR%% -%%PORTDOCS%%%%DOCSDIR%%/97CyberBase.Doc -%%PORTDOCS%%%%DOCSDIR%%/97CyberBit.Doc -%%PORTDOCS%%%%DOCSDIR%%/97CyberCJK.Doc -%%PORTDOCS%%%%DOCSDIR%%/CYBERBIT.DOC -%%PORTDOCS%%%%DOCSDIR%%/CYBERCJK.DOC -%%PORTDOCS%%%%DOCSDIR%%/READMEfirst.txt -%%PORTDOCS%%%%DOCSDIR%%/ReadMe.htm -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%FONTDIR%%/Cyberbit.ttf +%%FONTDIR%%/fonts.dir +%%FONTDIR%%/fonts.scale +@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true +@dirrm %%FONTDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407151848.s6FImT86036366>