[Midnightbsd-cvs] mports [15443] trunk/devel/gdb66: update for current
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Sep 12 19:55:30 EDT 2013
Revision: 15443
http://svnweb.midnightbsd.org/mports/?rev=15443
Author: laffer1
Date: 2013-09-12 19:55:29 -0400 (Thu, 12 Sep 2013)
Log Message:
-----------
update for current
Modified Paths:
--------------
trunk/devel/gdb66/Makefile
Added Paths:
-----------
trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk-hooks.c
trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk.c
trunk/devel/gdb66/files/patch-itcl
Modified: trunk/devel/gdb66/Makefile
===================================================================
--- trunk/devel/gdb66/Makefile 2013-09-12 23:52:59 UTC (rev 15442)
+++ trunk/devel/gdb66/Makefile 2013-09-12 23:55:29 UTC (rev 15443)
@@ -2,6 +2,7 @@
PORTNAME= gdb
PORTVERSION= 6.6
+PORTREVISION?= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:S,$,:gdb,} \
http://aldan.algebra.com/~mi/:gdbtk
@@ -14,26 +15,23 @@
LATEST_LINK?= gdb66
-.ifndef(WITH_INSIGHT)
-OPTIONS= INSIGHT "Build the Tcl/Tk GUI (experimental!)" off
-.endif
+OPTIONS_DEFINE= INSIGHT
+INSIGHT_DESC= Tcl/Tk GUI (experimental!)
CONFLICTS?= gdb-[7-9]*
-MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_GCC= any
USE_GMAKE= yes
-USE_GETTEXT= yes
-USE_ICONV= yes
+USES= gettext iconv
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \
--enable-target=all \
- --enable-tui --with-libiconv-prefix=${LOCALBASE}
+ --enable-tui ${ICONV_CONFIGURE_ARG}
CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes
CFLAGS+= -DRL_NO_COMPAT
EXCLUDE= dejagnu expect readline sim texinfo intl
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - ${EXCLUDE:S/^/--exclude /}
+EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /}
VER= ${PORTVERSION:S/.//}
PLIST_SUB= VER=${VER}
MAN1= gdb${VER}.1
@@ -40,15 +38,16 @@
.include <bsd.mport.options.mk>
-.if defined(WITH_INSIGHT)
+.if ${PORT_OPTIONS:MINSIGHT}
PKGNAMESUFFIX= -insight
-PORTREVISION= 0
USE_TK= 84+
LIB_DEPENDS= itk:${PORTSDIR}/x11-toolkits/itk
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 \
@@ -76,7 +75,7 @@
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-portbld-freebsd7.0
+CONFIGURE_TARGET= x86_64-portbld-freebsd9.1
.endif
post-patch:
@@ -84,7 +83,7 @@
${WRKSRC}/gdb/version.in
@${REINPLACE_CMD} -e 's/^READLINE/#READLINE/' \
-e 's/^readline/#readline/' \
- -e 's,^LIBICONV =.*,LIBICONV=-L${LOCALBASE}/lib -liconv,' \
+ -e 's,^LIBICONV =.*,LIBICONV=-L${LOCALBASE}/lib ${ICONV_LIB},' \
${WRKSRC}/gdb/Makefile.in
${ECHO} 'READLINE = -lreadline' >> ${WRKSRC}/gdb/Makefile.in
@@ -92,7 +91,7 @@
${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/gdb${VER}
${LN} ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/gdbtui${VER}
${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 ${MAN1PREFIX}/man/man1/gdb${VER}.1
-.if defined(WITH_INSIGHT)
+.if ${PORT_OPTIONS:MINSIGHT}
${LN} ${PREFIX}/bin/gdb${VER} ${PREFIX}/bin/insight
${MKDIR} ${PREFIX}/share/redhat/gui
${CP} -p ${WRKSRC}/libgui/library/*.tcl \
Added: trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk-hooks.c
===================================================================
--- trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk-hooks.c (rev 0)
+++ trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk-hooks.c 2013-09-12 23:55:29 UTC (rev 15443)
@@ -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;
+ }
+
Added: trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk.c
===================================================================
--- trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk.c (rev 0)
+++ trunk/devel/gdb66/files/extra-gdb-gdbtk-generic-gdbtk.c 2013-09-12 23:55:29 UTC (rev 15443)
@@ -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);
+
Added: trunk/devel/gdb66/files/patch-itcl
===================================================================
--- trunk/devel/gdb66/files/patch-itcl (rev 0)
+++ trunk/devel/gdb66/files/patch-itcl 2013-09-12 23:55:29 UTC (rev 15443)
@@ -0,0 +1,11 @@
+Obtained from gahr@
+
+--- gdb/configure 2006-12-17 10:38:59.000000000 -0500
++++ gdb/configure 2013-05-13 15:40:05.000000000 -0400
+@@ -22084,5 +22084,5 @@
+
+
+- ITCLLIB="${ITCL_BUILD_LIB_SPEC}"
++ ITCLLIB="${ITCL_LIB_SPEC}"
+ ITCL_DEPS="${ITCL_LIB_FULL_PATH}"
+ fi
More information about the Midnightbsd-cvs
mailing list