Commit bc83fae9 authored by gahr's avatar gahr
Browse files

lang/tcl86, x11-toolkits/tk86: update to 8.6.5

Announcement: http://code.activestate.com/lists/tcl-core/15514
parent 16e6d746
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tcl
PORTVERSION= 8.6.4
PORTVERSION= 8.6.5
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \
TCLTK/tcl8_6
......@@ -22,11 +22,13 @@ OPTIONS_DEFAULT=MODULES THREADS
TCLMAN_DESC= Install Tcl function manpages
TZDATA_DESC= Install Tcl timezone data
MODULES_DESC= Install Tcl common modules
OPTIONS_SUB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
ALL_TARGET= all
INSTALL_TARGET= install-strip install-libraries
TEST_TARGET= do-test
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
......@@ -46,34 +48,12 @@ MAKE_ENV= SHORT_TCL_VER=${SHORT_TCL_VER} \
PLIST_SUB= TCL_VER=${TCL_VER} \
SHORT_TCL_VER=${SHORT_TCL_VER}
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MTCLMAN}
INSTALL_TARGET+=install-doc
PLIST_SUB+= MAN=""
.else
PLIST_SUB+= MAN="@comment "
.endif
.if ${PORT_OPTIONS:MTZDATA}
PLIST_SUB+= TZDATA=""
INSTALL_TARGET+=install-tzdata
.else
PLIST_SUB+= TZDATA="@comment "
.endif
TCLMAN_VARS= INSTALL_TARGET+=install-doc
TZDATA_VARS= INSTALL_TARGET+=install-tzdata
MODULES_VARS= INSTALL_TARGET+=install-modules
THREADS_CONFIGURE_ENABLE= threads
.if ${PORT_OPTIONS:MMODULES}
PLIST_SUB+= MODULES=""
INSTALL_TARGET+=install-modules
.else
PLIST_SUB+= MODULES="@comment "
.endif
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+=--enable-threads
.else
CONFIGURE_ARGS+=--disable-threads
.endif
.include <bsd.port.options.mk>
post-patch:
${REINPLACE_CMD} -e \
......@@ -92,7 +72,7 @@ post-configure:
-e 's,-DNO_MEMMOVE=1,,' -e 's,-DNO_STRING_H=1,,' \
-e 's,^COMPAT_OBJS.*,,' ${WRKSRC}/Makefile
regression-test: build
cd ${WRKSRC} && LC_ALL=C ${MAKE} test
do-test:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test-tcl
.include <bsd.port.mk>
SHA256 (tcl8.6.4-src.tar.gz) = 9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d
SIZE (tcl8.6.4-src.tar.gz) = 8915556
SHA256 (tcl8.6.5-src.tar.gz) = ce26d5b9c7504fc25d2f10ef0b82b14cf117315445b5afa9e673ed331830fb53
SIZE (tcl8.6.5-src.tar.gz) = 9398130
--- Makefile.in.orig 2014-08-26 17:23:08.000000000 +0200
+++ Makefile.in 2014-09-01 15:03:50.000000000 +0200
@@ -54,6 +54,8 @@
--- Makefile.in.orig 2016-02-16 19:00:36 UTC
+++ Makefile.in
@@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC
# Directory in which to install the include file tcl.h:
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
......@@ -9,7 +9,7 @@
# Path to the private tcl header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
@@ -80,10 +82,10 @@
@@ -80,10 +82,10 @@ HTML_DIR = @HTML_DIR@
HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
# Directory in which to install the configuration file tclConfig.sh
......@@ -22,7 +22,7 @@
# Package search path.
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
@@ -611,9 +613,9 @@
@@ -612,9 +614,9 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $
# Start of rules
#--------------------------------------------------------------------------
......@@ -34,7 +34,7 @@
libraries:
@@ -624,6 +626,12 @@
@@ -625,6 +627,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 \
@@ -767,13 +775,13 @@
@@ -768,13 +776,13 @@ trace-test: ${TCLTEST_EXE}
# Installation rules
#--------------------------------------------------------------------------
......@@ -64,7 +64,7 @@
install: $(INSTALL_TARGETS)
@@ -799,6 +807,11 @@
@@ -796,6 +804,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)/"
@@ -811,12 +824,20 @@
@@ -808,12 +821,20 @@ install-binaries: binaries
@INSTALL_STUB_LIB@ ; \
fi
@EXTRA_INSTALL_BINARIES@
......@@ -101,7 +101,7 @@
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -824,7 +845,13 @@
@@ -821,7 +842,13 @@ install-libraries: libraries
else true; \
fi; \
done;
......@@ -116,55 +116,34 @@
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -833,42 +860,26 @@
fi; \
done;
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
- @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
- $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
- 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 ; \
do \
@@ -841,21 +868,21 @@ install-libraries: libraries
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
@echo "Installing package http 2.8.8 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.8.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.8.tm;
@echo "Installing package http 2.8.9 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.9.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.9.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 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 msgcat 1.6.0 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.6.0.tm;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.6.0.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.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 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;
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.14.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;
-
- @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; \
- done;
- @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \
- echo "Customizing tcl module path"; \
- echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
- "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
- fi
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm;
install-tzdata:
@for i in tzdata; \
@@ -943,7 +954,7 @@
@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
@@ -940,7 +967,7 @@ install-doc: doc
done
install-headers:
......@@ -173,7 +152,7 @@
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -952,14 +963,19 @@
@@ -949,14 +976,19 @@ install-headers:
fi; \
done;
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
......@@ -186,10 +165,10 @@
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
+ @for i in $(GENERIC_DIR)/*.h; do \
+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"/; \
+ done;
done;
+ @for i in $(UNIX_DIR)/*.h; do \
+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"/; \
done;
+ done;
+ @ln -sf generic/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
+ @ln -sf generic/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
+ @ln -sf generic/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tk
PORTVERSION= 8.6.4
PORTVERSION= 8.6.5
CATEGORIES= x11-toolkits
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} TCLTK/tcl8_6
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
......
SHA256 (tk8.6.4-src.tar.gz) = 08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd26c1
SIZE (tk8.6.4-src.tar.gz) = 4266426
SHA256 (tk8.6.5-src.tar.gz) = fbbd93541b4cd467841208643b4014c4543a54c3597586727f0ab128220d7946
SIZE (tk8.6.5-src.tar.gz) = 4417393
......@@ -75,6 +75,7 @@ lib/tk%%TK_VER%%/console.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/image2.tcl
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earth.gif
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/earthris.gif
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/face.xbm
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagdown.xbm
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/flagup.xbm
%%DEMOS%%lib/tk%%TK_VER%%/demos/images/gray25.xbm
......@@ -133,8 +134,6 @@ lib/tk%%TK_VER%%/fontchooser.tcl
lib/tk%%TK_VER%%/iconlist.tcl
lib/tk%%TK_VER%%/icons.tcl
lib/tk%%TK_VER%%/images/README
lib/tk%%TK_VER%%/images/lamp.png
lib/tk%%TK_VER%%/images/lamp.svg
lib/tk%%TK_VER%%/images/logo.eps
lib/tk%%TK_VER%%/images/logo100.gif
lib/tk%%TK_VER%%/images/logo64.gif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment