pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/fonts/Xft2 handle X.org config definitions to determin...
details: https://anonhg.NetBSD.org/pkgsrc/rev/63106e0ea611
branches: trunk
changeset: 478461:63106e0ea611
user: grant <grant%pkgsrc.org@localhost>
date: Sat Jul 24 06:50:19 2004 +0000
description:
handle X.org config definitions to determine what version of XFree86
we have. for the moment, consider X.org 6.7 the same as XFree86 4.4
for the purpose of Xft2.
diffstat:
fonts/Xft2/builtin.mk | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diffs (51 lines):
diff -r f51b27511154 -r 63106e0ea611 fonts/Xft2/builtin.mk
--- a/fonts/Xft2/builtin.mk Sat Jul 24 06:48:51 2004 +0000
+++ b/fonts/Xft2/builtin.mk Sat Jul 24 06:50:19 2004 +0000
@@ -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/24 06:50:19 grant Exp $
_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl
@@ -26,9 +26,29 @@
_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]*
_XFT2_2.1.0+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]*
. if !defined(XF86_VERSION)
+XF86_VERSION= 3.3
+. 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_VERSION= 3.3
-. if exists(${_X11_CONFIG_VERSION_DEF})
_XF86_MAJOR!= \
${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \
${_X11_CONFIG_VERSION_DEF}
@@ -48,8 +68,8 @@
XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY}
. endif
. endif
+. endif # defined(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_})
Home |
Main Index |
Thread Index |
Old Index