From 00deba8fc50e6479db77a72fc4c5199c21e8ca7a Mon Sep 17 00:00:00 2001 From: bapt Date: Thu, 19 Mar 2015 17:29:27 +0000 Subject: Convert to USES=fonts Use SUB_FILES instead of mangling pkg-message manually --- x11-fonts/bitstream-vera/Makefile | 32 ++++------------- x11-fonts/bitstream-vera/files/fonts.dir | 51 --------------------------- x11-fonts/bitstream-vera/files/pkg-message.in | 14 ++++++++ x11-fonts/bitstream-vera/pkg-message | 14 -------- x11-fonts/bitstream-vera/pkg-plist | 5 --- 5 files changed, 20 insertions(+), 96 deletions(-) delete mode 100644 x11-fonts/bitstream-vera/files/fonts.dir create mode 100644 x11-fonts/bitstream-vera/files/pkg-message.in delete mode 100644 x11-fonts/bitstream-vera/pkg-message (limited to 'x11-fonts/bitstream-vera') diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile index a3cba3798ed8..64819bf97892 100644 --- a/x11-fonts/bitstream-vera/Makefile +++ b/x11-fonts/bitstream-vera/Makefile @@ -1,10 +1,9 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/x11-fonts/bitstream-vera/Makefile,v 1.2 2005/10/14 20:39:59 adamw Exp $ PORTNAME= bitstream-vera PORTVERSION= 1.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-fonts MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/ttf-${PORTNAME}/1.10 @@ -14,39 +13,20 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Bitstream Vera TrueType font collection -BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig - -USES= tar:bzip2 +USES= fonts tar:bzip2 NO_BUILD= yes -PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" - -MSG_FILE= ${PKGDIR}/pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -# -# Local variables -# - FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} +SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS -post-patch: - ${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE} - -do-install: install-fonts install-docs - -install-fonts: - ${MKDIR} ${STAGEDIR}${FONTSDIR} +do-install: + @${MKDIR} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.TXT ${STAGEDIR}${FONTSDIR} - -install-docs: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.TXT ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/RELEASENOTES.TXT ${STAGEDIR}${DOCSDIR} diff --git a/x11-fonts/bitstream-vera/files/fonts.dir b/x11-fonts/bitstream-vera/files/fonts.dir deleted file mode 100644 index fd16ab5539da..000000000000 --- a/x11-fonts/bitstream-vera/files/fonts.dir +++ /dev/null @@ -1,51 +0,0 @@ -50 -Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-9 -Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15 -Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-fcd8859-15 -Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1 -Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0 -VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-9 -VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-15 -VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-fcd8859-15 -VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1 -VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0 -VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-9 -VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-15 -VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-fcd8859-15 -VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-1 -VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-ascii-0 -VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-9 -VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-15 -VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-fcd8859-15 -VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-1 -VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-ascii-0 -VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-9 -VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-15 -VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-fcd8859-15 -VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-1 -VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-ascii-0 -VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-9 -VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-15 -VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-fcd8859-15 -VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-1 -VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-ascii-0 -VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-9 -VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-15 -VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-fcd8859-15 -VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-1 -VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-ascii-0 -VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-9 -VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-15 -VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-fcd8859-15 -VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-1 -VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-ascii-0 -VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-9 -VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-15 -VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-fcd8859-15 -VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-1 -VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-ascii-0 -VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9 -VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15 -VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-fcd8859-15 -VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1 -VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-ascii-0 diff --git a/x11-fonts/bitstream-vera/files/pkg-message.in b/x11-fonts/bitstream-vera/files/pkg-message.in new file mode 100644 index 000000000000..b8a87e071618 --- /dev/null +++ b/x11-fonts/bitstream-vera/files/pkg-message.in @@ -0,0 +1,14 @@ +IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts +before using. The copyright can be found at %%FONTSDIR%%/COPYRIGHT.TXT. To +use these fonts, follow the instructions below. + +Make sure that the freetype module is loaded. If it is not, add the following +line to the "Modules" section of your X Windows configuration file: + + Load "freetype" + +Add the following line to the "Files" section of X Windows configuration file: + + FontPath "%%FONTSDIR%%/" + +Note: your X Windows configuration file is typically /etc/X11/xorg.conf diff --git a/x11-fonts/bitstream-vera/pkg-message b/x11-fonts/bitstream-vera/pkg-message deleted file mode 100644 index b8a87e071618..000000000000 --- a/x11-fonts/bitstream-vera/pkg-message +++ /dev/null @@ -1,14 +0,0 @@ -IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts -before using. The copyright can be found at %%FONTSDIR%%/COPYRIGHT.TXT. To -use these fonts, follow the instructions below. - -Make sure that the freetype module is loaded. If it is not, add the following -line to the "Modules" section of your X Windows configuration file: - - Load "freetype" - -Add the following line to the "Files" section of X Windows configuration file: - - FontPath "%%FONTSDIR%%/" - -Note: your X Windows configuration file is typically /etc/X11/xorg.conf diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist index 56bb9c252498..1fdba7e378c0 100644 --- a/x11-fonts/bitstream-vera/pkg-plist +++ b/x11-fonts/bitstream-vera/pkg-plist @@ -1,5 +1,4 @@ %%FONTSDIR%%/COPYRIGHT.TXT -%%FONTSDIR%%/fonts.dir %%FONTSDIR%%/Vera.ttf %%FONTSDIR%%/VeraBI.ttf %%FONTSDIR%%/VeraBd.ttf @@ -12,7 +11,3 @@ %%FONTSDIR%%/VeraSeBd.ttf %%PORTDOCS%%%%DOCSDIR%%/README.TXT %%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.TXT -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true -@dirrm %%FONTSDIR%% -@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true -- cgit