summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2009-09-27 18:44:27 +0000
committertnn <tnn@pkgsrc.org>2009-09-27 18:44:27 +0000
commit4f4ff8b361bff94be3d25517be3aa49b39360436 (patch)
treea374df9f732ad7465cbd4d5ce5af087c4be0e433
parentd773b2deca06cf30094f9c4f3a8bd352091898f7 (diff)
downloadpkgsrc-4f4ff8b361bff94be3d25517be3aa49b39360436.tar.gz
improve error message
-rw-r--r--pkgtools/x11-links/Makefile15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index a53d725534e..40e4a58c679 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2009/09/13 13:31:41 tron Exp $
+# $NetBSD: Makefile,v 1.106 2009/09/27 18:44:27 tnn Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in buildlink3.mk to the correct version,
@@ -26,8 +26,17 @@ PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files}
.include "../../mk/bsd.prefs.mk"
-.if !exists(${X11BASE}/include/X11/X.h)
-PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed"
+.if ${X11_TYPE} == "modular"
+PKG_FAIL_REASON+= "${PKGNAME} should only be used with X11_TYPE=native."
+.elif !exists(${X11BASE}/include/X11/X.h)
+PKG_FAIL_REASON+= "pkgsrc has been configured to use a system provided X11 installation"
+PKG_FAIL_REASON+= "but one could not be found. Possible solutions:"
+PKG_FAIL_REASON+= ""
+PKG_FAIL_REASON+= " *) install X headers and libraries in X11BASE (currently ${X11BASE})"
+PKG_FAIL_REASON+= " *) set X11_TYPE=modular in mk.conf to use X11 from pkgsrc"
+PKG_FAIL_REASON+= ""
+PKG_FAIL_REASON+= "Please note that changing the value of X11_TYPE in existing"
+PKG_FAIL_REASON+= "pkgsrc installations is not supported!"
.endif
.if ${OPSYS} == "IRIX"