Update thaixfonts to 1.2.4.

2003-01-13  Theppitak Karoonboonyanan <thep@linux.thai.net>

	* Makefile.am:
	Use install-data-hook instead of install-data-local target,
	and uninstall-hook instead of uninstall-local as well.

	* thaixfonts.spec.in:
	Fix "%install" mess in new rpmbuild version.

2002-03-30  Theppitak Karoonboonyanan <thep@links.nectec.or.th>

	* thaixfonts.spec.in:
	Add Prereq: section, for proper order of installation via apt.
	(Thanks to Sadit)

2002-02-23  Theppitak Karoonboonyanan <thep@links.nectec.or.th>

	* phaisarn/angsana*.bdf:
	Relocate extra chars into 8-bit range.

	* thai.alias:
	Fix thai.alias according to recent changes in PtThaiSmall.bdf
	and PtSanSerif.bdf

	* thaixfonts.spec.in:
	Check-in changes made to RPM spec during TLE 4.1 development.
	(Mainly: automatically generate fonts.alias from alias files
	stored in /etc/X11/fonts [borrowed from debian] instead of
	trying to merge old and new fonts.alias, which would otherwise
	cause problem with RPM scriptlet execution order)

	* phaisarn/PtBrowallia12.bdf:
	Change font size from 12 Px to 16 Px (actual ascent).
	Change spacing from "C" to "P".

	* configure.in:
	Version 1.2.4

2002-02-19  Theppitak Karoonboonyanan <thep@links.nectec.or.th>

	* phaisarn/PtThaiSmall.bdf:
	Fix font size property from 20 px to 14 px, to reflect actual size.
	Change font spacing tag from "C" to "P".

	* phaisarn/PtSanSerif.bdf, phaisarn/PtSanSerifB.bdf:
	Fix font size property from 8 px to 14 px, to reflect actual size.
	Change font spacing tag from "m" to "p".

	* configure.in:
	Version 1.2.3

2002-01-04  Theppitak Karoonboonyanan <thep@links.nectec.or.th>

	* thai.alias:
	Add tis620-0 subsetting aliases for tis620-2 fonts.
	Fix comment sign from # to !

	* configure.in:
	Version 1.2.2

2001-11-25  Theppitak Karoonboonyanan <thep@links.nectec.or.th>

	* thaixfonts.spec.in:
	Fix configure --with-fontdir option. Redefine fontdir to
	/usr/X11R6/lib/X11/fonts/local. Add BuildArch: section.
	Filter out dynamic files from manifest.
	Add fonts.alias manipulation in %post and %postun.

	* Makefile.am:
	Add thai.alias to installation list, for post processing.
	Fix uninstall-local script, to remove dir if empty.

	* Makefile.am, dbthaitext/Makefile.am, etlthai/Makefile.am,
	manop/Makefile.am, nectec/Makefile.am, phaisarn/Makefile.am,
	yenbut/Makefile.am:
	Fix fontdir var: remove $(DESTDIR) from assignment, and use it
	literally in installation scripts instead.

	* configure.in, Makefile.am, poonlap/Makefile.am:
	Add Poonlap's fonts to the package.

	* thai.alias, -poonlap/fonts.alias, -poonlap/fonts.dir:
	Move Poonlap's alias info into thai.alias.

	* thaixfonts.spec.in:
	Update summary to include Poonlap's.
	Fix many typos in scripts.

	* configure.in:
	Version 1.2.1

2001-08-24  Theppitak Karoonboonyanan <thep@links.nectec.or.th>

	* +configure.in, +Makefile.am, +Make.rule,
	+{dbthaitext|etlthai|manop|nectec|phaisarn|yenbut}/Makefile.am :
	Use autoconf/automake to manage package.

	* +AUTHORS, +INSTALL, +NEWS, +README, +COPYING, +ChangeLog :
	Add necessary files for automake.

	* +thaixfonts.spec.in :
	Add RPM spec file into the source tree.

	* +autogen.sh :
	Add autogen.sh script for invoking autotools.

	* Makefile.am, {dbthaitext|etlthai|manop|phaisarn|yenbut}/Makefile.am :
	Add EXTRA_DIST to list source files. Use DESTDIR in fontdir.

4 files changed, 36 insertions, 43 deletions

diff --git a/fonts/thaixfonts/DESCR b/fonts/thaixfonts/DESCR
index 41d545f211c..4f940e6a423 100644
--- a/fonts/thaixfonts/DESCR
+++ b/fonts/thaixfonts/DESCR
@@ -1,11 +1,3 @@
-A collection of Thai fonts for X11.  Includes:
-
-- DBThaiText family
-- DBNarai family
-- Manop's fonts
-- Voradesh fonts
-- Etl Thai
-- Phaisarn's fonts
-- Phaisarn's Linux console fonts (untested)
-
-They use tis-620 encoding. See home page for more info.
+Thai X fonts included here are dbthaitext, Phaisarn's fonts, Manop's fonts,
+Voradej's fonts, NECTEC fonts, and Poonlap's fonts. These fonts were
+collected from Internet and they are free.
diff --git a/fonts/thaixfonts/Makefile b/fonts/thaixfonts/Makefile
index 35390d02df9..6d8dd19a41c 100644
--- a/fonts/thaixfonts/Makefile
+++ b/fonts/thaixfonts/Makefile
@@ -1,37 +1,27 @@
-# $NetBSD: Makefile,v 1.4 2008/05/11 05:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.5 2008/08/10 09:47:05 obache Exp $
 #
 
-DISTNAME=	thaixfonts-1.1-3.noarch
-PKGNAME=	thaixfonts-1.1.3
+DISTNAME=	thaixfonts-1.2.4
 CATEGORIES=	fonts x11
-MASTER_SITES=	http://www.fedu.uec.ac.jp/ZzzThai/linux/redhat/RPMS/noarch/
-EXTRACT_SUFX=	.rpm
+MASTER_SITES=	http://linux.thai.net/pub/thailinux/software/thaixfonts/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fedu.uec.ac.jp/ZzzThai/fonts.html
-COMMENT=	Various X11 Thai fonts in tis-620 encoding
-
-BUILD_DEPENDS+=	rpm-[0-9]*:../../misc/rpm
+HOMEPAGE=	http://linux.thai.net/projects/thaixfonts
+COMMENT=	The collection of Thai X fonts
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_X11BASE=	yes
+USE_TOOLS+=	automake gmake bdftopcf gzip mkfontdir
+GNU_CONFIGURE=	yes
 
-MAKE_ENV+=	FONTDIR=${FONTDIR}
-
-FONTDIR=	${PREFIX}/lib/X11/fonts/thaixfonts/
-INSTALLATION_DIRS=	${FONTDIR}
-
-WRKSRC=		${WRKDIR}/usr/share/fonts/TIS-620/misc/
-
-NO_BUILD=	yes
-NO_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--with-fontdir=${FONTDIR}
 
-do-extract:
-	cd ${WRKDIR} && rpm2cpio ${_DISTDIR}/${DISTFILES} | \
-		cpio -i --make-directories \*
+FONTDIR=		${PREFIX}/lib/X11/fonts/thaixfonts
+FONTS_DIRS.x11+=        ${FONTDIR}
+OWN_DIRS=		${FONTDIR}
 
-do-install:
-	cd ${WRKSRC} && ${INSTALL_DATA} *.gz fonts.* ${DESTDIR}${FONTDIR}
+pre-configure:
+		cd ${WRKSRC} && sh autogen.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/thaixfonts/PLIST b/fonts/thaixfonts/PLIST
index dc6e70b26b6..c1a6820a2d2 100644
--- a/fonts/thaixfonts/PLIST
+++ b/fonts/thaixfonts/PLIST
@@ -1,13 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/03 15:33:12 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/08/10 09:47:05 obache Exp $
 lib/X11/fonts/thaixfonts/Phaisarn97-14.pcf.gz
 lib/X11/fonts/thaixfonts/PnThai.pcf.gz
-lib/X11/fonts/thaixfonts/PsMule.pcf.gz
 lib/X11/fonts/thaixfonts/PsThai.pcf.gz
 lib/X11/fonts/thaixfonts/PtBrowallia12.pcf.gz
 lib/X11/fonts/thaixfonts/PtCUFont.pcf.gz
 lib/X11/fonts/thaixfonts/PtFixed.pcf.gz
 lib/X11/fonts/thaixfonts/PtHelvB12.pcf.gz
-lib/X11/fonts/thaixfonts/PtKMFont.pcf.gz
 lib/X11/fonts/thaixfonts/PtLight.pcf.gz
 lib/X11/fonts/thaixfonts/PtMule.pcf.gz
 lib/X11/fonts/thaixfonts/PtRamaFont.pcf.gz
@@ -83,15 +81,28 @@ lib/X11/fonts/thaixfonts/etl16-thai.pcf.gz
 lib/X11/fonts/thaixfonts/etl24-thai.pcf.gz
 lib/X11/fonts/thaixfonts/fonts.alias
 lib/X11/fonts/thaixfonts/fonts.dir
+lib/X11/fonts/thaixfonts/pvemacs_20b.pcf.gz
+lib/X11/fonts/thaixfonts/pvemacs_20bi.pcf.gz
+lib/X11/fonts/thaixfonts/pvemacs_20i.pcf.gz
+lib/X11/fonts/thaixfonts/pvemacs_20r.pcf.gz
+lib/X11/fonts/thaixfonts/pvemacs_8r.pcf.gz
+lib/X11/fonts/thaixfonts/pvfixed_20b.pcf.gz
+lib/X11/fonts/thaixfonts/pvfixed_20bi.pcf.gz
+lib/X11/fonts/thaixfonts/pvfixed_20i.pcf.gz
+lib/X11/fonts/thaixfonts/pvfixed_20r.pcf.gz
+lib/X11/fonts/thaixfonts/pvfixed_8r.pcf.gz
+lib/X11/fonts/thaixfonts/thai.alias
 lib/X11/fonts/thaixfonts/thai18.pcf.gz
+lib/X11/fonts/thaixfonts/thai18_emacs.pcf.gz
 lib/X11/fonts/thaixfonts/thai18b.pcf.gz
+lib/X11/fonts/thaixfonts/thai18b_emacs.pcf.gz
 lib/X11/fonts/thaixfonts/thai18bi.pcf.gz
+lib/X11/fonts/thaixfonts/thai18bi_emacs.pcf.gz
 lib/X11/fonts/thaixfonts/thai18i.pcf.gz
+lib/X11/fonts/thaixfonts/thai18i_emacs.pcf.gz
 lib/X11/fonts/thaixfonts/thai6x14.pcf.gz
 lib/X11/fonts/thaixfonts/thai7x18.pcf.gz
 lib/X11/fonts/thaixfonts/thai8x13.pcf.gz
 lib/X11/fonts/thaixfonts/thai8x16.pcf.gz
 lib/X11/fonts/thaixfonts/thai8x20.pcf.gz
-lib/X11/fonts/thaixfonts/thai8x20nz.pcf.gz
 lib/X11/fonts/thaixfonts/thai9x13.pcf.gz
-@dirrm lib/X11/fonts/thaixfonts
diff --git a/fonts/thaixfonts/distinfo b/fonts/thaixfonts/distinfo
index 6daae628d8d..703d73e9970 100644
--- a/fonts/thaixfonts/distinfo
+++ b/fonts/thaixfonts/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/03 15:33:12 rillig Exp $
+$NetBSD: distinfo,v 1.2 2008/08/10 09:47:05 obache Exp $
 
-SHA1 (thaixfonts-1.1-3.noarch.rpm) = 1ea9dbabfbac831d1e11a9ea34902f9efa1efa6c
-RMD160 (thaixfonts-1.1-3.noarch.rpm) = 561491a2be704e24ee64dbc50c4e2a3e43f89c54
-Size (thaixfonts-1.1-3.noarch.rpm) = 526546 bytes
+SHA1 (thaixfonts-1.2.4.tar.gz) = 64d18e601edc0dc5cc5c510a2cc60fb30d96ab14
+RMD160 (thaixfonts-1.2.4.tar.gz) = 8b58c9f5f65d94b3bb3ce2b1f85c0357996ac807
+Size (thaixfonts-1.2.4.tar.gz) = 472592 bytes