Date: Wed, 21 Nov 2012 04:50:27 GMT From: Chris Petrik <c.petrik.sosa@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173753: [PATCH] lang/tcl85 update to 8.5.13 Message-ID: <201211210450.qAL4oRVM009343@red.freebsd.org> Resent-Message-ID: <201211210500.qAL500GE064710@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173753
>Category: ports
>Synopsis: [PATCH] lang/tcl85 update to 8.5.13
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 21 05:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Chris Petrik
>Release:
>Organization:
na
>Environment:
>Description:
Update tcl85 to 8.5.13
remove patch-uk as it was commited upstream.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: tcl85/Makefile
==================================================================
--- tcl85/Makefile
+++ tcl85/Makefile
@@ -1,11 +1,10 @@
# Created by: Martin Matuska <mm@FreeBSD.org>
# $FreeBSD: head/lang/tcl85/Makefile 305074 2012-09-30 06:25:19Z rm $
PORTNAME?= tcl
-PORTVERSION= 8.5.12
-PORTREVISION= 2
+PORTVERSION= 8.5.13
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION}
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME= tcl${PORTVERSION}-src
Index: tcl85/distinfo
==================================================================
--- tcl85/distinfo
+++ tcl85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcl8.5.12-src.tar.gz) = 20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2
-SIZE (tcl8.5.12-src.tar.gz) = 4501505
+SHA256 (tcl8.5.13-src.tar.gz) = 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a
+SIZE (tcl8.5.13-src.tar.gz) = 4513204
DELETED tcl85/files/patch-uk-locale
Index: tcl85/files/patch-uk-locale
==================================================================
--- tcl85/files/patch-uk-locale
+++ tcl85/files/patch-uk-locale
@@ -1,15 +0,0 @@
-Fix the misspelled name of "March" in Ukrainian.
-
-Submitted upstream as:
-
-https://sourceforge.net/tracker/?func=detail&aid=3561330&group_id=10894&atid=310894
-
---- ../library/msgs/uk.msg 2011-04-26 11:14:03.000000000 -0400
-+++ ../library/msgs/uk.msg 2012-08-24 12:52:15.000000000 -0400
-@@ -34,5 +34,5 @@
- "\u0441\u0456\u0447\u043d\u044f"\
- "\u043b\u044e\u0442\u043e\u0433\u043e"\
-- "\u0431\u0435\u0440\u0435\u0436\u043d\u044f"\
-+ "\u0431\u0435\u0440\u0435\u0437\u043d\u044f"\
- "\u043a\u0432\u0456\u0442\u043d\u044f"\
- "\u0442\u0440\u0430\u0432\u043d\u044f"\
Index: tcl85/files/patch-unix-Makefile.in
==================================================================
--- tcl85/files/patch-unix-Makefile.in
+++ tcl85/files/patch-unix-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig 2012-07-25 18:45:05.000000000 +0200
-+++ Makefile.in 2012-08-02 15:10:04.590514599 +0200
+--- Makefile.in.bak 2012-11-20 23:39:58.000000000 -0600
++++ Makefile.in 2012-11-20 23:47:34.000000000 -0600
@@ -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
@@ -16,88 +16,86 @@
-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@
+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@
# Flags to pass to the linker
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-@@ -541,7 +543,7 @@
+@@ -542,7 +544,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
libraries:
-@@ -552,6 +554,15 @@
+@@ -553,6 +555,14 @@
${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
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
-+
++ 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 $@
-@@ -693,7 +704,7 @@
+@@ -694,7 +704,7 @@
dltest.marker: ${STUB_LIB_FILE}
cd dltest ; $(MAKE)
-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@
+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
install: $(INSTALL_TARGETS)
-@@ -723,10 +734,18 @@
+@@ -720,10 +730,17 @@
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@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 \
+ "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
+ @(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@"
++ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/"
++ @mkdir -p "$(SCRIPT_INSTALL_DIR)"
++ @$(INSTALL_DATA) tclConfig.sh "$(SCRIPT_INSTALL_DIR)"/tclConfig.sh
@$(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
-+ @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@ ; \
-@@ -734,7 +753,8 @@
+@@ -731,7 +748,8 @@
@EXTRA_INSTALL_BINARIES@
install-libraries: libraries $(INSTALL_TZDATA) install-msgs
- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
+ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" \
+ "$(UNIX_INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -743,7 +763,7 @@
+@@ -739,7 +757,7 @@
else true; \
fi; \
done;
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \
+ @for i in opt0.4 http1.0 encoding; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -756,13 +776,17 @@
- chmod +x $(SRC_DIR)/../unix/install-sh; \
- fi
- @echo "Installing header files";
+@@ -748,13 +766,17 @@
+ fi; \
+ done;
+ @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
- $(GENERIC_DIR)/tclPlatDecls.h \
- $(GENERIC_DIR)/tclTomMath.h \
- $(GENERIC_DIR)/tclTomMathDecls.h ; \
+ @for i in $(GENERIC_DIR)/*.h ; \
@@ -110,50 +108,51 @@
+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \
done;
+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
+ @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h
- @echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
+ @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@; \
-@@ -774,22 +798,11 @@
+@@ -766,23 +788,11 @@
do \
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
-- @echo "Installing package http 2.7.9 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.9.tm;
- @echo "Installing library opt0.4 directory";
+- @echo "Installing package http 2.7.10 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.10.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.4.5 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.5.tm;
+- @echo "Installing package msgcat 1.5.0 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.0.tm;
- @echo "Installing package tcltest 2.3.4 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.4.tm;
-
- @echo "Installing package platform 1.0.10 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.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 library encoding directory";
+-
+ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-@@ -801,6 +814,28 @@
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
+@@ -792,6 +802,27 @@
+ echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
"$(SCRIPT_INSTALL_DIR)"/tm.tcl; \
fi
-
+install-tm:
+ @for i in tcl8 tcl8/8.4 tcl8/8.4/platform tcl8/8.5; \
+ do \
-+ if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \
++ if [ ! -d "$(LIB_INSTALL_DIR)"/$$i ] ; then \
+ echo "Making directory $(LIB_INSTALL_DIR)/$$i"; \
+ mkdir -p "$(LIB_INSTALL_DIR)"/$$i; \
+ chmod 755 "$(LIB_INSTALL_DIR)"/$$i; \
+ else true; \
+ fi; \
-+ done;
++ done;
+ @echo "Installing package http 2.7.9 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.9.tm;
+ @echo "Installing package msgcat 1.4.5 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.5.tm;
+ @echo "Installing package tcltest 2.3.4 as a Tcl Module";
@@ -161,42 +160,58 @@
+
+ @echo "Installing package platform 1.0.10 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm;
+ @echo "Installing package platform::shell 1.1.4 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform/shell-1.1.4.tm;
-+
+
install-tzdata: ${TCL_EXE}
- @echo "Installing time zone data"
- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
-@@ -825,21 +860,26 @@
+ @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
+@@ -823,18 +854,23 @@
else true; \
fi; \
done;
-- @echo "Installing and cross-linking top-level (.1) docs";
+- @echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
- @for i in $(TOP_DIR)/doc/*.1; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
- done
-
- @echo "Installing and cross-linking C API (.3) docs";
+ @echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
@for i in $(TOP_DIR)/doc/*.3; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
-+ $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \
- done
-
- @echo "Installing and cross-linking command (.n) docs";
+- done
++ $(BSD_INSTALL_MAN) $$i "$(MAN3_INSTALL_DIR)"; \
++ done;
+ @echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
@for i in $(TOP_DIR)/doc/*.n; do \
- $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
-+ $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \
- done
-
+- done
++ $(BSD_INSTALL_MAN) $$i "$(MANN_INSTALL_DIR)"; \
++ done;
+ @echo "**********"
+ @echo "IMPORTANT:"
+ @echo "**********"
+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh"
+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h"
+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
+ @echo "There are NOT default place, but good place to avoid"
+ @echo "conflicting with another version of Tcl/Tks."
+
+
# Optional target to install private headers
install-private-headers: libraries
- @for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
+@@ -1537,7 +1573,7 @@
+ match=1; \
+ fi; \
+ done; \
+- if [ $$match -eq 0 ]; then echo $$i; fi \
++ if [ $$match -eq 0 ]; then echo $$i; fi; \
+ done
+
+ #
+@@ -1554,7 +1590,7 @@
+ match=1; \
+ fi; \
+ done; \
+- if [ $$match -eq 0 ]; then echo $$i; fi \
++ if [ $$match -eq 0 ]; then echo $$i; fi; \
+ done
+
+ #
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211210450.qAL4oRVM009343>