[pkgsrc/pkgsrc-2005Q2]: pkgsrc/x11 Pullup ticket 562 - requested by Johnny C....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/74266f85b2d0
branches:  pkgsrc-2005Q2
changeset: 495824:74266f85b2d0
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri Jun 24 09:08:32 2005 +0000

description:
Pullup ticket 562 - requested by Johnny C. Lam
built-in detection fixes for XFree86-libs and xorg-libs

Revisions pulled up:
- pkgsrc/x11/XFree86-libs/builtin.mk    1.2
- pkgsrc/x11/xorg-libs/builtin.mk       1.2

   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Fri Jun 24 05:21:31 UTC 2005

   Modified Files:
        pkgsrc/x11/XFree86-libs: builtin.mk
        pkgsrc/x11/xorg-libs: builtin.mk

   Log Message:
   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 3402164e8204 -r 74266f85b2d0 x11/XFree86-libs/builtin.mk
--- a/x11/XFree86-libs/builtin.mk       Fri Jun 24 09:03:16 2005 +0000
+++ b/x11/XFree86-libs/builtin.mk       Fri Jun 24 09:08:32 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.1.2.1 2005/06/24 09:08:32 salo 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 3402164e8204 -r 74266f85b2d0 x11/xorg-libs/builtin.mk
--- a/x11/xorg-libs/builtin.mk  Fri Jun 24 09:03:16 2005 +0000
+++ b/x11/xorg-libs/builtin.mk  Fri Jun 24 09:08:32 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.1.2.1 2005/06/24 09:08:32 salo 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