summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-10-04 07:56:06 +0000
committerjlam <jlam@pkgsrc.org>2001-10-04 07:56:06 +0000
commit2b9404e054d84f3407d1307f79ce0d4fb67718b1 (patch)
tree42420b050a70c8db2d5d0be7f2127fd1a5d8df72 /mk
parent04d88431f13a34bde675cd43d1fbb574868df354 (diff)
downloadpkgsrc-2b9404e054d84f3407d1307f79ce0d4fb67718b1.tar.gz
If USE_IMAKE is set, then ensure that the buildlink-x11 package isn't
installed, as it currently breaks builds that use imake. I made an announcement on current-users and tech-pkg on this, but having the make logic place to verify that buildlink-x11 is actually gone is better.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk13
1 files changed, 12 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 2935a635468..b380e5f7335 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.819 2001/10/03 07:57:04 tron Exp $
+# $NetBSD: bsd.pkg.mk,v 1.820 2001/10/04 07:56:06 jlam Exp $
#
# This file is in the public domain.
#
@@ -134,6 +134,17 @@ NO_MTREE= yes
PREFIX= ${LOCALBASE}
.endif
+# We need to make sure the buildlink-x11 package is not installed since it
+# currently breaks builds that use imake.
+#
+.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
+
.if defined(USE_GMAKE)
BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake
MAKE_PROGRAM= ${GMAKE}