diff options
author | jperkin <jperkin> | 2015-11-25 12:50:14 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2015-11-25 12:50:14 +0000 |
commit | 1a12761eacb56ee78a09a4843ffa810fcfc3df3f (patch) | |
tree | ff8c89c0e5a6cb37e365121fda62ea1484c63fe7 | |
parent | 693cd3043a2001e25e33ce6162b2a34ac605c886 (diff) | |
download | pkgsrc-1a12761eacb56ee78a09a4843ffa810fcfc3df3f.tar.gz |
Remove mk/find-prefix.mk usage from the fonts 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.
-rw-r--r-- | fonts/ms-ttf/Makefile | 6 | ||||
-rw-r--r-- | fonts/ricty-ttf/Makefile | 12 | ||||
-rw-r--r-- | fonts/vfontcap-kochi/Makefile | 6 |
3 files changed, 8 insertions, 16 deletions
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile index 2fa39931d34..ebe3c5a3fff 100644 --- a/fonts/ms-ttf/Makefile +++ b/fonts/ms-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:33 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2015/11/25 12:50:14 jperkin Exp $ DISTNAME= # empty PKGNAME= ms-ttf-20020306 @@ -26,9 +26,7 @@ NO_CONFIGURE= yes NO_BUILD= yes DIST_SUBDIR= ms-ttf -EVAL_PREFIX+= CABEXTRACT_PREFIX=cabextract -CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE} -EXTRACT_CMD= ${CABEXTRACT_PREFIX}/bin/cabextract -q $${extract_file} +EXTRACT_CMD= ${LOCALBASE}/bin/cabextract -q $${extract_file} FONTDIR= ${PREFIX}/share/fonts/X11/TTF DOCDIR= ${PREFIX}/share/doc/ms-ttf FONTS_DIRS.ttf= ${FONTDIR} diff --git a/fonts/ricty-ttf/Makefile b/fonts/ricty-ttf/Makefile index 83dc7a11c4c..8c7dfd06fca 100644 --- a/fonts/ricty-ttf/Makefile +++ b/fonts/ricty-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:33 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2015/11/25 12:50:14 jperkin Exp $ DISTNAME= Ricty-3.2.4 PKGNAME= ${DISTNAME:S/Ricty/ricty-ttf/} @@ -37,17 +37,13 @@ INSTALL_FONTS= Ricty-Bold.ttf \ USE_LANGUAGES= # none -FIND_PREFIX:= INCONSOLATADIR=inconsolata-ttf -FIND_PREFIX+= MIGUDIR=migu-ttf -.include "../../mk/find-prefix.mk" - do-build: set -e; \ cd ${WRKSRC}; \ ${BASH} ./ricty_generator.sh \ - ${INCONSOLATADIR}/share/fonts/X11/TTF/Inconsolata.otf \ - ${MIGUDIR}/share/fonts/X11/TTF/migu-1m-regular.ttf \ - ${MIGUDIR}/share/fonts/X11/TTF/migu-1m-bold.ttf + ${LOCALBASE}/share/fonts/X11/TTF/Inconsolata.otf \ + ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-regular.ttf \ + ${LOCALBASE}/share/fonts/X11/TTF/migu-1m-bold.ttf post-build: set -e; \ diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile index aa79fb8e356..aab60d3e023 100644 --- a/fonts/vfontcap-kochi/Makefile +++ b/fonts/vfontcap-kochi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/06/01 16:37:16 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2015/11/25 12:50:15 jperkin Exp $ DISTNAME= vfontcap-kochi-0.0 PKGREVISION= 4 @@ -15,8 +15,6 @@ DEPENDS+= kochi-ttf-[0-9]*:../../fonts/kochi-ttf WRKSRC= ${WRKDIR} NO_BUILD= yes -EVAL_PREFIX+= KOCHI_TTF_PREFIX=kochi-ttf - VFONTCAPDIR= share/VFlib/2.24.2 FILES_SUBST+= VFONTCAPDIR=${VFONTCAPDIR} MESSAGE_SUBST+= VFONTCAPDIR=${VFONTCAPDIR} @@ -25,7 +23,7 @@ PLIST_SUBST+= VFONTCAPDIR=${VFONTCAPDIR} INSTALLATION_DIRS= ${VFONTCAPDIR} do-configure: - ${SED} -e "s,@KOCHI_TTF_PREFIX@,${KOCHI_TTF_PREFIX},g" \ + ${SED} -e "s,@KOCHI_TTF_PREFIX@,${LOCALBASE},g" \ ${FILESDIR}/vfontcap > ${WRKSRC}/vfontcap do-install: |