Wed Dec 12 15:30:52 2012 UTC ()
Add default-on options enabling xft2 support for nicer interfaces.
>From Anthony Mallet in PR 47246.
Bump PKGREVISION.


(wiz)
diff -r1.69 -r1.70 pkgsrc/x11/tk/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/tk/options.mk
cvs diff -r1.69 -r1.70 pkgsrc/x11/tk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/tk/Makefile 2012/11/24 21:38:50 1.69
+++ pkgsrc/x11/tk/Makefile 2012/12/12 15:30:52 1.70
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.69 2012/11/24 21:38:50 adam Exp $ 1# $NetBSD: Makefile,v 1.70 2012/12/12 15:30:52 wiz Exp $
2 2
3DISTNAME= tk${TK_VERSION}-src 3DISTNAME= tk${TK_VERSION}-src
4PKGNAME= tk-${TK_VERSION} 4PKGNAME= tk-${TK_VERSION}
 5PKGREVISION= 1
5CATEGORIES= x11 lang 6CATEGORIES= x11 lang
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.tcl.tk/ 10HOMEPAGE= http://www.tcl.tk/
10COMMENT= Graphical toolkit for TCL 11COMMENT= Graphical toolkit for TCL
11LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
12 13
13.include "../../x11/tk/Makefile.version" 14.include "../../x11/tk/Makefile.version"
14 15
15PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
16 17
17WRKSRC= ${WRKDIR}/tk${TK_VERSION} 18WRKSRC= ${WRKDIR}/tk${TK_VERSION}
cvs diff -r1.1 -r1.2 pkgsrc/x11/tk/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/tk/options.mk 2012/08/22 22:05:05 1.1
+++ pkgsrc/x11/tk/options.mk 2012/12/12 15:30:52 1.2
@@ -1,19 +1,27 @@ @@ -1,19 +1,27 @@
1# $NetBSD: options.mk,v 1.1 2012/08/22 22:05:05 marino Exp $ 1# $NetBSD: options.mk,v 1.2 2012/12/12 15:30:52 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tk 3PKG_OPTIONS_VAR= PKG_OPTIONS.tk
4PKG_SUPPORTED_OPTIONS= threads debug 4PKG_SUPPORTED_OPTIONS= threads debug xft2
5PKG_SUGGESTED_OPTIONS= threads 5PKG_SUGGESTED_OPTIONS= threads xft2
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if !empty(PKG_OPTIONS:Mdebug) 10.if !empty(PKG_OPTIONS:Mdebug)
11CONFIGURE_ARGS+= --enable-symbols 11CONFIGURE_ARGS+= --enable-symbols
12.endif 12.endif
13 13
14.if !empty(PKG_OPTIONS:Mthreads) 14.if !empty(PKG_OPTIONS:Mthreads)
15CONFIGURE_ARGS+= --enable-threads 15CONFIGURE_ARGS+= --enable-threads
16. include "../../mk/pthread.buildlink3.mk" 16. include "../../mk/pthread.buildlink3.mk"
17.else 17.else
18CONFIGURE_ARGS+= --disable-threads 18CONFIGURE_ARGS+= --disable-threads
19.endif 19.endif
 20
 21.if !empty(PKG_OPTIONS:Mxft2)
 22CONFIGURE_ARGS+= --enable-xft
 23USE_TOOLS+= pkg-config
 24. include "../../x11/libXft/buildlink3.mk"
 25.else
 26CONFIGURE_ARGS+= --disable-xft
 27.endif