diff options
| author | xtraeme <xtraeme> | 2005-03-01 18:56:43 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2005-03-01 18:56:43 +0000 |
| commit | 795f8b4412d1819bbd322e24bf23306f228b81ef (patch) | |
| tree | 63eec8cc999affaccd54e5dd024c82de01e80d73 /x11 | |
| parent | afe9c8eecb834e964a6c452cea481bf303de6e27 (diff) | |
| download | pkgsrc-795f8b4412d1819bbd322e24bf23306f228b81ef.tar.gz | |
Look for XORG_VERSION_* defs from ${X11BASE}/lib/X11/config/xorgversion.def
before xorg.cf, which in xorg from pkgsrc does not contain them.
(This is required by our xorg-* packages).
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Xrandr-mixedcase/builtin.mk | 8 | ||||
| -rw-r--r-- | x11/Xrender/builtin.mk | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk index be19b1116ef..bf91f74e19e 100644 --- a/x11/Xrandr-mixedcase/builtin.mk +++ b/x11/Xrandr-mixedcase/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.6 2004/11/08 12:38:19 markd Exp $ +# $NetBSD: builtin.mk,v 1.7 2005/03/01 18:56:43 xtraeme Exp $ _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -28,8 +28,10 @@ _XRANDR_1.0= 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* _XRANDR_1.0+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* . if !defined(XF86_VERSION) XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf +. if exists(${X11BASE}/lib/X11/config/xorgversion.def) +_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def +. elif 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} diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk index a35576b5ef6..1e9d43b395a 100644 --- a/x11/Xrender/builtin.mk +++ b/x11/Xrender/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2004/07/25 07:34:38 grant Exp $ +# $NetBSD: builtin.mk,v 1.6 2005/03/01 18:56:43 xtraeme Exp $ _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -29,8 +29,10 @@ _XRENDER_0.8= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]* _XRENDER_0.8+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]* . if !defined(XF86_VERSION) XF86_VERSION= 3.3 -. if exists(${X11BASE}/lib/X11/config/xorg.cf) -_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorg.cf +. if exists(${X11BASE}/lib/X11/config/xorgversion.def) +_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/xorgversion.def +. elif 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} |