kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x11/tk: avoid x11 when building aqua

Browse source
This commit is contained in:
dbj 2020-12-14 08:46:56 +00:00
parent 253d5bde66
commit 0a7a3111c0
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x11/tk/Makefile
View file

@ -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

5
x11/tk/options.mk
View file

@ -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"