pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links improve error message
details: https://anonhg.NetBSD.org/pkgsrc/rev/a269c89840ca
branches: trunk
changeset: 565575:a269c89840ca
user: tnn <tnn%pkgsrc.org@localhost>
date: Sun Sep 27 18:44:27 2009 +0000
description:
improve error message
diffstat:
pkgtools/x11-links/Makefile | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diffs (29 lines):
diff -r 77079f9f0f91 -r a269c89840ca pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile Sun Sep 27 18:43:55 2009 +0000
+++ b/pkgtools/x11-links/Makefile Sun Sep 27 18:44:27 2009 +0000
@@ -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 @@
.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"
Home |
Main Index |
Thread Index |
Old Index