diff options
| author | jlam <jlam> | 2006-03-30 18:06:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-30 18:06:17 +0000 |
| commit | a35f9b4747edb8252e3b814ea5580fd22f62dc6b (patch) | |
| tree | a4e8c404ab7153a9727f5d7f913a25bdd6b97971 /fonts | |
| parent | a363c62fe6f0f041b9e87d700fa75aa44358a5d9 (diff) | |
| download | pkgsrc-a35f9b4747edb8252e3b814ea5580fd22f62dc6b.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.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/Xft2/builtin.mk | 6 | ||||
| -rw-r--r-- | fonts/fontconfig/builtin.mk | 6 |
2 files changed, 6 insertions, 6 deletions
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 } \ |