Mon Dec 4 19:46:34 2017 UTC ()
Make sure aclocal will search in $X11BASE/share/aclocal/, fix build
with native Xorg on netbsd-8.


(bouyer)
diff -r1.18 -r1.19 pkgsrc/net/tigervnc/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/net/tigervnc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tigervnc/Makefile 2017/09/13 08:33:03 1.18
+++ pkgsrc/net/tigervnc/Makefile 2017/12/04 19:46:34 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2017/09/13 08:33:03 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2017/12/04 19:46:34 bouyer Exp $
2 2
3DISTNAME= tigervnc-1.8.0 3DISTNAME= tigervnc-1.8.0
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7XORG_SERVER_FILE= xorg-server-1.17.2 7XORG_SERVER_FILE= xorg-server-1.17.2
8SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} 8SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://tigervnc.org/ 12HOMEPAGE= http://tigervnc.org/
13COMMENT= High-performance, platform-neutral VNC client/server 13COMMENT= High-performance, platform-neutral VNC client/server
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
@@ -55,27 +55,29 @@ XORG_CONFIGURE_ARGS+= --disable-xorg --d @@ -55,27 +55,29 @@ XORG_CONFIGURE_ARGS+= --disable-xorg --d
55XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic 55XORG_CONFIGURE_ARGS+= --disable-config-hal --disable-config-udev --with-pic
56XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror 56XORG_CONFIGURE_ARGS+= --disable-unit-tests --disable-devel-docs --disable-selective-werror
57XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls 57XORG_CONFIGURE_ARGS+= --disable-dri --enable-dri2 --disable-dri3 --enable-glx --enable-glx-tls
58 58
59.include "../../mk/bsd.prefs.mk" 59.include "../../mk/bsd.prefs.mk"
60 60
61.if ${X11_TYPE} != "modular" 61.if ${X11_TYPE} != "modular"
62# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following: 62# when using native X, tigervnc server can't find xkb rules or xkbcomp without the following:
63XORG_CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/lib/X11/xkb 63XORG_CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/lib/X11/xkb
64XORG_CONFIGURE_ARGS+= --with-xkb-bin-directory=${X11BASE}/bin 64XORG_CONFIGURE_ARGS+= --with-xkb-bin-directory=${X11BASE}/bin
65.endif 65.endif
66 66
67pre-configure: 67pre-configure:
68 cd ${WRKSRC}/unix/xserver && autoreconf -fvi && \ 68 cd ${WRKSRC}/unix/xserver && \
 69 ${PKGSRC_SETENV} ACLOCAL_PATH=${X11BASE}/share/aclocal \
 70 autoreconf -fvi && \
69 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \ 71 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} CONFIG_SHELL=${BASH} \
70 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 72 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
71 ./configure ${XORG_CONFIGURE_ARGS} 73 ./configure ${XORG_CONFIGURE_ARGS}
72 74
73.include "../../mk/jpeg.buildlink3.mk" 75.include "../../mk/jpeg.buildlink3.mk"
74.include "../../converters/libiconv/buildlink3.mk" 76.include "../../converters/libiconv/buildlink3.mk"
75.include "../../devel/gettext-lib/buildlink3.mk" 77.include "../../devel/gettext-lib/buildlink3.mk"
76.include "../../devel/zlib/buildlink3.mk" 78.include "../../devel/zlib/buildlink3.mk"
77.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 79.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
78.include "../../security/gnutls/buildlink3.mk" 80.include "../../security/gnutls/buildlink3.mk"
79.include "../../security/libgcrypt/buildlink3.mk" 81.include "../../security/libgcrypt/buildlink3.mk"
80.include "../../x11/libXft/buildlink3.mk" 82.include "../../x11/libXft/buildlink3.mk"
81.include "../../x11/libX11/buildlink3.mk" 83.include "../../x11/libX11/buildlink3.mk"