pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 For XFree86-libs and xorg-libs file existence test...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dca67e375ade
branches: trunk
changeset: 496171:dca67e375ade
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jun 24 05:21:31 2005 +0000
description:
For XFree86-libs and xorg-libs file existence test, check whether the
file is in ${LOCALBASE} or not. If it isn't, then assume that the
X11 distribution is built-in. This fixes the detection of both
XFree86-libs and xorg-libs and causes the proper dependency to be
added to packages that use X11.
diffstat:
x11/XFree86-libs/builtin.mk | 4 ++--
x11/xorg-libs/builtin.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (36 lines):
diff -r 5251d60c66a6 -r dca67e375ade x11/XFree86-libs/builtin.mk
--- a/x11/XFree86-libs/builtin.mk Thu Jun 23 23:53:06 2005 +0000
+++ b/x11/XFree86-libs/builtin.mk Fri Jun 24 05:21:31 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2005/06/24 05:21:31 jlam Exp $
BUILTIN_PKG:= XFree86-libs
@@ -13,7 +13,7 @@
###
.if !defined(IS_BUILTIN.XFree86-libs)
IS_BUILTIN.XFree86-libs= no
-. if exists(${CF_XFREE86})
+. if empty(CF_XFREE86:M${LOCALBASE}/*) && exists(${CF_XFREE86})
IS_BUILTIN.XFree86-libs= yes
. endif
.endif
diff -r 5251d60c66a6 -r dca67e375ade x11/xorg-libs/builtin.mk
--- a/x11/xorg-libs/builtin.mk Thu Jun 23 23:53:06 2005 +0000
+++ b/x11/xorg-libs/builtin.mk Fri Jun 24 05:21:31 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2005/06/24 05:21:31 jlam Exp $
BUILTIN_PKG:= xorg-libs
@@ -13,7 +13,7 @@
###
.if !defined(IS_BUILTIN.xorg-libs)
IS_BUILTIN.xorg-libs= no
-. if exists(${CF_XORG})
+. if empty(CF_XORG:M${LOCALBASE}/*) && exists(${CF_XORG})
IS_BUILTIN.xorg-libs= yes
. endif
.endif
Home |
Main Index |
Thread Index |
Old Index