svn commit: r372592 - in head: lang/tcl85 x11-toolkits/tk85 x11-toolkits/tk85/files

[Pietro Cerutti]

Author: gahr
Date: Sat Nov 15 10:53:29 2014
New Revision: 372592
URL: https://svnweb.freebsd.org/changeset/ports/372592
QAT: https://qat.redports.org/buildarchive/r372592/

Log:
  - Update Tcl/Tk 8.5 to 8.5.17
  
    Release notes: http://code.activestate.com/lists/tcl-core/14232/

Modified:
  head/lang/tcl85/Makefile
  head/lang/tcl85/distinfo
  head/x11-toolkits/tk85/Makefile
  head/x11-toolkits/tk85/distinfo
  head/x11-toolkits/tk85/files/patch-unix-configure

Modified: head/lang/tcl85/Makefile
==============================================================================
--- head/lang/tcl85/Makefile	Sat Nov 15 10:50:32 2014	(r372591)
+++ head/lang/tcl85/Makefile	Sat Nov 15 10:53:29 2014	(r372592)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-PORTVERSION=	8.5.16
+PORTVERSION=	8.5.17
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_TCLTK} \
 		SF/tcl/Tcl/${PORTVERSION}

Modified: head/lang/tcl85/distinfo
==============================================================================
--- head/lang/tcl85/distinfo	Sat Nov 15 10:50:32 2014	(r372591)
+++ head/lang/tcl85/distinfo	Sat Nov 15 10:53:29 2014	(r372592)
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.16-src.tar.gz) = a26cbdb0437d05e5a00c993570737e71fa6cc9084e19174d714097b5cbaac1b1
-SIZE (tcl8.5.16-src.tar.gz) = 4545982
+SHA256 (tcl8.5.17-src.tar.gz) = 4c7cd8f2e0900cb36dde899b3f9f4d5c471ee3c4f8304cf9ec71fd18cd5e98d6
+SIZE (tcl8.5.17-src.tar.gz) = 4546317

Modified: head/x11-toolkits/tk85/Makefile
==============================================================================
--- head/x11-toolkits/tk85/Makefile	Sat Nov 15 10:50:32 2014	(r372591)
+++ head/x11-toolkits/tk85/Makefile	Sat Nov 15 10:53:29 2014	(r372592)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tk
-PORTVERSION=	8.5.16
+PORTVERSION=	8.5.17
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_TCLTK} \
 		SF/tcl/Tcl/${PORTVERSION}

Modified: head/x11-toolkits/tk85/distinfo
==============================================================================
--- head/x11-toolkits/tk85/distinfo	Sat Nov 15 10:50:32 2014	(r372591)
+++ head/x11-toolkits/tk85/distinfo	Sat Nov 15 10:53:29 2014	(r372592)
@@ -1,2 +1,2 @@
-SHA256 (tk8.5.16-src.tar.gz) = fbcbe74d665df7cb286d042552323a051c611c50683beb18fc6fb59ebe293993
-SIZE (tk8.5.16-src.tar.gz) = 4095839
+SHA256 (tk8.5.17-src.tar.gz) = b517914d076fba047c4bbc02f7dd7f0b0b06d1931826ae440129162d8bba92d3
+SIZE (tk8.5.17-src.tar.gz) = 4095985

Modified: head/x11-toolkits/tk85/files/patch-unix-configure
==============================================================================
--- head/x11-toolkits/tk85/files/patch-unix-configure	Sat Nov 15 10:50:32 2014	(r372591)
+++ head/x11-toolkits/tk85/files/patch-unix-configure	Sat Nov 15 10:53:29 2014	(r372592)
@@ -1,5 +1,5 @@
---- configure.orig	2014-08-22 16:06:02.000000000 +0200
-+++ configure	2014-08-27 09:28:32.000000000 +0200
+--- configure.orig	2014-10-22 12:32:42.000000000 +0000
++++ configure	2014-11-15 10:50:06.000000000 +0000
 @@ -3538,6 +3538,7 @@
  # Threads support - this auto-enables if Tcl was compiled threaded
  #------------------------------------------------------------------------
@@ -8,7 +8,7 @@
  
      # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
-@@ -5829,7 +5830,7 @@
+@@ -5835,7 +5836,7 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
@@ -17,10 +17,10 @@
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5852,33 +5853,19 @@
+@@ -5857,10 +5858,14 @@
+ 	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
- 	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
- 	    TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+ 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
 -	    SHLIB_SUFFIX=".so"
 +	    SHLIB_SUFFIX=".so.${SHLIB_VERSION}"
  	    DL_OBJS="tclLoadDl.o"
@@ -33,16 +33,10 @@
  	    if test $doRpath = yes; then
  
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
--fi
--
--	    if test "${TCL_THREADS}" = "1"; then
--
--		# The -pthread needs to go in the LDFLAGS, not LIBS
--		LIBS=`echo $LIBS | sed s/-pthread//`
--		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
--		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
--fi
+@@ -5874,16 +5879,6 @@
+ 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ fi
 -
 -	    case $system in
 -	    FreeBSD-3.*)
@@ -53,7 +47,6 @@
 -		TCL_LIB_VERSIONS_OK=nodots
 -		;;
 -	    esac
-+	    fi
  	    ;;
  	Darwin-*)
  	    CFLAGS_OPTIMIZE="-Os"