[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links handle X.org 6.7 and treat it the s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d01d581430f
branches:  trunk
changeset: 478462:9d01d581430f
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jul 24 07:00:39 2004 +0000

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

diffstat:

 pkgtools/x11-links/builtin.mk |  36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 63106e0ea611 -r 9d01d581430f pkgtools/x11-links/builtin.mk
--- a/pkgtools/x11-links/builtin.mk     Sat Jul 24 06:50:19 2004 +0000
+++ b/pkgtools/x11-links/builtin.mk     Sat Jul 24 07:00:39 2004 +0000
@@ -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 @@
        ${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