diff options
author | Martin Matuska <mm@FreeBSD.org> | 2012-08-03 09:17:41 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2012-08-03 09:17:41 +0000 |
commit | 4138f727a815bcd88c5c2e623f17bfe7ff89199f (patch) | |
tree | 8998693ca57a40474dcd69de07ddd0b9b65312ba /lang/tcl85 | |
parent | Update to 1.2.1 (diff) |
Update tcl85/tk85 to 8.5.12
Notes
Notes:
svn path=/head/; revision=301943
Diffstat (limited to 'lang/tcl85')
-rw-r--r-- | lang/tcl85/Makefile | 28 | ||||
-rw-r--r-- | lang/tcl85/distinfo | 4 | ||||
-rw-r--r-- | lang/tcl85/files/patch-unix-Makefile.in | 76 | ||||
-rw-r--r-- | lang/tcl85/files/patch-unix-tclUnixPort.h | 21 | ||||
-rw-r--r-- | lang/tcl85/pkg-plist | 1 | ||||
-rw-r--r-- | lang/tcl85/pkg-plist.tm | 6 |
6 files changed, 70 insertions, 66 deletions
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile index 4cafc80731cc..f4289b29bc00 100644 --- a/lang/tcl85/Makefile +++ b/lang/tcl85/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= tcl -PORTVERSION= 8.5.11 +PORTVERSION= 8.5.12 CATEGORIES= lang MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2} @@ -34,9 +34,11 @@ PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER} EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ .if !defined(BUILDING_TCL_THREADS) && !defined(BUILDING_TCL_TM) -OPTIONS= TCL85_MAN "Install tcl 8.5 function manpages" off \ - TZDATA "Install tcl timezone data" off \ - TCL_MODULES "Install tcl common modules" on +OPTIONS_DEFINE= TCL85_MAN TZDATA TCL_MODULES +OPTIONS_DEFAULT= TCL_MODULES +TCL85_MAN_DESC=Install tcl 8.5 function manpages +TZDATA_DESC=Install tcl timezone data +TCL_MODULES_DESC=Install tcl common modules .elif defined(BUILDING_TCL_THREADS) USE_TCL= ${SHORT_TCL_VER} PLIST= ${PKGDIR}/pkg-plist.threads @@ -53,19 +55,19 @@ PLIST= ${PKGDIR}/pkg-plist.tm .if !defined(BUILDING_TCL_TM) -.if !defined(WITHOUT_TCL_MODULES) -RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.3.tm:${PORTSDIR}/lang/tcl-modules +.if ${PORT_OPTIONS:MTCL_MODULES} +RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.4.tm:${PORTSDIR}/lang/tcl-modules .endif DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} -.if defined(WITH_TZDATA) +.if ${PORT_OPTIONS:MTZDATA} PLIST_SUB+= TZDATA="" .else PLIST_SUB+= TZDATA="@comment " .endif -.if !defined(NO_INSTALL_MANPAGES) +.if ${PORT_OPTIONS:MDOCS} MAN1= tclsh${TCL_VER}${THREADS_SUFFIX}.1 .endif @@ -758,24 +760,24 @@ do-install: .endif post-install: -.if defined(WITH_TZDATA) +.if ${PORT_OPTIONS:MTZDATA} @cd ${WRKSRC} && ${MAKE} -f Makefile install-tzdata ${MAKE_ENV} .endif ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR} -.if !defined(NO_INSTALL_MANPAGES) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1 -.if !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL85_MAN) +.if !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN} . for mp in ${MAN3} ${MANN} @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/${mp} . endfor @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV} -.endif # !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL85_MAN) +.endif # !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL85_MAN} -.endif # !defined(NO_INSTALL_MANPAGES) +.endif # ${PORT_OPTIONS:MDOCS} regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test diff --git a/lang/tcl85/distinfo b/lang/tcl85/distinfo index 9ff6ae0f344d..3c274a1cf6f9 100644 --- a/lang/tcl85/distinfo +++ b/lang/tcl85/distinfo @@ -1,2 +1,2 @@ -SHA256 (tcl8.5.11-src.tar.gz) = 8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a -SIZE (tcl8.5.11-src.tar.gz) = 4484001 +SHA256 (tcl8.5.12-src.tar.gz) = 20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2 +SIZE (tcl8.5.12-src.tar.gz) = 4501505 diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in index e86972b67d5f..b6ed7919cd66 100644 --- a/lang/tcl85/files/patch-unix-Makefile.in +++ b/lang/tcl85/files/patch-unix-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2010-09-08 19:40:48.000000000 +0200 -+++ Makefile.in 2010-09-17 16:35:44.992422365 +0200 -@@ -55,6 +55,8 @@ +--- Makefile.in.orig 2012-07-25 18:45:05.000000000 +0200 ++++ Makefile.in 2012-08-02 15:10:04.590514599 +0200 +@@ -54,6 +54,8 @@ # 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@ -@@ -101,7 +103,7 @@ +@@ -100,7 +102,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) @@ -18,7 +18,7 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -538,7 +540,7 @@ +@@ -541,7 +543,7 @@ all: binaries libraries doc @@ -27,7 +27,7 @@ libraries: -@@ -549,6 +551,15 @@ +@@ -552,6 +554,15 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ @@ -43,7 +43,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -697,7 +708,7 @@ +@@ -693,7 +704,7 @@ dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) @@ -52,16 +52,16 @@ install: $(INSTALL_TARGETS) -@@ -727,10 +738,18 @@ - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" +@@ -723,10 +734,18 @@ + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ - @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) -+ @ln -sf $(LIB_FILE) "$(LIB_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so + @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 \ -+ "$(LIB_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a -+ @(cd "$(LIB_INSTALL_DIR)"; $(RANLIB) libtcl${SHORT_TCL_VER}.a) -+ @chmod 555 "$(LIB_INSTALL_DIR)"/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@" @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ @@ -73,7 +73,7 @@ @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -738,7 +757,8 @@ +@@ -734,7 +753,8 @@ @EXTRA_INSTALL_BINARIES@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs @@ -83,16 +83,16 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -747,7 +767,7 @@ +@@ -743,7 +763,7 @@ else true; \ fi; \ done; -- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \ +- @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"; \ -@@ -760,13 +780,17 @@ +@@ -756,13 +776,17 @@ chmod +x $(SRC_DIR)/../unix/install-sh; \ fi @echo "Installing header files"; @@ -101,35 +101,35 @@ - $(GENERIC_DIR)/tclTomMath.h \ - $(GENERIC_DIR)/tclTomMathDecls.h ; \ + @for i in $(GENERIC_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ ++ do \ + $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ - done; ++ done; + @for i in $(UNIX_DIR)/*.h ; \ -+ do \ + do \ +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ + $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \ -+ done; + 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)"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \ -@@ -778,22 +802,11 @@ +@@ -774,22 +798,11 @@ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; -- @echo "Installing package http 2.7.7 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.7.tm; +- @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"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; -- @echo "Installing package msgcat 1.4.4 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.4.tm; -- @echo "Installing package tcltest 2.3.3 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.3.tm; +- @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 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; @@ -138,7 +138,7 @@ @echo "Installing library encoding directory"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -@@ -805,6 +818,28 @@ +@@ -801,6 +814,28 @@ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ fi @@ -152,12 +152,12 @@ + else true; \ + fi; \ + done; -+ @echo "Installing package http 2.7.7 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.4/http-2.7.7.tm; -+ @echo "Installing package msgcat 1.4.4 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/msgcat-1.4.4.tm; -+ @echo "Installing package tcltest 2.3.3 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_INSTALL_DIR)"/tcl8/8.5/tcltest-2.3.3.tm; ++ @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"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(LIB_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 "$(LIB_INSTALL_DIR)"/tcl8/8.4/platform-1.0.10.tm; @@ -167,7 +167,7 @@ install-tzdata: ${TCL_EXE} @echo "Installing time zone data" @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ -@@ -829,21 +864,26 @@ +@@ -825,21 +860,26 @@ else true; \ fi; \ done; diff --git a/lang/tcl85/files/patch-unix-tclUnixPort.h b/lang/tcl85/files/patch-unix-tclUnixPort.h index 7a4f70a917d2..cd63d3b2b4d5 100644 --- a/lang/tcl85/files/patch-unix-tclUnixPort.h +++ b/lang/tcl85/files/patch-unix-tclUnixPort.h @@ -1,12 +1,13 @@ ---- tclUnixPort.h.orig Wed Jan 17 13:14:18 2007 -+++ tclUnixPort.h Wed Jan 17 13:08:39 2007 -@@ -628,6 +628,9 @@ - EXTERN struct tm * TclpLocaltime(CONST time_t *); - EXTERN struct tm * TclpGmtime(CONST time_t *); - EXTERN char * TclpInetNtoa(struct in_addr); -+#ifdef inet_ntoa -+# undef inet_ntoa -+#endif +--- tclUnixPort.h.orig 2012-08-02 15:43:23.269506562 +0200 ++++ tclUnixPort.h 2012-08-02 15:43:25.167507612 +0200 +@@ -631,7 +631,9 @@ + EXTERN struct tm *TclpGmtime(CONST time_t *); /* #define localtime(x) TclpLocaltime(x) * #define gmtime(x) TclpGmtime(x) */ - # undef inet_ntoa +-# undef inet_ntoa ++# ifdef inet_ntoa ++# undef inet_ntoa ++# endif + # define inet_ntoa(x) TclpInetNtoa(x) + # ifdef HAVE_PTHREAD_ATTR_GET_NP + # define TclpPthreadGetAttrs pthread_attr_get_np diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist index bf0a9cfc6dd0..45dcc77e5b20 100644 --- a/lang/tcl85/pkg-plist +++ b/lang/tcl85/pkg-plist @@ -389,6 +389,7 @@ lib/tcl%%TCL_VER%%/tclIndex %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Coral_Harbour %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Cordoba %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Costa_Rica +%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Creston %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Cuiaba %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Curacao %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Danmarkshavn diff --git a/lang/tcl85/pkg-plist.tm b/lang/tcl85/pkg-plist.tm index 4a8832ae751d..679c9889a006 100644 --- a/lang/tcl85/pkg-plist.tm +++ b/lang/tcl85/pkg-plist.tm @@ -1,8 +1,8 @@ -lib/tcl8/8.4/http-2.7.7.tm +lib/tcl8/8.4/http-2.7.9.tm lib/tcl8/8.4/platform/shell-1.1.4.tm lib/tcl8/8.4/platform-1.0.10.tm -lib/tcl8/8.5/msgcat-1.4.4.tm -lib/tcl8/8.5/tcltest-2.3.3.tm +lib/tcl8/8.5/msgcat-1.4.5.tm +lib/tcl8/8.5/tcltest-2.3.4.tm @dirrmtry lib/tcl8/8.3 @dirrmtry lib/tcl8/8.4/platform @dirrmtry lib/tcl8/8.4 |