diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2015-03-07 10:57:50 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2015-03-07 10:57:50 +0000 |
| commit | 4f3e70eb4d4e2bcb68650e137dca4f8fdda9b8f0 (patch) | |
| tree | 3ec661d184bf0e38b361cc93d3ad1c607909f61a /x11-toolkits | |
| parent | c347a5e2934641b4394c7e5bc8f97af8d6b1b5e8 (diff) | |
| download | ports-4f3e70eb4d4e2bcb68650e137dca4f8fdda9b8f0.tar.gz ports-4f3e70eb4d4e2bcb68650e137dca4f8fdda9b8f0.zip | |
- Update Tcl/Tk 8.5 to 8.5.18
Release notes: http://code.activestate.com/lists/tcl-core/14457/
Notes
Notes:
svn path=/head/; revision=380682
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/tk85/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/tk85/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/tk85/files/patch-unix-configure | 45 |
3 files changed, 18 insertions, 33 deletions
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 01f564599c27..e84bdd3fe772 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tk -PORTVERSION= 8.5.17 +PORTVERSION= 8.5.18 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_TCLTK} \ SF/tcl/Tcl/${PORTVERSION} diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo index 3712e564ad7f..65db4507c291 100644 --- a/x11-toolkits/tk85/distinfo +++ b/x11-toolkits/tk85/distinfo @@ -1,2 +1,2 @@ -SHA256 (tk8.5.17-src.tar.gz) = b517914d076fba047c4bbc02f7dd7f0b0b06d1931826ae440129162d8bba92d3 -SIZE (tk8.5.17-src.tar.gz) = 4095985 +SHA256 (tk8.5.18-src.tar.gz) = 0328aa32a5674f9ae6079d7abfeed5597765cee7ca0e9aa8c1ded32f27e6c32a +SIZE (tk8.5.18-src.tar.gz) = 4101233 diff --git a/x11-toolkits/tk85/files/patch-unix-configure b/x11-toolkits/tk85/files/patch-unix-configure index 214b20436a77..6bd6e10f12e3 100644 --- a/x11-toolkits/tk85/files/patch-unix-configure +++ b/x11-toolkits/tk85/files/patch-unix-configure @@ -1,43 +1,28 @@ ---- 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 - #------------------------------------------------------------------------ +--- configure.orig 2015-03-06 15:14:59.000000000 +0000 ++++ configure 2015-03-07 10:23:19.000000000 +0000 +@@ -3547,6 +3547,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION} - # Check whether --enable-threads or --disable-threads was given. - if test "${enable_threads+set}" = set; then -@@ -5835,7 +5836,7 @@ - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="$LDFLAGS -export-dynamic" -+ LDFLAGS="" - if test $doRpath = yes; then - - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -5857,10 +5858,14 @@ - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@" -- SHLIB_SUFFIX=".so" -+ SHLIB_SUFFIX=".so.${SHLIB_VERSION}" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LDFLAGS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +@@ -5467,6 +5468,10 @@ + ;; + FreeBSD-*) + # This configuration from FreeBSD Ports. + TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' + TCL_LIB_VERSIONS_OK=nodots - if test $doRpath = yes; then - - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -5874,16 +5879,6 @@ + SHLIB_CFLAGS="-fPIC" + SHLIB_LD="${CC} -shared" + SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@" +@@ -5486,15 +5491,6 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi -- - case $system in - FreeBSD-3.*) - # Version numbers are dot-stripped by system policy. |