diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-02-17 16:35:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-02-17 16:35:07 +0000 |
| commit | bec6064bc2d95849fb39a2720d31762195ba2cee (patch) | |
| tree | 0a8d9742d9c01b8a5527dfb0dc93ad7f1cfd2bf4 /x11 | |
| parent | d7612dc53b27fe7b0adfe3cf81fbce44eb32e50d (diff) | |
| download | pkgsrc-bec6064bc2d95849fb39a2720d31762195ba2cee.tar.gz | |
Don't enable Aqua support at all on Darwin, it installs X11 headers
which are incompatible with Xquartz, breaking various packages.
Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/tk/Makefile | 19 | ||||
| -rw-r--r-- | x11/tk/PLIST.aqua | 12 |
2 files changed, 5 insertions, 26 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 48fb1135dea..a436d625184 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.78 2014/02/05 12:56:19 obache Exp $ +# $NetBSD: Makefile,v 1.79 2014/02/17 16:35:07 jperkin Exp $ DISTNAME= tk${TK_VERSION}-src PKGNAME= tk-${TK_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} @@ -21,6 +21,8 @@ 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 PTHREAD_OPTS+= require @@ -43,19 +45,8 @@ SUBST_SED.tk-config+= -e "s|${WRKSRC}|${PREFIX}/include/tk|" PLIST_SUBST+= SONUM=${TK_SONUM} PLIST_SUBST+= BASEVER=${TK_BASEVER} -.include "../../mk/bsd.prefs.mk" - -PLIST_SRC= PLIST -.if ${OPSYS} == "Darwin" && ${X11_TYPE} == "native" -CONFIGURE_ARGS+= --enable-aqua -PLIST_SRC+= PLIST.aqua -.else -CONFIGURE_ARGS+= --x-includes=${X11BASE}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q} +.include "../../lang/tcl/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.endif - -.include "../../lang/tcl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/PLIST.aqua b/x11/tk/PLIST.aqua deleted file mode 100644 index 6eeec160450..00000000000 --- a/x11/tk/PLIST.aqua +++ /dev/null @@ -1,12 +0,0 @@ -@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 |