summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin>2015-11-25 12:49:27 +0000
committerjperkin <jperkin>2015-11-25 12:49:27 +0000
commit317af26926bb44211d748e1c291b7db874beffea (patch)
tree87654d5930b0e702ccb36811401cfe615e681364
parentbc6061e2fa05d72f14b6be5e9bb5466a17d69c3a (diff)
downloadpkgsrc-317af26926bb44211d748e1c291b7db874beffea.tar.gz
Remove mk/find-prefix.mk usage from the databases 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--databases/php-mysql/Makefile3
-rw-r--r--databases/py-gdbm/Makefile6
2 files changed, 3 insertions, 6 deletions
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile
index 679c99faa57..b21c0ef8023 100644
--- a/databases/php-mysql/Makefile
+++ b/databases/php-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/08/10 14:19:11 manu Exp $
+# $NetBSD: Makefile,v 1.22 2015/11/25 12:49:27 jperkin Exp $
MODNAME= mysql
CATEGORIES+= databases
@@ -19,7 +19,6 @@ PKG_SUGGESTED_OPTIONS= # empty
.if !empty(PKG_OPTIONS:Mmysqlnd)
CONFIGURE_ARGS+= --with-${MODNAME}=shared,mysqlnd
.else
-EVAL_PREFIX+= MYSQLDIR=mysql-client
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.mysql-client}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql
. include "../../mk/mysql.buildlink3.mk"
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 476b534e809..e7606910aee 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/12/21 01:22:33 obache Exp $
+# $NetBSD: Makefile,v 1.35 2015/11/25 12:49:27 jperkin Exp $
PKGNAME= ${PYPKGPREFIX}-gdbm-${PY_DISTVERSION}
CATEGORIES= databases python
@@ -7,8 +7,6 @@ MAINTAINER= dolecek@ics.muni.cz
HOMEPAGE= http://www.python.org/doc/lib/module-gdbm.html
COMMENT= Python interface to gdbm - GNU database manager
-EVAL_PREFIX+= GDBMDIR=gdbm
-
USE_TOOLS+= patch
.include "../../lang/python/pyversion.mk"
@@ -22,7 +20,7 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/${GDBM_MODNAME}module.c
PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
-PY_SETUP_SUBST+= GDBMPREFIX=${GDBMDIR}
+PY_SETUP_SUBST+= GDBMPREFIX=${BUILDLINK_PREFIX.gdbm}
PY_SETUP_SUBST+= GDBM_MODNAME=${GDBM_MODNAME}
PLIST_SUBST+= GDBM_MODNAME=${GDBM_MODNAME}
PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload