Date: Tue, 15 Jan 2013 14:34:32 +0100 From: Pietro Cerutti <gahr@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: erik@bz.bzflag.bz Subject: Re: ports/175162: [patch] lang/itcl -- update to 4.0.0 Message-ID: <20130115133432.GC99194@gahrfit.gahr.ch> In-Reply-To: <201301091650.r09Go0Qc087799@freefall.freebsd.org> References: <201301091642.r09GgbxH038238@red.freebsd.org> <201301091650.r09Go0Qc087799@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0vzXIDBeUiKkjNJl
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Rethinking about it, it's probably better to keep this port at 3.4.1,
which requires Tcl/Tk 8.4+. The new 4.0.0 release requires Tcl/Tk 8.6
and this could cause problems to dependent ports. Here's an updated
patch.
I'm thinking about creating a lang/itcl4 port to track the 4.0.0
version. Would you be willing to maintain it or you'd rather have tcltk@
do the job?
Thanks for your feedback!
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile (revision 310152)
+++ Makefile (working copy)
@@ -1,15 +1,11 @@
-# New ports collection makefile for: itcl
-# Date created: Aug 17 1996
-# Whom: chuckr
-#
+# Created by: chuckr
# $FreeBSD$
-#
=20
PORTNAME=3D itcl
-PORTVERSION=3D 3.4b1
-PORTREVISION=3D 1
+PORTVERSION=3D 3.4.1
+PORTEPOCH=3D 1
CATEGORIES=3D lang tcl
-MASTER_SITES=3D SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4
+MASTER_SITES=3D SF/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4.1
DISTNAME=3D itcl${PORTVERSION}
=20
MAINTAINER=3D erik@bz.bzflag.bz
@@ -30,8 +26,11 @@
PLIST_SUB+=3D MAJOR=3D${MAJOR} MINOR=3D${MINOR}
ITCL_LIB=3D libitcl.so
MAKEFILE=3D ${FILESDIR}/Makefile.lib
-WRKSRC=3D ${WRKDIR}/itcl3.4
+WRKSRC=3D ${WRKDIR}/${PORTNAME}${PORTVERSION}
=20
+GNU_CONFIGURE=3D yes
+CONFIGURE_ARGS=3D --with-tcl=3D${TCL_LIBDIR}
+
MANCOMPRESSED=3D no
MANN=3D body.n class.n code.n configbody.n delete.n ensemble.n find.n
MANN+=3D is.n itcl.n itclvars.n local.n scope.n
@@ -43,10 +42,11 @@
=20
post-build test:
cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=3D${WRKSRC}/library \
- ${TCLSH} tests/all.tcl -load "load ./${ITCL_LIB}"
+ ${TCLSH} tests/all.tcl -load "load ./${ITCL_LIB_FILE}"
=20
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.n ${PREFIX}/man/mann/
+ ${LN} -sf libitcl.so.3 ${PREFIX}/lib/libitcl.so
.for FILE in ${MAN3}
${INSTALL_DATA} ${WRKSRC}/doc/${FILE:S/Itcl_//} ${PREFIX}/man/man3/${FILE}
.endfor
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- distinfo (revision 310152)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (itcl3.4b1.tar.gz) =3D dc99fcf6c00b00774dbfb94ccc437ea3e6315a198645=
b6d2acf8acba8fdb4608
-SIZE (itcl3.4b1.tar.gz) =3D 306342
+SHA256 (itcl3.4.1.tar.gz) =3D 5330832ce72da97610497a58eca904287d0ff91f9ec7=
41a4e4810d5b933c8568
+SIZE (itcl3.4.1.tar.gz) =3D 263316
Index: files/patch-test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-test (revision 310152)
+++ files/patch-test (working copy)
@@ -1,26 +0,0 @@
---- tests/ensemble.test 2004-02-12 13:09:50.000000000 -0500
-+++ tests/ensemble.test 2010-01-24 14:57:20.000000000 -0500
-@@ -97,12 +97,19 @@
- "itcl::ensemble test_numbers {part foo}"}}
-=20
--test ensemble-1.11 {part argument errors are handled gracefully} {
-- list [catch "itcl::ensemble test_numbers {part foo {{}} {}}" msg] $ms=
g $errorInfo
--} {1 {procedure "foo" has argument with no name} {procedure "foo" has arg=
ument with no name
-+if {$tcl_version < 8.5} {
-+ set errmsg111 {procedure "foo" has argument with no name}
-+} else {
-+ set errmsg111 {argument with no name}
-+}
-+set errmsg111 [format {1 {%s} {%s
- while executing
- "part foo {{}} {}"
- ("ensemble" body line 1)
- invoked from within
--"itcl::ensemble test_numbers {part foo {{}} {}}"}}
-+"itcl::ensemble test_numbers {part foo {{}} {}}"}} $errmsg111 $errmsg111]
-+
-+test ensemble-1.11 {part argument errors are handled gracefully} {
-+ list [catch "itcl::ensemble test_numbers {part foo {{}} {}}" msg] $ms=
g $errorInfo
-+} $errmsg111
-=20
- test ensemble-2.0 {defining subensembles} {
Index: files/patch-warnings
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/patch-warnings (revision 310152)
+++ files/patch-warnings (working copy)
@@ -1,164 +0,0 @@
---- generic/itcl_bicmds.c 2008-10-04 11:22:39.000000000 -0400
-+++ generic/itcl_bicmds.c 2010-01-24 14:39:45.000000000 -0500
-@@ -1022,5 +1022,5 @@
- Tcl_Obj *objPtr =3D NULL;
-=20
-- static char *options[] =3D {
-+ static const char *options[] =3D {
- "-args", "-body", "-name", "-protection", "-type",
- (char*)NULL
-@@ -1213,9 +1213,9 @@
- Tcl_Obj *CONST objv[]; /* argument objects */
- {
-- char *varName =3D NULL;
-+ const char *varName =3D NULL;
- Tcl_Obj *resultPtr =3D NULL;
- Tcl_Obj *objPtr =3D NULL;
-=20
-- static char *options[] =3D {
-+ static const char *options[] =3D {
- "-config", "-init", "-name", "-protection", "-type",
- "-value", (char*)NULL
---- generic/itcl_cmds.c 2008-12-15 15:02:58.000000000 -0500
-+++ generic/itcl_cmds.c 2010-01-24 14:41:33.000000000 -0500
-@@ -30,4 +30,5 @@
- */
- #include "itclInt.h"
-+#include <stdint.h>
-=20
- /*
-@@ -883,5 +884,5 @@
- Tcl_Obj *CONST objv[]; /* argument objects */
- {
-- int pLevel =3D (int)clientData;
-+ int pLevel =3D (intptr_t)clientData;
-=20
- int result;
---- generic/itcl_ensemble.c 2008-12-15 15:02:58.000000000 -0500
-+++ generic/itcl_ensemble.c 2010-01-24 14:47:49.000000000 -0500
-@@ -103,5 +103,5 @@
-=20
- static int CreateEnsemble _ANSI_ARGS_((Tcl_Interp *interp,
-- Ensemble *parentEnsData, char *ensName));
-+ Ensemble *parentEnsData, const char *ensName));
-=20
- static int AddEnsemblePart _ANSI_ARGS_((Tcl_Interp *interp,
-@@ -112,5 +112,5 @@
- static void DeleteEnsemble _ANSI_ARGS_((ClientData clientData));
-=20
--static int FindEnsemble _ANSI_ARGS_((Tcl_Interp *interp, char **nameArgv,
-+static int FindEnsemble _ANSI_ARGS_((Tcl_Interp *interp, const char **nam=
eArgv,
- int nameArgc, Ensemble** ensDataPtr));
-=20
-@@ -212,5 +212,5 @@
- CONST char* ensName; /* name of the new ensemble */
- {
-- char **nameArgv =3D NULL;
-+ const char **nameArgv =3D NULL;
- int nameArgc;
- Ensemble *parentEnsData;
-@@ -319,5 +319,5 @@
- Tcl_CmdDeleteProc *deleteProc; /* procedure used to destroy client da=
ta */
- {
-- char **nameArgv =3D NULL;
-+ const char **nameArgv =3D NULL;
- int nameArgc;
- Ensemble *ensData;
-@@ -396,5 +396,5 @@
- Tcl_CmdInfo *infoPtr; /* returns: info associated with part =
*/
- {
-- char **nameArgv =3D NULL;
-+ const char **nameArgv =3D NULL;
- int nameArgc;
- Ensemble *ensData;
-@@ -508,5 +508,5 @@
- Tcl_Obj *objPtr; /* returns: summary of usage info */
- {
-- char **nameArgv =3D NULL;
-+ const char **nameArgv =3D NULL;
- int nameArgc;
- Ensemble *ensData;
-@@ -752,5 +752,5 @@
- Tcl_Interp *interp; /* interpreter to be updated */
- Ensemble *parentEnsData; /* parent ensemble or NULL */
-- char *ensName; /* name of the new ensemble */
-+ const char *ensName; /* name of the new ensemble */
- {
- Ensemble *ensData;
-@@ -957,5 +957,5 @@
- FindEnsemble(interp, nameArgv, nameArgc, ensDataPtr)
- Tcl_Interp *interp; /* interpreter containing the ensemble=
*/
-- char **nameArgv; /* path of names leading to ensemble */
-+ const char **nameArgv; /* path of names leading to ensemble */
- int nameArgc; /* number of strings in nameArgv */
- Ensemble** ensDataPtr; /* returns: ensemble data */
---- generic/itcl_methods.c 2008-12-15 15:02:58.000000000 -0500
-+++ generic/itcl_methods.c 2010-01-24 14:50:55.000000000 -0500
-@@ -981,6 +981,6 @@
- }
- else if ((mcode->flags & ITCL_IMPLEMENT_ARGCMD) !=3D 0) {
-- char **argv;
-- argv =3D (char**)ckalloc( (unsigned)(objc*sizeof(char*)) );
-+ const char *argv[objc];
-+
- for (i=3D0; i < objc; i++) {
- argv[i] =3D Tcl_GetStringFromObj(objv[i], (int*)NULL);
-@@ -989,6 +989,4 @@
- result =3D (*mcode->cfunc.argCmd)(mcode->clientData,
- interp, objc, argv);
--
-- ckfree((char*)argv);
- }
- else if ((mcode->flags & ITCL_IMPLEMENT_TCL) !=3D 0) {
-@@ -1050,5 +1048,5 @@
-=20
- int i, argc, fargc;
-- char **argv, **fargv;
-+ const char **argv, **fargv;
- CompiledLocal *localPtr, *last;
-=20
-@@ -1825,5 +1823,5 @@
-=20
- int defargc;
-- char **defargv =3D NULL;
-+ const char **defargv =3D NULL;
- Tcl_Obj **defobjv =3D NULL;
- int configc =3D 0;
---- generic/itcl_objects.c 2007-08-07 16:05:30.000000000 -0400
-+++ generic/itcl_objects.c 2010-01-24 14:52:10.000000000 -0500
-@@ -1155,5 +1155,5 @@
- {
- int namec;
-- char **namev;
-+ const char **namev;
- Tcl_Interp *errs;
- Tcl_CmdInfo cmdInfo;
---- generic/itcl_util.c 2007-08-07 16:05:30.000000000 -0400
-+++ generic/itcl_util.c 2010-01-24 14:54:01.000000000 -0500
-@@ -1274,5 +1274,5 @@
- CONST char *pos;
- int listc, result;
-- char **listv;
-+ const char **listv;
-=20
- cmdName =3D ckalloc((unsigned)strlen(name)+1);
---- generic/itclInt.h.orig 2008-12-15 21:02:58.000000000 +0100
-+++ generic/itclInt.h 2012-08-31 16:07:23.000000000 +0200
-@@ -63,7 +63,7 @@
- #if (TCL_MAJOR_VERSION =3D=3D 8) && (TCL_MINOR_VERSION < 6)
- #define ERRORLINE(interp) ((interp)->errorLine)
- #else
--#define ERRORLINE(interp) (Tcl_GetErrorLine(interp))
-+#define ERRORLINE(interp) (Tcl_GetErrorLine((Tcl_Interp *)interp))
- #endif
-=20
- #define ITCL_TCL_PRE_8_5 (TCL_MAJOR_VERSION =3D=3D 8 && TCL_MINOR_VERSION=
< 5)
-@@ -206,7 +206,7 @@
- Tcl_HashEntry entry;
- } ItclVarInHash;
-=20
--#define ItclOffset(type, field) ((int) ((char *) &((type *) 0)->field))
-+#define ItclOffset(type, field) ((intptr_t)((char *) &((type *) 0)->field=
))
-=20
- #define itclOldRuntime (itclVarFlagOffset!=3D0)
-=20
Index: pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pkg-plist (revision 310152)
+++ pkg-plist (working copy)
@@ -2,6 +2,7 @@
include/itcl%%MAJOR%%.%%MINOR%%/itclInt.h
include/itcl%%MAJOR%%.%%MINOR%%/itclDecls.h
include/itcl%%MAJOR%%.%%MINOR%%/itclIntDecls.h
+lib/libitcl.so.3
lib/libitcl.so.%%MAJOR%%
lib/libitcl.so
lib/libitcl.a
--=20
Pietro Cerutti
The FreeBSD Project
gahr@FreeBSD.org
PGP Public Key:
http://gahr.ch/pgp
--0vzXIDBeUiKkjNJl
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)
iEYEARECAAYFAlD1WucACgkQwMJqmJVx944UcQCfYVnNj2ryyLyKYUlRGojtNs7X
GuoAoMgXnwygXmq31rVPnmAdMhhavym3
=ZF2T
-----END PGP SIGNATURE-----
--0vzXIDBeUiKkjNJl--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130115133432.GC99194>