diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2014-11-15 10:53:29 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2014-11-15 10:53:29 +0000 |
| commit | 58c07c4937a7788c2735691390c32734f6b07238 (patch) | |
| tree | 0d645a096b84980d1217a8fe276256ae76db234c /x11-toolkits/tk85 | |
| parent | 8da18c7e44eb1512788f36c84953ad3c8e7c8ca0 (diff) | |
| download | ports-58c07c4937a7788c2735691390c32734f6b07238.tar.gz ports-58c07c4937a7788c2735691390c32734f6b07238.zip | |
Notes
Diffstat (limited to 'x11-toolkits/tk85')
| -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 | 27 |
3 files changed, 13 insertions, 20 deletions
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index 75efce41320b..01f564599c27 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -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} diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo index 0b4eb93b6630..3712e564ad7f 100644 --- a/x11-toolkits/tk85/distinfo +++ b/x11-toolkits/tk85/distinfo @@ -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 diff --git a/x11-toolkits/tk85/files/patch-unix-configure b/x11-toolkits/tk85/files/patch-unix-configure index db91aa7e2448..214b20436a77 100644 --- a/x11-toolkits/tk85/files/patch-unix-configure +++ b/x11-toolkits/tk85/files/patch-unix-configure @@ -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" |