diff options
| author | jlam <jlam> | 2004-01-06 23:00:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-06 23:00:51 +0000 |
| commit | d427ca8253db984f3e3bef20ef8f35154dde49a4 (patch) | |
| tree | 73b77be7d67ac9e09d82bc7e950df0e1c15f55ec /mk/bsd.pkg.mk | |
| parent | e18862a1839b695d4bdf817228de52a96d953ee1 (diff) | |
| download | pkgsrc-d427ca8253db984f3e3bef20ef8f35154dde49a4.tar.gz | |
Create a variable USE_XPKGWEDGE that determines whether or not pkgsrc will
use xpkgwedge to install X11 packages into ${LOCALBASE}. It defaults to
"no" to preserve the current behaviour.
Also make pkgviews imply USE_XPKGWEDGE=yes, as xpkgwedge is a requirement
for making X11 packages install properly using pkgviews.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e0b526e492c..ec7be14b58f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1338 2004/01/06 14:43:02 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1339 2004/01/06 23:00:51 jlam Exp $ # # This file is in the public domain. # @@ -174,17 +174,26 @@ USE_X11?= implied # .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) -_OPSYS_NEEDS_XPKGWEDGE= yes +USE_XPKGWEDGE= yes .else -_OPSYS_NEEDS_XPKGWEDGE?= no +USE_XPKGWEDGE?= no +.endif + +.if defined(_OPSYS_NEEDS_XPKGWEDGE) && \ + !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) +USE_XPKGWEDGE= yes +.endif + +.if ${PKG_INSTALLATION_TYPE} == "pkgviews" +USE_XPKGWEDGE= yes +_XPKGWEDGE_REQD= 1.9 +.else +_XPKGWEDGE_REQD= 1.5 .endif # Set the PREFIX appropriately. .if ${PKG_INSTALLATION_TYPE} == "overwrite" . if defined(USE_X11BASE) -. if !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) -BUILD_DEPENDS+= xpkgwedge>=1.5:../../pkgtools/xpkgwedge -. endif PREFIX= ${X11PREFIX} . elif defined(USE_CROSSBASE) PREFIX= ${CROSSBASE} @@ -197,6 +206,12 @@ PREFIX= ${DEPOTBASE}/${PKGNAME} NO_MTREE= yes .endif +.if defined(USE_X11BASE) +. if !empty(USE_XPKGWEDGE:M[yY][eE][sS]) +BUILD_DEPENDS+= xpkgwedge>=${_XPKGWEDGE_REQD}:../../pkgtools/xpkgwedge +. endif +.endif + .if empty(DEPOT_SUBDIR) PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty." .endif |