[pkgsrc/trunk]: pkgsrc Look for XORG_VERSION_* defs from ${X11BASE}/lib/X11/c...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52423d1e4b1f
branches:  trunk
changeset: 489982:52423d1e4b1f
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Mar 01 18:56:43 2005 +0000

description:
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:

 fonts/Xft2/builtin.mk           |  8 +++++---
 x11/Xrandr-mixedcase/builtin.mk |  8 +++++---
 x11/Xrender/builtin.mk          |  8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r d5f684c0d881 -r 52423d1e4b1f fonts/Xft2/builtin.mk
--- a/fonts/Xft2/builtin.mk     Tue Mar 01 17:15:48 2005 +0000
+++ b/fonts/Xft2/builtin.mk     Tue Mar 01 18:56:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2004/07/24 06:50:19 grant Exp $
+# $NetBSD: builtin.mk,v 1.6 2005/03/01 18:56:43 xtraeme Exp $
 
 _X11_TMPL=     ${X11BASE}/lib/X11/config/X11.tmpl
 
@@ -27,8 +27,10 @@
 _XFT2_2.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 -r d5f684c0d881 -r 52423d1e4b1f x11/Xrandr-mixedcase/builtin.mk
--- a/x11/Xrandr-mixedcase/builtin.mk   Tue Mar 01 17:15:48 2005 +0000
+++ b/x11/Xrandr-mixedcase/builtin.mk   Tue Mar 01 18:56:43 2005 +0000
@@ -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.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 -r d5f684c0d881 -r 52423d1e4b1f x11/Xrender/builtin.mk
--- a/x11/Xrender/builtin.mk    Tue Mar 01 17:15:48 2005 +0000
+++ b/x11/Xrender/builtin.mk    Tue Mar 01 18:56:43 2005 +0000
@@ -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.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}