[pkgsrc/trunk]: pkgsrc/x11 handle X.org 6.7 and treat it the same way as XFre...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef6574d11941
branches:  trunk
changeset: 478531:ef6574d11941
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Jul 25 07:34:38 2004 +0000

description:
handle X.org 6.7 and treat it the same way as XFree86 4.4 for the
moment.

diffstat:

 x11/Xrandr-mixedcase/builtin.mk |  28 ++++++++++++++++++++++++----
 x11/Xrender/builtin.mk          |  28 ++++++++++++++++++++++++----
 2 files changed, 48 insertions(+), 8 deletions(-)

diffs (100 lines):

diff -r 7713347ca5e4 -r ef6574d11941 x11/Xrandr-mixedcase/builtin.mk
--- a/x11/Xrandr-mixedcase/builtin.mk   Sun Jul 25 06:51:33 2004 +0000
+++ b/x11/Xrandr-mixedcase/builtin.mk   Sun Jul 25 07:34:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2004/03/30 17:10:16 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2004/07/25 07:34:38 grant Exp $
 
 _X11_TMPL=     ${X11BASE}/lib/X11/config/X11.tmpl
 
@@ -26,9 +26,29 @@
 _XRANDR_1.0=   4.2 4.2.* 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
+_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
+.        elif exists(${X11BASE}/lib/X11/config/version.def)
 _X11_CONFIG_VERSION_DEF=       ${X11BASE}/lib/X11/config/version.def
-XF86_VERSION=  3.3
-.        if exists(${_X11_CONFIG_VERSION_DEF})
 _XF86_MAJOR!=  \
        ${AWK} '/\#define[      ]*XF86_VERSION_MAJOR/ { print $$3 }'    \
                ${_X11_CONFIG_VERSION_DEF}
@@ -49,7 +69,7 @@
 .          endif
 .        endif
 BUILDLINK_VARS+=       XF86_VERSION
-.      endif
+.      endif   # defined(XF86_VERSION)
 .      for _xrandr_version_ in ${_XRANDR_VERSIONS}
 .        for _pattern_ in ${_XRANDR_${_xrandr_version_}}
 .          if !empty(XF86_VERSION:M${_pattern_})
diff -r 7713347ca5e4 -r ef6574d11941 x11/Xrender/builtin.mk
--- a/x11/Xrender/builtin.mk    Sun Jul 25 06:51:33 2004 +0000
+++ b/x11/Xrender/builtin.mk    Sun Jul 25 07:34:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2004/03/30 17:10:16 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2004/07/25 07:34:38 grant Exp $
 
 _X11_TMPL=     ${X11BASE}/lib/X11/config/X11.tmpl
 
@@ -28,9 +28,29 @@
 _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
+_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
+.        elif exists(${X11BASE}/lib/X11/config/version.def)
 _X11_CONFIG_VERSION_DEF=       ${X11BASE}/lib/X11/config/version.def
-XF86_VERSION=  3.3
-.        if exists(${_X11_CONFIG_VERSION_DEF})
 _XF86_MAJOR!=  \
        ${AWK} '/\#define[      ]*XF86_VERSION_MAJOR/ { print $$3 }'    \
                ${_X11_CONFIG_VERSION_DEF}
@@ -51,7 +71,7 @@
 .          endif
 .        endif
 BUILDLINK_VARS+=       XF86_VERSION
-.      endif
+.      endif   # defined(XF86_VERSION)
 .      for _xrender_version_ in ${_XRENDER_VERSIONS}
 .        for _pattern_ in ${_XRENDER_${_xrender_version_}}
 .          if !empty(XF86_VERSION:M${_pattern_})