diff options
| author | tron <tron> | 2000-11-20 09:02:25 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-11-20 09:02:25 +0000 |
| commit | d342d1c1afcc1f75f8cb38d30c3472357b905e90 (patch) | |
| tree | 8b46426e1cdb5563cf9a93f23d639569c80d6859 /mk | |
| parent | c5c4ea5e428f0784bb30bbf6e258ef3ba16b7fe9 (diff) | |
| download | pkgsrc-d342d1c1afcc1f75f8cb38d30c3472357b905e90.tar.gz | |
Prevent an attempt to build the "xpm" package on a system with XFree86 4.0
or newer installed because it includes this library.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3cd4aa16cf4..42d7162e2fb 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.611 2000/11/20 08:33:42 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.612 2000/11/20 09:02:25 tron Exp $ # # This file is in the public domain. # @@ -777,15 +777,19 @@ DEPENDS+= ${LESSTIF_DEPENDS} # Check if we got Xpm distributed with XFree86 4.0 or newer or if we # need to use the package. -.if defined(USE_XPM) +.if defined(USE_XPM) || (${DISTNAME:Mxpm-*} != "") .if exists(${X11BASE}/include/X11/xpm.h) __BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.if defined(USE_XPM) .if (${__BUILTIN_XPM} == "0") DEPENDS+= xpm-3.4k:../../graphics/xpm XPMDIR_DEFAULT= ${X11PREFIX} .else XPMDIR_DEFAULT= ${X11BASE} .endif +.elif (${__BUILTIN_XPM} != "0") +IGNORE= "The Xpm library is included in your X11 distribution." +.endif .undef __BUILTIN_XPM .else DEPENDS+= xpm-3.4k:../../graphics/xpm |