Sat May 30 20:43:40 2020 UTC ()
Be nicer to C++11 code. Bump revision.


(joerg)
diff -r1.34 -r1.35 pkgsrc/devel/tcl-tclcl/Makefile
diff -r1.13 -r1.14 pkgsrc/devel/tcl-tclcl/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/tcl-tclcl/patches/patch-tclcl.h
cvs diff -r1.34 -r1.35 pkgsrc/devel/tcl-tclcl/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/tcl-tclcl/Makefile 2020/03/20 11:57:33 1.34
+++ pkgsrc/devel/tcl-tclcl/Makefile 2020/05/30 20:43:40 1.35
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.34 2020/03/20 11:57:33 nia Exp $ 1# $NetBSD: Makefile,v 1.35 2020/05/30 20:43:40 joerg Exp $
2 2
3DISTNAME= tclcl-src-1.20 3DISTNAME= tclcl-src-1.20
4PKGNAME= tcl-${DISTNAME:S/-src//} 4PKGNAME= tcl-${DISTNAME:S/-src//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
8 8
9MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://otcl-tclcl.sourceforge.net/tclcl/ 10HOMEPAGE= http://otcl-tclcl.sourceforge.net/tclcl/
11COMMENT= Tcl/C++ interface used by ns and nam 11COMMENT= Tcl/C++ interface used by ns and nam
12 12
13WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} 13WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
14USE_LANGUAGES= c c++03 14USE_LANGUAGES= c c++03
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17 17
18CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} 18CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
cvs diff -r1.13 -r1.14 pkgsrc/devel/tcl-tclcl/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/tcl-tclcl/distinfo 2015/11/03 03:29:34 1.13
+++ pkgsrc/devel/tcl-tclcl/distinfo 2020/05/30 20:43:40 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.13 2015/11/03 03:29:34 agc Exp $ 1$NetBSD: distinfo,v 1.14 2020/05/30 20:43:40 joerg Exp $
2 2
3SHA1 (tclcl-src-1.20.tar.gz) = 45d38a1dea2ed9bfd529776b16f5a78d584f7549 3SHA1 (tclcl-src-1.20.tar.gz) = 45d38a1dea2ed9bfd529776b16f5a78d584f7549
4RMD160 (tclcl-src-1.20.tar.gz) = eea14ea193669d60c8e7fab23bf2096d9feaae8a 4RMD160 (tclcl-src-1.20.tar.gz) = eea14ea193669d60c8e7fab23bf2096d9feaae8a
5SHA512 (tclcl-src-1.20.tar.gz) = 3a9ac4e7c4866674b0b6f140f189328912e2484cd567b1aa243ad402e09099fb6d298da2d78892b73887130df3c94c4d5df5bbaac9822f82fd3fd93d30107540 5SHA512 (tclcl-src-1.20.tar.gz) = 3a9ac4e7c4866674b0b6f140f189328912e2484cd567b1aa243ad402e09099fb6d298da2d78892b73887130df3c94c4d5df5bbaac9822f82fd3fd93d30107540
6Size (tclcl-src-1.20.tar.gz) = 171728 bytes 6Size (tclcl-src-1.20.tar.gz) = 171728 bytes
7SHA1 (patch-Tcl.cc) = 0540b3ac59bb6a55c43f9ed0ef6f88032d2bc9cc 7SHA1 (patch-Tcl.cc) = 0540b3ac59bb6a55c43f9ed0ef6f88032d2bc9cc
8SHA1 (patch-Tcl2.cc) = 35d14ddcdc9677a2b42df6c57868103c9adbc245 8SHA1 (patch-Tcl2.cc) = 35d14ddcdc9677a2b42df6c57868103c9adbc245
9SHA1 (patch-aa) = df5fde2f7bc352a5b108472cdc88e728d0ca3fe7 9SHA1 (patch-aa) = df5fde2f7bc352a5b108472cdc88e728d0ca3fe7
10SHA1 (patch-ab) = 8df79a3911c55aa21eaa9d4a2cbb7f82dc9870a1 10SHA1 (patch-ab) = 8df79a3911c55aa21eaa9d4a2cbb7f82dc9870a1
11SHA1 (patch-ac) = dbbd4529799e015ffaafff449fb6140aa8f9d663 11SHA1 (patch-ac) = dbbd4529799e015ffaafff449fb6140aa8f9d663
12SHA1 (patch-rate-variable.cc) = c07ee30701b82de146c49f8300644aee73e45b09 12SHA1 (patch-rate-variable.cc) = c07ee30701b82de146c49f8300644aee73e45b09
13SHA1 (patch-rate-variable.h) = c316718a950a8ac6a8bcc304dc25b48e0baad537 13SHA1 (patch-rate-variable.h) = c316718a950a8ac6a8bcc304dc25b48e0baad537
14SHA1 (patch-tclcl.h) = ddb7884a0106ef1c2796743ffbef13f50e5dd992 14SHA1 (patch-tclcl.h) = bf0902bc62066fc8981e2bbfa6e09f8f144e4708
cvs diff -r1.1 -r1.2 pkgsrc/devel/tcl-tclcl/patches/patch-tclcl.h (expand / switch to unified diff)

--- pkgsrc/devel/tcl-tclcl/patches/patch-tclcl.h 2014/02/01 08:00:06 1.1
+++ pkgsrc/devel/tcl-tclcl/patches/patch-tclcl.h 2020/05/30 20:43:40 1.2
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-tclcl.h,v 1.1 2014/02/01 08:00:06 markd Exp $ 1$NetBSD: patch-tclcl.h,v 1.2 2020/05/30 20:43:40 joerg Exp $
2 2
3Build with tcl8.6 3Build with tcl8.6
 4Allow using C++11 compilers.
4 5
5--- tclcl.h.orig 2005-09-07 04:53:51.000000000 +0000 6--- tclcl.h.orig 2005-09-07 04:53:51.000000000 +0000
6+++ tclcl.h 7+++ tclcl.h
7@@ -85,7 +85,7 @@ class Tcl { 8@@ -85,7 +85,7 @@ class Tcl {
8 /* may not work at all! */ 9 /* may not work at all! */
9 inline char* result() const { return (tcl_->result); } 10 inline char* result() const { return (tcl_->result); }
10 #endif /* TCL_MAJOR_VERSION >= 8 */ 11 #endif /* TCL_MAJOR_VERSION >= 8 */
11- inline void result(const char* p) { tcl_->result = (char*)p; } 12- inline void result(const char* p) { tcl_->result = (char*)p; }
12+ inline void result(const char* p) { Tcl_SetResult (tcl_, (char *)p, NULL);} 13+ inline void result(const char* p) { Tcl_SetResult (tcl_, (char *)p, NULL);}
13 void resultf(const char* fmt, ...); 14 void resultf(const char* fmt, ...);
14 inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc, 15 inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc,
15 ClientData cd = 0, 16 ClientData cd = 0,
 17@@ -190,7 +190,7 @@ class TclObject {
 18 /* give an error message and exit if the old variable
 19 name is used either for read or write */
 20 #define _RENAMED(oldname, newname) \
 21- bind_error(oldname, "variable "oldname" is renamed to "newname)
 22+ bind_error(oldname, "variable " oldname " is renamed to " newname)
 23
 24
 25 virtual int init(int /*argc*/, const char*const* /*argv*/) {