pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 Make these fail with a comprehensible error messag...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d71cb816aad1
branches:  trunk
changeset: 546821:d71cb816aad1
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Sep 08 07:02:52 2008 +0000

description:
Make these fail with a comprehensible error message when X11_TYPE != native.

diffstat:

 x11/Xfixes/Makefile  |  5 ++++-
 x11/Xrender/Makefile |  5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 953e45ae5556 -r d71cb816aad1 x11/Xfixes/Makefile
--- a/x11/Xfixes/Makefile       Mon Sep 08 06:38:56 2008 +0000
+++ b/x11/Xfixes/Makefile       Mon Sep 08 07:02:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/02/22 19:27:25 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/09/08 07:02:52 dholland Exp $
 #
 
 DISTNAME=              libXfixes-2.0.1
@@ -13,6 +13,9 @@
 COMMENT=               X Fixes extension of X RandR
 
 CONFLICTS+=            libXfixes-[0-9]*
+.if "${X11_TYPE}" != "native"
+PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead."
+.endif
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
diff -r 953e45ae5556 -r d71cb816aad1 x11/Xrender/Makefile
--- a/x11/Xrender/Makefile      Mon Sep 08 06:38:56 2008 +0000
+++ b/x11/Xrender/Makefile      Mon Sep 08 07:02:52 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/01/03 22:12:25 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2008/09/08 07:02:52 dholland Exp $
 
 DISTNAME=      libXrender-0.9.0
 PKGNAME=       ${DISTNAME:S/lib//}
@@ -12,6 +12,9 @@
 COMMENT=       Client library for the X Rendering Extension protocol
 
 CONFLICTS+=    libXrender-[0-9]*
+.if "${X11_TYPE}" != "native"
+PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead."
+.endif
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir



Home | Main Index | Thread Index | Old Index