pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/startup-notification On NetBSD<5.99 with native X,...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6684c527b98b
branches:  trunk
changeset: 598956:6684c527b98b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 02 11:33:32 2012 +0000

description:
On NetBSD<5.99 with native X, use startup-notification010 instead,
which does not use XCB (which is not provided by native X in older
NetBSD releases). From Robert Elz.

diffstat:

 x11/startup-notification/buildlink3.mk |  16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 2ee799e1bfa0 -r 6684c527b98b x11/startup-notification/buildlink3.mk
--- a/x11/startup-notification/buildlink3.mk    Thu Feb 02 11:32:48 2012 +0000
+++ b/x11/startup-notification/buildlink3.mk    Thu Feb 02 11:33:32 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/11/08 18:59:56 jakllsch Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2012/02/02 11:33:32 wiz Exp $
 
 BUILDLINK_TREE+=       startup-notification
 
@@ -7,7 +7,21 @@
 
 BUILDLINK_API_DEPENDS.startup-notification+=   startup-notification>=0.5
 BUILDLINK_ABI_DEPENDS.startup-notification+=   startup-notification>=0.8nb1
+
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${X11_TYPE} == "modular"
 BUILDLINK_PKGSRCDIR.startup-notification?=     ../../x11/startup-notification
+.else
+.if ${OPSYS} == "NetBSD"
+.if !empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6789].*)
+BUILDLINK_PKGSRCDIR.startup-notification?=     ../../x11/startup-notification
+.else
+BUILDLINK_PKGSRCDIR.startup-notification?=     ../../x11/startup-notification010
+.endif
+.else #!NetBSD
+BUILDLINK_PKGSRCDIR.startup-notification?=     ../../x11/startup-notification
+.endif
+.endif
 
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"



Home | Main Index | Thread Index | Old Index