svn commit: r381628 - in head/x11-fonts/bitstream-vera: . files

[Baptiste Daroussin]

Author: bapt
Date: Thu Mar 19 17:29:27 2015
New Revision: 381628
URL: https://svnweb.freebsd.org/changeset/ports/381628
QAT: https://qat.redports.org/buildarchive/r381628/

Log:
  Convert to USES=fonts
  Use SUB_FILES instead of mangling pkg-message manually

Added:
  head/x11-fonts/bitstream-vera/files/pkg-message.in
     - copied unchanged from r381579, head/x11-fonts/bitstream-vera/pkg-message
Deleted:
  head/x11-fonts/bitstream-vera/files/fonts.dir
  head/x11-fonts/bitstream-vera/pkg-message
Modified:
  head/x11-fonts/bitstream-vera/Makefile
  head/x11-fonts/bitstream-vera/pkg-plist

Modified: head/x11-fonts/bitstream-vera/Makefile
==============================================================================
--- head/x11-fonts/bitstream-vera/Makefile	Thu Mar 19 17:27:31 2015	(r381627)
+++ head/x11-fonts/bitstream-vera/Makefile	Thu Mar 19 17:29:27 2015	(r381628)
@@ -1,10 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $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 at 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}
 

Copied: head/x11-fonts/bitstream-vera/files/pkg-message.in (from r381579, head/x11-fonts/bitstream-vera/pkg-message)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fonts/bitstream-vera/files/pkg-message.in	Thu Mar 19 17:29:27 2015	(r381628, copy of r381579, head/x11-fonts/bitstream-vera/pkg-message)
@@ -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

Modified: head/x11-fonts/bitstream-vera/pkg-plist
==============================================================================
--- head/x11-fonts/bitstream-vera/pkg-plist	Thu Mar 19 17:27:31 2015	(r381627)
+++ head/x11-fonts/bitstream-vera/pkg-plist	Thu Mar 19 17:29:27 2015	(r381628)
@@ -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%%
- at unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
- at dirrm %%FONTSDIR%%
- at exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true