4 files changed, 25 insertions, 31 deletions

diff --git a/x11-fonts/sourcesanspro-ttf/Makefile b/x11-fonts/sourcesanspro-ttf/Makefile
index 06d82567e6b1..cdec6c556e15 100644
--- a/x11-fonts/sourcesanspro-ttf/Makefile
+++ b/x11-fonts/sourcesanspro-ttf/Makefile
@@ -2,34 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	sourcesanspro-ttf
-PORTVERSION=	1.050
-PORTREVISION=	1
+PORTVERSION=	1.065
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF/sourcesans.adobe
-DISTNAME=	SourceSansPro_FontsOnly-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Set of fonts by Adobe designed for user interfaces
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+USE_GITHUB=	yes
+GH_ACCOUNT=	adobe-fonts
+GH_PROJECT=	source-sans-pro
+GH_TAGNAME=	2.010R-ro/1.065R-it
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S,/,-,}
 
 NO_BUILD=	yes
-USES=		zip
+USES=		fonts
 USE_XORG=	x11
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST_SUB=	FONTDIR=${FONTDIR}
+FONTNAME=	SourceSansPro
 SUB_FILES=	pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
-
-FONTDIR=	lib/X11/fonts/SourceSansPro
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
-	cd ${WRKSRC}/ && ${INSTALL_DATA} TTF/*.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TTF/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/sourcesanspro-ttf/distinfo b/x11-fonts/sourcesanspro-ttf/distinfo
index 7ec0a4be211f..c8a232315f60 100644
--- a/x11-fonts/sourcesanspro-ttf/distinfo
+++ b/x11-fonts/sourcesanspro-ttf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SourceSansPro_FontsOnly-1.050.zip) = c379f5ef53981757b9aa115cfd0775e9fa92175f5d611ab3bbe57689fa3c5f00
-SIZE (SourceSansPro_FontsOnly-1.050.zip) = 1556479
+SHA256 (sourcesanspro-ttf-1.065_GH0.tar.gz) = e29660947d1a77bc2682b6036cfa4d644d9cdf00a272baaf60dda56e547c79e8
+SIZE (sourcesanspro-ttf-1.065_GH0.tar.gz) = 5503301
diff --git a/x11-fonts/sourcesanspro-ttf/files/pkg-message.in b/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
index 6592e4421e31..58071a80c57f 100644
--- a/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
+++ b/x11-fonts/sourcesanspro-ttf/files/pkg-message.in
@@ -2,4 +2,4 @@ You can start using the fonts by following these instructions:
 
 Add the following line to the "Files" section of your x.org configuration file:
 
-	FontPath "%%PREFIX%%/%%FONTDIR%%/"
+	FontPath "%%FONTSDIR%%/"
diff --git a/x11-fonts/sourcesanspro-ttf/pkg-plist b/x11-fonts/sourcesanspro-ttf/pkg-plist
index 495d80058581..ff932aa3b2b5 100644
--- a/x11-fonts/sourcesanspro-ttf/pkg-plist
+++ b/x11-fonts/sourcesanspro-ttf/pkg-plist
@@ -1,13 +1,12 @@
-%%FONTDIR%%/SourceSansPro-Black.ttf
-%%FONTDIR%%/SourceSansPro-BlackIt.ttf
-%%FONTDIR%%/SourceSansPro-Bold.ttf
-%%FONTDIR%%/SourceSansPro-BoldIt.ttf
-%%FONTDIR%%/SourceSansPro-ExtraLight.ttf
-%%FONTDIR%%/SourceSansPro-ExtraLightIt.ttf
-%%FONTDIR%%/SourceSansPro-It.ttf
-%%FONTDIR%%/SourceSansPro-Light.ttf
-%%FONTDIR%%/SourceSansPro-LightIt.ttf
-%%FONTDIR%%/SourceSansPro-Regular.ttf
-%%FONTDIR%%/SourceSansPro-Semibold.ttf
-%%FONTDIR%%/SourceSansPro-SemiboldIt.ttf
-@fcfontsdir %%FONTDIR%%
+%%FONTSDIR%%/SourceSansPro-Black.ttf
+%%FONTSDIR%%/SourceSansPro-BlackIt.ttf
+%%FONTSDIR%%/SourceSansPro-Bold.ttf
+%%FONTSDIR%%/SourceSansPro-BoldIt.ttf
+%%FONTSDIR%%/SourceSansPro-ExtraLight.ttf
+%%FONTSDIR%%/SourceSansPro-ExtraLightIt.ttf
+%%FONTSDIR%%/SourceSansPro-It.ttf
+%%FONTSDIR%%/SourceSansPro-Light.ttf
+%%FONTSDIR%%/SourceSansPro-LightIt.ttf
+%%FONTSDIR%%/SourceSansPro-Regular.ttf
+%%FONTSDIR%%/SourceSansPro-Semibold.ttf
+%%FONTSDIR%%/SourceSansPro-SemiboldIt.ttf