- Change MASTER_SITES to my LOCAL

- Respect PREFIX
- Cleanup Makefile
- Add maintainer section

4 files changed, 53 insertions, 73 deletions

diff --git a/x11-fonts/droid-fonts-ttf/Makefile b/x11-fonts/droid-fonts-ttf/Makefile
index 3582ba5fc483..21e381655220 100644
--- a/x11-fonts/droid-fonts-ttf/Makefile
+++ b/x11-fonts/droid-fonts-ttf/Makefile
@@ -8,64 +8,68 @@
 PORTNAME=	droid-fonts-ttf
 PORTVERSION=	20110324
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://android.git.kernel.org/?p=platform/frameworks/base.git\;a=blob_plain\;f=data/fonts/:droid
-DISTFILES=	DroidSans-Bold.ttf:droid \
-		DroidSans.ttf:droid \
-		DroidSansArabic.ttf:droid \
-		DroidSansFallback.ttf:droid \
-		DroidSansFallbackLegacy.ttf:droid \
-		DroidSansHebrew.ttf:droid \
-		DroidSansJapanese.ttf:droid \
-		DroidSansMono.ttf:droid \
-		DroidSansThai.ttf:droid \
-		DroidSerif-Bold.ttf:droid \
-		DroidSerif-BoldItalic.ttf:droid \
-		DroidSerif-Italic.ttf:droid \
-		DroidSerif-Regular.ttf:droid \
-		NOTICE:droid
+MASTER_SITES=	LOCAL/sunpoet/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	The Droid typeface family
 
 LICENSE=	ASL
-LICENSE_FILE=	${DISTDIR}/NOTICE
+LICENSE_FILE=	${WRKSRC}/NOTICE
 
-BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-NO_WRKSUBDIR=	yes
+USE_BZIP2=	yes
 
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${LOCALBASE}/||}"
-
-SUB_FILES=	pkg-message
+FONTDIR=	lib/X11/fonts/Droid
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB=	FONTDIR=${FONTDIR}
+SUB_FILES=	pkg-message
 SUB_LIST=	FONTDIR=${FONTDIR}
 
-FONTNAME=	Droid
-FONTDIR=	${LOCALBASE}/lib/X11/fonts/${FONTNAME}
-
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
-
-NO_MTREE=	yes
-
-do-extract:
-	@${MKDIR} ${WRKDIR}/ttf
-	@${CP} -p ${DISTDIR}/*.ttf ${WRKDIR}/ttf
-
 do-build:
-	@cd ${WRKDIR}/ttf && \
-		${MKFONTSCL_CMD} && \
-		${MKFONTDIR_CMD}
+	@cd ${WRKSRC}/ && \
+		${LOCALBASE}/bin/mkfontscale && \
+		${LOCALBASE}/bin/mkfontdir
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	@cd ${WRKDIR} && \
-		${INSTALL_DATA} ttf/* ${FONTDIR}
+	${MKDIR} ${PREFIX}/${FONTDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf fonts.* ${PREFIX}/${FONTDIR}/
 
 post-install:
-	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+
+# maintainer section:
+# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=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
+
+.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}/
+	${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
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/droid-fonts-ttf/distinfo b/x11-fonts/droid-fonts-ttf/distinfo
index 5068a49c2aa1..009e7096349c 100644
--- a/x11-fonts/droid-fonts-ttf/distinfo
+++ b/x11-fonts/droid-fonts-ttf/distinfo
@@ -1,28 +1,2 @@
-SHA256 (DroidSans-Bold.ttf) = 2f529a3e60c007979d95d29794c3660694217fb882429fb33919d2245fe969e9
-SIZE (DroidSans-Bold.ttf) = 194488
-SHA256 (DroidSans.ttf) = f51b88945f4c1b236f44b8d55a2d304316869127e95248c435c23f1e4142a7db
-SIZE (DroidSans.ttf) = 190776
-SHA256 (DroidSansArabic.ttf) = 73aeb7f633544fd3129cdb1e855b2f55071e10961319670d4459d5e54e103e7f
-SIZE (DroidSansArabic.ttf) = 35880
-SHA256 (DroidSansFallback.ttf) = f63694f2d0910e2f31d00a818e23b13c8e3a24af04672789c19c1fb1c9da24ce
-SIZE (DroidSansFallback.ttf) = 3725920
-SHA256 (DroidSansFallbackLegacy.ttf) = 82a74d0ef369ec7979172023cfff87f04f0a617a2871c39ef6aeb0f399c5cdaf
-SIZE (DroidSansFallbackLegacy.ttf) = 3081908
-SHA256 (DroidSansHebrew.ttf) = e46a71b7f6c8f0acfe855e854b0cadd709c443ea8b743ea16a42871bd5410961
-SIZE (DroidSansHebrew.ttf) = 23076
-SHA256 (DroidSansJapanese.ttf) = 935867c21b8484c959170e62879460ae9363eae91f9b35e4519d24080e2eac30
-SIZE (DroidSansJapanese.ttf) = 1173140
-SHA256 (DroidSansMono.ttf) = 12b552de765dc1265d64f9f5566649930dde4dba07da0251d9f92801e70a1047
-SIZE (DroidSansMono.ttf) = 119380
-SHA256 (DroidSansThai.ttf) = af9f2f5d833ecfb6f1766f3d5d9f380b6fca8b2c9553515fccc4faa4cc0451d3
-SIZE (DroidSansThai.ttf) = 36028
-SHA256 (DroidSerif-Bold.ttf) = c746c6383a03effbcad6ccb028e4b39e87071ff1a146a24fb2110a23e05776bb
-SIZE (DroidSerif-Bold.ttf) = 185228
-SHA256 (DroidSerif-BoldItalic.ttf) = 1aba99421b31afe890182663270c28bc619f00d8746234da3dda054cd5bf09b0
-SIZE (DroidSerif-BoldItalic.ttf) = 190304
-SHA256 (DroidSerif-Italic.ttf) = 02c0108dea583e393fbcbec39c7093e9a3095a09d65e37fafff9a9b7a89123a4
-SIZE (DroidSerif-Italic.ttf) = 177560
-SHA256 (DroidSerif-Regular.ttf) = ae32140265dbe0dfde24b9abd222be9210a531888f014ff9b2326aba2d6fd777
-SIZE (DroidSerif-Regular.ttf) = 172916
-SHA256 (NOTICE) = 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a
-SIZE (NOTICE) = 10695
+SHA256 (droid-fonts-ttf-20110324.tar.bz2) = b0f1d49970aa92583e0c7da183518a2a99b3f946a7fc14cf52f15689a5316ad5
+SIZE (droid-fonts-ttf-20110324.tar.bz2) = 4282894
diff --git a/x11-fonts/droid-fonts-ttf/files/pkg-message.in b/x11-fonts/droid-fonts-ttf/files/pkg-message.in
index ead8ffccbc39..798a45125c89 100644
--- a/x11-fonts/droid-fonts-ttf/files/pkg-message.in
+++ b/x11-fonts/droid-fonts-ttf/files/pkg-message.in
@@ -1,6 +1,8 @@
+
 You can start using the fonts by following these instructions:
 
-Add the following line to the "Files" section of your x.org configuration
+Add the following line to the "Files" section of your X.org configuration
 file:
 
-	FontPath	"%%FONTDIR%%/"
+	FontPath	"%%PREFIX%%/%%FONTDIR%%/"
+
diff --git a/x11-fonts/droid-fonts-ttf/pkg-descr b/x11-fonts/droid-fonts-ttf/pkg-descr
index 49a2fd1a3324..e9beb3546438 100644
--- a/x11-fonts/droid-fonts-ttf/pkg-descr
+++ b/x11-fonts/droid-fonts-ttf/pkg-descr
@@ -4,4 +4,4 @@ for its Android platform. The goal was to provide optimal quality and
 comfort on a mobile handset when rendered in application menus, web 
 browser and for other screen text.
 
-WWW:	http://www.droidfonts.com/
+WWW: http://www.droidfonts.com/