svn commit: r362557 - in head/x11-fonts/sourcesanspro-ttf: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Tue Jul 22 17:42:01 2014
New Revision: 362557
URL: http://svnweb.freebsd.org/changeset/ports/362557
QAT: https://qat.redports.org/buildarchive/r362557/

Log:
  - Remove leading indefinite article from COMMENT
  - Use @fcfontsdir
  - Simplify FONTDIR
  - Cleanup Makefile

Modified:
  head/x11-fonts/sourcesanspro-ttf/Makefile
  head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
  head/x11-fonts/sourcesanspro-ttf/pkg-plist

Modified: head/x11-fonts/sourcesanspro-ttf/Makefile
==============================================================================
--- head/x11-fonts/sourcesanspro-ttf/Makefile	Tue Jul 22 17:41:55 2014	(r362556)
+++ head/x11-fonts/sourcesanspro-ttf/Makefile	Tue Jul 22 17:42:01 2014	(r362557)
@@ -3,41 +3,32 @@
 
 PORTNAME=	sourcesanspro-ttf
 PORTVERSION=	1.050
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/sourcesans.adobe
 DISTNAME=	SourceSansPro_FontsOnly-${PORTVERSION}
 
 MAINTAINER=	office at FreeBSD.org
-COMMENT=	A set of fonts by Adobe designed for user interfaces
+COMMENT=	Set of fonts by Adobe designed for user interfaces
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
+BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
+NO_BUILD=	yes
 USES=		zip
 USE_XORG=	x11
 
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-
-SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB=	FONTDIR=${FONTDIR}
+SUB_FILES=	pkg-message
 SUB_LIST=	FONTDIR=${FONTDIR}
 
-FONTNAME=	SourceSansPro
-FONTDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT=		fonts.dir fonts.scale
-
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
-
-do-build:
-	cd ${WRKSRC}/ && ${MKFONTSCL_CMD}
-	cd ${WRKSRC}/ && ${MKFONTDIR_CMD}
+FONTDIR=	lib/X11/fonts/SourceSansPro
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTDIR}
-	cd ${WRKSRC}/ &&	\
-	${INSTALL_DATA} ${INSTDAT} TTF/*.ttf ${STAGEDIR}${FONTDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
+	cd ${WRKSRC}/ && ${INSTALL_DATA} TTF/*.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
==============================================================================
--- head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in	Tue Jul 22 17:41:55 2014	(r362556)
+++ head/x11-fonts/sourcesanspro-ttf/files/pkg-message.in	Tue Jul 22 17:42:01 2014	(r362557)
@@ -2,4 +2,4 @@ You can start using the fonts by followi
 
 Add the following line to the "Files" section of your x.org configuration file:
 
-	FontPath "%%FONTDIR%%/"
+	FontPath "%%PREFIX%%/%%FONTDIR%%/"

Modified: head/x11-fonts/sourcesanspro-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/sourcesanspro-ttf/pkg-plist	Tue Jul 22 17:41:55 2014	(r362556)
+++ head/x11-fonts/sourcesanspro-ttf/pkg-plist	Tue Jul 22 17:42:01 2014	(r362557)
@@ -10,7 +10,4 @@
 %%FONTDIR%%/SourceSansPro-Regular.ttf
 %%FONTDIR%%/SourceSansPro-Semibold.ttf
 %%FONTDIR%%/SourceSansPro-SemiboldIt.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
- at unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
- at dirrm %%FONTDIR%%
+ at fcfontsdir %%FONTDIR%%