svn commit: r323530 - in head/devel/gdb66: . files
Pietro Cerutti
gahr at FreeBSD.org
Tue Jul 23 12:28:57 UTC 2013
Author: gahr
Date: Tue Jul 23 12:28:56 2013
New Revision: 323530
URL: http://svnweb.freebsd.org/changeset/ports/323530
Log:
- Fix patch when INSIGHT is not selected
Reported by: bapt
Added:
head/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk-hooks.c
- copied unchanged from r323528, head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk-hooks.c
head/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk.c
- copied unchanged from r323528, head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk.c
Deleted:
head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk-hooks.c
head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk.c
Modified:
head/devel/gdb66/Makefile
Modified: head/devel/gdb66/Makefile
==============================================================================
--- head/devel/gdb66/Makefile Tue Jul 23 12:27:51 2013 (r323529)
+++ head/devel/gdb66/Makefile Tue Jul 23 12:28:56 2013 (r323530)
@@ -46,7 +46,9 @@ LIB_DEPENDS= itk:${PORTSDIR}/x11-toolkit
RUN_DEPENDS= ${LOCALBASE}/lib/iwidgets:${PORTSDIR}/x11-toolkits/iwidgets
DISTFILES+= gdbtk-6.6${EXTRACT_SUFX}:gdbtk
PLIST_SUB+= INSIGHT=''
-EXTRA_PATCHES= ${FILESDIR}/itcl33-patch
+EXTRA_PATCHES= ${FILESDIR}/itcl33-patch \
+ ${FILESDIR}/extra-gdb-gdbtk-generic-gdbtk.c \
+ ${FILESDIR}/extra-gdb-gdbtk-generic-gdbtk-hooks.c
CONFIGURE_ARGS+=--enable-gdbtk \
--with-tclconfig=${LOCALBASE}/lib/tcl${TCL_VER} \
--with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER}/generic \
Copied: head/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk-hooks.c (from r323528, head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk-hooks.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk-hooks.c Tue Jul 23 12:28:56 2013 (r323530, copy of r323528, head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk-hooks.c)
@@ -0,0 +1,50 @@
+--- gdb/gdbtk/generic/gdbtk-hooks.c.orig 2013-07-15 11:47:33.000000000 +0200
++++ gdb/gdbtk/generic/gdbtk-hooks.c 2013-07-15 11:48:41.000000000 +0200
+@@ -254,13 +254,13 @@
+ actual_len = 0;
+ }
+ else
+- actual_len = strlen (gdbtk_interp->result);
++ actual_len = strlen (Tcl_GetStringResult(gdbtk_interp));
+
+ /* Truncate the string if it is too big for the caller's buffer. */
+ if (actual_len >= sizeof_buf)
+ actual_len = sizeof_buf - 1;
+
+- memcpy (buf, gdbtk_interp->result, actual_len);
++ memcpy (buf, Tcl_GetStringResult(gdbtk_interp), actual_len);
+ buf[actual_len] = '\0';
+ return actual_len;
+ }
+@@ -505,11 +505,11 @@
+
+ if (result == TCL_OK)
+ {
+- return (xstrdup (gdbtk_interp->result));
++ return (xstrdup (Tcl_GetStringResult(gdbtk_interp)));
+ }
+ else
+ {
+- gdbtk_fputs (gdbtk_interp->result, gdb_stdout);
++ gdbtk_fputs (Tcl_GetStringResult(gdbtk_interp), gdb_stdout);
+ gdbtk_fputs ("\n", gdb_stdout);
+ return (NULL);
+ }
+@@ -633,7 +633,7 @@
+ report_error ();
+ free(buf);
+
+- return atoi (gdbtk_interp->result);
++ return atoi (Tcl_GetStringResult(gdbtk_interp));
+ }
+
+
+@@ -686,7 +686,7 @@
+ gdbtk_two_elem_cmd ("gdbtk_tcl_query", buf);
+ free(buf);
+
+- val = atol (gdbtk_interp->result);
++ val = atol (Tcl_GetStringResult(gdbtk_interp));
+ return val;
+ }
+
Copied: head/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk.c (from r323528, head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk.c Tue Jul 23 12:28:56 2013 (r323530, copy of r323528, head/devel/gdb66/files/patch-gdb-gdbtk-generic-gdbtk.c)
@@ -0,0 +1,58 @@
+--- gdb/gdbtk/generic/gdbtk.c.orig 2013-07-15 11:44:12.000000000 +0200
++++ gdb/gdbtk/generic/gdbtk.c 2013-07-15 11:45:50.000000000 +0200
+@@ -468,7 +468,7 @@
+ Tcl_Free ((char *) exec_path);
+
+ if (Tcl_Init (gdbtk_interp) != TCL_OK)
+- error ("Tcl_Init failed: %s", gdbtk_interp->result);
++ error ("Tcl_Init failed: %s", Tcl_GetStringResult(gdbtk_interp));
+
+ /* Set up some globals used by gdb to pass info to gdbtk
+ for start up options and the like */
+@@ -486,23 +486,23 @@
+
+ /* Initialize the Paths variable. */
+ if (ide_initialize_paths (gdbtk_interp, "") != TCL_OK)
+- error ("ide_initialize_paths failed: %s", gdbtk_interp->result);
++ error ("ide_initialize_paths failed: %s", Tcl_GetStringResult(gdbtk_interp));
+
+ if (Tk_Init (gdbtk_interp) != TCL_OK)
+- error ("Tk_Init failed: %s", gdbtk_interp->result);
++ error ("Tk_Init failed: %s", Tcl_GetStringResult(gdbtk_interp));
+
+ if (Itcl_Init (gdbtk_interp) == TCL_ERROR)
+- error ("Itcl_Init failed: %s", gdbtk_interp->result);
++ error ("Itcl_Init failed: %s", Tcl_GetStringResult(gdbtk_interp));
+ Tcl_StaticPackage (gdbtk_interp, "Itcl", Itcl_Init,
+ (Tcl_PackageInitProc *) NULL);
+
+ if (Itk_Init (gdbtk_interp) == TCL_ERROR)
+- error ("Itk_Init failed: %s", gdbtk_interp->result);
++ error ("Itk_Init failed: %s", Tcl_GetStringResult(gdbtk_interp));
+ Tcl_StaticPackage (gdbtk_interp, "Itk", Itk_Init,
+ (Tcl_PackageInitProc *) NULL);
+
+ if (Tktable_Init (gdbtk_interp) != TCL_OK)
+- error ("Tktable_Init failed: %s", gdbtk_interp->result);
++ error ("Tktable_Init failed: %s", Tcl_GetStringResult(gdbtk_interp));
+
+ Tcl_StaticPackage (gdbtk_interp, "Tktable", Tktable_Init,
+ (Tcl_PackageInitProc *) NULL);
+@@ -540,7 +540,7 @@
+
+ if (Gdbtk_Init (gdbtk_interp) != TCL_OK)
+ {
+- error ("Gdbtk_Init failed: %s", gdbtk_interp->result);
++ error ("Gdbtk_Init failed: %s", Tcl_GetStringResult(gdbtk_interp));
+ }
+
+ Tcl_StaticPackage (gdbtk_interp, "Insight", Gdbtk_Init, NULL);
+@@ -719,7 +719,7 @@
+
+ retval = Tcl_Eval (gdbtk_interp, cmd);
+
+- result = xstrdup (gdbtk_interp->result);
++ result = xstrdup (Tcl_GetStringResult(gdbtk_interp));
+
+ old_chain = make_cleanup (free, result);
+
More information about the svn-ports-all
mailing list