diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-27 14:29:45 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-27 14:29:45 +0000 |
| commit | 64fb99a6c0e5f40a5519a48a82c0f8e4cc734718 (patch) | |
| tree | 100afc41abbd29422d5319f64f5932f576c50b60 /mk/bsd.prefs.mk | |
| parent | b7b0906be8f6370c83ee45144bea05e3942d5e8e (diff) | |
| download | pkgsrc-64fb99a6c0e5f40a5519a48a82c0f8e4cc734718.tar.gz | |
Move USE_XPKGWEDGE handling to bsd.prefs.mk. The logic depends on
X11_TYPE and some other settings which can overriden by the platform
defaults. This has the nice side effect of simplifying the handling
in bsd.prefs.mk. Discussed with and reviewed by wiz@. Keep the
documentation for USE_XPKGWEDGE in defaults/mk.conf as suggested by
salo@.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 37d0dc63c1d..6406c58f4b4 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.242 2006/12/20 01:04:46 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.243 2006/12/27 14:29:45 joerg Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -421,17 +421,15 @@ CROSSBASE?= ${LOCALBASE}/cross .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) USE_XPKGWEDGE= yes -.else -USE_XPKGWEDGE?= yes -.endif - -.if defined(_OPSYS_NEEDS_XPKGWEDGE) && \ +.elif defined(_OPSYS_NEEDS_XPKGWEDGE) && \ !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) USE_XPKGWEDGE= yes -.endif - -.if ${PKG_INSTALLATION_TYPE} == "pkgviews" +.elif ${PKG_INSTALLATION_TYPE} == "pkgviews" USE_XPKGWEDGE= yes +.elif ${X11_TYPE} == "modular" +USE_XPKGWEDGE= no +.else +USE_XPKGWEDGE?= yes .endif # Default installation prefix for meta-pkgs/xorg. @@ -441,9 +439,10 @@ X11ROOT_PREFIX?= xorg X11ROOT_PREFIX?= # empty .endif -.if (defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)) && \ - (defined(X11_TYPE) && empty(X11_TYPE:Mnative)) +.if ${X11_TYPE} == "xorg" X11BASE?= ${LOCALBASE}/${X11ROOT_PREFIX} +.elif ${X11_TYPE} == "modular" +X11BASE= ${LOCALBASE} .endif .if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss]) |