[pkgsrc/trunk]: pkgsrc/x11/tk x11/tk: avoid x11 when building aqua

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

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

description:
x11/tk: avoid x11 when building aqua

diffstat:

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

diffs (39 lines):

diff -r dc3415b5f2f3 -r d9adacd16bb9 x11/tk/Makefile
--- a/x11/tk/Makefile   Mon Dec 14 08:46:08 2020 +0000
+++ b/x11/tk/Makefile   Mon Dec 14 08:46:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2020/12/14 08:46:08 dbj Exp $
+# $NetBSD: Makefile,v 1.90 2020/12/14 08:46:56 dbj Exp $
 
 DISTNAME=      tk${TK_VERSION}-src
 PKGNAME=       tk-${TK_VERSION}
@@ -21,8 +21,6 @@
 CONFIGURE_DIRS=                unix
 BUILD_DIRS=            ${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
-CONFIGURE_ARGS+=       --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 CONFIGURE_ENV+=                LIB_RUNTIME_DIR=${PREFIX}/lib
 
 PKGCONFIG_OVERRIDE+=   unix/tk.pc.in
diff -r dc3415b5f2f3 -r d9adacd16bb9 x11/tk/options.mk
--- a/x11/tk/options.mk Mon Dec 14 08:46:08 2020 +0000
+++ b/x11/tk/options.mk Mon Dec 14 08:46:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2020/12/14 08:46:08 dbj Exp $
+# $NetBSD: options.mk,v 1.9 2020/12/14 08:46:56 dbj Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.tk
 PKG_SUPPORTED_OPTIONS= threads debug xft2
@@ -20,8 +20,11 @@
 # Otherwise some X11 headers are installed and will break X11 compatibility.
 .if !empty(PKG_OPTIONS:Maqua)
 CONFIGURE_ARGS+=       --enable-aqua
+CONFIGURE_ARGS+=       --without-x
 PLIST.aqua=            yes
 .else
+CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=       --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"