diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-24 05:21:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-24 05:21:31 +0000 |
| commit | 8a3ddadd73c7a9e7c183859fc183a0095ae85f83 (patch) | |
| tree | 6175847a0cf570de4ccd02033951d6a66b68a2e8 /x11 | |
| parent | 7ba643a29e666811c163e19bbcc7f45fe66afe09 (diff) | |
| download | pkgsrc-8a3ddadd73c7a9e7c183859fc183a0095ae85f83.tar.gz | |
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 (limited to 'x11')
| -rw-r--r-- | x11/XFree86-libs/builtin.mk | 4 | ||||
| -rw-r--r-- | x11/xorg-libs/builtin.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x11/XFree86-libs/builtin.mk b/x11/XFree86-libs/builtin.mk index de25ce940b9..a0f3a3f5c92 100644 --- a/x11/XFree86-libs/builtin.mk +++ b/x11/XFree86-libs/builtin.mk @@ -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 @@ BUILTIN_FIND_FILES.CF_XFREE86= ${X11BASE}/lib/X11/config/xfree86.cf ### .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 --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk index f600b89da58..a39a4484612 100644 --- a/x11/xorg-libs/builtin.mk +++ b/x11/xorg-libs/builtin.mk @@ -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 @@ BUILTIN_FIND_FILES.CF_XORG= ${X11BASE}/lib/X11/config/xorg.cf ### .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 |