diff options
| author | tron <tron> | 2000-11-24 23:28:30 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-11-24 23:28:30 +0000 |
| commit | cb36d2101a55a98eb63b495fd9e92e9790332cdd (patch) | |
| tree | 1a407c98161258e1efc1329abbccde7d3f259210 /mk | |
| parent | babb9fe1a936017c2eb69d776ef1db9f9aeebbae (diff) | |
| download | pkgsrc-cb36d2101a55a98eb63b495fd9e92e9790332cdd.tar.gz | |
Partially back out revision 1.612 because it causes endless loops in
dependency checks if the "xpm" package is not installed.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a5fc51ff1ce..627a4579f85 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.615 2000/11/22 10:40:21 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.616 2000/11/24 23:28:30 tron Exp $ # # This file is in the public domain. # @@ -776,22 +776,18 @@ 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) || (${DISTNAME:Mxpm-*} != "") +.if defined(USE_XPM) .if exists(${X11BASE}/include/X11/xpm.h) .if !defined(IS_BUILTIN_XPM) IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} MAKEFLAGS+= IS_BUILTIN_XPM=${IS_BUILTIN_XPM} .endif -.if defined(USE_XPM) .if (${IS_BUILTIN_XPM} == "0") DEPENDS+= xpm-3.4k:../../graphics/xpm XPMDIR_DEFAULT= ${X11PREFIX} .else XPMDIR_DEFAULT= ${X11BASE} .endif -.elif (${IS_BUILTIN_XPM} != "0") -IGNORE= "The Xpm library is included in your X11 distribution." -.endif .else DEPENDS+= xpm-3.4k:../../graphics/xpm XPMDIR_DEFAULT= ${X11PREFIX} |