CVS commit: pkgsrc/x11/tk

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Mon Dec 14 08:46:56 UTC 2020

Modified Files:
        pkgsrc/x11/tk: Makefile options.mk

Log Message:
x11/tk: avoid x11 when building aqua


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/tk/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/tk/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/tk/Makefile
diff -u pkgsrc/x11/tk/Makefile:1.89 pkgsrc/x11/tk/Makefile:1.90
--- pkgsrc/x11/tk/Makefile:1.89 Mon Dec 14 08:46:08 2020
+++ pkgsrc/x11/tk/Makefile      Mon Dec 14 08:46:56 2020
@@ -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 @@ GNU_CONFIGURE=                yes
 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

Index: pkgsrc/x11/tk/options.mk
diff -u pkgsrc/x11/tk/options.mk:1.8 pkgsrc/x11/tk/options.mk:1.9
--- pkgsrc/x11/tk/options.mk:1.8        Mon Dec 14 08:46:08 2020
+++ pkgsrc/x11/tk/options.mk    Mon Dec 14 08:46:56 2020
@@ -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 @@ PKG_SUPPORTED_OPTIONS+=      aqua
 # 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"