kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
moment.
This commit is contained in:
grant 2004-07-25 07:34:38 +00:00
parent 38ec7e0ca7
commit a8c0d67d4f
2 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
x11/Xrandr-mixedcase/builtin.mk
View file

@ -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_VERSIONS= 1.0.2 1.0.1 1.0
_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)
_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}
@ -49,7 +69,7 @@ XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. 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_})

28
x11/Xrender/builtin.mk
View file

@ -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_})