diff options
author | Justin M. Seger <jseger@FreeBSD.org> | 2000-01-05 07:11:54 +0000 |
---|---|---|
committer | Justin M. Seger <jseger@FreeBSD.org> | 2000-01-05 07:11:54 +0000 |
commit | fa786a57ac1f7b4ebb95ebcdc6810cf0ef81d9f0 (patch) | |
tree | 42ad330bc63574ac21aa87578baa33301c37a208 /lang/tcl84 | |
parent | Update port to 0.7.1 (and unmark as BROKEN) (diff) |
Upgrade to tcl 8.2.3
Notes
Notes:
svn path=/head/; revision=24431
Diffstat (limited to 'lang/tcl84')
-rw-r--r-- | lang/tcl84/Makefile | 9 | ||||
-rw-r--r-- | lang/tcl84/distinfo | 2 | ||||
-rw-r--r-- | lang/tcl84/files/patch-aa | 26 | ||||
-rw-r--r-- | lang/tcl84/files/patch-ab | 17 | ||||
-rw-r--r-- | lang/tcl84/pkg-descr | 2 |
5 files changed, 28 insertions, 28 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index af1da5d25ae0..5d9a4d0fde85 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: tcl8.2.2 -# Version required: 8.2.2 +# New ports collection makefile for: tcl8.2.3 +# Version required: 8.2.3 # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # -DISTNAME= tcl8.2.2 -PKGNAME= tcl-8.2.2 +DISTNAME= tcl8.2.3 +PKGNAME= tcl-8.2.3 CATEGORIES= lang tcl82 MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/ @@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} +MAKE_ENV= SHORT_TCL_VER=82 PKGINSTALL= ${PKGDIR}/INSTALL.tclsh PLIST_SUB= TCL_VER=8.2 SHORT_TCL_VER=82 diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo index 0becb14a2b05..014a57b04b7a 100644 --- a/lang/tcl84/distinfo +++ b/lang/tcl84/distinfo @@ -1 +1 @@ -MD5 (tcl8.2.2.tar.gz) = 4b16a1d5f91ae5744d17385a7bf13820 +MD5 (tcl8.2.3.tar.gz) = 8d06f4837e8e93edbe78f5ceaaa16ab4 diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index 347b053cfc41..07db0c35ca9e 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -6,8 +6,8 @@ # Directory in which to install the include file tcl.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) -+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix ++GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic ++UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix # Top-level directory in which to install manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man @@ -34,7 +34,7 @@ all: binaries libraries doc -binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh -+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh ++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl${SHORT_TCL_VER}.a tclsh libraries: @@ -42,13 +42,13 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ -+ ln -sf ${TCL_LIB_FILE} libtcl82.so ++ ln -sf ${TCL_LIB_FILE} libtcl${SHORT_TCL_VER}.so $(RANLIB) ${TCL_LIB_FILE} -+libtcl82.a: ${OBJS} -+ rm -f libtcl82.a -+ ar cr libtcl82.a ${OBJS} -+ $(RANLIB) libtcl82.a ++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} @@ -57,13 +57,13 @@ @echo "Installing $(TCL_LIB_FILE)" chmod +x $(SRC_DIR)/install-sh @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so ++ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @echo "Installing libtcl82.a" -+ @$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a ++ @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 @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE)"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab index 6cda56a21351..85ee6265de11 100644 --- a/lang/tcl84/files/patch-ab +++ b/lang/tcl84/files/patch-ab @@ -1,11 +1,11 @@ ---- configure.orig Wed Nov 3 21:37:24 1999 -+++ configure Sun Nov 21 15:34:05 1999 +--- configure.orig Tue Dec 14 22:59:18 1999 ++++ configure Wed Jan 5 00:56:06 2000 @@ -4648,7 +4648,7 @@ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" - TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' -+ TCL_TRIM_DOTS=82 ++ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g @@ -18,7 +18,7 @@ # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -4922,16 +4922,21 @@ +@@ -4922,16 +4922,20 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -33,7 +33,6 @@ LD_SEARCH_FLAGS="" - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then -+ echo "SHARED_LIB_SUFFIX JSEGER" + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' + SHLIB_LD="ld -shared -x -soname \$@" + else @@ -43,7 +42,7 @@ else echo "$ac_t""no" 1>&6 -@@ -4954,17 +4959,6 @@ +@@ -4954,17 +4958,6 @@ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -61,7 +60,7 @@ NEXTSTEP-*) SHLIB_CFLAGS="" SHLIB_LD="cc -nostdlib -r" -@@ -5371,7 +5365,7 @@ +@@ -5371,7 +5364,7 @@ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' fi if test "$UNSHARED_LIB_SUFFIX" = "" ; then @@ -70,7 +69,7 @@ fi -@@ -5628,11 +5622,7 @@ +@@ -5628,11 +5621,7 @@ # up the Tcl library. if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then @@ -83,7 +82,7 @@ TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" else -@@ -5678,11 +5668,7 @@ +@@ -5678,11 +5667,7 @@ TCL_STUB_LIB_FILE=${STUB_LIB_FILE} diff --git a/lang/tcl84/pkg-descr b/lang/tcl84/pkg-descr index 58797d179672..f120ad346ae5 100644 --- a/lang/tcl84/pkg-descr +++ b/lang/tcl84/pkg-descr @@ -1,4 +1,4 @@ -This is Tcl8.1, an embeddable tool command language. +This is Tcl8.2, an embeddable tool command language. The best way to get started with Tcl is to read ``Tcl and the Tk Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X. |