diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:52:47 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:52:47 +0000 |
| commit | 28ee9f75373d1692f4939d77721417c0e465efe5 (patch) | |
| tree | bd955c333970f80fe7462ea966224339b90b459e /pkgtools | |
| parent | ebc554ea5896e30e8540e081b919fbf5a87653d5 (diff) | |
| download | pkgsrc-28ee9f75373d1692f4939d77721417c0e465efe5.tar.gz | |
Remove mk/find-prefix.mk usage from the pkgtools 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 'pkgtools')
| -rw-r--r-- | pkgtools/autoswc/Makefile | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile index e286f7e4c64..57c8a2e325b 100644 --- a/pkgtools/autoswc/Makefile +++ b/pkgtools/autoswc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/03/03 03:33:18 obache Exp $ +# $NetBSD: Makefile,v 1.22 2015/11/25 12:52:47 jperkin Exp $ PKGNAME= autoswc-1.6 CATEGORIES= pkgtools sysutils @@ -19,13 +19,6 @@ CACHEDIR= /var/db/autoswc MKCONF= /etc/mk.conf OWN_DIRS= ${CACHEDIR} -EVAL_PREFIX+= PREFIX.autoconf=autoconf -PREFIX.autoconf_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= PREFIX.automake=automake -PREFIX.automake_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= PREFIX.libtool=libtool -PREFIX.libtool_DEFAULT= ${LOCALBASE} - SUBST_CLASSES+= build SUBST_MESSAGE.build= Building autoswc. SUBST_STAGE.build= do-build @@ -33,11 +26,11 @@ SUBST_FILES.build= autoswc SUBST_FILES.build+= autoswc.8 SUBST_FILES.build+= autoswc.mk SUBST_FILES.build+= config.site -SUBST_SED.build= -e 's|@ACLOCAL@|${PREFIX.automake}/bin/aclocal|g' -SUBST_SED.build+= -e 's|@AUTOCONF@|${PREFIX.autoconf}/bin/autoconf|g' -SUBST_SED.build+= -e 's|@AUTOMAKE@|${PREFIX.automake}/bin/automake|g' +SUBST_SED.build= -e 's|@ACLOCAL@|${LOCALBASE}/bin/aclocal|g' +SUBST_SED.build+= -e 's|@AUTOCONF@|${LOCALBASE}/bin/autoconf|g' +SUBST_SED.build+= -e 's|@AUTOMAKE@|${LOCALBASE}/bin/automake|g' SUBST_SED.build+= -e 's|@CACHEDIR@|${CACHEDIR}|g' -SUBST_SED.build+= -e 's|@LIBTOOLIZE@|${PREFIX.libtool}/bin/libtoolize|g' +SUBST_SED.build+= -e 's|@LIBTOOLIZE@|${LOCALBASE}/bin/libtoolize|g' SUBST_SED.build+= -e 's|@MACHINE_GNU_PLATFORM@|${MACHINE_GNU_PLATFORM}|g' SUBST_SED.build+= -e 's|@MAKE@|${MAKE}|g' SUBST_SED.build+= -e 's|@MKCONF@|${MKCONF}|g' |