summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-08-06 06:11:12 +0000
committerjlam <jlam@pkgsrc.org>2002-08-06 06:11:12 +0000
commit28130fad6ccc04989ebd5d545ebe090238c19581 (patch)
tree4e972485c521ffc855af1a8b00656aaedace97e3 /mk
parent2fd2e60ce02c7581cb791d3cdb9dd6008fbfcc63 (diff)
downloadpkgsrc-28130fad6ccc04989ebd5d545ebe090238c19581.tar.gz
USE_BUILDLINK_X11 is dead too with the removal of pkgtools/buildlink-x11.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 0fd9e02e6b6..553c03f67e1 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1026 2002/08/03 19:51:20 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1027 2002/08/06 06:11:12 jlam Exp $
#
# This file is in the public domain.
#
@@ -188,15 +188,15 @@ PREFIX= ${LOCALBASE}
.endif
# We need to make sure the buildlink-x11 package is not installed since it
-# currently breaks builds that use imake.
+# breaks builds that use imake.
#
-.if defined(USE_IMAKE) && !defined(USE_BUILDLINK_X11)
+.if defined(USE_IMAKE)
. if exists(${LOCALBASE}/lib/X11/config/buildlinkX11.def) || \
exists(${X11BASE}/lib/X11/config/buildlinkX11.def)
IGNORE+= "${PKGNAME} uses imake, but the buildlink-x11 package was found." \
" Please deinstall it (pkg_delete buildlink-x11)."
. endif
-.endif # USE_IMAKE && !USE_BUILDLINK_X11
+.endif # USE_IMAKE
.if defined(USE_GMAKE)
. if ${_OPSYS_HAS_GMAKE} == "no"