diff options
author | gahr <gahr@FreeBSD.org> | 2014-08-27 15:54:49 +0800 |
---|---|---|
committer | gahr <gahr@FreeBSD.org> | 2014-08-27 15:54:49 +0800 |
commit | 924833eae57de53f07722e704f2f5832700b4ab4 (patch) | |
tree | f383f330530e2cbaf67fa1b8da978d4acf8ab25e /lang | |
parent | 351b3c5ef1bb36509a3916f82b24c9d10753cb2f (diff) | |
download | freebsd-ports-gnome-924833eae57de53f07722e704f2f5832700b4ab4.tar.gz freebsd-ports-gnome-924833eae57de53f07722e704f2f5832700b4ab4.tar.zst freebsd-ports-gnome-924833eae57de53f07722e704f2f5832700b4ab4.zip |
- Update Tcl/Tk 8.5 to 8.5.16
Release notes: http://code.activestate.com/lists/tcl-core/14056/
Diffstat (limited to 'lang')
-rw-r--r-- | lang/tcl85/Makefile | 9 | ||||
-rw-r--r-- | lang/tcl85/distinfo | 4 | ||||
-rw-r--r-- | lang/tcl85/files/patch-unix-Makefile.in | 108 | ||||
-rw-r--r-- | lang/tcl85/files/patch-unix-configure | 67 | ||||
-rw-r--r-- | lang/tcl85/pkg-plist | 8 |
5 files changed, 92 insertions, 104 deletions
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile index e7ebc5d9a6e7..1ec4ec8b08dd 100644 --- a/lang/tcl85/Makefile +++ b/lang/tcl85/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tcl -PORTVERSION= 8.5.15 -PORTREVISION= 2 +PORTVERSION= 8.5.16 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_TCLTK} \ SF/tcl/Tcl/${PORTVERSION} @@ -38,7 +37,7 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TCL_VER= 8.5 SHORT_TCL_VER= ${TCL_VER:S/8./8/} -MAN_SUFFIX= ${LATEST_LINK} +MAN_SUFFIX= ${PORTNAME}${PKGNAMESUFFIX} MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} \ MAN_SUFFIX=.${MAN_SUFFIX} \ @@ -92,8 +91,8 @@ post-configure: -e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tclsh${TCL_VER} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcl${SHORT_TCL_VER}.so.1 + ${LN} -fs libtcl${SHORT_TCL_VER}.so.1.0 \ + ${STAGEDIR}${PREFIX}/lib/libtcl${SHORT_TCL_VER}.so.1 regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo index da4e756b53bd..6abb6d13c47e 100644 --- a/lang/tcl85/distinfo +++ b/lang/tcl85/distinfo @@ -1,2 +1,2 @@ -SHA256 (tcl8.5.15-src.tar.gz) = f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e -SIZE (tcl8.5.15-src.tar.gz) = 4536117 +SHA256 (tcl8.5.16-src.tar.gz) = a26cbdb0437d05e5a00c993570737e71fa6cc9084e19174d714097b5cbaac1b1 +SIZE (tcl8.5.16-src.tar.gz) = 4545982 diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in index a11565d8fa67..fc11ac28aace 100644 --- a/lang/tcl85/files/patch-unix-Makefile.in +++ b/lang/tcl85/files/patch-unix-Makefile.in @@ -1,39 +1,51 @@ ---- Makefile.in.orig 2013-09-13 18:07:56.000000000 +0200 -+++ Makefile.in 2014-04-28 09:48:13.000000000 +0200 +--- Makefile.in.orig 2014-07-23 15:03:24.000000000 +0200 ++++ Makefile.in 2014-07-24 09:54:20.000000000 +0200 @@ -54,6 +54,8 @@ # Directory in which to install the include file tcl.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix ++UNIX_INCLUDE_INSTALL_DIR= $(INCLUDE_INSTALL_DIR)/unix # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -542,7 +544,7 @@ +@@ -152,8 +154,8 @@ + INSTALL_STRIP_LIBRARY = -S -x + + INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_LIBRARY = ${INSTALL} ++INSTALL_PROGRAM = ${INSTALL} -s ++INSTALL_LIBRARY = ${INSTALL} -s + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_DATA_DIR = ${INSTALL} -d -m 755 + +@@ -546,7 +548,7 @@ all: binaries libraries doc --binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} -+binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE} libtcl${SHORT_TCL_VER}.a +-binaries: ${LIB_FILE} ${TCL_EXE} ++binaries: ${LIB_FILE} ${TCL_EXE} libtcl${SHORT_TCL_VER}.a libraries: -@@ -553,6 +555,14 @@ - ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} +@@ -557,6 +559,15 @@ + ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} rm -f $@ @MAKE_LIB@ + @ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so + if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ + $(RANLIB) ${LIB_FILE}; \ + fi; ++ +libtcl${SHORT_TCL_VER}.a: ${OBJS} + rm -f libtcl${SHORT_TCL_VER}.a + ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} + $(RANLIB) libtcl${SHORT_TCL_VER}.a ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f $@ -@@ -694,7 +704,7 @@ + @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ +@@ -701,7 +712,7 @@ dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) @@ -42,10 +54,10 @@ install: $(INSTALL_TARGETS) -@@ -720,10 +730,17 @@ +@@ -727,21 +738,29 @@ @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ - @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) + @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" + @ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so + @echo "Installing libtcl${SHORT_TCL_VER}.a" + @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \ @@ -53,17 +65,23 @@ + @(cd "$(DLL_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a) + @chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ + @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" - @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh +- @$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)/tclConfig.sh" + @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/" + @mkdir -p "$(SCRIPT_INSTALL_DIR)" + @$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -731,7 +748,8 @@ + fi @EXTRA_INSTALL_BINARIES@ +- @echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/" +- @mkdir -p $(LIB_INSTALL_DIR)/pkgconfig +- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc ++ @echo "Installing pkg-config file to $(DESTDIR)$(prefix)/libdata/pkgconfig/" ++ @mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig ++ @$(INSTALL_DATA) tcl.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/tcl85.pc install-libraries: libraries $(INSTALL_TZDATA) install-msgs - @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ @@ -72,7 +90,7 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -739,7 +757,7 @@ +@@ -749,7 +768,7 @@ else true; \ fi; \ done; @@ -81,7 +99,7 @@ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -748,51 +766,61 @@ +@@ -758,50 +777,61 @@ fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; @@ -107,8 +125,6 @@ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ done; -- @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/"; -- @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \ + @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; + @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ @@ -119,33 +135,37 @@ + +install-tm: + @for i in opt0.4 http1.0; \ - do \ -- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ ++ do \ + if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ + echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ + $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \ + else true; \ + fi; \ ++ done; + @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/"; + @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \ + do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; -- @echo "Installing package http 2.7.12 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.12.tm; +- @echo "Installing package http 2.7.13 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.13.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; -+ @echo "Installing package http 2.7.12 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.12.tm ++ @echo "Installing package http 2.7.13 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.13.tm @echo "Installing package msgcat 1.5.2 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm; + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.2.tm - @echo "Installing package tcltest 2.3.5 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm; + @echo "Installing package tcltest 2.3.8 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm; - -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.5.tm - @echo "Installing package platform 1.0.12 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.12.tm ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.8.tm + @echo "Installing package platform 1.0.13 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.13.tm @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; - @@ -158,32 +178,8 @@ - echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ - "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ - fi -- + @$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/platform; + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm -+ @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/"; -+ @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \ -+ do \ -+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ -+ done; + install-tzdata: @for i in tzdata; \ - do \ -@@ -1564,7 +1592,7 @@ - match=1; \ - fi; \ - done; \ -- if [ $$match -eq 0 ]; then echo $$i; fi \ -+ if [ $$match -eq 0 ]; then echo $$i; fi; \ - done - - # -@@ -1581,7 +1609,7 @@ - match=1; \ - fi; \ - done; \ -- if [ $$match -eq 0 ]; then echo $$i; fi \ -+ if [ $$match -eq 0 ]; then echo $$i; fi; \ - done - - # diff --git a/lang/tcl85/files/patch-unix-configure b/lang/tcl85/files/patch-unix-configure index c1c6c4739ff2..0aac70ad4a8f 100644 --- a/lang/tcl85/files/patch-unix-configure +++ b/lang/tcl85/files/patch-unix-configure @@ -1,41 +1,32 @@ ---- configure.orig 2011-06-23 15:18:36.000000000 +0200 -+++ configure 2011-06-25 21:30:44.310215849 +0200 -@@ -6638,7 +6638,7 @@ - # is disabled by the user. [Bug 1016796] - LDFLAGS_ARCH="" - UNSHARED_LIB_SUFFIX="" -- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' -+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` - ECHO_VERSION='`echo ${VERSION}`' - TCL_LIB_VERSIONS_OK=ok - CFLAGS_DEBUG=-g -@@ -7648,7 +7648,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}' -@@ -7659,16 +7659,16 @@ - - # The -pthread needs to go in the CFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` -- CFLAGS="$CFLAGS -pthread" -- LDFLAGS="$LDFLAGS -pthread" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS" +--- configure.orig 2014-07-23 15:03:24.000000000 +0200 ++++ configure 2014-07-23 17:04:12.000000000 +0200 +@@ -7641,7 +7641,11 @@ + ;; + FreeBSD-*) +- # This configuration from FreeBSD Ports. ++ # Version numbers are dot-stripped by system policy. ++ 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 + SHLIB_CFLAGS="-fPIC" + SHLIB_LD="${CC} -shared" + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" +@@ -7663,16 +7667,6 @@ + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi - - case $system in +- +- case $system in - FreeBSD-3.*) -+ FreeBSD-*) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - esac +- # Version numbers are dot-stripped by system policy. +- TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` +- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' +- TCL_LIB_VERSIONS_OK=nodots +- ;; +- esac + ;; + Darwin-*) + CFLAGS_OPTIMIZE="-Os" diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist index da9f88630581..634be2f4d907 100644 --- a/lang/tcl85/pkg-plist +++ b/lang/tcl85/pkg-plist @@ -26,6 +26,7 @@ include/tcl%%TCL_VER%%/unix/tclUnixThrd.h lib/libtcl%%SHORT_TCL_VER%%.a lib/libtcl%%SHORT_TCL_VER%%.so lib/libtcl%%SHORT_TCL_VER%%.so.1 +lib/libtcl%%SHORT_TCL_VER%%.so.1.0 lib/libtclstub%%SHORT_TCL_VER%%.a lib/tcl%%TCL_VER%%/auto.tcl lib/tcl%%TCL_VER%%/clock.tcl @@ -244,6 +245,7 @@ lib/tcl%%TCL_VER%%/tclConfig.sh lib/tcl%%TCL_VER%%/tclIndex lib/tcl%%TCL_VER%%/tm.tcl lib/tcl%%TCL_VER%%/word.tcl +libdata/pkgconfig/tcl85.pc %%MAN%%man/man1/tclsh.tcl85.1.gz %%MAN%%man/man3/TCL_MEM_DEBUG.tcl85.3.gz %%MAN%%man/man3/Tcl_Access.tcl85.3.gz @@ -1551,15 +1553,15 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/America %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata -%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.12.tm +%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.13.tm %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl %%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl %%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm %%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl %%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl -%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.12.tm +%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.13.tm %%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm -%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.5.tm +%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.8.tm %%MODULES%%@dirrm lib/tcl%%TCL_VER%%/platform %%MODULES%%@dirrm lib/tcl%%TCL_VER%%/opt0.4 %%MODULES%%@dirrm lib/tcl%%TCL_VER%%/http1.0 |