From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 24 12:30:51 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E0873813;
 Mon, 24 Mar 2014 12:30:51 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B3A21D85;
 Mon, 24 Mar 2014 12:30:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2OCUpXO075982;
 Mon, 24 Mar 2014 12:30:51 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2OCUptM075980;
 Mon, 24 Mar 2014 12:30:51 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201403241230.s2OCUptM075980@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 24 Mar 2014 12:30:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348959 - in head/x11-fonts/dejavu: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Mar 2014 12:30:52 -0000

Author: sunpoet
Date: Mon Mar 24 12:30:51 2014
New Revision: 348959
URL: http://svnweb.freebsd.org/changeset/ports/348959
QAT: https://qat.redports.org/buildarchive/r348959/

Log:
  - Fix fonts.dir and fonts.scale
  - Fix pkg-message
  - Bump PORTREVISION for package change
  - While I'm here, use USES=tar:bzip2
  
  Submitted by:	J.R. Oldroyd <jr@opal.com>

Modified:
  head/x11-fonts/dejavu/Makefile
  head/x11-fonts/dejavu/files/pkg-message.in

Modified: head/x11-fonts/dejavu/Makefile
==============================================================================
--- head/x11-fonts/dejavu/Makefile	Mon Mar 24 12:30:45 2014	(r348958)
+++ head/x11-fonts/dejavu/Makefile	Mon Mar 24 12:30:51 2014	(r348959)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dejavu
 PORTVERSION=	2.34
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
@@ -19,7 +19,7 @@ OPTIONS_DEFAULT=LINKS
 OPTIONS_SUB=	yes
 LINKS_DESC=	Install links of configuration files in conf.d
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 PLIST_SUB=	FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS} FONTSDIR=${FONTSDIR}
 PORTDOCS=	README langcover.txt status.txt unicover.txt
@@ -31,14 +31,14 @@ FCDIR_LINKS=	${FCDIR:S|conf.avail|conf.d
 FONTSDIR?=	lib/X11/fonts/${PORTNAME}
 
 do-build:
-	@cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontscale
-	@cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontdir
+	@cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontscale
+	@cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontdir
 
 do-install:
 	cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${FONTSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/
 	cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf .
-	${INSTALL_DATA} ${WRKSRC}/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ttf/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 

Modified: head/x11-fonts/dejavu/files/pkg-message.in
==============================================================================
--- head/x11-fonts/dejavu/files/pkg-message.in	Mon Mar 24 12:30:45 2014	(r348958)
+++ head/x11-fonts/dejavu/files/pkg-message.in	Mon Mar 24 12:30:51 2014	(r348959)
@@ -5,7 +5,7 @@ line to the "Modules" section of your X 
 
 Add the following line to the "Files" section of X Windows configuration file:
 
-	FontPath "%%FONTSDIR%%/"
+	FontPath "%%PREFIX%%/%%FONTSDIR%%/"
 
 Note: your X Windows configuration file is typically /etc/X11/XF86Config
 if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org.