From 3cec767c10dc93a8ff8dae9b4b4414ed7f6ba4c5 Mon Sep 17 00:00:00 2001 From: minskim Date: Sat, 16 Jan 2010 03:33:54 +0000 Subject: Update gsftopkk to the version in TeX Live 2009. - Use an absolute path to gs instead of relying on PATH. --- fonts/gsftopkk/Makefile | 32 +++++++++++--------------------- fonts/gsftopkk/distinfo | 10 +++++----- fonts/gsftopkk/patches/patch-aa | 18 ------------------ fonts/gsftopkk/patches/patch-ab | 13 +++++++++++++ 4 files changed, 29 insertions(+), 44 deletions(-) delete mode 100644 fonts/gsftopkk/patches/patch-aa create mode 100644 fonts/gsftopkk/patches/patch-ab (limited to 'fonts/gsftopkk') diff --git a/fonts/gsftopkk/Makefile b/fonts/gsftopkk/Makefile index 9416057f81e..fc87fc5e775 100644 --- a/fonts/gsftopkk/Makefile +++ b/fonts/gsftopkk/Makefile @@ -1,43 +1,33 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/07/26 23:41:25 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2010/01/16 03:33:54 minskim Exp $ -DISTNAME= texlive-20080816-source +DISTNAME= texlive-20091011-source PKGNAME= gsftopkk-1.19.2 +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://math.berkeley.edu/~vojta/gsftopk.html COMMENT= Tool to convert bitmaps to .pk format CONFLICTS+= teTeX-bin<=3.0nb34 -DEPENDS+= ghostscript>=2.5.2:../../print/ghostscript -EXTRACT_ELEMENTS= ${DISTNAME}/texk/gsftopk \ - ${DISTNAME}/texk/make \ - ${DISTNAME}/texk/install.sh \ - ${DISTNAME}/texk/mkinstalldirs +EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ + ${DISTNAME}/texk/gsftopk PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes INFO_FILES= yes USE_LIBTOOL= yes +USE_TOOLS+= gs:run WRKSRC= ${WRKDIR}/${DISTNAME}/texk/gsftopk -FIND_PREFIX:= GHOSTSCRIPT_PREFIX=ghostscript -.include "../../mk/find-prefix.mk" - -MAKE_ENV+= XCFLAGS="-DGS_PATH='\"${GHOSTSCRIPT_PREFIX}/bin/gs\"'" -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 +CPPFLAGS+= -DGS_PATH='"${TOOLS_PATH.gs}"' TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf diff --git a/fonts/gsftopkk/distinfo b/fonts/gsftopkk/distinfo index aba358cada3..f3175680c87 100644 --- a/fonts/gsftopkk/distinfo +++ b/fonts/gsftopkk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/07/26 23:41:25 minskim Exp $ +$NetBSD: distinfo,v 1.2 2010/01/16 03:33:54 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 (patch-aa) = 9970aed4ecb8e42df31cafe9767013d37e0ea028 +SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d +RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9 +Size (texlive-20091011-source.tar.xz) = 29683728 bytes +SHA1 (patch-ab) = 0514214408c63e26c9ccaf840331549048ada5b0 diff --git a/fonts/gsftopkk/patches/patch-aa b/fonts/gsftopkk/patches/patch-aa deleted file mode 100644 index aabe797d014..00000000000 --- a/fonts/gsftopkk/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/07/26 23:41:25 minskim Exp $ - ---- Makefile.in.orig 2008-02-01 03:23:16.000000000 -0800 -+++ Makefile.in -@@ -23,8 +23,6 @@ objects = gsftopk.o - $(program): $(kpathsea) $(objects) - $(kpathsea_link) $(objects) $(LOADLIBES) - --kpse_include ../make/tkpathsea.mk -- - gsftopk.1: gsftopk1.sed sedscript - sed -f sedscript <$(srcdir)/gsftopk1.sed >$@ - -@@ -61,4 +59,3 @@ kpse_include ../make/config.mk - info dvi check: - - kpse_include ../make/rdepend.mk --kpse_include depend.mk diff --git a/fonts/gsftopkk/patches/patch-ab b/fonts/gsftopkk/patches/patch-ab new file mode 100644 index 00000000000..8745d751405 --- /dev/null +++ b/fonts/gsftopkk/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2010/01/16 03:33:54 minskim Exp $ + +--- Makefile.in.orig 2009-06-22 00:25:39.000000000 -0700 ++++ Makefile.in +@@ -256,7 +256,7 @@ gsftopk_SOURCES = \ + gsftopk_DEPENDENCIES = $(KPATHSEA_DEPEND) + LDADD = $(KPATHSEA_LIBS) + dist_gsftopkpsheader_DATA = render.ps +-gsftopkpsheaderdir = ${prefix}/texmf/dvips/gsftopk ++gsftopkpsheaderdir = ${prefix}/share/texmf/dvips/gsftopk + nodist_man1_MANS = gsftopk.1 + DISTCLEANFILES = gsftopk.1 sedscript + EXTRA_DIST = gsftopk1.sed mksedscript -- cgit v1.2.3