From 3fa7525efe78486bc3b3e6fe694f932e46803e02 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 25 Nov 2015 12:53:09 +0000 Subject: Remove mk/find-prefix.mk usage from the print category. The find-prefix infrastructure was required in a pkgviews world where packages installed from pkgsrc could have different installation prefixes, and this was a way for a dependency prefix to be determined. Now that pkgviews has been removed there is no longer any need for the overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the dependency is coming from pkgsrc. Provides a reasonable performance win due to the reduction of `pkg_info -qp` calls, some of which were redundant anyway as they were duplicating the same information provided by BUILDLINK_PREFIX.pkg. --- print/dvipsk/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'print/dvipsk') diff --git a/print/dvipsk/Makefile b/print/dvipsk/Makefile index 98c67957242..a77b114e406 100644 --- a/print/dvipsk/Makefile +++ b/print/dvipsk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2015/06/14 12:50:00 markd Exp $ +# $NetBSD: Makefile,v 1.14 2015/11/25 12:53:09 jperkin Exp $ DISTNAME= texlive-20150521-source PKGNAME= dvipsk-5.995 @@ -41,22 +41,18 @@ INSTALLATION_DIRS+= share/examples/dvipsk TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf-dist -FIND_PREFIX:= TEX_DVIPS_PREFIX=tex-dvips \ - TEXCONFIG_PREFIX=tex-texconfig -.include "../../mk/find-prefix.mk" - BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1 .include "../../print/kpathsea/buildlink3.mk" .include "../../print/kpathsea/texmf.mk" post-build: ${MKDIR} -p ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config - ${CP} ${TEX_DVIPS_PREFIX}/share/texmf-dist/dvips/config/config.ps \ + ${CP} ${LOCALBASE}/share/texmf-dist/dvips/config/config.ps \ ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config - env TEXMFCONFIG=${TEX_DVIPS_PREFIX}/share/texmf-dist \ + env TEXMFCONFIG=${LOCALBASE}/share/texmf-dist \ TFC_TEXMFCONFIG=${WRKSRC}/texk/dvipsk/texmf \ configPsFile=${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config/config.ps \ - ${TEXCONFIG_PREFIX}/bin/texconfig dvips paper ${LOWER_PAPERSIZE} + ${LOCALBASE}/bin/texconfig dvips paper ${LOWER_PAPERSIZE} post-install: ${INSTALL_DATA} ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config/config.ps \ -- cgit v1.2.3