summaryrefslogtreecommitdiff
path: root/x11/Xrender
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-07-25 07:34:38 +0000
committergrant <grant@pkgsrc.org>2004-07-25 07:34:38 +0000
commita8c0d67d4f913ddbc598504732048f1f82658936 (patch)
tree954ce55479ce32ad54d2acb57fe274a69f28d060 /x11/Xrender
parent38ec7e0ca73c767a64556fd34e788708d402f67a (diff)
downloadpkgsrc-a8c0d67d4f913ddbc598504732048f1f82658936.tar.gz
handle X.org 6.7 and treat it the same way as XFree86 4.4 for the
moment.
Diffstat (limited to 'x11/Xrender')
-rw-r--r--x11/Xrender/builtin.mk28
1 files changed, 24 insertions, 4 deletions
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index 4dc2c3893d4..a35576b5ef6 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -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.2= 4.1.99.* 4.2 4.2.[0-9] 4.2.[0-9].* 4.2.[1-8][0-9]* 4.2.9[0-8]*
_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)
-_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def
XF86_VERSION= 3.3
-. if exists(${_X11_CONFIG_VERSION_DEF})
+. 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_MAJOR!= \
${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \
${_X11_CONFIG_VERSION_DEF}
@@ -51,7 +71,7 @@ _F86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. 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_})