diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:47:32 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:47:32 +0000 |
| commit | f846bf1141fe294eae944f234022576916cbf8e9 (patch) | |
| tree | 3caf68974600f1fce29a923c7122ee85aea03d18 /archivers | |
| parent | d3465025631a4e952c173265be09d9f1d91964cf (diff) | |
| download | pkgsrc-f846bf1141fe294eae944f234022576916cbf8e9.tar.gz | |
Remove mk/find-prefix.mk usage from the archivers 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.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/jamjar/Makefile | 5 | ||||
| -rw-r--r-- | archivers/ruby-xz/Makefile | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/archivers/jamjar/Makefile b/archivers/jamjar/Makefile index 1e21b3f5abe..9e3ad44c53d 100644 --- a/archivers/jamjar/Makefile +++ b/archivers/jamjar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2014/10/09 14:05:52 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2015/11/25 12:47:32 jperkin Exp $ # DISTNAME= jamjar-0.7.1 @@ -13,11 +13,10 @@ BUILD_DEPENDS+= acunia-jam>=1.0:../../devel/acunia-jam WRKSRC= ${WRKDIR}/jamjar -EVAL_PREFIX+= ACUNIA_JAM_PREFIX=acunia-jam JAM_COMMAND= \ cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} \ - ${ACUNIA_JAM_PREFIX}/bin/jam \ + ${LOCALBASE}/bin/jam \ -sPREFIX="${DESTDIR}${PREFIX}" \ -sCFLAGS="${CFLAGS}" diff --git a/archivers/ruby-xz/Makefile b/archivers/ruby-xz/Makefile index 54ce8a05e67..7b14683d9bf 100644 --- a/archivers/ruby-xz/Makefile +++ b/archivers/ruby-xz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2015/05/31 15:21:44 taca Exp $ +# $NetBSD: Makefile,v 1.12 2015/11/25 12:47:32 jperkin Exp $ DISTNAME= ruby-xz-0.2.1 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//} @@ -13,12 +13,10 @@ DEPENDS+= xz-[0-9]*:../../archivers/xz DEPENDS+= ${RUBY_PKGPREFIX}-ffi-[0-9]*:../../devel/ruby-ffi DEPENDS+= ${RUBY_PKGPREFIX}-io-like-[0-9]*:../../devel/ruby-io-like -EVAL_PREFIX+= XZ_PREFIX=xz - SUBST_CLASSES+= path SUBST_STAGE.path= pre-configure SUBST_FILES.path= lib/xz/lib_lzma.rb -SUBST_SED.path= -e "s,@LOCALBASE@,${XZ_PREFIX},g" +SUBST_SED.path+= -e "s,@LOCALBASE@,${LOCALBASE},g" SUBST_SED.path+= -e "s,@SHLIB_EXT@,${RUBY_SLEXT},g" .include "../../lang/ruby/gem.mk" |