CVS commit: pkgsrc/net/tigervnc

["Dan McMahill" <dmcmahill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dmcmahill
Date:           Wed Jan 25 03:18:35 UTC 2017

Modified Files:
        pkgsrc/net/tigervnc: Makefile

Log Message:
Add configure args to give the location of xkb.  Without this, the vnc
server would fail to start when using the native X on NetBSD-7.0.2.  This
should allow it to work on native and pkgsrc X


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/tigervnc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.15 pkgsrc/net/tigervnc/Makefile:1.16
--- pkgsrc/net/tigervnc/Makefile:1.15   Tue Jan 24 08:30:25 2017
+++ pkgsrc/net/tigervnc/Makefile        Wed Jan 25 03:18:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/01/24 08:30:25 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2017/01/25 03:18:35 dmcmahill Exp $
 
 DISTNAME=      tigervnc-1.7.1
 CATEGORIES=    net
@@ -55,6 +55,9 @@ XORG_CONFIGURE_ARGS+= --disable-xorg --d
 XORG_CONFIGURE_ARGS+=  --disable-config-hal --disable-config-udev --with-pic
 XORG_CONFIGURE_ARGS+=  --disable-unit-tests --disable-devel-docs --disable-selective-werror
 XORG_CONFIGURE_ARGS+=  --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
+# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following:
+XORG_CONFIGURE_ARGS+=  --with-xkb-path=${X11BASE}/lib/X11/xkb
+XORG_CONFIGURE_ARGS+=  --with-xkb-bin-directory=${X11BASE}/bin
 
 pre-configure:
        cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \