diff options
| author | grant <grant> | 2004-05-20 11:25:57 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-05-20 11:25:57 +0000 |
| commit | f52b9e6694aec322f7e93b23d7f9ca8f7ae3a63c (patch) | |
| tree | b0bdec0f6903a648d48e57946472f9a3186a514c /graphics/xpm | |
| parent | 51c25890e0ccdb6ca7890e6c1ea6548bff5be3f1 (diff) | |
| download | pkgsrc-f52b9e6694aec322f7e93b23d7f9ca8f7ae3a63c.tar.gz | |
drop the minimum required version of built-in xpm to 3.4. this is
actually still more strict than the buildlink2 behaviour (which would
allow any version), but at least packages requiring xpm can now build
again with builtin xpm on non-XFree86 platforms.
Diffstat (limited to 'graphics/xpm')
| -rw-r--r-- | graphics/xpm/builtin.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index ae813630b4b..e6d3f83bc6c 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2004/04/24 21:20:56 snj Exp $ +# $NetBSD: builtin.mk,v 1.4 2004/05/20 11:25:57 grant Exp $ .include "../../mk/bsd.prefs.mk" @@ -53,16 +53,14 @@ USE_BUILTIN.xpm?= ${IS_BUILTIN.xpm} . if defined(BUILTIN_PKG.xpm) USE_BUILTIN.xpm= yes -. for _depend_ in ${BUILDLINK_DEPENDS.xpm} -. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) USE_BUILTIN.xpm!= \ - if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.xpm}; then \ + if ${PKG_ADMIN} pmatch 'xpm>=3.4' ${BUILTIN_PKG.xpm}; then \ ${ECHO} "yes"; \ - else \ + else \ ${ECHO} "no"; \ - fi -. endif -. endfor + fi +. endif . endif .endif # USE_BUILTIN.xpm |