summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-30 17:04:06 +0000
committerjlam <jlam@pkgsrc.org>2004-03-30 17:04:06 +0000
commit88588c9c0b2c39b09f4fcbbcaf6c56008564ad7a (patch)
treebb4a3387f49841829b96e843af15a78a2ebaebd3 /fonts
parenteec580656a82c5f463cabea34e375132ff9606a1 (diff)
downloadpkgsrc-88588c9c0b2c39b09f4fcbbcaf6c56008564ad7a.tar.gz
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 (limited to 'fonts')
-rw-r--r--fonts/Xft2/builtin.mk14
1 files changed, 7 insertions, 7 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