pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/tigervnc Fix previous -- only set native-necessary...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/38a03e857f80
branches:  trunk
changeset: 357693:38a03e857f80
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jan 25 23:17:08 2017 +0000

description:
Fix previous -- only set native-necessary flags in native case.

Paths for modular are different enough this broke.

Bump PKGREVISION.

diffstat:

 net/tigervnc/Makefile |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r dc5728c4ab2f -r 38a03e857f80 net/tigervnc/Makefile
--- a/net/tigervnc/Makefile     Wed Jan 25 21:40:24 2017 +0000
+++ b/net/tigervnc/Makefile     Wed Jan 25 23:17:08 2017 +0000
@@ -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-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 && \



Home | Main Index | Thread Index | Old Index