diff options
author | markd <markd> | 2004-11-08 12:38:19 +0000 |
---|---|---|
committer | markd <markd> | 2004-11-08 12:38:19 +0000 |
commit | d6b6094998e2d652dd11572c2830366c70a4b2ee (patch) | |
tree | 05f1ada47f8716dda55de07ce40867c3075b81d6 | |
parent | f8f9c327e9c30f943ea2c7a1c6216c6b5d707253 (diff) | |
download | pkgsrc-d6b6094998e2d652dd11572c2830366c70a4b2ee.tar.gz |
Allow distinguishing the version of Xrandr that came with XFree86 4.2
from that of XFree86 4.3.
-rw-r--r-- | x11/Xrandr-mixedcase/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/Xrandr-mixedcase/builtin.mk | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index fd2b11d02b1..caa2b0851b1 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2004/10/03 00:18:28 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2004/11/08 12:38:19 markd Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXrandr} BUILDLINK_PACKAGES+= Xrandr .if !empty(XRANDR_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 +BUILDLINK_DEPENDS.Xrandr+= Xrandr>=0.99 BUILDLINK_RECOMMENDED.Xrandr+= Xrandr>=1.0.2nb1 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr .endif # XRANDR_BUILDLINK3_MK diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk index 9daa1bc6793..be19b1116ef 100644 --- a/x11/Xrandr-mixedcase/builtin.mk +++ b/x11/Xrandr-mixedcase/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2004/07/25 07:34:38 grant Exp $ +# $NetBSD: builtin.mk,v 1.6 2004/11/08 12:38:19 markd Exp $ _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -22,8 +22,9 @@ IS_BUILTIN.Xrandr!= \ # the software. Match up Xrandr versions with XFree86 versions for an # approximate determination of the Xrandr version. # -_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_VERSIONS= 1.0.2 1.0.1 1.0 0.99 +_XRANDR_0.99= 4.2 4.2.* +_XRANDR_1.0= 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 |