Update fonts/ttf-tlwg to ttf-tlwg-0.6.1, patches based from Benedek Gergely

via pkgsrc-users@.

Changes:
* New font: Laksaman (Sarabun derivative).
* Split fontconfig files to allow individual fonts installation.
* LaTeX options for setting default fonts.

3 files changed, 33 insertions, 21 deletions

diff --git a/fonts/ttf-tlwg/Makefile b/fonts/ttf-tlwg/Makefile
index f28f121c0a9..af7584d0378 100644
--- a/fonts/ttf-tlwg/Makefile
+++ b/fonts/ttf-tlwg/Makefile
@@ -1,29 +1,23 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 16:35:37 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/17 18:09:07 leot Exp $
 
-DISTNAME=	ttf-tlwg-0.6.0
-PKGREVISION=	1
+DISTNAME=	ttf-tlwg-0.6.1
 CATEGORIES=	fonts
-MASTER_SITES=	ftp://linux.thai.net/pub/thailinux/software/thai-ttf/
+MASTER_SITES=	ftp://linux.thai.net/pub/thailinux/software/thai-ttf/ \
+		http://linux.thai.net/pub/thailinux/software/thai-ttf/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://linux.thai.net/projects/thaifonts-scalable
 COMMENT=	Thai fonts in TTF format
-#LICENSE=	# TODO: (see mk/license.mk)
+LICENSE=	gnu-gpl-v2 AND vera-ttf-license
 
 USE_LANGUAGES=	# none
+NO_BUILD=	yes
 
-FONTDIR=	${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf= ${FONTDIR}
-PKG_SYSCONFSUBDIR=	fontconfig
-CONF_FILES=	${PREFIX}/share/fontconfig/conf.avail/64-ttf-thai-tlwg.conf \
-		${PKG_SYSCONFDIR}/conf.d/64-ttf-thai-tlwg.conf
-CONF_FILES+=	${PREFIX}/share/fontconfig/conf.avail/89-ttf-thai-tlwg-synthetic.conf \
-		${PKG_SYSCONFDIR}/conf.d/89-ttf-thai-tlwg-synthetic.conf
+FONTDIR=		${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf=		${FONTDIR}
 INSTALLATION_DIRS=	${FONTDIR} share/fontconfig/conf.avail
 
-do-build:
-
 do-install:
 	cd ${WRKSRC} && for f in *.ttf ; do \
 		${INSTALL_DATA} $$f ${DESTDIR}${FONTDIR}/$$f; \
diff --git a/fonts/ttf-tlwg/PLIST b/fonts/ttf-tlwg/PLIST
index 6c628a02998..23a560b0f81 100644
--- a/fonts/ttf-tlwg/PLIST
+++ b/fonts/ttf-tlwg/PLIST
@@ -1,4 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2014/06/01 16:35:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/08/17 18:09:07 leot Exp $
+share/fontconfig/conf.avail/64-01-tlwg-kinnari.conf
+share/fontconfig/conf.avail/64-02-tlwg-norasi.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
+share/fontconfig/conf.avail/64-21-tlwg-typo.conf
+share/fontconfig/conf.avail/64-22-tlwg-typist.conf
+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
@@ -9,6 +25,10 @@ share/fonts/X11/TTF/Kinnari-BoldOblique.ttf
 share/fonts/X11/TTF/Kinnari-Italic.ttf
 share/fonts/X11/TTF/Kinnari-Oblique.ttf
 share/fonts/X11/TTF/Kinnari.ttf
+share/fonts/X11/TTF/Laksaman-Bold.ttf
+share/fonts/X11/TTF/Laksaman-BoldItalic.ttf
+share/fonts/X11/TTF/Laksaman-Italic.ttf
+share/fonts/X11/TTF/Laksaman.ttf
 share/fonts/X11/TTF/Loma-Bold.ttf
 share/fonts/X11/TTF/Loma-BoldOblique.ttf
 share/fonts/X11/TTF/Loma-Oblique.ttf
@@ -53,5 +73,3 @@ share/fonts/X11/TTF/Waree-Bold.ttf
 share/fonts/X11/TTF/Waree-BoldOblique.ttf
 share/fonts/X11/TTF/Waree-Oblique.ttf
 share/fonts/X11/TTF/Waree.ttf
-share/fontconfig/conf.avail/64-ttf-thai-tlwg.conf
-share/fontconfig/conf.avail/89-ttf-thai-tlwg-synthetic.conf
diff --git a/fonts/ttf-tlwg/distinfo b/fonts/ttf-tlwg/distinfo
index 509420f1fbd..31af46a9812 100644
--- a/fonts/ttf-tlwg/distinfo
+++ b/fonts/ttf-tlwg/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/03/31 08:11:14 wiz Exp $
+$NetBSD: distinfo,v 1.2 2015/08/17 18:09:07 leot Exp $
 
-SHA1 (ttf-tlwg-0.6.0.tar.xz) = 54858c350b1339d0db2a18c5ba7f47658c96040d
-RMD160 (ttf-tlwg-0.6.0.tar.xz) = 9000ce9f3cd4f63b825c2026a0934d9571a57b24
-Size (ttf-tlwg-0.6.0.tar.xz) = 1775996 bytes
+SHA1 (ttf-tlwg-0.6.1.tar.xz) = 975bb4fb87ef52598519a6aba21bcf694d3901ff
+RMD160 (ttf-tlwg-0.6.1.tar.xz) = 717ecb59b990e242ca7d1e47d1be3c38f5090452
+Size (ttf-tlwg-0.6.1.tar.xz) = 1931628 bytes