pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Use "XF86_VERSION" instead of "_XF86_VERSION" as the v...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c3af181a4958
branches: trunk
changeset: 471730:c3af181a4958
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Mar 30 17:04:06 2004 +0000
description:
Use "XF86_VERSION" instead of "_XF86_VERSION" as the variable name since
we use it in several places within pkgsrc as a public variable.
diffstat:
fonts/Xft2/builtin.mk | 14 +++++++-------
pkgtools/x11-links/builtin.mk | 14 ++++++--------
x11/Xrandr-mixedcase/builtin.mk | 14 +++++++-------
x11/Xrender/builtin.mk | 14 +++++++-------
4 files changed, 27 insertions(+), 29 deletions(-)
diffs (165 lines):
diff -r 02b7d4c320ee -r c3af181a4958 fonts/Xft2/builtin.mk
--- a/fonts/Xft2/builtin.mk Tue Mar 30 16:49:32 2004 +0000
+++ b/fonts/Xft2/builtin.mk Tue Mar 30 17:04:06 2004 +0000
@@ -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 @@
#
_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 @@
${_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 -r 02b7d4c320ee -r c3af181a4958 pkgtools/x11-links/builtin.mk
--- a/pkgtools/x11-links/builtin.mk Tue Mar 30 16:49:32 2004 +0000
+++ b/pkgtools/x11-links/builtin.mk Tue Mar 30 17:04:06 2004 +0000
@@ -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 @@
${_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 @@
IGNORE_PKG.Xrandr= yes
IGNORE_PKG.randrext= yes
.endif
-
diff -r 02b7d4c320ee -r c3af181a4958 x11/Xrandr-mixedcase/builtin.mk
--- a/x11/Xrandr-mixedcase/builtin.mk Tue Mar 30 16:49:32 2004 +0000
+++ b/x11/Xrandr-mixedcase/builtin.mk Tue Mar 30 17:04:06 2004 +0000
@@ -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 @@
#
_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 @@
${_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 -r 02b7d4c320ee -r c3af181a4958 x11/Xrender/builtin.mk
--- a/x11/Xrender/builtin.mk Tue Mar 30 16:49:32 2004 +0000
+++ b/x11/Xrender/builtin.mk Tue Mar 30 17:04:06 2004 +0000
@@ -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_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 @@
${_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
Home |
Main Index |
Thread Index |
Old Index