aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/tcl86/Makefile33
-rw-r--r--lang/tcl86/distinfo6
-rw-r--r--lang/tcl86/files/patch-unix-Makefile.in32
-rw-r--r--lang/tcl86/files/patch-unix-configure4
-rw-r--r--lang/tcl86/files/patch-unix-tclUnixInit.c6
-rw-r--r--lang/tcl86/pkg-plist4
6 files changed, 44 insertions, 41 deletions
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 57bb0d2d0a68..91f14bdf7dee 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -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}
diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo
index e7e8b225c15b..57b5f1685e72 100644
--- a/lang/tcl86/distinfo
+++ b/lang/tcl86/distinfo
@@ -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
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in
index eca4b86ea67e..8cd260018f2b 100644
--- a/lang/tcl86/files/patch-unix-Makefile.in
+++ b/lang/tcl86/files/patch-unix-Makefile.in
@@ -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)/";
diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure
index 280c504b8150..b025de75c2d3 100644
--- a/lang/tcl86/files/patch-unix-configure
+++ b/lang/tcl86/files/patch-unix-configure
@@ -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
diff --git a/lang/tcl86/files/patch-unix-tclUnixInit.c b/lang/tcl86/files/patch-unix-tclUnixInit.c
index b55fb818a0fb..7d26afb39714 100644
--- a/lang/tcl86/files/patch-unix-tclUnixInit.c
+++ b/lang/tcl86/files/patch-unix-tclUnixInit.c
@@ -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__)
diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist
index 66b7789b2f1c..78717b89dd97 100644
--- a/lang/tcl86/pkg-plist
+++ b/lang/tcl86/pkg-plist
@@ -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
generated by cgit (git 2.34.1) at 2024-11-17 04:23:12 +0800