diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-11-12 21:11:16 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-11-12 21:11:16 +0000 |
commit | 533f7540ab49dfd5fc500d6fc4a0aa060d0623f1 (patch) | |
tree | 5d0f8cfa3fa6534bb44d3e823650aaa58a4fee7b /lang/tcl83 | |
parent | Add the patch mentioned in the previous commit. (diff) |
- Update to 8.3.5
Notes
Notes:
svn path=/head/; revision=69974
Diffstat (limited to 'lang/tcl83')
-rw-r--r-- | lang/tcl83/Makefile | 7 | ||||
-rw-r--r-- | lang/tcl83/distinfo | 2 | ||||
-rw-r--r-- | lang/tcl83/files/patch-aa | 40 | ||||
-rw-r--r-- | lang/tcl83/files/patch-configure | 36 | ||||
-rw-r--r-- | lang/tcl83/files/patch-tcl.m4 | 22 |
5 files changed, 44 insertions, 63 deletions
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index 73194f6f5002..f339a91baef4 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -6,18 +6,17 @@ # PORTNAME= tcl -PORTVERSION= 8.3.4 -PORTREVISION= 4 +PORTVERSION= 8.3.5 CATEGORIES= lang tcl83 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl -DISTNAME= ${PORTNAME}${PORTVERSION} +DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= dinoex@FreeBSD.org LATEST_LINK= tcl83 PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} -WRKSRC= ${WRKDIR}/${DISTNAME}/unix +WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo index f914cacee8b8..ce4508cf3ce4 100644 --- a/lang/tcl83/distinfo +++ b/lang/tcl83/distinfo @@ -1 +1 @@ -MD5 (tcl8.3.4.tar.gz) = 8777250e03d6be9be7551bfc6e99d252 +MD5 (tcl8.3.5-src.tar.gz) = 5cb79f8b90cf1322cb1286b9fe67f7a2 diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa index 0ff89d9eade2..671ab4f73df7 100644 --- a/lang/tcl83/files/patch-aa +++ b/lang/tcl83/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Oct 20 02:24:15 2001 -+++ Makefile.in Sat Oct 20 11:21:50 2001 +--- Makefile.in.orig Fri Oct 18 22:44:46 2002 ++++ Makefile.in Tue Nov 12 21:45:50 2002 @@ -53,7 +53,9 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) @@ -30,32 +30,28 @@ libraries: -@@ -418,10 +421,16 @@ +@@ -418,7 +421,15 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ +- $(RANLIB) ${TCL_LIB_FILE} + @ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so - if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ - $(RANLIB) ${TCL_LIB_FILE}; \ - fi - ++ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ ++ $(RANLIB) ${TCL_LIB_FILE}; \ ++ 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 ${STUB_LIB_FILE} - @MAKE_STUB_LIB@ -@@ -539,10 +548,16 @@ - fi - @echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/" +@@ -561,6 +572,12 @@ @$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so - @if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ - (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \ - fi + @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) ++ @ln -sf $(TCL_LIB_FILE) $(LIB_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 @@ -64,7 +60,7 @@ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -550,8 +565,9 @@ +@@ -568,8 +585,9 @@ fi @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @@ -76,7 +72,7 @@ @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_LIBRARY) $(STUB_LIB_FILE) \ -@@ -559,7 +575,8 @@ +@@ -577,7 +595,8 @@ fi install-libraries: libraries @@ -86,7 +82,7 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -581,11 +598,16 @@ +@@ -599,11 +618,16 @@ chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; @@ -106,7 +102,7 @@ @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ do \ -@@ -643,7 +665,6 @@ +@@ -661,7 +685,6 @@ chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking top-level (.1) docs"; @@ -114,7 +110,7 @@ @echo "Installing C API (.3) docs"; @cd $(TOP_DIR)/doc; for i in *.3; \ do \ -@@ -653,7 +674,6 @@ +@@ -671,7 +694,6 @@ chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking C API (.3) docs"; @@ -122,7 +118,7 @@ @echo "Installing command (.n) docs"; @cd $(TOP_DIR)/doc; for i in *.n; \ do \ -@@ -663,7 +683,14 @@ +@@ -681,7 +703,14 @@ chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking command (.n) docs"; diff --git a/lang/tcl83/files/patch-configure b/lang/tcl83/files/patch-configure index 10d1e458ad04..77f71fb0133e 100644 --- a/lang/tcl83/files/patch-configure +++ b/lang/tcl83/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Oct 20 02:24:15 2001 -+++ configure Sun Jan 27 14:52:09 2002 -@@ -4779,7 +4779,7 @@ +--- configure.orig Fri Oct 18 22:44:46 2002 ++++ configure Tue Nov 12 21:40:13 2002 +@@ -4831,7 +4831,7 @@ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@ -9,24 +9,32 @@ ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g -@@ -5386,16 +5386,17 @@ +@@ -5499,12 +5499,13 @@ FreeBSD-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -+ TCL_SHLIB_LD_EXTRAS="-soname \$@" + SHLIB_LD="ld -shared -x" - SHLIB_LD_LIBS="" ++ TCL_SHLIB_LD_EXTRAS="-soname \$@" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="-export-dynamic" + LDFLAGS="" - LD_SEARCH_FLAGS="" - # FreeBSD doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - Rhapsody-*|Darwin-*) + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS +@@ -5513,10 +5514,10 @@ + LDFLAGS="$LDFLAGS -pthread" + fi + case $system in +- FreeBSD-3.*) ++ FreeBSD-*) + # FreeBSD-3 doesn't handle version numbers with dots. + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' + TCL_LIB_VERSIONS_OK=nodots + ;; + esac diff --git a/lang/tcl83/files/patch-tcl.m4 b/lang/tcl83/files/patch-tcl.m4 deleted file mode 100644 index 7341faab013e..000000000000 --- a/lang/tcl83/files/patch-tcl.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- tcl.m4.orig Sat Oct 20 02:24:15 2001 -+++ tcl.m4 Sat Nov 10 20:17:34 2001 -@@ -952,16 +952,16 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="ld -shared -x -soname \$@" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" -- LDFLAGS="-export-dynamic" -+ LDFLAGS="" - LD_SEARCH_FLAGS="" - # FreeBSD doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' - TCL_LIB_VERSIONS_OK=nodots - ;; - Rhapsody-*|Darwin-*) |