summaryrefslogtreecommitdiff
path: root/net/nam
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2014-02-01 08:07:01 +0000
committermarkd <markd@pkgsrc.org>2014-02-01 08:07:01 +0000
commit141e43ba2b937e9fe99887324f9337d97a45be6f (patch)
treecdaaae12cf99abad425c11c1649581912f682f9d /net/nam
parent118761bfd1f8eb59eb410cb26e3959b660acedbe (diff)
downloadpkgsrc-141e43ba2b937e9fe99887324f9337d97a45be6f.tar.gz
Fix build with tcl8.6. Bump PKGREVISION.
Diffstat (limited to 'net/nam')
-rw-r--r--net/nam/Makefile8
-rw-r--r--net/nam/distinfo3
-rw-r--r--net/nam/patches/patch-main.cc42
3 files changed, 48 insertions, 5 deletions
diff --git a/net/nam/Makefile b/net/nam/Makefile
index 38e1005bd06..21a3493e2f0 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2014/01/11 14:42:05 adam Exp $
+# $NetBSD: Makefile,v 1.35 2014/02/01 08:07:01 markd Exp $
DISTNAME= nam-src-1.15
PKGNAME= nam-1.15
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsnam/}
@@ -18,9 +18,9 @@ GNU_CONFIGURE= yes
BUILD_TARGET=
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
-CONFIGURE_ARGS+= --with-tcl-ver=8.5
+CONFIGURE_ARGS+= --with-tcl-ver=8.6
CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
-CONFIGURE_ARGS+= --with-tk-ver=8.5
+CONFIGURE_ARGS+= --with-tk-ver=8.6
CONFIGURE_ARGS+= --with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
CONFIGURE_ARGS+= --with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
diff --git a/net/nam/distinfo b/net/nam/distinfo
index b342dce7c85..bb752b7fda0 100644
--- a/net/nam/distinfo
+++ b/net/nam/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2012/12/15 22:17:31 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/02/01 08:07:01 markd Exp $
SHA1 (nam-src-1.15.tar.gz) = 9059914cf537ba32f297bcd4b4a6ebf940a7ca4c
RMD160 (nam-src-1.15.tar.gz) = 3f52ee941a24a5f26624ba75177835fee4d37920
Size (nam-src-1.15.tar.gz) = 4365554 bytes
SHA1 (patch-aa) = a24e3353c3e5a6ee8bcdc75d2d9cea1653847c35
SHA1 (patch-ac) = 3daef7356606a00144117e4ea235ccab1572c0d8
+SHA1 (patch-main.cc) = 088c34957c77f1496bd637317571af2cb3f583fd
diff --git a/net/nam/patches/patch-main.cc b/net/nam/patches/patch-main.cc
new file mode 100644
index 00000000000..cfe6bd19903
--- /dev/null
+++ b/net/nam/patches/patch-main.cc
@@ -0,0 +1,42 @@
+$NetBSD: patch-main.cc,v 1.1 2014/02/01 08:07:01 markd Exp $
+
+Fix build with tcl8.6
+
+--- main.cc.orig 2011-11-04 17:18:42.000000000 +0000
++++ main.cc
+@@ -222,7 +222,7 @@ extern "C" char version[];
+
+ static int cmd_version(ClientData , Tcl_Interp* tcl, int , CONST84 char **)
+ {
+- tcl->result = version;
++ Tcl_SetObjResult(tcl, Tcl_NewStringObj(version, -1));
+ return (TCL_OK);
+ }
+
+@@ -331,7 +331,7 @@ main(int argc, char **argv) {
+
+ Tcl_Interp *interp = Tcl_CreateInterp();
+ if (Tcl_Init(interp) == TCL_ERROR) {
+- printf("%s\n", interp->result);
++ printf("%s\n", Tcl_GetStringResult(interp));
+ abort();
+ }
+
+@@ -350,7 +350,7 @@ main(int argc, char **argv) {
+ #endif
+
+ if (Otcl_Init(interp) == TCL_ERROR) {
+- printf("%s\n", interp->result);
++ printf("%s\n", Tcl_GetStringResult(interp));
+ abort();
+ }
+ #ifdef HAVE_LIBTCLDBG
+@@ -372,7 +372,7 @@ main(int argc, char **argv) {
+ if (Tk_Init(tcl.interp()) == TCL_OK)
+ tk = Tk_MainWindow(tcl.interp());
+ if (tk == 0) {
+- fprintf(stderr, "nam: %s\n", interp->result);
++ fprintf(stderr, "nam: %s\n", Tcl_GetStringResult(interp));
+ exit(1);
+ }
+ tcl.tkmain(tk);