summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fonts/Xft2/builtin.mk14
-rw-r--r--pkgtools/x11-links/builtin.mk14
-rw-r--r--x11/Xrandr-mixedcase/builtin.mk14
-rw-r--r--x11/Xrender/builtin.mk14
4 files changed, 27 insertions, 29 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index 5727d71f458..75c857dbcc8 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/30 17:04:06 jlam Exp $
_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl
@@ -24,9 +24,9 @@ IS_BUILTIN.Xft2!= \
#
_XFT2_VERSIONS= 2.1.2 2.1.1 2.1.0
_XFT2_2.1.0= 4.2.99.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]*
-. if !defined(_XF86_VERSION)
+. if !defined(XF86_VERSION)
_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def
-_XF86_VERSION= 3.3
+XF86_VERSION= 3.3
. if exists(${_X11_CONFIG_VERSION_DEF})
_XF86_MAJOR!= \
${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \
@@ -42,16 +42,16 @@ _XF86_SNAP!= \
${_X11_CONFIG_VERSION_DEF}
_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP}
. if !empty(_XF86_TEENY:M0.0)
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
+XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
. else
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
+XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
-BUILDLINK_VARS+= _XF86_VERSION
+BUILDLINK_VARS+= XF86_VERSION
. endif
. for _xrender_version_ in ${_XFT2_VERSIONS}
. for _pattern_ in ${_XFT2_${_xrender_version_}}
-. if !empty(_XF86_VERSION:M${_pattern_})
+. if !empty(XF86_VERSION:M${_pattern_})
_XFT2_VERSION?= ${_xrender_version_}
. endif
. endfor
diff --git a/pkgtools/x11-links/builtin.mk b/pkgtools/x11-links/builtin.mk
index 252f1ed8177..b58ec507d85 100644
--- a/pkgtools/x11-links/builtin.mk
+++ b/pkgtools/x11-links/builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: builtin.mk,v 1.3 2004/03/15 17:30:18 recht Exp $
+# $NetBSD: builtin.mk,v 1.4 2004/03/30 17:04:06 jlam Exp $
.if !defined(XF86_VERSION)
_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def
-_XF86_VERSION= 3.3
+XF86_VERSION= 3.3
. if !exists(${_X11_CONFIG_VERSION_DEF})
-_XF86_VERSION= 0
+XF86_VERSION= 0
. else
_XF86_MAJOR!= \
${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \
@@ -20,13 +20,12 @@ _XF86_SNAP!= \
${_X11_CONFIG_VERSION_DEF}
_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP}
. if !empty(_XF86_TEENY:M0.0)
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
+XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
. else
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
-XF86_VERSION= ${_XF86_VERSION}
+XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
-MAKEFLAGS+= XF86_VERSION=${XF86_VERSION}
+BUILDLINK_VARS+= XF86_VERSION
.endif
USE_BUILTIN.x11-links?= no
@@ -38,4 +37,3 @@ USE_BUILTIN.x11-links?= no
IGNORE_PKG.Xrandr= yes
IGNORE_PKG.randrext= yes
.endif
-
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index cec185a9a22..a3250786cd8 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/30 17:04:06 jlam Exp $
_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl
@@ -24,9 +24,9 @@ IS_BUILTIN.Xrandr!= \
#
_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]*
-. if !defined(_XF86_VERSION)
+. if !defined(XF86_VERSION)
_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def
-_XF86_VERSION= 3.3
+XF86_VERSION= 3.3
. if exists(${_X11_CONFIG_VERSION_DEF})
_XF86_MAJOR!= \
${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \
@@ -42,16 +42,16 @@ _XF86_SNAP!= \
${_X11_CONFIG_VERSION_DEF}
_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP}
. if !empty(_XF86_TEENY:M0.0)
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
+XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
. else
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
+XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
-BUILDLINK_VARS+= _XF86_VERSION
+BUILDLINK_VARS+= XF86_VERSION
. endif
. for _xrandr_version_ in ${_XRANDR_VERSIONS}
. for _pattern_ in ${_XRANDR_${_xrandr_version_}}
-. if !empty(_XF86_VERSION:M${_pattern_})
+. if !empty(XF86_VERSION:M${_pattern_})
_XRANDR_VERSION?= ${_xrandr_version_}
. endif
. endfor
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index bfd222e00b4..1261635146e 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:36 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/30 17:04:06 jlam Exp $
_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl
@@ -26,9 +26,9 @@ _XRENDER_VERSIONS= 0.8.3 0.8.2 0.8.1 0.8 0.2 0.1
_XRENDER_0.1= 4.0 4.0.* 4.1 4.1.[0-9] 4.1.[0-9].* 4.1.[1-8][0-9]* 4.1.9[0-8]*
_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]*
-. if !defined(_XF86_VERSION)
+. if !defined(XF86_VERSION)
_X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def
-_XF86_VERSION= 3.3
+XF86_VERSION= 3.3
. if exists(${_X11_CONFIG_VERSION_DEF})
_XF86_MAJOR!= \
${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \
@@ -44,16 +44,16 @@ _XF86_SNAP!= \
${_X11_CONFIG_VERSION_DEF}
_XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP}
. if !empty(_XF86_TEENY:M0.0)
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
+XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}
. else
-_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
+_F86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
-BUILDLINK_VARS+= _XF86_VERSION
+BUILDLINK_VARS+= XF86_VERSION
. endif
. for _xrender_version_ in ${_XRENDER_VERSIONS}
. for _pattern_ in ${_XRENDER_${_xrender_version_}}
-. if !empty(_XF86_VERSION:M${_pattern_})
+. if !empty(XF86_VERSION:M${_pattern_})
_XRENDER_VERSION?= ${_xrender_version_}
. endif
. endfor
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 09:01:47 +0000