Update ttf2pk to 1.5.

Changes:
 * data/ttfonts.map: new version from zhmetrics package.

3 files changed, 23 insertions, 71 deletions

diff --git a/fonts/ttf2pk/DESCR b/fonts/ttf2pk/DESCR
index f2210e74b64..d6059851f1a 100644
--- a/fonts/ttf2pk/DESCR
+++ b/fonts/ttf2pk/DESCR
@@ -1 +1 @@
-ttf2pk/ttf2tfm permit using TrueType fonts with teTeX.
+ttf2pk/ttf2tfm permit using TrueType fonts with TeX Live.
diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile
index ea6b19b20ac..116e4948864 100644
--- a/fonts/ttf2pk/Makefile
+++ b/fonts/ttf2pk/Makefile
@@ -1,59 +1,32 @@
-# $NetBSD: Makefile,v 1.22 2009/06/09 21:31:04 minskim Exp $
-#
+# $NetBSD: Makefile,v 1.23 2010/09/13 04:51:59 minskim Exp $
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-.include "../../graphics/freetype-lib/Makefile.common"
-
-PKGNAME=		ttf2pk-${FT_VERS}
-PKGREVISION=		2
-CATEGORIES=		print
-
-MAINTAINER=		bernhard@SDG.de
-HOMEPAGE=		http://www.freetype.org/
-COMMENT=		TrueType to TeX PK font converter
+DISTNAME=	texlive-20100720-source
+PKGNAME=	ttf2pk-1.5
+CATEGORIES=	fonts print
+MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+EXTRACT_SUFX=	.tar.xz
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=	--with-kpathsea-include=${BUILDLINK_PREFIX.teTeX-bin}/include
-CONFIGURE_ARGS+=	--with-kpathsea-lib=${BUILDLINK_PREFIX.teTeX-bin}/lib
+MAINTAINER=	bernhard@SDG.de
+HOMEPAGE=	http://www.freetype.org/
+COMMENT=	TrueType to TeX PK font converter
 
-T2PSRC=			${WRKSRC}/contrib/ttf2pk
-CONFIGURE_DIRS+=	${T2PSRC}
-BUILD_DIRS=		${T2PSRC}
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/texk/ttf2pk
 
-BUILD_TARGET=		depend all
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LIBTOOL=		yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ttf2pk
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+CONFIGURE_ARGS+=	--with-system-kpathsea \
+		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
+CONFIGURE_ARGS+=	--with-system-freetype \
+		--with-freetype-includes=${BUILDLINK_PREFIX.freetype}/include/freetype \
+		--with-freetype-libdir=${BUILDLINK_PREFIX.freetype}/lib
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
-
-do-install:
-	${INSTALL_PROGRAM}	${T2PSRC}/ttf2pk \
-				${T2PSRC}/ttf2tfm \
-				${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA}		${T2PSRC}/ttf2pk.1 \
-				${T2PSRC}/ttf2tfm.1 \
-				${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR}	${DESTDIR}${PREFIX}/share/texmf-dist/doc/ttf2pk
-	${INSTALL_DATA}		${T2PSRC}/BUGS \
-				${T2PSRC}/README \
-				${T2PSRC}/TODO \
-				${T2PSRC}/ttf2pk.doc \
-				${T2PSRC}/data/ttfonts.map \
-				${DESTDIR}${PREFIX}/share/texmf-dist/doc/ttf2pk
-	${INSTALL_DATA_DIR}	${DESTDIR}${PREFIX}/share/texmf-dist/ttf2tfm
-	${LN} -fs		ttf2tfm \
-				${DESTDIR}${PREFIX}/share/texmf-dist/ttf2pk
-	${INSTALL_DATA_DIR}	${DESTDIR}${PREFIX}/share/texmf-dist/ttf2tfm/base
-	${INSTALL_DATA}		${T2PSRC}/data/*.enc \
-				${T2PSRC}/data/*.rpl \
-				${T2PSRC}/data/*.sfd \
-				${DESTDIR}${PREFIX}/share/texmf-dist/ttf2tfm/base
-	${TOUCH}		${DESTDIR}${PREFIX}/share/texmf-dist/ttf2tfm/base/ttfonts.map
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ttf2pk/PLIST b/fonts/ttf2pk/PLIST
index 1cd57fc7f01..b75b506ce9d 100644
--- a/fonts/ttf2pk/PLIST
+++ b/fonts/ttf2pk/PLIST
@@ -1,26 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:54:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/09/13 04:51:59 minskim Exp $
 bin/ttf2pk
 bin/ttf2tfm
 man/man1/ttf2pk.1
 man/man1/ttf2tfm.1
-share/texmf-dist/doc/ttf2pk/BUGS
-share/texmf-dist/doc/ttf2pk/README
-share/texmf-dist/doc/ttf2pk/TODO
-share/texmf-dist/doc/ttf2pk/ttf2pk.doc
-share/texmf-dist/doc/ttf2pk/ttfonts.map
-share/texmf-dist/ttf2pk
-share/texmf-dist/ttf2tfm/base/Big5.sfd
-share/texmf-dist/ttf2tfm/base/EUC.sfd
-share/texmf-dist/ttf2tfm/base/KS-HLaTeX.sfd
-share/texmf-dist/ttf2tfm/base/SJIS.sfd
-share/texmf-dist/ttf2tfm/base/T1-WGL4.enc
-share/texmf-dist/ttf2tfm/base/UBg5plus.sfd
-share/texmf-dist/ttf2tfm/base/UBig5.sfd
-share/texmf-dist/ttf2tfm/base/UGB.sfd
-share/texmf-dist/ttf2tfm/base/UGBK.sfd
-share/texmf-dist/ttf2tfm/base/UJIS.sfd
-share/texmf-dist/ttf2tfm/base/UKS-HLaTeX.sfd
-share/texmf-dist/ttf2tfm/base/UKS.sfd
-share/texmf-dist/ttf2tfm/base/Unicode.sfd
-share/texmf-dist/ttf2tfm/base/VPS.rpl
-share/texmf-dist/ttf2tfm/base/ttfonts.map