diff options
| -rw-r--r-- | Packages.txt | 3 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 13 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 24 |
3 files changed, 3 insertions, 37 deletions
diff --git a/Packages.txt b/Packages.txt index 7706cecd6ab..3b95560f52b 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.263 2002/10/21 01:21:46 wiz Exp $ +# $NetBSD: Packages.txt,v 1.264 2002/10/21 13:58:14 wiz Exp $ ########################################################################### ========================== @@ -1666,7 +1666,6 @@ buildlink.mk files: USE_LIBINTL --> .include "../../devel/gettext-lib/buildlink.mk" USE_X11 --> .include "../../mk/x11.buildlink.mk" - USE_XPM --> .include "../../graphics/xpm/buildlink.mk" Packages that have an explicit dependency on ncurses should set USE_NCURSES to the reason why the system curses is insufficient, and include diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ba65001ef95..3e16cef7425 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1072 2002/10/21 01:40:56 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1073 2002/10/21 13:58:16 wiz Exp $ # # This file is in the public domain. # @@ -711,17 +711,6 @@ INSTALL_TARGET+= install.man FETCH_BEFORE_ARGS += -p .endif -# If USE_XPM is set, depend on xpm. -.if defined(USE_XPM) -. if (defined(HAVE_BUILTIN_XPM) && (${HAVE_BUILTIN_XPM} == "NO")) -DEPENDS+= xpm-3.4k:../../graphics/xpm -XPMDIR_DEFAULT= ${X11PREFIX} -. else -XPMDIR_DEFAULT= ${X11BASE} -. endif -. undef __BUILTIN_XPM -.endif # USE_XPM - # Check if we got "rman" with XFree86, for packages that need "rman". .if defined(USE_RMAN) . if !exists(${X11BASE}/bin/rman) diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c6d52a153c0..ec89b442c63 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.85 2002/10/21 01:40:57 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.86 2002/10/21 13:58:18 wiz Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -210,28 +210,6 @@ USE_INET6?= NO .include "${.CURDIR}/mk/defs.NetBSD.mk" .endif -# Check if we got Xpm distributed with XFree86 4.x or Solaris 9 or if we need -# to depend on the Xpm package. -.if (defined(CHECK_XPM) || defined(USE_XPM)) -X11BASE?= /usr/X11R6 -.if (${OPSYS} != SunOS) -.if exists(${X11BASE}/include/X11/xpm.h) && \ - exists(${X11BASE}/lib/X11/config/X11.tmpl) -__BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} -.else -__BUILTIN_XPM= 0 -.endif -.else -__BUILTIN_XPM!= (/usr/sbin/pkgchk -l SUNWxwinc | ${EGREP} -c xpm.h) || ${TRUE} -.endif -.if ${__BUILTIN_XPM} == "0" -HAVE_BUILTIN_XPM= NO -.else -HAVE_BUILTIN_XPM= YES -.endif -.undef __BUILTIN_XPM -.endif # CHECK_XPM - LOCALBASE?= ${DESTDIR}/usr/pkg X11BASE?= ${DESTDIR}/usr/X11R6 CROSSBASE?= ${LOCALBASE}/cross |