diff options
| author | wiz <wiz> | 2014-12-30 15:13:19 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-12-30 15:13:19 +0000 |
| commit | 0d2d40dde1f14e4fb43d302d93d462a07b1d2b78 (patch) | |
| tree | 72a940b4201682de30eda8c9b0e307555f4681b7 /mk/bsd.pkg.use.mk | |
| parent | 31cc7872d0b124ecb60336d12b994e18407c3758 (diff) | |
| download | pkgsrc-0d2d40dde1f14e4fb43d302d93d462a07b1d2b78.tar.gz | |
Remove pkg_views support, second part: infrastructure.
Diffstat (limited to 'mk/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 9bab4f26cd0..c0e44554075 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.57 2014/10/01 19:14:21 joerg Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.58 2014/12/30 15:13:19 wiz Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -55,22 +55,14 @@ MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} . include "x11.buildlink3.mk" .endif -.if ${PKG_INSTALLATION_TYPE} == "pkgviews" -PREFIX= ${DEPOTBASE}/${PKGNAME} -.elif ${PKG_INSTALLATION_TYPE} == "overwrite" -. if defined(INSTALLATION_PREFIX) +.if defined(INSTALLATION_PREFIX) PREFIX= ${INSTALLATION_PREFIX} -. elif defined(USE_X11BASE) +.elif defined(USE_X11BASE) PREFIX= ${X11PREFIX} -. elif defined(USE_CROSSBASE) +.elif defined(USE_CROSSBASE) PREFIX= ${CROSSBASE} -. else +.else PREFIX= ${LOCALBASE} -. endif -.endif - -.if (${PKG_INSTALLATION_TYPE} == "pkgviews") && defined(INSTALLATION_PREFIX) -PKG_FAIL_REASON= "INSTALLATION_PREFIX can't be used in a pkgviews package" .endif ############################################################################ |