From 5e9e3bcf0e499e4e7ca475dd6ff48ca1ffc9220f Mon Sep 17 00:00:00 2001 From: jperkin Date: Fri, 25 Oct 2013 10:21:57 +0000 Subject: Do not enable aqua on OSX when using modular X11, avoids file conflicts with libX11. Bump PKGREVISION. --- x11/tk/Makefile | 7 ++++--- x11/tk/PLIST.Darwin | 12 ------------ x11/tk/PLIST.aqua | 12 ++++++++++++ 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 x11/tk/PLIST.Darwin create mode 100644 x11/tk/PLIST.aqua diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 5387a80c47f..38f02d8915c 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2013/06/06 12:53:41 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2013/10/25 10:21:57 jperkin Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} @@ -45,8 +45,9 @@ PLIST_SUBST+= BASEVER=${TK_BASEVER} .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" +.if ${OPSYS} == "Darwin" && ${X11_TYPE} == "native" CONFIGURE_ARGS+= --enable-aqua +PLIST_SRC+= PLIST.aqua .else .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/tk/PLIST.Darwin b/x11/tk/PLIST.Darwin deleted file mode 100644 index fe5055920f3..00000000000 --- a/x11/tk/PLIST.Darwin +++ /dev/null @@ -1,12 +0,0 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2012/11/24 21:39:12 adam Exp $ -include/X11/X.h -include/X11/Xatom.h -include/X11/Xfuncproto.h -include/X11/Xlib.h -include/X11/Xutil.h -include/X11/cursorfont.h -include/X11/keysym.h -include/X11/keysymdef.h -include/X11/xbytes.h -lib/Tk.icns -lib/Tk.tiff diff --git a/x11/tk/PLIST.aqua b/x11/tk/PLIST.aqua new file mode 100644 index 00000000000..6eeec160450 --- /dev/null +++ b/x11/tk/PLIST.aqua @@ -0,0 +1,12 @@ +@comment $NetBSD: PLIST.aqua,v 1.1 2013/10/25 10:21:57 jperkin Exp $ +include/X11/X.h +include/X11/Xatom.h +include/X11/Xfuncproto.h +include/X11/Xlib.h +include/X11/Xutil.h +include/X11/cursorfont.h +include/X11/keysym.h +include/X11/keysymdef.h +include/X11/xbytes.h +lib/Tk.icns +lib/Tk.tiff -- cgit v1.2.3