Date: Thu, 23 Oct 2003 18:13:14 -0400 (EDT) From: Michael Edenfield <kutulu@kutulu.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58466: lang/itcl: Update build for tcl8.4 Message-ID: <20031023221314.7562AB827@wombat.localnet> Resent-Message-ID: <200310232220.h9NMKILc048266@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58466
>Category: ports
>Synopsis: lang/itcl: Update build for tcl8.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 23 15:20:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Michael Edenfield
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD wombat.localnet 5.1-CURRENT FreeBSD 5.1-CURRENT #7: Sun Aug 24 21:35:57 EDT 2003 root@wombat.localnet:/usr/obj/usr/src/sys/ATHLON i386
>Description:
Note that one test in the test suite fails, but the failure is due to a change in the wording of an error message:
---- Result was:
1 {wrong # args: should be "test_numbers three x y z"}
---- Result should have been (exact matching):
1 {no value given for parameter "y" to "test_numbers three"}
==== ensemble-1.5 FAILED
The library still appears to function as it should. For some reason my changes to ensemble.test were ignored.
>How-To-Repeat:
>Fix:
--- itcl.patch begins here ---
diff -urN itcl.orig/Makefile itcl/Makefile
--- itcl.orig/Makefile Thu Feb 20 13:37:58 2003
+++ itcl/Makefile Thu Oct 23 17:39:04 2003
@@ -15,13 +15,13 @@
MAINTAINER= ports@freebsd.org
COMMENT= [incr Tcl] (A.K.A. "itcl")
-LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83
+LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84
WRKSRC= ${WRKDIR}/${DISTNAME}/itcl
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-PKGINSTALL= ${PORTSDIR}/lang/tcl83/pkg-install.tclsh
-PKGDEINSTALL= ${PORTSDIR}/lang/tcl83/pkg-deinstall.tclsh
+PKGINSTALL= ${PORTSDIR}/lang/tcl84/pkg-install.tclsh
+PKGDEINSTALL= ${PORTSDIR}/lang/tcl84/pkg-deinstall.tclsh
MAKE_ENV+= ${PLIST_SUB} \
SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
@@ -56,7 +56,7 @@
post-build test:
cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
- ${PREFIX}/bin/tclsh8.3 tests/all.tcl
+ ${PREFIX}/bin/tclsh8.4 tests/all.tcl
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.n ${PREFIX}/man/mann/
diff -urN itcl.orig/files/Makefile.lib itcl/files/Makefile.lib
--- itcl.orig/files/Makefile.lib Sat Jul 28 10:53:45 2001
+++ itcl/files/Makefile.lib Thu Oct 23 17:42:29 2003
@@ -2,7 +2,7 @@
LIB= itcl${MAJOR}${MINOR}
ITCL_LIBRARY= ${PREFIX}/lib/itcl${MAJOR}.${MINOR}
CFLAGS+= -I. -I./../generic \
- -I${PREFIX}/include/tcl8.3/generic \
+ -I${PREFIX}/include/tcl8.4/generic \
-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
-DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\
@@ -11,7 +11,7 @@
-DHAVE_SYS_FILIO_H=1 \
-DRETSIGTYPE=void \
-DITCL_LIBRARY=\"${ITCL_LIBRARY}\"
-LDADD+= -L${PREFIX}/lib -ltcl83
+LDADD+= -L${PREFIX}/lib -ltcl84
.PATH: ${.CURDIR}/unix ${.CURDIR}/generic ${.CURDIR}/man
diff -urN itcl.orig/files/patch-itcl_class.c itcl/files/patch-itcl_class.c
--- itcl.orig/files/patch-itcl_class.c Wed Dec 31 19:00:00 1969
+++ itcl/files/patch-itcl_class.c Thu Oct 23 18:09:16 2003
@@ -0,0 +1,11 @@
+--- generic/itcl_class.c.orig Thu Oct 23 17:58:16 2003
++++ generic/itcl_class.c Thu Oct 23 17:59:01 2003
+@@ -960,7 +960,7 @@
+ * it--as it is being resolved again by the compiler.
+ */
+ cmdPtr = (Command*)mfunc->accessCmd;
+- if (!cmdPtr || cmdPtr->deleted) {
++ if (!cmdPtr || (cmdPtr->flags & CMD_IS_DELETED)) {
+ mfunc->accessCmd = NULL;
+
+ if ((flags & TCL_LEAVE_ERR_MSG) != 0) {
diff -urN itcl.orig/files/patch-itcl_ensemble.c itcl/files/patch-itcl_ensemble.c
--- itcl.orig/files/patch-itcl_ensemble.c Wed Dec 31 19:00:00 1969
+++ itcl/files/patch-itcl_ensemble.c Thu Oct 23 18:09:30 2003
@@ -0,0 +1,20 @@
+--- generic/itcl_ensemble.c.orig Thu Oct 23 17:59:33 2003
++++ generic/itcl_ensemble.c Thu Oct 23 18:00:52 2003
+@@ -819,7 +819,7 @@
+ cmdPtr->clientData = NULL;
+ cmdPtr->deleteProc = DeleteEnsemble;
+ cmdPtr->deleteData = cmdPtr->objClientData;
+- cmdPtr->deleted = 0;
++ cmdPtr->flags = 0;
+ cmdPtr->importRefPtr = NULL;
+
+ ensPart->cmdPtr = cmdPtr;
+@@ -896,7 +896,7 @@
+ cmdPtr->clientData = NULL;
+ cmdPtr->deleteProc = deleteProc;
+ cmdPtr->deleteData = (ClientData)clientData;
+- cmdPtr->deleted = 0;
++ cmdPtr->flags = 0;
+ cmdPtr->importRefPtr = NULL;
+
+ ensPart->cmdPtr = cmdPtr;
--- itcl.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031023221314.7562AB827>