Update fonts/ttf-tlwg to 0.6.3

Changes from 0.6.2

    The first release from GitHub.
    Drop Tahoma and MS Sans Serif synthesizing, which caused Waree to get
    priority higher than all Thai fonts in fontconfig matching.
    Promote Loma over Waree as sans-serif candidate.
    Narrow down the width of space glyph for Loma.

3 files changed, 37 insertions, 45 deletions

diff --git a/fonts/ttf-tlwg/Makefile b/fonts/ttf-tlwg/Makefile
index f002ccb3964..c591ff6dbed 100644
--- a/fonts/ttf-tlwg/Makefile
+++ b/fonts/ttf-tlwg/Makefile
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2017/01/19 18:52:09 agc Exp $
+# $NetBSD: Makefile,v 1.6 2017/07/07 21:24:59 scole Exp $
 
-DISTNAME=	ttf-tlwg-0.6.1
+DISTNAME=	ttf-tlwg-${TLWG_VERSION}
 CATEGORIES=	fonts
-MASTER_SITES=	ftp://linux.thai.net/pub/thailinux/software/thai-ttf/
-MASTER_SITES+=	http://linux.thai.net/pub/thailinux/software/thai-ttf/
+
+MASTER_SITES=	${MASTER_SITE_GITHUB:=tlwg/}
+GITHUB_PROJECT=	fonts-tlwg
+GITHUB_RELEASE=	v${TLWG_VERSION}
 EXTRACT_SUFX=	.tar.xz
 
+TLWG_VERSION=	0.6.3
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://linux.thai.net/projects/thaifonts-scalable
 COMMENT=	Thai fonts in TTF format
@@ -17,38 +21,28 @@ NO_BUILD=	yes
 FONTDIR=		${PREFIX}/share/fonts/X11/TTF
 FONTS_DIRS.ttf=		${FONTDIR}
 INSTALLATION_DIRS=	${FONTDIR} share/fontconfig/conf.avail
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-01-tlwg-kinnari.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-01-tlwg-kinnari.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-02-tlwg-norasi.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-02-tlwg-norasi.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-11-tlwg-waree.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-11-tlwg-waree.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-12-tlwg-loma.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-12-tlwg-loma.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-13-tlwg-garuda.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-13-tlwg-garuda.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-14-tlwg-umpush.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-14-tlwg-umpush.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-15-laksaman.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-15-laksaman.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-21-tlwg-typo.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-21-tlwg-typo.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-22-tlwg-typist.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-22-tlwg-typist.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/64-23-tlwg-mono.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-23-tlwg-mono.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/89-tlwg-garuda-synthetic.conf \
-		${PKG_SYSCONFDIR}/conf.d/89-tlwg-garuda-synthetic.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/89-tlwg-kinnari-synthetic.conf \
-		${PKG_SYSCONFDIR}/conf.d/89-tlwg-kinnari-synthetic.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/89-tlwg-laksaman-synthetic.conf \
-		${PKG_SYSCONFDIR}/conf.d/89-tlwg-laksaman-synthetic.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/89-tlwg-loma-synthetic.conf \
-		${PKG_SYSCONFDIR}/conf.d/89-tlwg-loma-synthetic.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/89-tlwg-umpush-synthetic.conf \
-		${PKG_SYSCONFDIR}/conf.d/89-tlwg-umpush-synthetic.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/89-tlwg-waree-synthetic.conf \
-		${PKG_SYSCONFDIR}/conf.d/89-tlwg-waree-synthetic.conf
+
+TMPLDIR=	${PREFIX}/share/fontconfig/conf.avail
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/conf.d
+
+TLWG_STDCONF=	64-01-tlwg-kinnari.conf \
+		64-02-tlwg-norasi.conf \
+		64-10-tlwg-loma.conf \
+		64-11-tlwg-waree.conf \
+		64-13-tlwg-garuda.conf \
+		64-14-tlwg-umpush.conf \
+		64-15-laksaman.conf \
+		64-21-tlwg-typo.conf \
+		64-22-tlwg-typist.conf \
+		64-23-tlwg-mono.conf \
+		89-tlwg-garuda-synthetic.conf \
+		89-tlwg-kinnari-synthetic.conf \
+		89-tlwg-laksaman-synthetic.conf \
+		89-tlwg-umpush-synthetic.conf
+
+.for f in ${TLWG_STDCONF}
+CONF_FILES+=	${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f}
+.endfor
 
 do-install:
 	cd ${WRKSRC} && for f in *.ttf ; do \
diff --git a/fonts/ttf-tlwg/PLIST b/fonts/ttf-tlwg/PLIST
index 23a560b0f81..d9a2fae6a4c 100644
--- a/fonts/ttf-tlwg/PLIST
+++ b/fonts/ttf-tlwg/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2015/08/17 18:09:07 leot Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/07/07 21:24:59 scole Exp $
 share/fontconfig/conf.avail/64-01-tlwg-kinnari.conf
 share/fontconfig/conf.avail/64-02-tlwg-norasi.conf
+share/fontconfig/conf.avail/64-10-tlwg-loma.conf
 share/fontconfig/conf.avail/64-11-tlwg-waree.conf
-share/fontconfig/conf.avail/64-12-tlwg-loma.conf
 share/fontconfig/conf.avail/64-13-tlwg-garuda.conf
 share/fontconfig/conf.avail/64-14-tlwg-umpush.conf
 share/fontconfig/conf.avail/64-15-laksaman.conf
@@ -12,9 +12,7 @@ share/fontconfig/conf.avail/64-23-tlwg-mono.conf
 share/fontconfig/conf.avail/89-tlwg-garuda-synthetic.conf
 share/fontconfig/conf.avail/89-tlwg-kinnari-synthetic.conf
 share/fontconfig/conf.avail/89-tlwg-laksaman-synthetic.conf
-share/fontconfig/conf.avail/89-tlwg-loma-synthetic.conf
 share/fontconfig/conf.avail/89-tlwg-umpush-synthetic.conf
-share/fontconfig/conf.avail/89-tlwg-waree-synthetic.conf
 share/fonts/X11/TTF/Garuda-Bold.ttf
 share/fonts/X11/TTF/Garuda-BoldOblique.ttf
 share/fonts/X11/TTF/Garuda-Oblique.ttf
diff --git a/fonts/ttf-tlwg/distinfo b/fonts/ttf-tlwg/distinfo
index 653d0e3fbbc..1df1999a89a 100644
--- a/fonts/ttf-tlwg/distinfo
+++ b/fonts/ttf-tlwg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 20:45:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/07/07 21:24:59 scole Exp $
 
-SHA1 (ttf-tlwg-0.6.1.tar.xz) = 975bb4fb87ef52598519a6aba21bcf694d3901ff
-RMD160 (ttf-tlwg-0.6.1.tar.xz) = 717ecb59b990e242ca7d1e47d1be3c38f5090452
-SHA512 (ttf-tlwg-0.6.1.tar.xz) = 47364c9125509eb115abdaa60eb1f046d5bef694b2b51113e611b1c35c50300d682fc35c71e16ab3d6ffb43f36ba3e77af70019ec050012aebe04d9c0ece544f
-Size (ttf-tlwg-0.6.1.tar.xz) = 1931628 bytes
+SHA1 (ttf-tlwg-0.6.3.tar.xz) = 94649e8ac5dd1152d8d27f49a1c2e7b930ccc447
+RMD160 (ttf-tlwg-0.6.3.tar.xz) = 63e1d797c77307457adeca38de699641b6f87f4a
+SHA512 (ttf-tlwg-0.6.3.tar.xz) = 8b77ed00fef8591ff1bbb07ed43d017986c30e331fa69019fea53208fff93c23cdb1cc8c49d6c7fa6ed4965e9c923f200ed9c52cb819ea89136338677367b776
+Size (ttf-tlwg-0.6.3.tar.xz) = 1961492 bytes