CVS commit: pkgsrc/net/tigervnc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

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.

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 && \