summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-30 18:06:17 +0000
committerjlam <jlam@pkgsrc.org>2006-03-30 18:06:17 +0000
commitd71a98aa8eb185cc8c26f46f2502a25cb3135389 (patch)
treea4e8c404ab7153a9727f5d7f913a25bdd6b97971
parent3987a638118f7f4cad35ee461afa830350d86564 (diff)
downloadpkgsrc-d71a98aa8eb185cc8c26f46f2502a25cb3135389.tar.gz
Avoid extra stat() calls by not repeatedly checking whether a file
exists on the disk -- we can just check whether a variable defined by find-files.mk is "__nonexistent__" or not.
-rw-r--r--archivers/bzip2/builtin.mk4
-rw-r--r--converters/libiconv/builtin.mk6
-rw-r--r--devel/cdk/builtin.mk4
-rw-r--r--devel/dlcompat/builtin.mk4
-rw-r--r--devel/gettext-lib/builtin.mk19
-rw-r--r--devel/libevent/builtin.mk4
-rw-r--r--devel/libgetopt/builtin.mk4
-rw-r--r--devel/ncurses/builtin.mk7
-rw-r--r--devel/readline/builtin.mk13
-rw-r--r--devel/sysexits/builtin.mk4
-rw-r--r--devel/zlib/builtin.mk6
-rw-r--r--fonts/Xft2/builtin.mk6
-rw-r--r--fonts/fontconfig/builtin.mk6
-rw-r--r--graphics/MesaLib/builtin.mk6
-rw-r--r--graphics/freetype2/builtin.mk6
-rw-r--r--graphics/glu/builtin.mk6
-rw-r--r--graphics/xpm/builtin.mk6
-rw-r--r--mail/libmilter/builtin.mk5
-rw-r--r--mail/libmilter812/builtin.mk5
-rw-r--r--net/bind9/builtin.mk5
-rw-r--r--net/libpcap/builtin.mk6
-rw-r--r--net/netbsd-tap/builtin.mk5
-rw-r--r--security/PAM/builtin.mk4
-rw-r--r--security/heimdal/builtin.mk9
-rw-r--r--security/libdes/builtin.mk4
-rw-r--r--security/openpam/builtin.mk6
-rw-r--r--security/openssl/builtin.mk12
-rw-r--r--security/pflkm/builtin.mk6
-rw-r--r--security/skey/builtin.mk6
-rw-r--r--security/tcp_wrappers/builtin.mk6
-rw-r--r--sysutils/fam/builtin.mk4
-rw-r--r--sysutils/file/builtin.mk4
-rw-r--r--textproc/expat/builtin.mk6
-rw-r--r--x11/XFree86-libs/builtin.mk6
-rw-r--r--x11/Xcomposite/builtin.mk4
-rw-r--r--x11/Xfixes/builtin.mk4
-rw-r--r--x11/Xrandr-mixedcase/builtin.mk6
-rw-r--r--x11/Xrender/builtin.mk6
-rw-r--r--x11/compositeext/builtin.mk5
-rw-r--r--x11/fixesext/builtin.mk5
-rw-r--r--x11/randrext/builtin.mk6
-rw-r--r--x11/renderext/builtin.mk6
-rw-r--r--x11/xcursor/builtin.mk6
-rw-r--r--x11/xextensions/builtin.mk4
-rw-r--r--x11/xorg-libs/builtin.mk6
45 files changed, 141 insertions, 127 deletions
diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk
index f9ecc3c43ae..8c76957760f 100644
--- a/archivers/bzip2/builtin.mk
+++ b/archivers/bzip2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/27 18:17:57 minskim Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= bzip2
@@ -14,7 +14,7 @@ BUILTIN_FIND_GREP.H_BZIP2= BZ2_
###
.if !defined(IS_BUILTIN.bzip2)
IS_BUILTIN.bzip2= no
-. if empty(H_BZIP2:M${LOCALBASE}/*) && exists(${H_BZIP2})
+. if empty(H_BZIP2:M__nonexistent__) && empty(H_BZIP2:M${LOCALBASE}/*)
IS_BUILTIN.bzip2= yes
. endif
.endif
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index bda1405ad4b..59d24953110 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2005/06/06 01:30:56 jlam Exp $
+# $NetBSD: builtin.mk,v 1.15 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= iconv
@@ -15,7 +15,7 @@ BUILTIN_FIND_GREP.H_ICONV= GNU LIBICONV Library
###
.if !defined(IS_BUILTIN.iconv)
IS_BUILTIN.iconv= no
-. if empty(H_ICONV:M${LOCALBASE}/*) && exists(${H_ICONV}) && \
+. if empty(H_ICONV:M__nonexistent__) && empty(H_ICONV:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS])
IS_BUILTIN.iconv= yes
. endif
@@ -28,7 +28,7 @@ MAKEVARS+= IS_BUILTIN.iconv
###
.if !defined(BUILTIN_PKG.iconv) && \
!empty(IS_BUILTIN.iconv:M[yY][eE][sS]) && \
- exists(${H_ICONV})
+ empty(H_ICONV:M__nonexistent__)
BUILTIN_VERSION.iconv!= \
${AWK} 'BEGIN { hex="0123456789abcdef" } \
/\#define[ ]*_LIBICONV_VERSION[ ]/ { \
diff --git a/devel/cdk/builtin.mk b/devel/cdk/builtin.mk
index 11110f5f13e..372d0a1e650 100644
--- a/devel/cdk/builtin.mk
+++ b/devel/cdk/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= cdk
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_CDK= /usr/include/cdk/cdk.h
###
.if !defined(IS_BUILTIN.cdk)
IS_BUILTIN.cdk= no
-. if empty(H_CDK:M${LOCALBASE}/*) && exists(${H_CDK})
+. if empty(H_CDK:M__nonexistent__) && empty(H_CDK:M${LOCALBASE}/*)
IS_BUILTIN.cdk= yes
. endif
.endif
diff --git a/devel/dlcompat/builtin.mk b/devel/dlcompat/builtin.mk
index 3d0af773b02..b158e625103 100644
--- a/devel/dlcompat/builtin.mk
+++ b/devel/dlcompat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/01 20:35:41 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= dlcompat
@@ -14,7 +14,7 @@ BUILTIN_FIND_FILES.H_DLFCN= /usr/include/dlfcn.h
###
.if !defined(IS_BUILTIN.dlcompat)
IS_BUILTIN.dlcompat= no
-. if empty(H_DLFCN:M${LOCALBASE}/*) && exists(${H_DLFCN}) && \
+. if empty(H_DLFCN:M__nonexistent__) && empty(H_DLFCN:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS])
IS_BUILTIN.dlcompat= yes
. endif
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 50f2a34b196..5ac8ac10f6f 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,11 +1,12 @@
-# $NetBSD: builtin.mk,v 1.28 2006/02/28 23:43:38 joerg Exp $
+# $NetBSD: builtin.mk,v 1.29 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= gettext
-BUILTIN_FIND_LIBS:= intl
-BUILTIN_FIND_FILES_VAR:= H_GETTEXT
-BUILTIN_FIND_FILES.H_GETTEXT= /usr/include/libintl.h
-BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT
+BUILTIN_FIND_LIBS:= intl
+BUILTIN_FIND_FILES_VAR:= H_GETTEXT
+BUILTIN_FIND_FILES.H_GETTEXT= /usr/include/libintl.h
+BUILTIN_FIND_FILES._BLTN_H_GETTEXT= /usr/include/libintl.h
+BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT
.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -15,17 +16,17 @@ BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT
###
.if !defined(IS_BUILTIN.gettext)
IS_BUILTIN.gettext= no
-. if empty(H_GETTEXT:M${LOCALBASE}/*) && exists(${H_GETTEXT}) && \
+. if empty(H_GETTEXT:M__nonexistent__) && \
+ empty(H_GETTEXT:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS])
IS_BUILTIN.gettext= yes
. endif
.endif
MAKEVARS+= IS_BUILTIN.gettext
-_BLTN_H_GETTEXT= /usr/include/libintl.h
.if !defined(BUILTIN_GETTEXT_NGETTEXT)
BUILTIN_GETTEXT_NGETTEXT= no
-. if exists(${_BLTN_H_GETTEXT})
+. if empty(_BLTN_H_GETTEXT:M__nonexistent__)
BUILTIN_GETTEXT_NGETTEXT!= \
if ${GREP} -q "char.*ngettext" ${_BLTN_H_GETTEXT:Q}; then \
${ECHO} yes; \
@@ -66,7 +67,7 @@ _BLTN_REPLACE.gettext= no
# XXX enough to replace GNU gettext if it is part of glibc (the GNU C
# XXX Library).
# XXX
-. if exists(${_BLTN_H_GETTEXT})
+. if empty(_BLTN_H_GETTEXT:M__nonexistent__)
_BLTN_REPLACE.gettext!= \
if ${GREP} -q "This file is part of the GNU C Library" ${_BLTN_H_GETTEXT:Q}; then \
${ECHO} yes; \
diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk
index 14c77ca8ca5..974625a06fc 100644
--- a/devel/libevent/builtin.mk
+++ b/devel/libevent/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= libevent
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_LIBEVENT= /usr/include/event.h
###
.if !defined(IS_BUILTIN.libevent)
IS_BUILTIN.libevent= no
-. if empty(H_LIBEVENT:M${LOCALBASE}/*) && exists(${H_LIBEVENT})
+. if empty(H_LIBEVENT:M__nonexistent__) && empty(H_LIBEVENT:M${LOCALBASE}/*)
IS_BUILTIN.libevent= yes
. endif
.endif # IS_BUILTIN.libevent
diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk
index 213033f54a1..6a7e28684d7 100644
--- a/devel/libgetopt/builtin.mk
+++ b/devel/libgetopt/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/05 09:25:37 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= getopt
@@ -14,7 +14,7 @@ BUILTIN_FIND_GREP.H_GETOPT= int.*getopt_long
###
.if !defined(IS_BUILTIN.getopt)
IS_BUILTIN.getopt= no
-. if empty(H_GETOPT:M${LOCALBASE}/*) && exists(${H_GETOPT})
+. if empty(H_GETOPT:M__nonexistent__) && empty(H_GETOPT:M${LOCALBASE}/*)
IS_BUILTIN.getopt= yes
. endif
.endif # IS_BUILTIN.getopt
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 952ece0d01a..027235b2e18 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= ncurses
@@ -15,7 +15,8 @@ BUILTIN_FIND_GREP.H_NCURSES= \#define[ ]*NCURSES_VERSION
###
.if !defined(IS_BUILTIN.ncurses)
IS_BUILTIN.ncurses= no
-. if empty(H_NCURSES:M${LOCALBASE}/*) && exists(${H_NCURSES}) && \
+. if empty(H_NCURSES:M__nonexistent__) && \
+ empty(H_NCURSES:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.ncurses:M[yY][eE][sS])
IS_BUILTIN.ncurses= yes
. endif
@@ -28,7 +29,7 @@ MAKEVARS+= IS_BUILTIN.ncurses
###
.if !defined(BUILTIN_PKG.ncurses) && \
!empty(IS_BUILTIN.ncurses:M[yY][eE][sS]) && \
- exists(${H_NCURSES})
+ empty(H_NCURSES:M__nonexistent__)
BUILTIN_VERSION.ncurses!= \
${AWK} '/\#define[ ]*NCURSES_VERSION[ ]/ { \
vers = $$3; \
diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk
index 3308cff2603..d41ae59c8c1 100644
--- a/devel/readline/builtin.mk
+++ b/devel/readline/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2005/07/01 17:24:02 minskim Exp $
+# $NetBSD: builtin.mk,v 1.12 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= readline
@@ -6,6 +6,9 @@ BUILTIN_FIND_LIBS:= edit readline
BUILTIN_FIND_FILES_VAR:= H_READLINE
BUILTIN_FIND_FILES.H_READLINE= /usr/include/readline/readline.h \
/usr/include/readline.h
+BUILTIN_FIND_FILES._BLTN_H_READLINE= \
+ /usr/include/readline/readline.h \
+ /usr/include/readline.h
BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR
.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -16,7 +19,8 @@ BUILTIN_FIND_GREP.H_READLINE= \#define[ ]*RL_VERSION_MAJOR
###
.if !defined(IS_BUILTIN.readline)
IS_BUILTIN.readline= no
-. if empty(H_READLINE:M${LOCALBASE}/*) && exists(${H_READLINE}) && \
+. if empty(H_READLINE:M__nonexistent__) && \
+ empty(H_READLINE:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.readline:M[yY][eE][sS])
IS_BUILTIN.readline= yes
. endif
@@ -29,7 +33,7 @@ MAKEVARS+= IS_BUILTIN.readline
###
.if !defined(BUILTIN_PKG.readline) && \
!empty(IS_BUILTIN.readline:M[yY][eE][sS]) && \
- exists(${H_READLINE})
+ empty(H_READLINE:M__nonexistent__)
BUILTIN_VERSION.readline!= \
${AWK} '/\#define[ ]*RL_VERSION_MAJOR/ { M = $$3 } \
/\#define[ ]*RL_VERSION_MINOR/ { m = "."$$3 } \
@@ -69,8 +73,7 @@ USE_BUILTIN.readline!= \
# XXX
. if !empty(BUILTIN_LIB_FOUND.readline:M[nN][oO]) && \
!empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) && \
- (exists(/usr/include/readline/readline.h) || \
- exists(/usr/include/readline.h))
+ empty(_BLTN_H_READLINE:M__nonexistent__)
USE_BUILTIN.readline= yes
. endif
#
diff --git a/devel/sysexits/builtin.mk b/devel/sysexits/builtin.mk
index ca8aea6c593..741ff7d8d5f 100644
--- a/devel/sysexits/builtin.mk
+++ b/devel/sysexits/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2005/10/31 15:53:19 tv Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= sysexits
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_SYSEXITS= /usr/include/sysexits.h
###
.if !defined(IS_BUILTIN.sysexits)
IS_BUILTIN.sysexits= no
-. if empty(H_SYSEXITS:M${LOCALBASE}/*) && exists(${H_SYSEXITS})
+. if empty(H_SYSEXITS:M__nonexistent__) && empty(H_SYSEXITS:M${LOCALBASE}/*)
IS_BUILTIN.sysexits= yes
. endif
.endif # IS_BUILTIN.sysexits
diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk
index cfc48374a44..26080ad9a86 100644
--- a/devel/zlib/builtin.mk
+++ b/devel/zlib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= zlib
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_ZLIB= /usr/include/zlib.h
###
.if !defined(IS_BUILTIN.zlib)
IS_BUILTIN.zlib= no
-. if empty(H_ZLIB:M${LOCALBASE}/*) && exists(${H_ZLIB})
+. if empty(H_ZLIB:M__nonexistent__) && empty(H_ZLIB:M${LOCALBASE}/*)
IS_BUILTIN.zlib= yes
. endif
.endif
@@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.zlib
###
.if !defined(BUILTIN_PKG.zlib) && \
!empty(IS_BUILTIN.zlib:M[yY][eE][sS]) && \
- exists(${H_ZLIB})
+ empty(H_ZLIB:M__nonexistent__)
BUILTIN_VERSION.zlib!= \
${AWK} '/\#define[ ]*ZLIB_VERSION/ { \
vers = $$3; \
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk
index 29a26272f88..25849ccb8e4 100644
--- a/fonts/Xft2/builtin.mk
+++ b/fonts/Xft2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2005/06/03 19:13:35 jlam Exp $
+# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= Xft2
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_XFT2= ${X11BASE}/include/X11/Xft/Xft.h
###
.if !defined(IS_BUILTIN.Xft2)
IS_BUILTIN.Xft2= no
-. if exists(${H_XFT2})
+. if empty(H_XFT2:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= Xft2:BuildXftLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.Xft2= ${BUILTIN_IMAKE_CHECK.Xft2}
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.Xft2
###
.if !defined(BUILTIN_PKG.Xft2) && \
!empty(IS_BUILTIN.Xft2:M[yY][eE][sS]) && \
- exists(${H_XFT2})
+ empty(H_XFT2:M__nonexistent__)
#
# Extract the version number from the header file, but if it's not
# there, then pretend it's from version 2.0.
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index c8103f6429c..16bb9522ae1 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= fontconfig
@@ -14,7 +14,7 @@ BUILTIN_FIND_FILES.H_FONTCONFIG= \
###
.if !defined(IS_BUILTIN.fontconfig)
IS_BUILTIN.fontconfig= no
-. if exists(${H_FONTCONFIG})
+. if empty(H_FONTCONFIG:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= fontconfig:BuildFontconfigLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.fontconfig= ${BUILTIN_IMAKE_CHECK.fontconfig}
@@ -28,7 +28,7 @@ MAKEVARS+= IS_BUILTIN.fontconfig
###
.if !defined(BUILTIN_PKG.fontconfig) && \
!empty(IS_BUILTIN.fontconfig:M[yY][eE][sS]) && \
- exists(${H_FONTCONFIG})
+ empty(H_FONTCONFIG:M__nonexistent__)
BUILTIN_VERSION.fontconfig!= \
${AWK} '/\#define[ ]*FC_MAJOR/ { M = $$3 } \
/\#define[ ]*FC_MINOR/ { m = "."$$3 } \
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index c557282c39f..dac3b0dc577 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2006/01/19 12:53:17 adam Exp $
+# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= MesaLib
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_MESALIB= ${X11BASE}/include/GL/glx.h
###
.if !defined(IS_BUILTIN.MesaLib)
IS_BUILTIN.MesaLib= no
-. if exists(${H_MESALIB})
+. if empty(H_MESALIB:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= MesaLib:BuildGLXLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.MesaLib= ${BUILTIN_IMAKE_CHECK.MesaLib}
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.MesaLib
###
.if !defined(BUILTIN_PKG.MesaLib) && \
!empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) && \
- exists(${H_MESALIB})
+ empty(H_MESALIB:M__nonexistent__)
. include "../../graphics/Mesa/version.mk"
BUILTIN_PKG.MesaLib= MesaLib-${BUILTIN_VERSION.Mesa}
.endif
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index d6c21b54c28..8afcae8d44c 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= freetype2
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_FREETYPE2= ${X11BASE}/include/freetype2/freetype/freetype.h
###
.if !defined(IS_BUILTIN.freetype2)
IS_BUILTIN.freetype2= no
-. if exists(${H_FREETYPE2})
+. if empty(H_FREETYPE2:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= freetype2:BuildFreetype2Library
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.freetype2= ${BUILTIN_IMAKE_CHECK.freetype2}
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.freetype2
###
.if !defined(BUILTIN_PKG.freetype2) && \
!empty(IS_BUILTIN.freetype2:M[yY][eE][sS]) && \
- exists(${H_FREETYPE2})
+ empty(H_FREETYPE2:M__nonexistent__)
BUILTIN_VERSION.freetype2!= \
${AWK} 'BEGIN { p = ".0" } \
/\#define[ ]*FREETYPE_MAJOR/ { M = $$3 } \
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index 3d15449dde3..474b0050a0b 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/01/19 12:53:17 adam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:17 jlam Exp $
BUILTIN_PKG:= glu
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_GLU= ${X11BASE}/include/GL/glu.h
###
.if !defined(IS_BUILTIN.glu)
IS_BUILTIN.glu= no
-. if exists(${H_GLU})
+. if empty(H_GLU:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= glu:BuildGLULibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.glu= ${BUILTIN_IMAKE_CHECK.glu}
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.glu
###
.if !defined(BUILTIN_PKG.glu) && \
!empty(IS_BUILTIN.glu:M[yY][eE][sS]) && \
- exists(${H_GLU})
+ empty(H_GLU:M__nonexistent__)
. include "../../graphics/Mesa/version.mk"
BUILTIN_PKG.glu= glu-${BUILTIN_VERSION.Mesa}
.endif
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index 277e9727234..eceebda0e4d 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= xpm
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_XPM= ${X11BASE}/include/X11/xpm.h
###
.if !defined(IS_BUILTIN.xpm)
IS_BUILTIN.xpm= no
-. if exists(${H_XPM})
+. if empty(H_XPM:M__nonexistent__)
. if !empty(X11BASE:M*openwin) && exists(/usr/sbin/pkgchk)
IS_BUILTIN.xpm!= \
if /usr/sbin/pkgchk -l SUNWxwinc | ${GREP} -q xpm.h; then \
@@ -38,7 +38,7 @@ MAKEVARS+= IS_BUILTIN.xpm
###
.if !defined(BUILTIN_PKG.xpm) && \
!empty(IS_BUILTIN.xpm:M[yY][eE][sS]) && \
- exists(${H_XPM})
+ empty(H_XPM:M__nonexistent__)
BUILTIN_VERSION.xpm!= \
${AWK} 'BEGIN { split("abcdefghijklmnopqrstuvwxyz", alpha, ""); \
p = ".0" } \
diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk
index 8f314ba5540..c88d7f68818 100644
--- a/mail/libmilter/builtin.mk
+++ b/mail/libmilter/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= libmilter
@@ -14,7 +14,8 @@ BUILTIN_FIND_FILES.H_LIBMILTER= /usr/include/libmilter/mfapi.h
###
.if !defined(IS_BUILTIN.libmilter)
IS_BUILTIN.libmilter= no
-. if empty(H_LIBMILTER:M${LOCALBASE}/*) && exists(${H_LIBMILTER}) && \
+. if empty(H_LIBMILTER:M__nonexistent__) && \
+ empty(H_LIBMILTER:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS])
IS_BUILTIN.libmilter= yes
. endif
diff --git a/mail/libmilter812/builtin.mk b/mail/libmilter812/builtin.mk
index 9743d3e3766..a15ac0e408e 100644
--- a/mail/libmilter812/builtin.mk
+++ b/mail/libmilter812/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= libmilter
@@ -14,7 +14,8 @@ BUILTIN_FIND_FILES.H_LIBMILTER= /usr/include/libmilter/mfapi.h
###
.if !defined(IS_BUILTIN.libmilter)
IS_BUILTIN.libmilter= no
-. if empty(H_LIBMILTER:M${LOCALBASE}/*) && exists(${H_LIBMILTER}) && \
+. if empty(H_LIBMILTER:M__nonexistent__) && \
+ empty(H_LIBMILTER:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.milter:M[yY][eE][sS])
IS_BUILTIN.libmilter= yes
. endif
diff --git a/net/bind9/builtin.mk b/net/bind9/builtin.mk
index b0108fe5482..a7597d7bb72 100644
--- a/net/bind9/builtin.mk
+++ b/net/bind9/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/26 04:05:41 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= bind
@@ -13,7 +13,8 @@ BUILTIN_FIND_LIBS:= bind
### system.
###
.if !defined(BUILTIN_VERSION.bind) && \
- empty(EXE_NAMED:M${LOCALBASE}/*) && exists(${EXE_NAMED})
+ empty(EXE_NAMED:M__nonexistent__) && \
+ empty(EXE_NAMED:M${LOCALBASE}/*)
BUILTIN_VERSION.bind!= \
${EXE_NAMED} -v 2>/dev/null | ${HEAD} -1 | \
${AWK} 'BEGIN { v = "4.9.11"; } \
diff --git a/net/libpcap/builtin.mk b/net/libpcap/builtin.mk
index a4ad5f43a81..cc808181ce0 100644
--- a/net/libpcap/builtin.mk
+++ b/net/libpcap/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2006/02/27 14:20:47 drochner Exp $
+# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= libpcap
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_LIBPCAP= /usr/include/pcap.h
###
.if !defined(IS_BUILTIN.libpcap)
IS_BUILTIN.libpcap= no
-. if empty(H_LIBPCAP:M${LOCALBASE}/*) && exists(${H_LIBPCAP})
+. if empty(H_LIBPCAP:M__nonexistent__) && empty(H_LIBPCAP:M${LOCALBASE}/*)
IS_BUILTIN.libpcap= yes
. endif
.endif
@@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.libpcap
###
.if !defined(BUILTIN_PKG.libpcap) && \
!empty(IS_BUILTIN.libpcap:M[yY][eE][sS]) && \
- exists(${H_LIBPCAP})
+ empty(H_LIBPCAP:M__nonexistent__)
# libpcap>=0.9.3: pcap_setdirection added (don't use pcap_inject, this
# was hacked into the NetBSD version of 0.8.3)
_BLTN_PCAP_093!= \
diff --git a/net/netbsd-tap/builtin.mk b/net/netbsd-tap/builtin.mk
index bc8d19347c2..ff2670ea28f 100644
--- a/net/netbsd-tap/builtin.mk
+++ b/net/netbsd-tap/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= netbsd-tap
@@ -13,7 +13,8 @@ BUILTIN_FIND_FILES.H_NETBSD_TAP= /usr/include/net/if_tap.h
###
.if !defined(IS_BUILTIN.netbsd-tap)
IS_BUILTIN.netbsd-tap= no
-. if empty(H_NETBSD_TAP:M${LOCALBASE}/*) && exists(${H_NETBSD_TAP})
+. if empty(H_NETBSD_TAP:M__nonexistent__) && \
+ empty(H_NETBSD_TAP:M${LOCALBASE}/*)
IS_BUILTIN.netbsd-tap= yes
. endif
.endif
diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk
index 3b3c81f2e01..47c69c8a802 100644
--- a/security/PAM/builtin.mk
+++ b/security/PAM/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2005/06/01 18:03:20 jlam Exp $
+# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= linux-pam
@@ -15,7 +15,7 @@ BUILTIN_FIND_GREP.H_LINUX_PAM= The Linux-PAM Framework layer API
###
.if !defined(IS_BUILTIN.linux-pam)
IS_BUILTIN.linux-pam= no
-. if empty(H_LINUX_PAM:M${LOCALBASE}/*) && exists(${H_LINUX_PAM})
+. if empty(H_LINUX_PAM:M__nonexistent__) && empty(H_LINUX_PAM:M${LOCALBASE}/*)
IS_BUILTIN.linux-pam= yes
. endif
.endif
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk
index 24256a0973d..e212ea11135 100644
--- a/security/heimdal/builtin.mk
+++ b/security/heimdal/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2006/01/26 22:46:15 markd Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= heimdal
@@ -16,7 +16,7 @@ BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)
###
.if !defined(IS_BUILTIN.heimdal)
IS_BUILTIN.heimdal= no
-. if empty(H_HEIMDAL:M${LOCALBASE}/*) && exists(${H_HEIMDAL})
+. if empty(H_HEIMDAL:M__nonexistent__) && empty(H_HEIMDAL:M${LOCALBASE}/*)
IS_BUILTIN.heimdal= yes
. endif
.endif
@@ -28,7 +28,7 @@ MAKEVARS+= IS_BUILTIN.heimdal
###
.if !defined(BUILTIN_PKG.heimdal) && \
!empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
-. if exists(${SH_KRB5_CONFIG})
+. if empty(SH_KRB5_CONFIG:M__nonexistent__)
BUILTIN_VERSION.heimdal!= ${SH_KRB5_CONFIG} --version | \
${AWK} '{ print $$2; exit }'
. else
@@ -104,7 +104,8 @@ CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q}
MAKE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q}
. endif
-. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS]) && !exists(${SH_KRB5_CONFIG})
+. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS]) && \
+ !empty(SH_KRB5_CONFIG:M__nonexistent__)
BUILDLINK_TARGETS+= fake-krb5-config
fake-krb5-config:
diff --git a/security/libdes/builtin.mk b/security/libdes/builtin.mk
index 710e3277265..0e383ed6c6c 100644
--- a/security/libdes/builtin.mk
+++ b/security/libdes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= libdes
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_LIBDES= /usr/include/libdes.h /usr/include/des.h
###
.if !defined(IS_BUILTIN.libdes)
IS_BUILTIN.libdes= no
-. if empty(H_LIBDES:M${LOCALBASE}/*) && exists(${H_LIBDES})
+. if empty(H_LIBDES:M__nonexistent__) && empty(H_LIBDES:M${LOCALBASE}/*)
IS_BUILTIN.libdes= yes
. endif
.endif
diff --git a/security/openpam/builtin.mk b/security/openpam/builtin.mk
index 7b651c9b483..d014f858f03 100644
--- a/security/openpam/builtin.mk
+++ b/security/openpam/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/09 06:07:29 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= openpam
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_OPENPAM= /usr/include/security/openpam_version.h
###
.if !defined(IS_BUILTIN.openpam)
IS_BUILTIN.openpam= no
-. if empty(H_OPENPAM:M${LOCALBASE}/*) && exists(${H_OPENPAM})
+. if empty(H_OPENPAM:M__nonexistent__) && empty(H_OPENPAM:M${LOCALBASE}/*)
IS_BUILTIN.openpam= yes
. endif
.endif
@@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.openpam
###
.if !defined(BUILTIN_PKG.openpam) && \
!empty(IS_BUILTIN.openpam:M[yY][eE][sS]) && \
- exists(${H_OPENPAM})
+ empty(H_OPENPAM:M__nonexistent__)
BUILTIN_VERSION.openpam!= \
${AWK} '/\#define[ ]*_OPENPAM_VERSION[ ]/ {print $$3; }' \
${H_OPENPAM}
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index 35aa387fe44..07c7dcd6dd9 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.17 2005/10/12 02:20:10 jlam Exp $
+# $NetBSD: builtin.mk,v 1.18 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= openssl
@@ -14,7 +14,7 @@ BUILTIN_FIND_FILES.H_OPENSSL= /usr/include/openssl/opensslv.h
###
.if !defined(IS_BUILTIN.openssl)
IS_BUILTIN.openssl= no
-. if empty(H_OPENSSL:M${LOCALBASE}/*) && exists(${H_OPENSSL})
+. if empty(H_OPENSSL:M__nonexistent__) && empty(H_OPENSSL:M${LOCALBASE}/*)
IS_BUILTIN.openssl= yes
. endif
.endif
@@ -26,7 +26,7 @@ MAKEVARS+= IS_BUILTIN.openssl
###
.if !defined(BUILTIN_PKG.openssl) && \
!empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
- exists (${H_OPENSSL})
+ empty(H_OPENSSL:M__nonexistent__)
BUILTIN_VERSION.openssl!= \
${AWK} 'BEGIN { hex="0123456789abcdef"; \
split("abcdefghijklmnopqrstuvwxyz", alpha, ""); \
@@ -54,7 +54,8 @@ BUILTIN_VERSION.openssl!= \
} \
' ${H_OPENSSL}
-. if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && exists(${H_OPENSSL})
+. if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && \
+ empty(H_OPENSSL:M__nonexistent__)
#
# If the native OpenSSL contains the security fixes pulled up to the
# netbsd-1-6 branch on 2003-11-07, then pretend it's openssl-0.9.6l.
@@ -79,7 +80,8 @@ BUILTIN_OPENSSL_HAS_20040401_FIX!= \
. if !empty(BUILTIN_OPENSSL_HAS_20040401_FIX:M[yY][eE][sS])
BUILTIN_VERSION.openssl= 0.9.6m
. endif
-. elif !empty(BUILTIN_VERSION.openssl:M0\.9\.7d) && exists(${H_OPENSSL})
+. elif !empty(BUILTIN_VERSION.openssl:M0\.9\.7d) && \
+ empty(H_OPENSSL:M__nonexistent__)
#
# If the native OpenSSL contains the security fixes pulled up to the
# netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then
diff --git a/security/pflkm/builtin.mk b/security/pflkm/builtin.mk
index a162d1402a2..a9695aeab83 100644
--- a/security/pflkm/builtin.mk
+++ b/security/pflkm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 16:58:16 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= pflkm
@@ -14,7 +14,7 @@ BUILTIN_FIND_FILES.EXE_PFCTL+= /sbin/pfctl
#
.if !defined(PF_VERSION)
PF_VERSION= 3.7 # package default
-. if exists(${H_PFLKM})
+. if empty(H_PFLKM:M__nonexistent__)
# OpenBSD 3.8: pf_socket_lookup added
_BLTN_PF_3_8!= ${GREP} -c pf_socket_lookup ${H_PFLKM} || ${TRUE}
# OpenBSD 3.7: pf_threshold added
@@ -41,7 +41,7 @@ MAKEVARS+= PF_VERSION
###
.if !defined(IS_BUILTIN.pflkm)
IS_BUILTIN.pflkm= no
-. if empty(H_PFLKM:M${LOCALBASE}/*) && exists(${H_PFLKM})
+. if empty(H_PFLKM:M__nonexistent__) && empty(H_PFLKM:M${LOCALBASE}/*)
IS_BUILTIN.pflkm= yes
. endif
.endif
diff --git a/security/skey/builtin.mk b/security/skey/builtin.mk
index 0430d5cf856..6f79b3f79d4 100644
--- a/security/skey/builtin.mk
+++ b/security/skey/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= skey
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_SKEY= /usr/include/skey.h
###
.if !defined(IS_BUILTIN.skey)
IS_BUILTIN.skey= no
-. if empty(H_SKEY:M${LOCALBASE}/*) && exists(${H_SKEY})
+. if empty(H_SKEY:M__nonexistent__) && empty(H_SKEY:M${LOCALBASE}/*)
IS_BUILTIN.skey= yes
. endif
.endif
@@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.skey
###
.if !defined(BUILTIN_PKG.skey) && \
!empty(IS_BUILTIN.skey:M[yY][eE][sS) && \
- exists(${H_SKEY})
+ empty(H_SKEY:M__nonexistent__)
# XXX
# XXX Consider the native skey to be skey-1.1.5.
# XXX
diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk
index d571b5df8e8..8537f44cf01 100644
--- a/security/tcp_wrappers/builtin.mk
+++ b/security/tcp_wrappers/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= tcp_wrappers
@@ -14,8 +14,8 @@ BUILTIN_FIND_FILES.H_TCP_WRAPPERS= /usr/include/tcpd.h
###
.if !defined(IS_BUILTIN.tcp_wrappers)
IS_BUILTIN.tcp_wrappers= no
-. if empty(H_TCP_WRAPPERS:M${LOCALBASE}/*) && \
- exists(${H_TCP_WRAPPERS}) && \
+. if empty(H_TCP_WRAPPERS:M__nonexistent__) && \
+ empty(H_TCP_WRAPPERS:M${LOCALBASE}/*) && \
!empty(BUILTIN_LIB_FOUND.wrap:M[yY][eE][sS])
IS_BUILTIN.tcp_wrappers= yes
. endif
diff --git a/sysutils/fam/builtin.mk b/sysutils/fam/builtin.mk
index d3c0f824bb4..9585aed69f6 100644
--- a/sysutils/fam/builtin.mk
+++ b/sysutils/fam/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= fam
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_FAM= /usr/include/fam.h
###
.if !defined(IS_BUILTIN.fam)
IS_BUILTIN.fam= no
-. if empty(H_FAM:M${LOCALBASE}/*) && exists(${H_FAM})
+. if empty(H_FAM:M__nonexistent__) && empty(H_FAM:M${LOCALBASE}/*)
IS_BUILTIN.fam= yes
. endif
.endif
diff --git a/sysutils/file/builtin.mk b/sysutils/file/builtin.mk
index c603a25faec..bcf7e0ce9c5 100644
--- a/sysutils/file/builtin.mk
+++ b/sysutils/file/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2005/06/01 18:03:21 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= file
@@ -14,7 +14,7 @@ BUILTIN_FIND_GREP.H_FILE= magic_file
###
.if !defined(IS_BUILTIN.file)
IS_BUILTIN.file= no
-. if empty(H_FILE:M${LOCALBASE}/*) && exists(${H_FILE})
+. if empty(H_FILE:M__nonexistent__) && empty(H_FILE:M${LOCALBASE}/*)
IS_BUILTIN.file= yes
. endif
.endif
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index 1465e3aeb79..7c8e5f99a45 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/03/06 19:21:34 tv Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:18 jlam Exp $
BUILTIN_PKG:= expat
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h /usr/include/expat.h
###
.if !defined(IS_BUILTIN.expat)
IS_BUILTIN.expat= no
-. if exists(${H_EXPAT})
+. if empty(H_EXPAT:M__nonexistent__)
. if !empty(H_EXPAT:M${X11BASE}/)
BUILTIN_IMAKE_CHECK:= expat:BuildExpatLibrary
. include "../../mk/buildlink3/imake-check.mk"
@@ -31,7 +31,7 @@ MAKEVARS+= IS_BUILTIN.expat
###
.if !defined(BUILTIN_PKG.expat) && \
!empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \
- exists(${H_EXPAT})
+ empty(H_EXPAT:M__nonexistent__)
BUILTIN_VERSION.expat!= \
${AWK} '/\#define[ ]*XML_MAJOR_VERSION/ { M = $$3 } \
/\#define[ ]*XML_MINOR_VERSION/ { m = "."$$3 } \
diff --git a/x11/XFree86-libs/builtin.mk b/x11/XFree86-libs/builtin.mk
index a0f3a3f5c92..5e0007c2f4e 100644
--- a/x11/XFree86-libs/builtin.mk
+++ b/x11/XFree86-libs/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2005/06/24 05:21:31 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 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 empty(CF_XFREE86:M${LOCALBASE}/*) && exists(${CF_XFREE86})
+. if empty(CF_XFREE86:M__nonexistent__) && empty(CF_XFREE86:M${LOCALBASE}/*)
IS_BUILTIN.XFree86-libs= yes
. endif
.endif
@@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.XFree86-libs
###
.if !defined(BUILTIN_PKG.XFree86-libs) && \
!empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS]) && \
- exists(${CF_XFREE86})
+ empty(CF_XFREE86:M__nonexistent__)
. include "${BUILDLINK_PKGSRCDIR.XFree86-libs}/version.mk"
BUILTIN_PKG.XFree86-libs= XFree86-libs-${BUILTIN_X11_VERSION.XFree86}
.endif
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 53c51ee2e04..52d643625b3 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= Xcomposite
@@ -14,7 +14,7 @@ BUILTIN_FIND_FILES.H_XCOMPOSITE= \
###
.if !defined(IS_BUILTIN.Xcomposite)
IS_BUILTIN.Xcomposite= no
-. if exists(${H_XCOMPOSITE})
+. if empty(H_XCOMPOSITE:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= Xcomposite:BuildCompositeLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.Xcomposite= ${BUILTIN_IMAKE_CHECK.Xcomposite}
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index 59d68dac2ac..f5696f18a59 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/06/03 19:12:49 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= Xfixes
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_XFIXES= ${X11BASE}/include/X11/extensions/Xfixes.h
###
.if !defined(IS_BUILTIN.Xfixes)
IS_BUILTIN.Xfixes= no
-. if exists(${H_XFIXES})
+. if empty(H_XFIXES:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= Xfixes:BuildXfixesLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.Xfixes= ${BUILTIN_IMAKE_CHECK.Xfixes}
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index 832179c1213..c62345d1bc2 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2005/07/09 03:14:36 grant Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= Xrandr
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_XRANDR= ${X11BASE}/include/X11/extensions/Xrandr.h
###
.if !defined(IS_BUILTIN.Xrandr)
IS_BUILTIN.Xrandr= no
-. if exists(${H_XRANDR})
+. if empty(H_XRANDR:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= Xrandr:BuildRandRLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.Xrandr= ${BUILTIN_IMAKE_CHECK.Xrandr}
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.Xrandr
###
.if !defined(BUILTIN_PKG.Xrandr) && \
!empty(IS_BUILTIN.Xrandr:M[yY][eE][sS]) && \
- exists(${H_XRANDR})
+ empty(H_XRANDR:M__nonexistent__)
#
# Xrandr doesn't provide a method of discovering the version number of
# the software. Match up Xrandr versions with X11 versions for an
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index 4f28f9daf1c..cccc7ec9213 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2005/10/09 21:30:55 jmmv Exp $
+# $NetBSD: builtin.mk,v 1.16 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= Xrender
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_XRENDER= ${X11BASE}/include/X11/extensions/Xrender.h
###
.if !defined(IS_BUILTIN.Xrender)
IS_BUILTIN.Xrender= no
-. if exists(${H_XRENDER})
+. if empty(H_XRENDER:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= Xrender:BuildRenderLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.Xrender= ${BUILTIN_IMAKE_CHECK.Xrender}
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.Xrender
###
.if !defined(BUILTIN_PKG.Xrender) && \
!empty(IS_BUILTIN.Xrender:M[yY][eE][sS]) && \
- exists(${H_XRENDER})
+ empty(H_XRENDER:M__nonexistent__)
#
# Xrender doesn't provide a method of discovering the version number of
# the software. Match up Xrender versions with X11 versions for an
diff --git a/x11/compositeext/builtin.mk b/x11/compositeext/builtin.mk
index af622262ed8..2d536a2d9ce 100644
--- a/x11/compositeext/builtin.mk
+++ b/x11/compositeext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= compositeext
@@ -21,7 +21,8 @@ IS_BUILTIN.compositeext= no
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
#
-. if exists(${H_COMPOSITE}) && exists(${H_COMPOSITEPROTO})
+. if empty(H_COMPOSITE:M__nonexistent__) && \
+ empty(H_COMPOSITEPROTO:M__nonexistent__)
IS_BUILTIN.compositeext= yes
. endif
.endif
diff --git a/x11/fixesext/builtin.mk b/x11/fixesext/builtin.mk
index 5c2be9fd331..56586af3ee9 100644
--- a/x11/fixesext/builtin.mk
+++ b/x11/fixesext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= fixesext
@@ -21,7 +21,8 @@ IS_BUILTIN.fixesext= no
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
#
-. if exists(${H_XFIXESPROTO}) && exists(${H_XFIXESWIRE})
+. if empty(H_XFIXESPROTO:M__nonexistent__) && \
+ empty(H_XFIXESWIRE:M__nonexistent__)
IS_BUILTIN.fixesext= yes
. endif
.endif
diff --git a/x11/randrext/builtin.mk b/x11/randrext/builtin.mk
index f4604f81fa8..c5a26239366 100644
--- a/x11/randrext/builtin.mk
+++ b/x11/randrext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:30 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= randrext
@@ -18,7 +18,7 @@ IS_BUILTIN.randrext= no
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
#
-. if exists(${H_RANDR})
+. if empty(H_RANDR:M__nonexistent__)
IS_BUILTIN.randrext= yes
. endif
.endif
@@ -30,7 +30,7 @@ MAKEVARS+= IS_BUILTIN.randrext
###
.if !defined(BUILTIN_PKG.randrext) && \
!empty(IS_BUILTIN.randrext:M[yY][eE][sS]) && \
- exists(${H_RANDR})
+ empty(H_RANDR:M__nonexistent__)
BUILTIN_VERSION.randrext!= \
${AWK} '/\#define[ ]*RANDR_MAJOR/ { M = $$3 } \
/\#define[ ]*RANDR_MINOR/ { m = "."$$3 } \
diff --git a/x11/renderext/builtin.mk b/x11/renderext/builtin.mk
index a1fb34091da..f85455cf1fb 100644
--- a/x11/renderext/builtin.mk
+++ b/x11/renderext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2005/10/15 16:36:57 wiz Exp $
+# $NetBSD: builtin.mk,v 1.2 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= renderext
@@ -18,7 +18,7 @@ IS_BUILTIN.renderext= no
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
#
-. if exists(${H_RENDER})
+. if empty(H_RENDER:M__nonexistent__)
IS_BUILTIN.renderext= yes
. endif
.endif
@@ -30,7 +30,7 @@ MAKEVARS+= IS_BUILTIN.renderext
###
.if !defined(BUILTIN_PKG.renderext) && \
!empty(IS_BUILTIN.renderext:M[yY][eE][sS]) && \
- exists(${H_RENDER})
+ empty(H_RENDER:M__nonexistent__)
BUILTIN_VERSION.renderext!= \
${AWK} '/\#define[ ]*RENDER_MAJOR/ { M = $$3 } \
/\#define[ ]*RENDER_MINOR/ { m = "."$$3 } \
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index d10ae5b057b..d29ac9b8630 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2005/12/04 01:46:45 rxg Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= xcursor
@@ -13,7 +13,7 @@ BUILTIN_FIND_FILES.H_XCURSOR= ${X11BASE}/include/X11/Xcursor/Xcursor.h
###
.if !defined(IS_BUILTIN.xcursor)
IS_BUILTIN.xcursor= no
-. if exists(${H_XCURSOR})
+. if empty(H_XCURSOR:M__nonexistent__)
BUILTIN_IMAKE_CHECK:= xcursor:BuildXcursorLibrary
. include "../../mk/buildlink3/imake-check.mk"
IS_BUILTIN.xcursor= ${BUILTIN_IMAKE_CHECK.xcursor}
@@ -27,7 +27,7 @@ MAKEVARS+= IS_BUILTIN.xcursor
###
.if !defined(BUILTIN_PKG.xcursor) && \
!empty(IS_BUILTIN.xcursor:M[yY][eE][sS]) && \
- exists(${H_XCURSOR})
+ empty(H_XCURSOR:M__nonexistent__)
BUILTIN_VERSION.xcursor!= \
${AWK} '/\#define[ ]*XCURSOR_(LIB_)?MAJOR/ { M = $$3 } \
/\#define[ ]*XCURSOR_(LIB_)?MINOR/ { m = "."$$3 } \
diff --git a/x11/xextensions/builtin.mk b/x11/xextensions/builtin.mk
index a98317d134a..7e207fca3b1 100644
--- a/x11/xextensions/builtin.mk
+++ b/x11/xextensions/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2005/10/09 21:43:02 jmmv Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:19 jlam Exp $
BUILTIN_PKG:= xextensions
@@ -19,7 +19,7 @@ IS_BUILTIN.xextensions= no
# we'll consider this X11 package to be built-in even if it's a part
# of one of the pkgsrc-installed X11 distributions.
#
-. if exists(${H_XEXTENSIONS})
+. if empty(H_XEXTENSIONS:M__nonexistent__)
IS_BUILTIN.xextensions= yes
. endif
.endif
diff --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk
index 63191f389c0..7e85d9df883 100644
--- a/x11/xorg-libs/builtin.mk
+++ b/x11/xorg-libs/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2005/10/16 19:53:36 tonio Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:19 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 empty(CF_XORG:M${LOCALBASE}/*) && exists(${CF_XORG})
+. if empty(CF_XORG:M__nonexistent__) && empty(CF_XORG:M${LOCALBASE}/*)
IS_BUILTIN.xorg-libs= yes
. endif
.endif
@@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.xorg-libs
###
.if !defined(BUILTIN_PKG.xorg-libs) && \
!empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS]) && \
- exists(${CF_XORG})
+ empty(CF_XORG:M__nonexistent__)
. include "${BUILDLINK_PKGSRCDIR.xorg-libs}/version.mk"
BUILTIN_PKG.xorg-libs= xorg-libs-${BUILTIN_X11_VERSION.xorg}
.endif