diff options
| author | grant <grant> | 2004-07-24 07:00:39 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-07-24 07:00:39 +0000 |
| commit | d11ca89b3b1fd23c63563e65170a2e5ebfd399fe (patch) | |
| tree | e00f2156522b8f0a2358c849bda694310799cdf2 /pkgtools | |
| parent | 75602a3ebd4fbe81783fd8a7836de38164fb7d41 (diff) | |
| download | pkgsrc-d11ca89b3b1fd23c63563e65170a2e5ebfd399fe.tar.gz | |
handle X.org 6.7 and treat it the same way as XFree86 4.4 for the
moment.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/x11-links/builtin.mk | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/pkgtools/x11-links/builtin.mk b/pkgtools/x11-links/builtin.mk index b58ec507d85..f29696c7641 100644 --- a/pkgtools/x11-links/builtin.mk +++ b/pkgtools/x11-links/builtin.mk @@ -1,11 +1,32 @@ -# $NetBSD: builtin.mk,v 1.4 2004/03/30 17:04:06 jlam Exp $ +# $NetBSD: builtin.mk,v 1.5 2004/07/24 07:00:39 grant Exp $ .if !defined(XF86_VERSION) +. if exists(${X11BASE}/lib/X11/config/xorg.cf) +_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf +_XORG_MAJOR!= \ + ${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { print $$3 }' \ + ${_X11_CONFIG_VERSION_DEF} +_XORG_MINOR!= \ + ${AWK} '/\#define[ ]*XORG_VERSION_MINOR/ { print $$3 }' \ + ${_X11_CONFIG_VERSION_DEF} +_XORG_PATCH!= \ + ${AWK} '/\#define[ ]*XORG_VERSION_PATCH/ { print $$3 }' \ + ${_X11_CONFIG_VERSION_DEF} +_XORG_SNAP!= \ + ${AWK} '/\#define[ ]*XORG_VERSION_SNAP/ { print $$3 }' \ + ${_X11_CONFIG_VERSION_DEF} +_XORG_TEENY= ${_XORG_PATCH}.${_XORG_SNAP} +. if !empty(_XORG_TEENY:M0.0) +XF86_VERSION= 4.4 +. else +XF86_VERSION= 4.4.${_XORG_TEENY} +. endif +. else _X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -XF86_VERSION= 3.3 -. if !exists(${_X11_CONFIG_VERSION_DEF}) +XF86_VERSION= 3.3 +. if !exists(${_X11_CONFIG_VERSION_DEF}) XF86_VERSION= 0 -. else +. else _XF86_MAJOR!= \ ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ ${_X11_CONFIG_VERSION_DEF} @@ -19,12 +40,13 @@ _XF86_SNAP!= \ ${AWK} '/\#define[ ]*XF86_VERSION_SNAP/ { print $$3 }' \ ${_X11_CONFIG_VERSION_DEF} _XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} -. if !empty(_XF86_TEENY:M0.0) +. if !empty(_XF86_TEENY:M0.0) XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} -. else +. else XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} +. endif . endif -. endif +. endif # xorg BUILDLINK_VARS+= XF86_VERSION .endif |