3 files changed, 37 insertions, 33 deletions

diff --git a/x11-fonts/droid-fonts-ttf/Makefile b/x11-fonts/droid-fonts-ttf/Makefile
index db85902bcd03..83a55f0840bd 100644
--- a/x11-fonts/droid-fonts-ttf/Makefile
+++ b/x11-fonts/droid-fonts-ttf/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	droid-fonts-ttf
-PORTVERSION=	20110324
+PORTVERSION=	20131024
 CATEGORIES=	x11-fonts
-MASTER_SITES=	LOCAL/sunpoet/
+MASTER_SITES=	LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	The Droid typeface family
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 
 FONTDIR=	lib/X11/fonts/Droid
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -31,36 +31,31 @@ do-install:
 	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf fonts.* ${STAGEDIR}${PREFIX}/${FONTDIR}/
 
 # maintainer section:
-# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
+# https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/
 
-MS_WRKSRC=	${WRKSRC}/${PORTNAME}-${MS_VERSION}
-MS_MASTER_SITE=	http://android.git.kernel.org/?p=platform/frameworks/base.git\;a=blob_plain\;f=data/fonts
-MS_DISTFILES=	DroidSans-Bold.ttf \
-		DroidSans.ttf \
-		DroidSansArabic.ttf \
-		DroidSansFallback.ttf \
-		DroidSansFallbackLegacy.ttf \
-		DroidSansHebrew.ttf \
-		DroidSansJapanese.ttf \
-		DroidSansMono.ttf \
-		DroidSansThai.ttf \
-		DroidSerif-Bold.ttf \
-		DroidSerif-BoldItalic.ttf \
-		DroidSerif-Italic.ttf \
-		DroidSerif-Regular.ttf \
-		NOTICE
+MS_DISTFILES=	fonts.tar.gz
+MS_FONTS=	${WRKSRC}/.ms-fonts
+MS_MASTER_SITE=	https://android.googlesource.com/platform/frameworks/base/+archive/master/data/
+MS_PLIST=	${WRKSRC}/.ms-pkg-plist
+MS_VERSION?=	${PORTVERSION}
+MS_WRKSRC=	${WRKSRC}/tmp
 
-.if defined(MS_VERSION)
 maketar: do-clean extract
-	${MKDIR} ${MS_WRKSRC}
-.for distfile in ${MS_DISTFILES}
-	${FETCH_CMD} -o ${MS_WRKSRC}/${distfile} ${MS_MASTER_SITE}/${distfile}
-.endfor
-	cd ${WRKSRC}/ && ${TAR} -jcf ${PORTNAME}-${MS_VERSION}.tar.bz2 ${PORTNAME}-${MS_VERSION}/
+	${MKDIR} ${MS_WRKSRC}/ ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}/
+	${FETCH_CMD} -o ${MS_WRKSRC}/${MS_DISTFILES} ${MS_MASTER_SITE}${MS_DISTFILES}
+	${TAR} -x -C ${MS_WRKSRC}/ -f ${MS_WRKSRC}/${MS_DISTFILES}
+	${LS} ${MS_WRKSRC}/Droid*.ttf | ${SED} 's|${MS_WRKSRC}/||' > ${MS_FONTS}
+	${MV} ${MS_WRKSRC}/Droid*.ttf ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}/
+	${TAR} -Jc -C ${MS_WRKSRC}/ -f ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${PORTNAME}-${MS_VERSION}/
+	sudo ${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/
 	${SED} -i '' -e 's|${PORTVERSION}|${MS_VERSION}|' ${.CURDIR}/Makefile
-	${INSTALL} -m 644 ${WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.bz2 ${DISTDIR}/
 	cd ${.CURDIR}/ && ${MAKE} makesum
 	${ECHO_MSG} '*** Update from ${PORTVERSION} to ${MS_VERSION} ***'
-.endif
+# genplist
+	${SED} 's|^|%%FONTDIR%%/|' ${MS_FONTS} > ${MS_PLIST}
+	${ECHO_CMD} "%%FONTDIR%%/fonts.dir" >> ${MS_PLIST}
+	${ECHO_CMD} "%%FONTDIR%%/fonts.scale" >> ${MS_PLIST}
+	${ECHO_CMD} "@dirrm %%FONTDIR%%" >> ${MS_PLIST}
+	${INSTALL} -m 600 ${MS_PLIST} ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/droid-fonts-ttf/distinfo b/x11-fonts/droid-fonts-ttf/distinfo
index 009e7096349c..ec7a0fc46da9 100644
--- a/x11-fonts/droid-fonts-ttf/distinfo
+++ b/x11-fonts/droid-fonts-ttf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (droid-fonts-ttf-20110324.tar.bz2) = b0f1d49970aa92583e0c7da183518a2a99b3f946a7fc14cf52f15689a5316ad5
-SIZE (droid-fonts-ttf-20110324.tar.bz2) = 4282894
+SHA256 (droid-fonts-ttf-20131024.tar.xz) = fac4706130b6446839fc4f451dfac411fd87c7aa3bc48b544b8b368d9601efdd
+SIZE (droid-fonts-ttf-20131024.tar.xz) = 3652408
diff --git a/x11-fonts/droid-fonts-ttf/pkg-plist b/x11-fonts/droid-fonts-ttf/pkg-plist
index e90fde999a13..a9f05cf0d878 100644
--- a/x11-fonts/droid-fonts-ttf/pkg-plist
+++ b/x11-fonts/droid-fonts-ttf/pkg-plist
@@ -1,17 +1,26 @@
+%%FONTDIR%%/DroidKufi-Bold.ttf
+%%FONTDIR%%/DroidKufi-Regular.ttf
+%%FONTDIR%%/DroidNaskh-Bold.ttf
+%%FONTDIR%%/DroidNaskh-Regular.ttf
+%%FONTDIR%%/DroidNaskhUI-Regular.ttf
 %%FONTDIR%%/DroidSans-Bold.ttf
 %%FONTDIR%%/DroidSans.ttf
 %%FONTDIR%%/DroidSansArabic.ttf
+%%FONTDIR%%/DroidSansArmenian.ttf
+%%FONTDIR%%/DroidSansEthiopic-Bold.ttf
+%%FONTDIR%%/DroidSansEthiopic-Regular.ttf
 %%FONTDIR%%/DroidSansFallback.ttf
+%%FONTDIR%%/DroidSansFallbackFull.ttf
 %%FONTDIR%%/DroidSansFallbackLegacy.ttf
-%%FONTDIR%%/DroidSansHebrew.ttf
+%%FONTDIR%%/DroidSansGeorgian.ttf
+%%FONTDIR%%/DroidSansHebrew-Bold.ttf
+%%FONTDIR%%/DroidSansHebrew-Regular.ttf
 %%FONTDIR%%/DroidSansJapanese.ttf
 %%FONTDIR%%/DroidSansMono.ttf
-%%FONTDIR%%/DroidSansThai.ttf
 %%FONTDIR%%/DroidSerif-Bold.ttf
 %%FONTDIR%%/DroidSerif-BoldItalic.ttf
 %%FONTDIR%%/DroidSerif-Italic.ttf
 %%FONTDIR%%/DroidSerif-Regular.ttf
 %%FONTDIR%%/fonts.dir
 %%FONTDIR%%/fonts.scale
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTDIR%%