pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix variable names to start with "BUILTIN_FILES_" as e...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b85a0be434fb
branches: trunk
changeset: 495799:b85a0be434fb
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Jun 20 22:13:10 2005 +0000
description:
Fix variable names to start with "BUILTIN_FILES_" as expected by the
find-files.mk fragment. This fixes the version number detection for
Mesa, XFree86, and X.org.
diffstat:
graphics/Mesa/version.mk | 6 +++---
x11/XFree86-libs/version.mk | 8 ++++----
x11/xorg-libs/version.mk | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diffs (64 lines):
diff -r c48c59a697c5 -r b85a0be434fb graphics/Mesa/version.mk
--- a/graphics/Mesa/version.mk Mon Jun 20 22:06:00 2005 +0000
+++ b/graphics/Mesa/version.mk Mon Jun 20 22:13:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.11 2005/06/01 18:02:54 jlam Exp $
+# $NetBSD: version.mk,v 1.12 2005/06/20 22:13:10 jlam Exp $
#
# This file computes the version number of the Mesa distributed with
# XFree86 and stores it in ${BUILTIN_VERSION.Mesa}.
@@ -6,8 +6,8 @@
# NOTE: This file should only be used by the Mesa-related builtin.mk files.
#
-BUILTIN_FILES_VAR:= H_MESA
-BUILTIN_FILES.H_MESA= ${X11BASE}/include/GL/gl.h
+BUILTIN_FIND_FILES_VAR:= H_MESA
+BUILTIN_FIND_FILES.H_MESA= ${X11BASE}/include/GL/gl.h
.include "../../mk/buildlink3/find-files.mk"
.if !defined(BUILTIN_VERSION.Mesa) && exists(${H_MESA})
diff -r c48c59a697c5 -r b85a0be434fb x11/XFree86-libs/version.mk
--- a/x11/XFree86-libs/version.mk Mon Jun 20 22:06:00 2005 +0000
+++ b/x11/XFree86-libs/version.mk Mon Jun 20 22:13:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: version.mk,v 1.2 2005/06/20 22:13:10 jlam Exp $
#
# This Makefile fragment is included by Makefiles that need to access
# the X11_TYPE and version number of a XFree86 distribution.
@@ -14,9 +14,9 @@
BUILTIN_X11_TYPE.XFree86= XFree86
-BUILTIN_FILES_VAR:= CF_XFREE86 CF_XFREE86_VERSION
-BUILTIN_FILES.CF_XFREE86= ${X11BASE}/lib/X11/config/xfree86.cf
-BUILTIN_FILES.CF_XFREE86_VERSION= ${X11BASE}/lib/X11/config/version.def
+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) && \
diff -r c48c59a697c5 -r b85a0be434fb x11/xorg-libs/version.mk
--- a/x11/xorg-libs/version.mk Mon Jun 20 22:06:00 2005 +0000
+++ b/x11/xorg-libs/version.mk Mon Jun 20 22:13:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: version.mk,v 1.2 2005/06/20 22:13:10 jlam Exp $
#
# This Makefile fragment is included by Makefiles that need to access
# the X11_TYPE and version number of an X.org distribution.
@@ -14,9 +14,9 @@
BUILTIN_X11_TYPE.xorg= xorg
-BUILTIN_FILES_VAR:= CF_XORGVERSION CF_XORG
-BUILTIN_FILES.CF_XORGVERSION= ${X11BASE}/lib/X11/config/xorgversion.def
-BUILTIN_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf
+BUILTIN_FIND_FILES_VAR:= CF_XORGVERSION CF_XORG
+BUILTIN_FIND_FILES.CF_XORGVERSION= ${X11BASE}/lib/X11/config/xorgversion.def
+BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf
.include "../../mk/buildlink3/find-files.mk"
.if !defined(BUILTIN_XORG_VERSION_FILE)
Home |
Main Index |
Thread Index |
Old Index