diff options
| author | jlam <jlam> | 2003-08-16 10:31:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-16 10:31:17 +0000 |
| commit | 818cfcd3dfef3300949909bb743697c62ac14402 (patch) | |
| tree | f4d8023717f81c337495bba0f2a298784f05d57c /mk | |
| parent | 8a5ae402faed69f552bb785353dbde8edabf1256 (diff) | |
| download | pkgsrc-818cfcd3dfef3300949909bb743697c62ac14402.tar.gz | |
Note that we only support a single DEPOTBASE so that package lookups for
dependency checks can be made by looking in only one place.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/PKGVIEWS | 6 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/mk/PKGVIEWS b/mk/PKGVIEWS index 065e256af60..64e1c2c3461 100644 --- a/mk/PKGVIEWS +++ b/mk/PKGVIEWS @@ -1,4 +1,4 @@ -$NetBSD: PKGVIEWS,v 1.1.2.8 2003/08/05 10:46:50 jlam Exp $ +$NetBSD: PKGVIEWS,v 1.1.2.9 2003/08/16 10:31:17 jlam Exp $ Package views integration plan: ============================== @@ -11,8 +11,8 @@ Package views integration plan: on pkg_view to copy the metadata files into /var/db/pkg as part of adding the package to the default view. We only support the default view. Depoted packages will install into - either ${LOCALBASE}/packages or ${X11BASE}/packages, but the - default view will be through ${LOCALBASE} for all packages. + ${LOCALBASE}/packages and the default view will be through + ${LOCALBASE} for all packages. Using this infrastructure, depoted packages that have been added to the default view should look and feel like a non-depoted package in diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c7d6f8d6f13..600857335fd 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216.2.18 2003/08/16 09:08:48 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216.2.19 2003/08/16 10:31:17 jlam Exp $ # # This file is in the public domain. # @@ -143,17 +143,13 @@ NO_MTREE= yes PREFIX= ${LOCALBASE} .endif +DEPOTBASE= ${LOCALBASE}/${DEPOT_SUBDIR} DEPOT_SUBDIR?= packages .if empty(DEPOT_SUBDIR) PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty." .endif .if ${PKG_INSTALLATION_TYPE} == "pkgviews" -. if defined(USE_X11BASE) -DEPOTBASE= ${X11PREFIX}/${DEPOT_SUBDIR} -. else -DEPOTBASE= ${LOCALBASE}/${DEPOT_SUBDIR} -. endif PREFIX= ${DEPOTBASE}/${PKGNAME} PKG_DBDIR_MAKEFLAGS= _REAL_PKG_DBDIR=${PKG_DBDIR} PKG_DBDIR=${DEPOTBASE} NO_MTREE= yes |