kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove code which tries to use "Xquartz" to find out the X.org version

Browse source 
(presumably only under Mac OS X Mountain Lion). "Xquarty" simply doesn't
print out anything if you run it with "-version".

This avoids a lot of warning messages from "bmake" while building packages
that use X11.
This commit is contained in:
tron 2013-01-23 15:25:04 +00:00
parent d1139a08e6
commit 8969853303
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgtools/x11-links/xorg-version.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: xorg-version.mk,v 1.2 2011/09/09 09:08:07 abs Exp $
# $NetBSD: xorg-version.mk,v 1.3 2013/01/23 15:25:04 tron Exp $
#
# This Makefile fragment is included by Makefiles that need to access
# the X11_TYPE and version number of an X.org distribution.
@ -18,7 +18,6 @@ BUILTIN_FIND_FILES_VAR:= CF_XORG CF_XORG_VERSION CF_VERSION_OLD XQUARTZ
BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf
BUILTIN_FIND_FILES.CF_XORG_VERSION= ${X11BASE}/lib/X11/config/xorgversion.def
BUILTIN_FIND_FILES.CF_VERSION_OLD= ${X11BASE}/lib/X11/config/version.def
BUILTIN_FIND_FILES.XQUARTZ= ${X11BASE}/bin/Xquartz
.include "../../mk/buildlink3/find-files.mk"
.if !defined(BUILTIN_XORG_VERSION_FILE)
@ -32,11 +31,7 @@ BUILTIN_XORG_VERSION_FILE= ${CF_VERSION_OLD}
MAKEVARS+= BUILTIN_XORG_VERSION_FILE
.if !defined(BUILTIN_X11_VERSION.xorg)
. if exists(${XQUARTZ})
BUILTIN_X11_VERSION.xorg!= \
${XQUARTZ} -version 2>&1 | \
${AWK} '/X.org Release / { print $$3 }'
. elif exists(${BUILTIN_XORG_VERSION_FILE})
. if exists(${BUILTIN_XORG_VERSION_FILE})
BUILTIN_X11_VERSION.xorg!= \
${AWK} '/\#define[ ]*XORG_VERSION_MAJOR/ { M = $$3 } \
/\#define[ ]*XORG_VERSION_MINOR/ { m = "."$$3 } \