diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-30 07:48:56 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-30 07:48:56 +0000 |
| commit | 0cfedd6db1de31e305042a822f479dcbd5a73ceb (patch) | |
| tree | f9c91923cfc71f02eea9a816b17001c142f2c5e6 /mk | |
| parent | 02371f01af9e407a8c9a5d07d0166ad4383e37cf (diff) | |
| download | pkgsrc-0cfedd6db1de31e305042a822f479dcbd5a73ceb.tar.gz | |
Add a new variable to specify the installation prefix for
X11 packages (currently XFree86 and xorg), X11ROOT_PREFIX.
Defaults:
xorg: X11ROOT_PREFIX = xorg.
XFree86: X11ROOT_PREFIX = XFree86.
Otherwise it's undefined.
With this modification we don't have to specify X11BASE anymore,
because it's assigned automatically via bsd.pkg.defaults.mk.
If you want to change the defaults, specify X11ROOT_PREFIX in mk.conf.
Update Packages.txt now that we don't need X11BASE.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index b746db2584d..9dad4264cd1 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.268 2004/07/27 15:59:31 xtraeme Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.269 2004/07/30 07:48:56 xtraeme Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -159,6 +159,21 @@ VARBASE?= /var # Possible: any path # Default: /var +# Default installation prefix for meta-pkgs/XFree86 and +# meta-pkgs/xorg. +.if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86) +X11ROOT_PREFIX?= XFree86 +.elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) +X11ROOT_PREFIX?= xorg +.else +X11ROOT_PREFIX?= # empty +.endif + +.if ((defined(X11_TYPE) && !empty(X11_TYPE:MXFree86) || \ + defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)) && \ + defined(X11_TYPE) && empty(X11_TYPE:Mnative)) +X11BASE?= ${LOCALBASE}/${X11ROOT_PREFIX} +.endif #X11BASE?= /usr/X11R6 # Where X11 is installed on the system. # (and the default install path of X11 pkgs) |