[pkgsrc/trunk]: pkgsrc/x11/tk x11/tk: don't pull in pthreads when threads are...

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc3415b5f2f3
branches:  trunk
changeset: 443490:dc3415b5f2f3
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Mon Dec 14 08:46:08 2020 +0000

description:
x11/tk: don't pull in pthreads when threads are disabled

diffstat:

 x11/tk/Makefile   |  4 +---
 x11/tk/options.mk |  3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r e160f7dc2c76 -r dc3415b5f2f3 x11/tk/Makefile
--- a/x11/tk/Makefile   Mon Dec 14 07:31:47 2020 +0000
+++ b/x11/tk/Makefile   Mon Dec 14 08:46:08 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2020/08/17 20:18:01 leot Exp $
+# $NetBSD: Makefile,v 1.89 2020/12/14 08:46:08 dbj Exp $
 
 DISTNAME=      tk${TK_VERSION}-src
 PKGNAME=       tk-${TK_VERSION}
@@ -24,7 +24,6 @@
 CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
 CONFIGURE_ARGS+=       --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 CONFIGURE_ENV+=                LIB_RUNTIME_DIR=${PREFIX}/lib
-PTHREAD_OPTS+=         require
 
 PKGCONFIG_OVERRIDE+=   unix/tk.pc.in
 
@@ -46,5 +45,4 @@
 PLIST_SUBST+=          BASEVER=${TK_BASEVER}
 
 .include "../../lang/tcl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e160f7dc2c76 -r dc3415b5f2f3 x11/tk/options.mk
--- a/x11/tk/options.mk Mon Dec 14 07:31:47 2020 +0000
+++ b/x11/tk/options.mk Mon Dec 14 08:46:08 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2020/03/26 22:02:29 joerg Exp $
+# $NetBSD: options.mk,v 1.8 2020/12/14 08:46:08 dbj Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tk
 PKG_SUPPORTED_OPTIONS= threads debug xft2
@@ -33,6 +33,7 @@
 
 .if !empty(PKG_OPTIONS:Mthreads)
 CONFIGURE_ARGS+=       --enable-threads
+PTHREAD_OPTS+=         require
 .include "../../mk/pthread.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-threads