Sat May 2 10:24:58 2020 UTC ()
x11/x11vnc: allow no-op SUBST block for pthread

On NetBSD-8.0-x86_64, the generated configure script does not contain
"pthread" at all. Maybe it is different on other platforms, therefore
leave the possible substitution as-is, but don't error out.


(rillig)
diff -r1.83 -r1.84 pkgsrc/x11/x11vnc/Makefile
cvs diff -r1.83 -r1.84 pkgsrc/x11/x11vnc/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/x11vnc/Makefile 2020/03/10 22:11:21 1.83
+++ pkgsrc/x11/x11vnc/Makefile 2020/05/02 10:24:58 1.84
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile,v 1.83 2020/03/10 22:11:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.84 2020/05/02 10:24:58 rillig Exp $
2# 2#
3 3
4DISTNAME= x11vnc-0.9.16 4DISTNAME= x11vnc-0.9.16
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= x11 net 6CATEGORIES= x11 net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=LibVNC/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=LibVNC/}
8GITHUB_PROJECT= x11vnc 8GITHUB_PROJECT= x11vnc
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.karlrunge.com/x11vnc/ 11HOMEPAGE= http://www.karlrunge.com/x11vnc/
12COMMENT= VNC server for real X displays 12COMMENT= VNC server for real X displays
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_TOOLS+= autoconf automake autoreconf gmake pkg-config 15USE_TOOLS+= autoconf automake autoreconf gmake pkg-config
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18PTHREAD_AUTO_VARS= yes 18PTHREAD_AUTO_VARS= yes
19SUBST_CLASSES+= pthread 19SUBST_CLASSES+= pthread
20SUBST_STAGE.pthread= pre-configure 20SUBST_STAGE.pthread= pre-configure
21SUBST_FILES.pthread= configure 21SUBST_FILES.pthread= configure
22SUBST_SED.pthread= -e 's|-lpthread||g' 22SUBST_SED.pthread= -e 's|-lpthread||g'
 23SUBST_NOOP_OK.pthread= yes # configure does not contain "pthread"
23 24
24.include "options.mk" 25.include "options.mk"
25 26
26pre-configure: 27pre-configure:
27 cd ${WRKSRC} && autoreconf -vif 28 cd ${WRKSRC} && autoreconf -vif
28 29
29.include "../../security/openssl/buildlink3.mk" 30.include "../../security/openssl/buildlink3.mk"
30.include "../../net/libvncserver/buildlink3.mk" 31.include "../../net/libvncserver/buildlink3.mk"
31.include "../../graphics/png/buildlink3.mk" 32.include "../../graphics/png/buildlink3.mk"
32.include "../../sysutils/desktop-file-utils/desktopdb.mk" 33.include "../../sysutils/desktop-file-utils/desktopdb.mk"
33.include "../../mk/pthread.buildlink3.mk" 34.include "../../mk/pthread.buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"