aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2013-09-20 07:32:38 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2013-09-20 07:32:38 +0000
commit335927cf6f6f9726660614a916625a9acbfb04e1 (patch)
tree243fa18e319272c1f049170f3303eeb98ef68028 /x11-toolkits
parentc43ef9fd5a6419ca0c7758f3b9f926f635fa98ed (diff)
downloadports-335927cf6f6f9726660614a916625a9acbfb04e1.tar.gz
ports-335927cf6f6f9726660614a916625a9acbfb04e1.zip
- Update Tcl/Tk 8.6 to 8.6.1
Notes
Notes: svn path=/head/; revision=327664
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/tk86/Makefile22
-rw-r--r--x11-toolkits/tk86/distinfo4
2 files changed, 11 insertions, 15 deletions
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 279752e2a019..cf4d0d2a5698 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME= tk
-PORTVERSION= 8.6.0
-PORTREVISION= 2
+PORTVERSION= 8.6.1
CATEGORIES= x11-toolkits
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \
${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR=tcl8_6
+PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= tcltk@FreeBSD.org
@@ -16,10 +16,11 @@ COMMENT= Graphical toolkit for Tcl
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/../license.terms
-OPTIONS_DEFINE= TKMAN DEMOS XFT THREADS
-OPTIONS_DEFAULT=XFT THREADS
+OPTIONS_DEFINE= TKMAN DEMOS THREADS
+OPTIONS_DEFAULT=THREADS
TKMAN_DESC= Install Tk function manpages
DEMOS_DESC= Install demos
+XSS_DESC= XScrnSaver support
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
@@ -27,10 +28,12 @@ ALL_TARGET= all
INSTALL_TARGET= install
USE_LDCONFIG= yes
-USE_TCL= ${SHORT_TK_VER}
-USE_XORG= x11 xt
+USES+= tcl:${SHORT_TK_VER}
+USE_XORG= x11 xft xscrnsaver
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared \
+ --enable-xss \
+ --enable-xft \
--enable-man-suffix=.${MAN_SUFFIX} \
--with-tcl=${TCL_LIBDIR} \
--includedir=${PREFIX}/include/tk${TK_VER}
@@ -52,13 +55,6 @@ PLIST_SUB= TK_VER=${TK_VER} \
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MXFT}
-CONFIGURE_ARGS+=--enable-xft
-LIB_DEPENDS+= Xft:${PORTSDIR}/x11-fonts/libXft
-.else
-CONFIGURE_ARGS+=--disable-xft
-.endif
-
.if ${PORT_OPTIONS:MDEMOS}
INSTALL_TARGET+= install install-demos
PLIST_SUB+= DEMOS=""
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index bf0aa7dfea79..432b11d5ca31 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.6.0-src.tar.gz) = 5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6
-SIZE (tk8.6.0-src.tar.gz) = 4239836
+SHA256 (tk8.6.1-src.tar.gz) = b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c
+SIZE (tk8.6.1-src.tar.gz) = 4244010