Date: Mon, 19 Nov 2018 12:01:16 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485316 - in head: lang/tcl86 lang/tcl86/files x11-toolkits/tk86 Message-ID: <201811191201.wAJC1GTx091621@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Nov 19 12:01:15 2018 New Revision: 485316 URL: https://svnweb.freebsd.org/changeset/ports/485316 Log: lang/tcl86, x11-toolkits/tk86: update to 8.6.9 Announcement: https://sourceforge.net/p/tcl/mailman/message/36469053/ Modified: head/lang/tcl86/Makefile head/lang/tcl86/distinfo head/lang/tcl86/files/patch-unix-Makefile.in head/lang/tcl86/files/patch-unix-configure head/lang/tcl86/files/patch-unix-tclUnixInit.c head/lang/tcl86/pkg-plist head/x11-toolkits/tk86/Makefile head/x11-toolkits/tk86/distinfo Modified: head/lang/tcl86/Makefile ============================================================================== --- head/lang/tcl86/Makefile Mon Nov 19 11:04:53 2018 (r485315) +++ head/lang/tcl86/Makefile Mon Nov 19 12:01:15 2018 (r485316) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= tcl -PORTVERSION= 8.6.8 +DISTVERSION= ${TCL_VERSION}${TCL_RC} PORTREVISION= 0 CATEGORIES= lang -MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \ - TCLTK/tcl8_6 -PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} -DISTNAME= ${PORTNAME}${PORTVERSION}-src +MASTER_SITES= SF/tcl/Tcl/${TCL_VERSION} +PKGNAMESUFFIX= ${SHORT_TCL_VER} +DISTNAME= ${PORTNAME}-core${DISTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT= Tool Command Language @@ -18,6 +17,15 @@ LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/../license.terms LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +USES= cpe + +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-shared \ + --enable-man-suffix=.${MAN_SUFFIX} \ + --includedir=${PREFIX}/include/tcl${TCL_VER} +CONFIGURE_ENV= PORTSDIR=${PORTSDIR} + OPTIONS_DEFINE= TCLMAN TZDATA THREADS DEBUG OPTIONS_DEFINE_amd64= DTRACE OPTIONS_DEFAULT=THREADS @@ -30,21 +38,16 @@ OPTIONS_SUB= yes OPTIONS_EXCLUDE+= DTRACE .endif -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix +PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}${TCL_VERSION} +WRKSRC= ${PATCH_WRKSRC}/unix ALL_TARGET= all INSTALL_TARGET= install-strip install-libraries install-modules TEST_TARGET= test-tcl -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared \ - --enable-man-suffix=.${MAN_SUFFIX} \ - --includedir=${PREFIX}/include/tcl${TCL_VER} -CONFIGURE_ENV= PORTSDIR=${PORTSDIR} - -TCL_VER= ${PORTVERSION:R} +TCL_VERSION= 8.6.9 +TCL_VER= ${TCL_VERSION:R} +TCL_RC= # Nothing SHORT_TCL_VER= ${TCL_VER:S/.//} MAN_SUFFIX= ${PKGBASE} Modified: head/lang/tcl86/distinfo ============================================================================== --- head/lang/tcl86/distinfo Mon Nov 19 11:04:53 2018 (r485315) +++ head/lang/tcl86/distinfo Mon Nov 19 12:01:15 2018 (r485316) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514887912 -SHA256 (tcl8.6.8-src.tar.gz) = c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a -SIZE (tcl8.6.8-src.tar.gz) = 9793786 +TIMESTAMP = 1542617242 +SHA256 (tcl-core8.6.9-src.tar.gz) = ae52393dca82d5bbc8cad9b95fcf0cf8375603480ee31e7a480a951ab7ecbb4e +SIZE (tcl-core8.6.9-src.tar.gz) = 5932010 Modified: head/lang/tcl86/files/patch-unix-Makefile.in ============================================================================== --- head/lang/tcl86/files/patch-unix-Makefile.in Mon Nov 19 11:04:53 2018 (r485315) +++ head/lang/tcl86/files/patch-unix-Makefile.in Mon Nov 19 12:01:15 2018 (r485316) @@ -1,4 +1,4 @@ ---- unix/Makefile.in.orig 2016-03-01 01:59:35 UTC +--- unix/Makefile.in.orig 2018-10-09 18:52:36 UTC +++ unix/Makefile.in @@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC @@ -22,7 +22,7 @@ # Package search path. TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ -@@ -612,9 +614,9 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ +@@ -614,9 +616,9 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ # Start of rules #-------------------------------------------------------------------------- @@ -34,7 +34,7 @@ libraries: -@@ -625,6 +627,12 @@ doc: +@@ -627,6 +629,12 @@ doc: ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} rm -f $@ @MAKE_LIB@ @@ -47,7 +47,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ -@@ -768,13 +776,13 @@ trace-test: ${TCLTEST_EXE} +@@ -770,13 +778,13 @@ trace-test: ${TCLTEST_EXE} # Installation rules #-------------------------------------------------------------------------- @@ -64,7 +64,7 @@ install: $(INSTALL_TARGETS) -@@ -796,6 +804,11 @@ install-binaries: binaries +@@ -798,6 +806,11 @@ install-binaries: binaries @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -76,7 +76,7 @@ @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -808,12 +821,17 @@ install-binaries: binaries +@@ -810,12 +823,17 @@ install-binaries: binaries @INSTALL_STUB_LIB@ ; \ fi @EXTRA_INSTALL_BINARIES@ @@ -98,7 +98,7 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -821,7 +839,13 @@ install-libraries: libraries +@@ -823,7 +841,13 @@ install-libraries: libraries else true; \ fi; \ done; @@ -113,12 +113,12 @@ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -841,31 +865,31 @@ install-libraries: libraries +@@ -843,31 +867,31 @@ install-libraries: libraries $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.8.12 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.12.tm; + @echo "Installing package http 2.9.0 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.9.0.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.9.0.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ @@ -127,9 +127,9 @@ @echo "Installing package msgcat 1.6.1 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.1.tm; + @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.1.tm; - @echo "Installing package tcltest 2.4.1 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.4.1.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.4.1.tm; + @echo "Installing package tcltest 2.5.0 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.5.0.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.5.0.tm; @echo "Installing package platform 1.0.14 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.14.tm; @@ -155,7 +155,7 @@ install-tzdata: @for i in tzdata; \ -@@ -940,7 +964,7 @@ install-doc: doc +@@ -942,7 +966,7 @@ install-doc: doc done install-headers: @@ -164,7 +164,7 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -949,14 +973,19 @@ install-headers: +@@ -951,14 +975,19 @@ install-headers: fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; Modified: head/lang/tcl86/files/patch-unix-configure ============================================================================== --- head/lang/tcl86/files/patch-unix-configure Mon Nov 19 11:04:53 2018 (r485315) +++ head/lang/tcl86/files/patch-unix-configure Mon Nov 19 12:01:15 2018 (r485316) @@ -1,6 +1,6 @@ ---- unix/configure.orig 2016-03-01 01:59:35 UTC +--- unix/configure.orig 2018-10-09 18:52:36 UTC +++ unix/configure -@@ -7617,15 +7617,11 @@ fi +@@ -7534,15 +7534,11 @@ fi LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi Modified: head/lang/tcl86/files/patch-unix-tclUnixInit.c ============================================================================== --- head/lang/tcl86/files/patch-unix-tclUnixInit.c Mon Nov 19 11:04:53 2018 (r485315) +++ head/lang/tcl86/files/patch-unix-tclUnixInit.c Mon Nov 19 12:01:15 2018 (r485316) @@ -1,6 +1,6 @@ ---- unix/tclUnixInit.c.orig 2016-09-08 20:22:10.064101000 -0400 -+++ unix/tclUnixInit.c 2016-09-08 20:22:42.345592000 -0400 -@@ -391,14 +391,6 @@ +--- unix/tclUnixInit.c.orig 2018-10-05 17:38:41 UTC ++++ unix/tclUnixInit.c +@@ -391,14 +391,6 @@ TclpInitPlatform(void) #endif /* SIGPIPE */ #if defined(__FreeBSD__) && defined(__GNUC__) Modified: head/lang/tcl86/pkg-plist ============================================================================== --- head/lang/tcl86/pkg-plist Mon Nov 19 11:04:53 2018 (r485315) +++ head/lang/tcl86/pkg-plist Mon Nov 19 12:01:15 2018 (r485316) @@ -39,7 +39,7 @@ include/tcl%%TCL_VER%%/tclOO.h include/tcl%%TCL_VER%%/tclOODecls.h include/tcl%%TCL_VER%%/tclTomMath.h include/tcl%%TCL_VER%%/tclTomMathDecls.h -lib/tcl%%TCL_VER%%/http-2.8.12.tm +lib/tcl%%TCL_VER%%/http-2.9.0.tm lib/tcl%%TCL_VER%%/http1.0/http.tcl lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl lib/tcl%%TCL_VER%%/msgcat-1.6.1.tm @@ -47,7 +47,7 @@ lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl lib/tcl%%TCL_VER%%/platform-1.0.14.tm lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm -lib/tcl%%TCL_VER%%/tcltest-2.4.1.tm +lib/tcl%%TCL_VER%%/tcltest-2.5.0.tm lib/tcl%%TCL_VER%%/auto.tcl lib/tcl%%TCL_VER%%/clock.tcl lib/tcl%%TCL_VER%%/encoding/ascii.enc Modified: head/x11-toolkits/tk86/Makefile ============================================================================== --- head/x11-toolkits/tk86/Makefile Mon Nov 19 11:04:53 2018 (r485315) +++ head/x11-toolkits/tk86/Makefile Mon Nov 19 12:01:15 2018 (r485316) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= tk -PORTVERSION= 8.6.8 -PORTREVISION= 2 +DISTVERSION= ${TK_VERSION}${TK_RC} +PORTREVISION= 0 CATEGORIES= x11-toolkits -MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} TCLTK/tcl8_6 -PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} +MASTER_SITES= SF/tcl/Tcl/${TK_VERSION} +PKGNAMESUFFIX= ${SHORT_TK_VER} DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= tcltk@FreeBSD.org @@ -46,7 +46,9 @@ CONFIGURE_ENV= PORTSDIR=${PORTSDIR} CFLAGS+= -I${TCL_INCLUDEDIR} \ -I${LOCALBASE}/include -TK_VER= ${PORTVERSION:R} +TK_VERSION= 8.6.9 +TK_VER= ${TK_VERSION:R} +TK_RC= # Nothin SHORT_TK_VER= ${TK_VER:S/.//} MAN_SUFFIX= ${PKGBASE} Modified: head/x11-toolkits/tk86/distinfo ============================================================================== --- head/x11-toolkits/tk86/distinfo Mon Nov 19 11:04:53 2018 (r485315) +++ head/x11-toolkits/tk86/distinfo Mon Nov 19 12:01:15 2018 (r485316) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514889188 -SHA256 (tk8.6.8-src.tar.gz) = 49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33 -SIZE (tk8.6.8-src.tar.gz) = 4319854 +TIMESTAMP = 1542618299 +SHA256 (tk8.6.9-src.tar.gz) = d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac +SIZE (tk8.6.9-src.tar.gz) = 4364606
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811191201.wAJC1GTx091621>