diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cdk/builtin.mk | 4 | ||||
| -rw-r--r-- | devel/dlcompat/builtin.mk | 4 | ||||
| -rw-r--r-- | devel/gettext-lib/builtin.mk | 19 | ||||
| -rw-r--r-- | devel/libevent/builtin.mk | 4 | ||||
| -rw-r--r-- | devel/libgetopt/builtin.mk | 4 | ||||
| -rw-r--r-- | devel/ncurses/builtin.mk | 7 | ||||
| -rw-r--r-- | devel/readline/builtin.mk | 13 | ||||
| -rw-r--r-- | devel/sysexits/builtin.mk | 4 | ||||
| -rw-r--r-- | devel/zlib/builtin.mk | 6 |
9 files changed, 35 insertions, 30 deletions
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; \ |