[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links Copy XFree86 logic from x11/XFree86...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9be5baaa5346
branches:  trunk
changeset: 519043:9be5baaa5346
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Sep 27 16:41:20 2006 +0000

description:
Copy XFree86 logic from x11/XFree86-libs to pkgtools/x11-links to
unbreak build of x11-links.

diffstat:

 pkgtools/x11-links/version.mk       |   4 +-
 pkgtools/x11-links/xfree-version.mk |  41 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diffs (63 lines):

diff -r be4ae7d147cd -r 9be5baaa5346 pkgtools/x11-links/version.mk
--- a/pkgtools/x11-links/version.mk     Wed Sep 27 16:12:26 2006 +0000
+++ b/pkgtools/x11-links/version.mk     Wed Sep 27 16:41:20 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: version.mk,v 1.2 2006/09/27 16:41:20 joerg Exp $
 #
 # This Makefile fragment is included by Makefiles that need to access
 # the X11_TYPE and version number of a native X11 distribution.
@@ -14,7 +14,7 @@
 
 .if !defined(BUILTIN_X11_VERSION.native)
 .  include "../../x11/xorg-libs/version.mk"
-.  include "../../x11/XFree86-libs/version.mk"
+.  include "xfree-version.mk"
 
 .  if defined(BUILTIN_X11_VERSION.xorg)
 BUILTIN_X11_TYPE.native=       ${BUILTIN_X11_TYPE.xorg}
diff -r be4ae7d147cd -r 9be5baaa5346 pkgtools/x11-links/xfree-version.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/xfree-version.mk       Wed Sep 27 16:41:20 2006 +0000
@@ -0,0 +1,41 @@
+# $NetBSD: xfree-version.mk,v 1.1 2006/09/27 16:41:20 joerg Exp $
+#
+# This Makefile fragment is included by Makefiles that need to access
+# the X11_TYPE and version number of a XFree86 distribution.
+#
+# The following variables are provided by this file:
+#
+#    BUILTIN_X11_TYPE.XFree86 is the X11_TYPE of the XFree86 distribution
+#      and is simply "XFree86".
+#
+#    BUILTIN_X11_VERSION.XFree86 is the version number of the XFree86
+#      distribution detected on the system.
+#
+
+BUILTIN_X11_TYPE.XFree86=      XFree86
+
+BUILTIN_FIND_FILES_VAR:=               CF_XFREE86 CF_XFREE86_VERSION
+BUILTIN_FIND_FILES.CF_XFREE86=         ${X11BASE}/lib/X11/config/xfree86.cf
+BUILTIN_FIND_FILES.CF_XFREE86_VERSION= ${X11BASE}/lib/X11/config/version.def
+.include "../../mk/buildlink3/find-files.mk"
+
+.if !defined(BUILTIN_X11_VERSION.XFree86) && \
+    exists(${CF_XFREE86}) && exists(${CF_XFREE86_VERSION})
+BUILTIN_X11_VERSION.XFree86!=                                          \
+       ${AWK} '/\#define[      ]*XF86_VERSION_MAJOR/ { M = $$3 }       \
+               /\#define[      ]*XF86_VERSION_MINOR/ { m = "."$$3 }    \
+               /\#define[      ]*XF86_VERSION_PATCH/ { p = "."$$3 }    \
+               /\#define[      ]*XF86_VERSION_SNAP/ { s = "."$$3 }     \
+               /\#define[      ]*XFree86Version/ {                     \
+                       V = $$3;                                        \
+                       if (M == "") M = int(V / 1000) % 10;            \
+                       if (m == "") m = "."(int(V / 100) % 10);        \
+                       if (p == "") p = "."(int(V / 10) % 10);         \
+                       if (s == "") s = "."(V % 10);                   \
+               }                                                       \
+               END { if (s == ".0") s = "";                            \
+                     if (p == ".0" && s == "") p = "";                 \
+                     printf "%s%s%s%s\n", M, m, p, s }'                \
+               ${CF_XFREE86_VERSION}
+.endif
+MAKEVARS+=     BUILTIN_X11_VERSION.XFree86