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 339E77A28D for ; Wed, 25 Jan 2017 23:17:10 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9602A85582; Wed, 25 Jan 2017 23:17:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 25AE085578 for ; Wed, 25 Jan 2017 23:17:09 +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 AMwShPQ4rAHn for ; Wed, 25 Jan 2017 23:17:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8520C84CFB for ; Wed, 25 Jan 2017 23:17:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7F1A2FBA6; Wed, 25 Jan 2017 23:17:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1485386228220280" MIME-Version: 1.0 Date: Wed, 25 Jan 2017 23:17:08 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net/tigervnc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20170125231708.7F1A2FBA6@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. --_----------=_1485386228220280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Jan 25 23:17:08 UTC 2017 Modified Files: pkgsrc/net/tigervnc: Makefile Log Message: Fix previous -- only set native-necessary flags in native case. Paths for modular are different enough this broke. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/tigervnc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1485386228220280 Content-Disposition: inline Content-Length: 1223 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.16 pkgsrc/net/tigervnc/Makefile:1.17 --- pkgsrc/net/tigervnc/Makefile:1.16 Wed Jan 25 03:18:35 2017 +++ pkgsrc/net/tigervnc/Makefile Wed Jan 25 23:17:08 2017 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2017/01/25 03:18:35 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.17 2017/01/25 23:17:08 wiz Exp $ DISTNAME= tigervnc-1.7.1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -55,9 +56,14 @@ 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 + +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} != "modular" # 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 +.endif pre-configure: cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \ --_----------=_1485386228220280--