diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-10-25 10:21:57 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-10-25 10:21:57 +0000 |
| commit | ae4a0a3cd35f42c1e053693c1ff90251768294d6 (patch) | |
| tree | 8a22419d7981f1631f3d4f9f13ea5d98158e968f | |
| parent | 554f7c8b19ab494c7c7140674f2565edc1333333 (diff) | |
| download | pkgsrc-ae4a0a3cd35f42c1e053693c1ff90251768294d6.tar.gz | |
Do not enable aqua on OSX when using modular X11, avoids file conflicts
with libX11. Bump PKGREVISION.
| -rw-r--r-- | x11/tk/Makefile | 7 | ||||
| -rw-r--r-- | x11/tk/PLIST.aqua (renamed from x11/tk/PLIST.Darwin) | 2 |
2 files changed, 5 insertions, 4 deletions
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.aqua index fe5055920f3..6eeec160450 100644 --- a/x11/tk/PLIST.Darwin +++ b/x11/tk/PLIST.aqua @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2012/11/24 21:39:12 adam Exp $ +@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 |