diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-17 20:27:30 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-17 20:27:30 +0000 |
| commit | e09f68cb6b28ba299da00e48be3e72b20fc9c046 (patch) | |
| tree | e01f1fb12427ddd451a83c16d1eab11df0301e21 /mk/bsd.prefs.mk | |
| parent | 988d227a2f305777b0febedd25459f5855619652 (diff) | |
| download | pkgsrc-e09f68cb6b28ba299da00e48be3e72b20fc9c046.tar.gz | |
Remove infrastructure side of Xorg 6.9 support. Begin to simplify
some of the cases of X11_TYPE usage -- it will stay with modular|native,
so don't bother with keeping the separation in the tool list.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index e6d26526e05..0c3a0201343 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.264 2007/08/15 13:25:47 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.265 2007/08/17 20:27:30 joerg Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -497,16 +497,7 @@ USE_XPKGWEDGE= no USE_XPKGWEDGE?= yes .endif -# Default installation prefix for meta-pkgs/xorg. -.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) -X11ROOT_PREFIX?= xorg -.else -X11ROOT_PREFIX?= # empty -.endif - -.if ${X11_TYPE} == "xorg" -X11BASE?= ${LOCALBASE}/${X11ROOT_PREFIX} -.elif ${X11_TYPE} == "modular" +.if ${X11_TYPE} == "modular" X11BASE= ${LOCALBASE} .endif |