From bf790c6d0c39e9ffb3011753e21db8a5da504d75 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Sat, 16 Jan 2010 03:35:41 +0000
Subject: Update ps2pkm to the version in TeX Live 2009.

The version number remains the same, but bump PKGREIVISION as
precaution.
---
 fonts/ps2pkm/Makefile         | 26 +++++++++-----------------
 fonts/ps2pkm/distinfo         |  8 ++++----
 fonts/ps2pkm/patches/patch-aa | 18 ------------------
 3 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 fonts/ps2pkm/patches/patch-aa

(limited to 'fonts')

diff --git a/fonts/ps2pkm/Makefile b/fonts/ps2pkm/Makefile
index a370635090e..f62c40b5ff8 100644
--- a/fonts/ps2pkm/Makefile
+++ b/fonts/ps2pkm/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/07/26 23:50:00 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/16 03:35:41 minskim Exp $
 
-DISTNAME=	texlive-20080816-source
+DISTNAME=	texlive-20091011-source
 PKGNAME=	ps2pkm-1.5
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX=	.tar.lzma
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
@@ -12,27 +13,18 @@ COMMENT=	Tool to convert PostSCript fonts into TeX PK fonts
 
 CONFLICTS+=	teTeX-bin<=3.0nb34
 
-EXTRACT_ELEMENTS=	${DISTNAME}/texk/ps2pkm \
-			${DISTNAME}/texk/make \
-			${DISTNAME}/texk/install.sh \
-			${DISTNAME}/texk/mkinstalldirs
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/texk/ps2pkm
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-INFO_FILES=	yes
 USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ps2pkm
 
-MAKE_ENV+=	KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
-MAKE_FLAGS+=	LIBTOOL=${LIBTOOL:Q} \
-		kpathsea_parent=${BUILDLINK_PREFIX.kpathsea}/include \
-		kpathsea_srcdir=${BUILDLINK_PREFIX.kpathsea}/include/kpathsea \
-		kpathsea=${BUILDLINK_PREFIX.kpathsea}/lib/libkpathsea.la
-
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
-			infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} \
-			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--with-system-kpathsea \
+		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
 
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ps2pkm/distinfo b/fonts/ps2pkm/distinfo
index a65385a00c7..bb0844f3a63 100644
--- a/fonts/ps2pkm/distinfo
+++ b/fonts/ps2pkm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/26 23:50:00 minskim Exp $
+$NetBSD: distinfo,v 1.2 2010/01/16 03:35:41 minskim Exp $
 
-SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
-RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
-Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
 SHA1 (patch-aa) = f31335697dcc264eb1ff4fd640ade0a63d49a403
diff --git a/fonts/ps2pkm/patches/patch-aa b/fonts/ps2pkm/patches/patch-aa
deleted file mode 100644
index f9dad6b1c53..00000000000
--- a/fonts/ps2pkm/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/07/26 23:50:00 minskim Exp $
-
---- Makefile.in.orig	2008-02-01 03:23:16.000000000 -0800
-+++ Makefile.in
-@@ -30,8 +30,6 @@ pfb2pfa: $(kpathsea) $(pfb2pfaobjs)
- mag: $(kpathsea) $(magobjs)
- 	$(kpathsea_link) $(magobjs) $(LOADLIBES)
- 
--kpse_include ../make/tkpathsea.mk
--
- install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
- 
-@@ -61,4 +59,3 @@ info dvi check:
- 
- kpse_include ../make/clean.mk
- kpse_include ../make/rdepend.mk
--kpse_include depend.mk
-- 
cgit v1.2.3