diff options
| author | wiz <wiz@pkgsrc.org> | 2002-10-21 13:58:14 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-10-21 13:58:14 +0000 |
| commit | 555b0a21c7e3d170642a5e483c4f58fd771ebad1 (patch) | |
| tree | 9bc9f6d5dcab0d9dc5b64ebb5a1d1afa611e6b00 /mk | |
| parent | 56d92b93932316d55e289f3abea037f9d887776d (diff) | |
| download | pkgsrc-555b0a21c7e3d170642a5e483c4f58fd771ebad1.tar.gz | |
Purge unused USE_XPM (use graphics/xpm/buildlink2.mk instead).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 24 |
2 files changed, 2 insertions, 35 deletions
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 |