Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6CFAA7A26C for ; Wed, 25 Jan 2017 03:18:37 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id F31F4855C7; Wed, 25 Jan 2017 03:18:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 83960855A9 for ; Wed, 25 Jan 2017 03:18:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id LUsRNypoMg4I for ; Wed, 25 Jan 2017 03:18:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E15388556E for ; Wed, 25 Jan 2017 03:18:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DC0ABFBA6; Wed, 25 Jan 2017 03:18:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148531431535810" MIME-Version: 1.0 Date: Wed, 25 Jan 2017 03:18:35 +0000 From: "Dan McMahill" Subject: CVS commit: pkgsrc/net/tigervnc To: pkgsrc-changes@NetBSD.org Reply-To: dmcmahill@netbsd.org X-Mailer: log_accum Message-Id: <20170125031835.DC0ABFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148531431535810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_148531431535810 Content-Disposition: inline Content-Length: 1048 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 && \ --_----------=_148531431535810--