Updated ddd to 3.3.10

* New features and minor improvements
- More fixes for perl 5.8.x -- it's now a lot more usable.
- Fixes for Sun's SunONE Studio dbx (1). Build with -DHAVE_SUNDBX is
  necessary. Improvements for automatic detection of Sun DBX are welcome.
- Fixes for MacOS X (mainly workarounds for bugs in gdb) (2).
- Support for PHP debugger has been added (1).  This is essentially not
  tested.
- Source files in subdirectories should be located automatically
  when using dbx (tested on Solaris' dbx) (2).
- The perl version supported by DDD is now 5.8.x.  The perl debugger
  changed between perl 5.6.x and perl 5.8.0, which made this update necessary.
  This change is not backwards-compatible.  If it is not possible to upgrade
  your perl version to 5.8.x or newer, then you can simply install the file
  "perl5db.pl" from a recent perl distribution into your old perl tree.
- Through the maintenance menu ("ddd --maintenance"), it now possible to get
  a leak check of ddd if ddd is run under valgrind. This is only useful for
  ddd developers (or anybody that wants to help making ddd better).
- Several minor bugs fixed, some memory leaks plugged, more code clean-up
  done.
- A bug affecting platforms where the size of function pointers is 16 has
  been fixed.
- The settings window now starts at a larger, more reasonable size, and
  allows the user to resize it.

* Build fixes
- automake 1.9 is now the minimum requirement. This affects only builds
  from CVS repository.
- A warning is emitted if a version of g++ older than 3.1 is used.
- libiberty is neither linked nor bundled anymore.
- GNU libtermcap is not bundled anymore. A termcap like library (such as
  ncurses) is now required to build ddd.
- The configure machinery has been updated to conform more closely to the
  autoconf 2.5x requirements. Several bugs have been fixed.
  Minimum requirements: autoconf 2.59, automake 1.7.9, libtool 1.5.
- libiberty (which provides missing standard functions) is not linked by
  default anymore. configure has a new option '--with-libiberty' that
  enables the libiberty support if required.
  If nobody complains, libiberty will be unbundled in a next version.
- The libiberty distributed with ddd has been upgraded to the one included
  in GCC 3.4 20040116. It fixes some configuration problems.
- Builds with GCC 3.4, with IBM xlC on AIX, with Compaq/HP cxx on Tru64,
  on X11R5 based systems, with SGI CC on IRIX should be OK.
- Builds on HP-UX should now work out-of-the-box. Motif is linked statically
  and the Athena libraries are now found by default.
- Builds without Motif/Lesstif available abort with an adequate message.
- Builds with readline support now work. readline is not bundled anymore.
- Builds without -DNDEBUG (i.e. with "assert" enabled) now work.
  Default build enables assertions (i.e. -DNDEBUG is not used).
- Several missing files in the distribution are now included.
- Cygwin is supported again.

10 files changed, 15 insertions, 1066 deletions

diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index e3e209bb8c8..8f96de4cd88 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.60 2004/10/03 00:13:26 tv Exp $
+# $NetBSD: Makefile,v 1.61 2005/01/11 09:04:16 martti Exp $
 #
 
-DISTNAME=	ddd-3.3.8
-PKGREVISION=	1
+DISTNAME=	ddd-3.3.10
+#PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ddd/}
 
-MAINTAINER=     martti@NetBSD.org
+MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/ddd/
-COMMENT=	Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
+COMMENT=	Data Display Debugger -- graphical front-end for GDB/DBX/XDB
 
 GNU_CONFIGURE=		YES
 INFO_FILES=		ddd-themes.info ddd.info
@@ -51,5 +51,4 @@ post-install:
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
-.include "../../devel/libiberty/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ddd/PLIST b/devel/ddd/PLIST
index 7cd6e734732..62304f9ec48 100644
--- a/devel/ddd/PLIST
+++ b/devel/ddd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/06/04 11:19:32 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/01/11 09:04:16 martti Exp $
 bin/ddd
 man/man1/ddd.1
 share/${PKGNAME}/COPYING
@@ -6,6 +6,7 @@ share/${PKGNAME}/NEWS
 share/${PKGNAME}/ddd/Ddd
 share/${PKGNAME}/themes/green.vsl
 share/${PKGNAME}/themes/red.vsl
+share/${PKGNAME}/themes/rednil.vsl
 share/${PKGNAME}/themes/smalltitles.vsl
 share/${PKGNAME}/themes/smallvalues.vsl
 share/${PKGNAME}/themes/suppress.vsl
diff --git a/devel/ddd/distinfo b/devel/ddd/distinfo
index c1daa0cf05a..242c5c42b8a 100644
--- a/devel/ddd/distinfo
+++ b/devel/ddd/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.12 2004/06/04 11:19:32 shannonjr Exp $
+$NetBSD: distinfo,v 1.13 2005/01/11 09:04:16 martti Exp $
 
-SHA1 (ddd-3.3.8.tar.gz) = abf341271c5912a5fc6728cb8649c45653d755eb
-Size (ddd-3.3.8.tar.gz) = 8606382 bytes
-SHA1 (patch-ai) = 3998eceddf2e6379489d82eeef40dce51cb37dab
-SHA1 (patch-aj) = d6657a0fc1e574de53b481f5fb6d56d546ea4edb
-SHA1 (patch-ak) = 476151cd38404d7ec9d409905841cc2e0b3b7364
-SHA1 (patch-al) = 3ea62d81e02fe89153156be25e12b53a67d1958a
-SHA1 (patch-am) = 8f885993627b1ef490f8c6b92cb006140c47947a
-SHA1 (patch-an) = fb5bdabdbb578ed982407b9fac5a521a4ba722cd
-SHA1 (patch-ao) = 2754d1106740db9c563ef42391acee7174f4a06f
+SHA1 (ddd-3.3.10.tar.gz) = c58de1d48a6275052e9cb03ba3b35cb42950935c
+Size (ddd-3.3.10.tar.gz) = 7620458 bytes
+SHA1 (patch-ai) = 513621cb015cde43736ad9c28e1535358c398992
diff --git a/devel/ddd/patches/patch-ai b/devel/ddd/patches/patch-ai
index a247c355081..ef52f20c51a 100644
--- a/devel/ddd/patches/patch-ai
+++ b/devel/ddd/patches/patch-ai
@@ -1,13 +1,9 @@
-$NetBSD: patch-ai,v 1.1 2004/06/04 11:19:32 shannonjr Exp $
+$NetBSD: patch-ai,v 1.2 2005/01/11 09:04:16 martti Exp $
 
---- ddd/Command.C.orig	2003-10-07 05:58:23.000000000 -0600
-+++ ddd/Command.C
-@@ -191,6 +191,8 @@ void translate_command(string& command)
- 
-     case GDB:
+--- ddd/Command.C.orig	2004-06-07 14:52:52.000000000 +0300
++++ ddd/Command.C	2005-01-11 10:15:09.000000000 +0200
+@@ -190,2 +190,4 @@
  	break;
 +    default:
 +        break;
      }
- 
-     // When recording, realize certain commands as auto commands.
diff --git a/devel/ddd/patches/patch-aj b/devel/ddd/patches/patch-aj
deleted file mode 100644
index 5ea15708c0e..00000000000
--- a/devel/ddd/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/06/04 11:19:32 shannonjr Exp $
-
---- ddd/DataDisp.C.orig	2003-10-07 05:58:23.000000000 -0600
-+++ ddd/DataDisp.C
-@@ -4425,7 +4425,7 @@ void DataDisp::refresh_displaySQ(Widget 
-     }
- }
- 
--void DataDisp::refresh_displayOQAC (const StringArray& answers,
-+void DataDisp::refresh_displayOQAC (StringArray& answers,
- 				    const VoidArray& qu_datas,
- 				    void*  data)
- {
diff --git a/devel/ddd/patches/patch-ak b/devel/ddd/patches/patch-ak
deleted file mode 100644
index f1757959f8a..00000000000
--- a/devel/ddd/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/06/04 11:19:32 shannonjr Exp $
-
---- ddd/DataDisp.h.orig	2003-09-22 11:11:52.000000000 -0600
-+++ ddd/DataDisp.h
-@@ -467,7 +467,7 @@ private:
-     static void new_user_displayOQC  (const string& answer, void* data);
- 
-     static void refresh_displayOQC   (const string& answer, void*  data);
--    static void refresh_displayOQAC  (const StringArray& answers,
-+    static void refresh_displayOQAC  (StringArray& answers,
- 				      const VoidArray& qu_datas,
- 				      void*  data);
- 
diff --git a/devel/ddd/patches/patch-al b/devel/ddd/patches/patch-al
deleted file mode 100644
index 904f8ef63aa..00000000000
--- a/devel/ddd/patches/patch-al
+++ /dev/null
@@ -1,717 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/06/04 11:19:32 shannonjr Exp $
-
---- ddd/GDBAgent.C.orig	2003-10-11 05:03:33.000000000 -0600
-+++ ddd/GDBAgent.C
-@@ -175,6 +175,7 @@ char GDBAgent_rcsid[] =
- 
- DEFINE_TYPE_INFO_1(GDBAgent, TTYAgent);
- 
-+#define DBG_PROMPT "dbg>"
- 
- //-----------------------------------------------------------------------------
- // Construction and setup
-@@ -189,27 +190,28 @@ GDBAgent::GDBAgent (XtAppContext app_con
-       state(BusyOnInitialCmds),
-       _type(tp),
-       _user_data(0),
--      _has_frame_command(tp == GDB || tp == XDB || tp == BASH),
-+      _has_frame_command(tp == BASH  || tp == GDB || tp == XDB),
-       _has_func_command(tp == DBX),
-+      _has_file_command(tp == DBX),
-       _has_run_io_command(false),
-       _has_print_r_option(false),
-       _has_output_command(false),
-       _has_where_h_option(false),
--      _has_display_command(tp == GDB || tp == DBX || tp == PYDB || tp == BASH),
--      _has_clear_command(tp == GDB || tp == DBX || tp == JDB || tp == PERL || tp == BASH),
-+      _has_display_command(tp == BASH  || tp == DBX || tp == GDB || tp == PYDB),
-+      _has_clear_command(tp == BASH  || tp == DBX || tp == GDB || tp == JDB || tp == PERL),
-       _has_handler_command(false),
--      _has_pwd_command(tp == GDB || tp == DBX || tp == PYDB || tp == PERL || tp == BASH),
-+      _has_pwd_command(tp == BASH  || tp == DBX || tp == GDB || tp == PYDB || tp == PERL),
-       _has_setenv_command(tp == DBX),
-       _has_edit_command(tp == DBX),
-       _has_make_command(tp == GDB || tp == DBX || tp == PERL),
-       _has_jump_command(tp == GDB || tp == DBX || tp == XDB),
-       _has_regs_command(tp == GDB),
-       _has_watch_command(0),	// see below
--      _has_named_values(tp == GDB || tp == DBX || tp == JDB),
-+      _has_named_values(tp == DBX || tp == GDB || tp == JDB),
-       _has_when_command(tp == DBX),
-       _has_when_semicolon(tp == DBX),
-       _wants_delete_comma(false),
--      _has_err_redirection(tp == GDB || tp == DBX || tp == XDB),
-+      _has_err_redirection(tp == DBX || tp == GDB ||  tp == XDB),
-       _has_givenfile_command(false),
-       _has_cont_sig_command(false),
-       _has_examine_command(tp == GDB || tp == DBX),
-@@ -219,10 +221,10 @@ GDBAgent::GDBAgent (XtAppContext app_con
-       _has_addproc_command(false),
-       _has_debug_command(true),
-       _is_windriver_gdb(false),
--      _program_language((tp == JDB) ? LANGUAGE_JAVA :
--			(tp == PYDB) ? LANGUAGE_PYTHON : 
-+      _program_language((tp == BASH) ? LANGUAGE_BASH : 
-+			(tp == JDB)  ? LANGUAGE_JAVA :
- 			(tp == PERL) ? LANGUAGE_PERL : 
--			(tp == BASH) ? LANGUAGE_BASH : 
-+			(tp == PYDB) ? LANGUAGE_PYTHON : 
- 			LANGUAGE_C),
-       _verbatim(false),
-       _recording(false),
-@@ -280,6 +282,7 @@ GDBAgent::GDBAgent(const GDBAgent& gdb)
-       _user_data(0),
-       _has_frame_command(gdb.has_frame_command()),
-       _has_func_command(gdb.has_func_command()),
-+      _has_file_command(gdb.has_file_command()),
-       _has_run_io_command(gdb.has_run_io_command()),
-       _has_print_r_option(gdb.has_print_r_option()),
-       _has_output_command(gdb.has_output_command()),
-@@ -336,15 +339,15 @@ GDBAgent::GDBAgent(const GDBAgent& gdb)
- const string& GDBAgent::title() const
- {
- #define TITLES \
--X(tGDB,"GDB"),  \
--X(tWBD,"WDB"),  \
--X(tXDB,"XDB"),  \
--X(tLADEBUG,"Ladebug"),  \
-+X(tBASH,"Bash"),  \
- X(tDBX,"DBX"),  \
-+X(tGDB,"GDB"),  \
- X(tJDB,"JDB"),  \
--X(tPYDB,"PYDB"),  \
-+X(tLADEBUG,"Ladebug"),  \
- X(tPERL,"Perl"),  \
--X(tBASH,"Bash"),  \
-+X(tPYDB,"PYDB"),  \
-+X(tWBD,"WDB"),  \
-+X(tXDB,"XDB"),  \
- X(tDEBUGGER,"debugger")
-     enum{
- #define X(a,b) a
-@@ -363,11 +366,8 @@ X(tDEBUGGER,"debugger")
- 
-     switch (type())
-     {
--    case GDB:
--	if (path().contains("wdb"))
--	    return titles[tWBD];
--	else
--	    return titles[tGDB];
-+    case BASH:
-+        return titles[tBASH];
- 
-     case DBX:
- 	if (is_ladebug())
-@@ -375,20 +375,23 @@ X(tDEBUGGER,"debugger")
- 	else
- 	    return titles[tDBX];
- 
--    case XDB:
--	return titles[tXDB];
-+    case GDB:
-+	if (path().contains("wdb"))
-+	    return titles[tWBD];
-+	else
-+	    return titles[tGDB];
- 
-     case JDB:
- 	return titles[tJDB];
- 
--    case PYDB:
--	return titles[tPYDB];
--
-     case PERL:
- 	return titles[tPERL];
- 
--    case BASH:
--	return titles[tBASH];
-+    case PYDB:
-+	return titles[tPYDB];
-+
-+    case XDB:
-+	return titles[tXDB];
-     }
- 
-     return titles[tDEBUGGER];
-@@ -620,8 +623,8 @@ void GDBAgent::init_qu_array (const Stri
-     _qu_count = qu_count;
-     _qa_data  = qa_data;
- 
--    StringArray empty_s;
--    VoidArray   empty_v;
-+    static const StringArray empty_s;
-+    static const VoidArray   empty_v;
- 
-     complete_answers = empty_s;
-     cmd_array        = empty_s;
-@@ -830,13 +833,13 @@ bool GDBAgent::ends_with_prompt (const s
-     return false;		// Never reached
- }
- 
--static bool ends_in(const string& answer, const string& prompt)
-+static bool ends_in(const string& answer, const char *prompt)
- {
--    return answer.contains(prompt, answer.length() - prompt.length());
-+    return answer.contains(prompt, answer.length() - strlen(prompt));
- }
- 
- // JDB should be applied on itself.
--bool GDBAgent::is_exception_answer(const string& answer)
-+bool GDBAgent::is_exception_answer(const string& answer) const
- {
-     // Any JDB backtrace contains these lines.
-     return type() == JDB && 
-@@ -862,7 +865,7 @@ void GDBAgent::set_exception_state(bool 
- 
- 
- // Return true iff ANSWER ends with secondary prompt.
--bool GDBAgent::ends_with_secondary_prompt (const string& ans)
-+bool GDBAgent::ends_with_secondary_prompt (const string& ans) const
- {
-     string answer = ans;
-     strip_control(answer);
-@@ -902,11 +905,11 @@ bool GDBAgent::ends_with_secondary_promp
- 	// Prompt is `> ' at beginning of line
- 	return answer == "> " || ends_in(answer, "\n> ");
- 	
--    case XDB:
-+    case BASH:
-     case JDB:
--    case PYDB:
-     case PERL:
--    case BASH:
-+    case PYDB:
-+    case XDB:
- 	// Is there any secondary prompt in these debuggers? (FIXME)
- 	return false;
-     }
-@@ -915,7 +918,7 @@ bool GDBAgent::ends_with_secondary_promp
- }
- 
- // Return true iff ANSWER ends with (yes or no)
--bool GDBAgent::ends_with_yn (const string& answer)
-+bool GDBAgent::ends_with_yn (const string& answer) const
- {
-     if (ends_in(answer, "(y or n) "))
- 	return true;		// GDB
-@@ -1026,9 +1029,17 @@ void GDBAgent::cut_off_prompt(string& an
- 	answer = answer.before('(', -1);
- 	break;
- 
--    case XDB:
--	answer = answer.before('>', -1);
-+    case BASH:
-+    case JDB:
-+    {
-+	// Check for prompt at the end of the last line
-+	if (answer.contains(last_prompt, -1))
-+	{
-+	    answer = answer.before(int(answer.length()) - 
-+				   int(last_prompt.length()));
-+	}
- 	break;
-+    }
- 
-     case PERL:
-     {
-@@ -1039,18 +1050,10 @@ void GDBAgent::cut_off_prompt(string& an
- 	break;
-     }
- 
--    case BASH:
--    case JDB:
--    {
--	// Check for prompt at the end of the last line
--	if (answer.contains(last_prompt, -1))
--	{
--	    answer = answer.before(int(answer.length()) - 
--				   int(last_prompt.length()));
--	}
-+    case XDB:
-+	answer = answer.before('>', -1);
- 	break;
-     }
--    }
- }
- 
- // Strip annoying DBX comments
-@@ -1702,7 +1705,7 @@ void GDBAgent::handle_died()
- //-----------------------------------------------------------------------------
- 
- // DBX 3.0 wants `print -r' instead of `print' for C++
--string GDBAgent::print_command(const string& expr, bool internal) const
-+string GDBAgent::print_command(const char *expr, bool internal) const
- {
-     string cmd;
- 
-@@ -1737,26 +1740,30 @@ string GDBAgent::print_command(const str
- 	break;
-     }
- 
--    if (!expr.empty())
--	cmd += " " + expr;
-+    if (strlen(expr) != 0) {
-+	cmd += ' ';
-+	cmd += expr;
-+    }
- 
-     return cmd;
- }
- 
- // DBX 3.0 wants `display -r' instead of `display' for C++
--string GDBAgent::display_command(const string& expr) const
-+string GDBAgent::display_command(const char *expr) const
- {
-     string cmd;
-     if (!has_display_command())
- 	return cmd;
- 
--    if (has_print_r_option() && !expr.empty())
-+    if (has_print_r_option() && strlen(expr) != 0)
- 	cmd = "display -r";
-     else
- 	cmd = "display";
- 
--    if (!expr.empty())
--	cmd += " " + expr;
-+    if (strlen(expr) != 0) {
-+        cmd += ' ';
-+        cmd += expr;
-+    }
- 
-     return cmd;
- }
-@@ -1767,8 +1774,9 @@ string GDBAgent::where_command(int count
-     string cmd;
-     switch (type())
-     {
--    case GDB:
-+    case BASH:
-     case DBX:
-+    case GDB:
-     case JDB:
-     case PYDB:
- 	if (has_where_h_option())
-@@ -1777,7 +1785,6 @@ string GDBAgent::where_command(int count
- 	    cmd = "where";
- 	break;
- 
--    case BASH:
-     case PERL:
- 	cmd = "T";
- 	break;
-@@ -1813,6 +1820,8 @@ string GDBAgent::info_locals_command() c
-     case BASH:
-     case PERL:
- 	return "V";
-+
-+
-     }
- 
-     return "";			// Never reached
-@@ -1934,10 +1943,10 @@ string GDBAgent::jump_command(const stri
-     case DBX:
- 	return "cont at " + pos;
- 
-+    case BASH:
-     case JDB:
--    case PYDB:
-     case PERL:
--    case BASH:
-+    case PYDB:
- 	return "";		// Not available
-     }
- 
-@@ -1964,11 +1973,11 @@ string GDBAgent::regs_command(bool all) 
- 	else
- 	    return "regs";	
- 
--    case XDB:
-+    case BASH:
-     case JDB:
-     case PYDB:
-     case PERL:
--    case BASH:
-+    case XDB:
- 	return "";		// Not available
-     }
- 
-@@ -2027,8 +2036,8 @@ string GDBAgent::watch_command(const str
- 	    return "watch access " + expr;
- 	return "";
- 
--    case PYDB:
-     case PERL:
-+    case PYDB:
- 	return "";		// Not available
-     }
- 
-@@ -2040,16 +2049,14 @@ string GDBAgent::kill_command() const
- {
-     switch (type())
-     {
--    case GDB:
-     case DBX:
-+    case GDB:
-+    case PYDB:
- 	return "kill";
-    
-     case XDB:
- 	return "k";
- 
--    case PYDB:
--	return "kill";
--
-     case JDB:
-     case PERL:
-     case BASH:
-@@ -2063,9 +2070,9 @@ string GDBAgent::frame_command() const
- {
-     switch (type())
-     {
--    case GDB:
--    case DBX:
-     case BASH:
-+    case DBX:
-+    case GDB:
- 	if (has_frame_command())
- 	    return "frame";
- 	else
-@@ -2092,9 +2099,9 @@ string GDBAgent::frame_command(int num) 
- 
-     switch (type())
-     {
--    case GDB:
--    case DBX:
-     case BASH:
-+    case DBX:
-+    case GDB:
- 	return frame_command() + " " + itostring(num);
- 
-     case XDB:
-@@ -2131,12 +2138,12 @@ string GDBAgent::func_command() const
- {
-     switch (type())
-     {
-+    case BASH:
-     case GDB:
--    case XDB:
-     case JDB:
--    case PYDB:
-     case PERL:
--    case BASH:
-+    case PYDB:
-+    case XDB:
- 	return frame_command();
- 
-     case DBX:
-@@ -2215,9 +2222,9 @@ string GDBAgent::enable_command(string b
- 
-     switch (type())
-     {
-+    case BASH:
-     case GDB:
-     case PYDB:
--    case BASH:
- 	return "enable" + bp;
- 
-     case DBX:
-@@ -2247,9 +2254,9 @@ string GDBAgent::disable_command(string 
- 
-     switch (type())
-     {
-+    case BASH:
-     case GDB:
-     case PYDB:
--    case BASH:
- 	return "disable" + bp;
- 
-     case DBX:
-@@ -2279,10 +2286,10 @@ string GDBAgent::delete_command(string b
- 
-     switch (type())
-     {
-+    case BASH:
-     case DBX:
-     case GDB:
-     case PYDB:
--    case BASH:
- 	return "delete" + bp;
- 
-     case XDB:
-@@ -2314,9 +2321,9 @@ string GDBAgent::ignore_command(const st
-     case XDB:
- 	return "bc " + bp + " " + itostring(count);
- 
-+    case BASH:
-     case JDB:
-     case PERL:
--    case BASH:
- 	return "";		// Not available
-     }
- 
-@@ -2324,7 +2331,7 @@ string GDBAgent::ignore_command(const st
- }
- 
- // Set condition of breakpoint BP to EXPR
--string GDBAgent::condition_command(const string& bp, const string& expr) const
-+string GDBAgent::condition_command(const string& bp, const char *expr) const
- {
-     switch (type())
-     {
-@@ -2465,7 +2472,7 @@ string GDBAgent::quote_file(const string
- }
- 
- // Return command to debug PROGRAM
--string GDBAgent::debug_command(const string& program, string args) const
-+string GDBAgent::debug_command(const char *program, string args) const
- {
-     if (!args.empty() && !args.contains(' ', 0))
- 	args.prepend(' ');
-@@ -2479,27 +2486,27 @@ string GDBAgent::debug_command(const str
- 	    return "file " + quote_file(program);
- 
-     case PYDB:
--	return "file " + program;
-+	return string("file ") + program;
- 
-     case DBX:
- 	if (is_ladebug())
--	    return "load " + program;       // Compaq Ladebug
-+	    return string("load ") + program;       // Compaq Ladebug
- 	else if (has_givenfile_command())
--	    return "givenfile " + program; // SGI DBX
-+	    return string("givenfile ") + program; // SGI DBX
- 	else
--	    return "debug " + program;     // SUN DBX
-+	    return string("debug ") + program;     // SUN DBX
- 
-     case XDB:
--	return "#file " + program; // just a dummy
-+	return string("#file ") + program; // just a dummy
- 
-     case JDB:
--	return "load " + program;
-+	return string("load ") + program;
- 
-     case PERL:
- 	return "exec " + quote(debugger() + " -d " + program + args);
- 
-     case BASH:
--	return "debug " + program + args;
-+	return string("debug ") + program + args;
-     }
- 
-     return "";			// Never reached
-@@ -2536,12 +2543,12 @@ string GDBAgent::signal_command(int sig)
- 
- 
- // Return a command that does nothing.
--string GDBAgent::nop_command(const string& comment) const
-+string GDBAgent::nop_command(const char *comment) const
- {
-     if (type() == JDB)
- 	return " ";
- 
--    return "# " + comment;	// Works for all other inferior debuggers
-+    return string("# ") + comment;	// Works for all other inferior debuggers
- }
- 
- // Run program with given ARGS
-@@ -2591,10 +2598,10 @@ string GDBAgent::rerun_command() const
- {
-     switch (type())
-     {
-+    case BASH:
-     case GDB:
-     case JDB:
-     case PYDB:
--    case BASH:
- 	return "run";
- 
-     case DBX:
-@@ -2634,11 +2641,11 @@ string GDBAgent::attach_command(int pid,
- 	else
- 	    return "debug " + file + " " + itostring(pid); // Others
- 
--    case XDB:
-+    case BASH:
-     case JDB:
--    case PYDB:
-     case PERL:
--    case BASH:
-+    case PYDB:
-+    case XDB:
- 	break;
-     }
- 
-@@ -2658,11 +2665,11 @@ string GDBAgent::detach_command(int pid)
- 	else
- 	    return "detach";	// Others
- 
--    case XDB:
-+    case BASH:
-     case JDB:
--    case PYDB:
-     case PERL:
--    case BASH:
-+    case PYDB:
-+    case XDB:
- 	break;
-     }
- 
-@@ -2673,23 +2680,33 @@ string GDBAgent::detach_command(int pid)
- // Return PREFIX + EXPR, parenthesizing EXPR if needed
- string GDBAgent::prepend_prefix(const string& prefix, const string& expr)
- {
-+  return prepend_prefix( prefix.chars(), expr);
-+}
-+
-+string GDBAgent::prepend_prefix(const char *prefix, const string& expr)
-+{
-     if (expr.matches(rxidentifier)
- 	|| expr.contains("(", 0) && expr.contains(")", -1))
- 	return prefix + expr;
-     else if (expr.empty())
- 	return prefix;
-     else
--	return prefix + "(" + expr + ")";
-+	return string(prefix) + "(" + expr + ")";
- }
- 
- // Return EXPR + SUFFIX, parenthesizing EXPR if needed
--string GDBAgent::append_suffix(const string& expr, const string& suffix)
-+string GDBAgent::append_suffix(const string& expr, const string &suffix)
-+{
-+  return append_suffix( expr, suffix.chars() );
-+}
-+
-+string GDBAgent::append_suffix(const string& expr, const char *suffix)
- {
-     if (expr.matches(rxidentifier)
- 	|| expr.contains("(", 0) && expr.contains(")", -1))
- 	return expr + suffix;
-     else if (expr.empty())
--	return suffix;
-+	return string(suffix);
-     else
- 	return "(" + expr + ")" + suffix;
- }
-@@ -2702,6 +2719,7 @@ string GDBAgent::dereferenced_expr(const
-     case LANGUAGE_C:
- 	return prepend_prefix("*", expr);
- 
-+    case LANGUAGE_PHP:
-     case LANGUAGE_PERL:
- 	// Perl has three `dereferencing' operators, depending on the
- 	// type of reference.  The `deref()' function provides a
-@@ -2770,6 +2788,7 @@ string GDBAgent::address_expr(string exp
- 	return "";		// Not supported in Python
- 
-     case LANGUAGE_BASH:
-+    case LANGUAGE_PHP:          // Is this right? 
-     case LANGUAGE_PERL:
- 	return "";		// No such thing in bash/Perl
- 
-@@ -2822,8 +2841,9 @@ int GDBAgent::default_index_base() const
-     case LANGUAGE_ADA:
-     case LANGUAGE_C:
-     case LANGUAGE_JAVA:
--    case LANGUAGE_PYTHON:
-     case LANGUAGE_PERL:
-+    case LANGUAGE_PHP:
-+    case LANGUAGE_PYTHON:
-     case LANGUAGE_BASH:
-     case LANGUAGE_OTHER:
- 	return 0;
-@@ -2843,6 +2863,7 @@ string GDBAgent::member_separator() cons
-     case LANGUAGE_C:
-     case LANGUAGE_PYTHON:
-     case LANGUAGE_OTHER:
-+    case LANGUAGE_PHP:
- 	return " = ";
- 
-     case LANGUAGE_JAVA:
-@@ -2908,12 +2929,13 @@ string GDBAgent::assign_command(const st
- 
-     switch (program_language())
-     {
-+    case LANGUAGE_BASH:
-     case LANGUAGE_C:
--    case LANGUAGE_JAVA:
-     case LANGUAGE_FORTRAN:
--    case LANGUAGE_PYTHON:	// FIXME: vrbl names can conflict with commands
-+    case LANGUAGE_JAVA:
-     case LANGUAGE_PERL:
--    case LANGUAGE_BASH:
-+    case LANGUAGE_PHP:
-+    case LANGUAGE_PYTHON:	// FIXME: vrbl names can conflict with commands
-     case LANGUAGE_OTHER:
- 	cmd += "=";
- 	break;
-@@ -2948,13 +2970,14 @@ void GDBAgent::normalize_address(string&
-     {
- 	switch (program_language())
- 	{
-+	case LANGUAGE_ADA:
-+	case LANGUAGE_BASH:
- 	case LANGUAGE_C:
--	case LANGUAGE_JAVA:
- 	case LANGUAGE_FORTRAN:
--	case LANGUAGE_ADA:
--	case LANGUAGE_PYTHON:
-+	case LANGUAGE_JAVA:
- 	case LANGUAGE_PERL:
--	case LANGUAGE_BASH:
-+	case LANGUAGE_PHP:
-+	case LANGUAGE_PYTHON:
- 	case LANGUAGE_OTHER:
- 	    addr.prepend("0x");
- 	    break;
-@@ -2971,7 +2994,7 @@ void GDBAgent::normalize_address(string&
- }
- 
- // Return disassemble command
--string GDBAgent::disassemble_command(string start, const string& end) const
-+string GDBAgent::disassemble_command(string start, const char *end) const
- {
-     string cmd;
-     if (type() != GDB)
-@@ -2980,11 +3003,12 @@ string GDBAgent::disassemble_command(str
-     normalize_address(start);
-     cmd = "disassemble " + start;
- 
--    if (!end.empty())
-+    if (strlen(end) != 0)
-     {
-         string end_( end );
- 	normalize_address(end_);
--	cmd += " " + end_;
-+	cmd += ' ';
-+	cmd += end_;
-     }
-     return cmd;
- }
-@@ -3003,11 +3027,11 @@ string GDBAgent::history_file() const
- 	    return "./.gdb_history";
-     }
- 
-+    case BASH:
-     case DBX:
-     case JDB:
--    case PYDB:
-     case PERL:
--    case BASH:
-+    case PYDB:
- 	return "";		// Unknown
- 
-     case XDB:
-@@ -3072,6 +3096,7 @@ ProgramLanguage GDBAgent::program_langua
- 	{ "python",  LANGUAGE_PYTHON },
- 	{ "bash",    LANGUAGE_BASH },
- 	{ "perl",    LANGUAGE_PERL },
-+	{ "php",     LANGUAGE_PHP },
- 	{ "c",       LANGUAGE_C },
- 	{ "c++",     LANGUAGE_C },
- 	{ "auto",    LANGUAGE_OTHER }  // Keep current language
diff --git a/devel/ddd/patches/patch-am b/devel/ddd/patches/patch-am
deleted file mode 100644
index a6b03c497ce..00000000000
--- a/devel/ddd/patches/patch-am
+++ /dev/null
@@ -1,232 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/06/04 11:19:32 shannonjr Exp $
-
---- ddd/GDBAgent.h.orig	2003-10-11 05:03:34.000000000 -0600
-+++ ddd/GDBAgent.h
-@@ -57,7 +57,7 @@
- // Debugger types
- //-----------------------------------------------------------------------------
- 
--enum DebuggerType { GDB, DBX, XDB, JDB, PYDB, PERL, BASH };
-+enum DebuggerType { BASH, DBX, GDB, JDB, PERL, PYDB, XDB };
- //-----------------------------------------------------------------------------
- // Program language
- //-----------------------------------------------------------------------------
-@@ -67,15 +67,16 @@ enum DebuggerType { GDB, DBX, XDB, JDB, 
- #endif
- 
- enum ProgramLanguage { 
--    LANGUAGE_C,			// C-like: C, C++
--    LANGUAGE_JAVA,		// Java, as supported by GDB.
--    LANGUAGE_PASCAL,		// Pascal-like: Pascal, Modula...
-     LANGUAGE_ADA,		// Ada (GNAT), as supported by GDB
-+    LANGUAGE_BASH,		// Bash, as supported by bashdb.
-+    LANGUAGE_C,			// C-like: C, C++
-     LANGUAGE_CHILL,		// Chill, as supported by GDB.
-     LANGUAGE_FORTRAN,		// FORTRAN, as supported by GDB.
--    LANGUAGE_PYTHON,		// Python, as supported by PYDB.
-+    LANGUAGE_JAVA,		// Java, as supported by GDB.
-+    LANGUAGE_PASCAL,		// Pascal-like: Pascal, Modula...
-     LANGUAGE_PERL,		// Perl, as supported by Perl.
--    LANGUAGE_BASH,		// Bash, as supported by bashdb.
-+    LANGUAGE_PHP,		// PHP, as supported by DBG.
-+    LANGUAGE_PYTHON,		// Python, as supported by PYDB.
-     LANGUAGE_OTHER		// Others
- };
- 
-@@ -104,7 +105,7 @@ typedef void (* OAProc) (const string& a
- typedef void (* OACProc) (void* user_data);
- 
- // Called from send_qu_array with the complete answers
--typedef void (* OQACProc) (const StringArray& complete_answers,
-+typedef void (* OQACProc) (StringArray& complete_answers,
- 			   const VoidArray& user_datas,
- 			   void *user_data);
- 
-@@ -162,6 +163,7 @@ private:
- 
-     bool _has_frame_command;	// Debugger properties
-     bool _has_func_command;	
-+    bool _has_file_command;
-     bool _has_run_io_command;
-     bool _has_print_r_option;
-     bool _has_output_command;
-@@ -210,9 +212,11 @@ private:
- protected:
-     // Return PREFIX + EXPR, parenthesizing EXPR if needed
-     static string prepend_prefix(const string& prefix, const string& expr);
-+    static string prepend_prefix(const char *prefix, const string& expr);
- 
-     // Return EXPR + SUFFIX, parenthesizing EXPR if needed
-     static string append_suffix(const string& expr, const string& suffix);
-+    static string append_suffix(const string& expr, const char *suffix);
- 
-     // General trace function
-     void trace(const char *prefix, void *call_data) const;
-@@ -294,6 +298,10 @@ public:
-     bool has_frame_command() const    { return _has_frame_command; }	
-     bool has_frame_command(bool val)  { return _has_frame_command = val; }
- 
-+    // True if debugger has `file' command
-+    bool has_file_command() const    { return _has_file_command; }
-+    bool has_file_command(bool val)  { return _has_file_command = val; }
-+
-     // True if debugger has `func' command
-     bool has_func_command() const    { return _has_func_command; }	
-     bool has_func_command(bool val)  { return _has_func_command = val; }
-@@ -433,8 +441,8 @@ public:
-     // True if debugger can enable breakpoints
-     bool has_enable_command() const
-     { 
--      return type() == GDB  || type() == XDB || type() == PYDB || 
--	type() == BASH || has_handler_command();
-+      return type() == BASH || type() == GDB  
-+	|| type() == PYDB || type() == XDB || has_handler_command();
-     }
-     bool has_disable_command() const
-     {
-@@ -444,21 +452,22 @@ public:
-     // True if debugger can set ignore counts on breakpoints
-     bool has_ignore_command() const
-     {
--	return type() == GDB || type() == XDB || type() == PYDB || 
--	       has_handler_command();
-+	return type() == GDB || type() == PYDB 
-+	    || type() == XDB || has_handler_command();
-     }
- 
-     // True if debugger can set conditions on breakpoints
-     bool has_condition_command() const
-     {
--      return type() == GDB || type() == PYDB || type() == BASH;
-+      return type() == BASH || type() == GDB 
-+  	  || type() == PYDB ;
-     }
- 
-     // True if debugger can delete breakpoints by number
-     bool has_delete_command() const
-     {
--      return type() == GDB || type() == XDB || type() == BASH ||
--	     type() == DBX || type() == PYDB;
-+      return type() == BASH || type() == DBX || type() == GDB 
-+	  || type() == PYDB || type() == XDB ;
-     }
- 
-     // True if debugger has volatile breakpoints (i.e. breakpoints may
-@@ -529,24 +538,26 @@ public:
-     }
- 
-     // True if debugger has numbered breakpoints
--    bool has_numbered_breakpoints()
-+    bool has_numbered_breakpoints() const
-     {
--      return type() == GDB || type() == DBX || type() == XDB || type() == BASH
--	|| type() == PYDB;
-+      return type() == BASH || type() == DBX || type() == GDB
-+	  || type() == PYDB || type() == XDB;
-     }
- 
-     // True if debugger supports temporary breakpoints
-     bool has_temporary_breakpoints() const
-     {
--      return type() == GDB || type() == XDB || type() == PYDB || type() == BASH
--	|| has_when_command() || type() == PERL;
-+      return type() == BASH || type() == GDB 
-+	  || type() == PERL || type() == PYDB || type() == XDB 
-+	  || has_when_command() ;
-     }
- 
-     // True if debugger supports breakpoint conditions
-     bool has_breakpoint_conditions() const
-     {
--        return type() == GDB || type() == XDB || type() == BASH ||
--	       type() == DBX || type() == PYDB || type() == PERL;
-+      return type() == BASH || type() == DBX 
-+	  || type() == GDB  || type() == PERL || type() == PYDB 
-+ 	  || type() == XDB;
-     }
- 
-     // True if debugger supports breakpoint commands
-@@ -597,7 +608,7 @@ public:
-     }
- 
-     // True if debugger has numbered displays
--    bool has_numbered_displays()
-+    bool has_numbered_displays() const
-     {
- 	return type() == GDB || type() == PYDB;
-     }
-@@ -678,11 +689,18 @@ public:
-     // Several commands
- 				                    // GDB command
- 						    // -----------------------
--    string print_command(const string& expr = "",   // print|output EXP
-+    string print_command(const char *expr = "",     // print|output EXP
- 			 bool internal = true) const;
-+    string print_command(const string& expr,
-+			 bool internal = true) const {
-+      return print_command(expr.chars(), internal);
-+    }
-     string assign_command(const string& var,        // set variable VAR = EXPR
- 			  const string& expr) const;
--    string display_command(const string& expr = "") const; // display EXPR
-+    string display_command(const char *expr = "") const; // display EXPR
-+    string display_command(const string& expr) const {
-+      return display_command(expr.chars());
-+    }
-     string where_command(int count = 0) const;	    // where COUNT
-     string pwd_command() const;	                    // pwd
-     string frame_command(int number) const;         // frame NUMBER
-@@ -700,8 +718,11 @@ public:
-     string info_locals_command() const;	            // info locals
-     string info_args_command() const;	            // info args
-     string info_display_command() const;	    // info display
--    string disassemble_command(string start, const string& end = "") const;
-+    string disassemble_command(string start, const char *end = "") const;
-                                                     // disassemble START END
-+    string disassemble_command(const string &start, const string& end ) const {
-+      return disassemble_command(start, end.chars() );
-+    }
-     string make_command(const string& target) const;       // make TARGET
-     string jump_command(const string& pc) const;    // jump PC
-     string regs_command(bool all = true) const;	    // info registers
-@@ -713,13 +734,22 @@ public:
-     string delete_command(string bp = "") const;    // delete BP
-     string ignore_command(const string& bp, int count) const; 
-                                                     // ignore BP COUNT
--    string condition_command(const string& bp, const string& expr) const; 
-+    string condition_command(const string& bp, const string& expr) const {
-+      return condition_command(bp, expr.chars() );
-+    }
-+    string condition_command(const string& bp, const char *expr) const;
- 				                    // cond BP EXPR
-     string shell_command(const string& cmd) const;	    // shell CMD
--    string debug_command(const string& file = "",          // file FILE
-+    string debug_command(const char *file = "",          // file FILE
- 			 string args = "") const;
-+    string debug_command(const string& file, string args = "") const {
-+      return debug_command( file.chars(), args );
-+    }
-     string signal_command(int sig) const;           // signal SIG
--    string nop_command(const string& comment = "") const;  // # comment
-+    string nop_command(const char *comment = "") const;  // # comment
-+    string nop_command(const string& comment) const {
-+      return nop_command(comment.chars());
-+    }
- 
-     // Bring VALUE of VAR into a form understood by DDD
-     void munch_value(string& value, const string& var) const;
-@@ -755,11 +785,11 @@ public:
- 
-     // True if ANSWER ends in a prompt
-     bool ends_with_prompt(const string& answer);
--    bool ends_with_secondary_prompt(const string& answer);
--    bool ends_with_yn(const string& answer);
-+    bool ends_with_secondary_prompt(const string& answer) const;
-+    bool ends_with_yn(const string& answer) const;
- 
-     // True if exception error message
--    bool is_exception_answer(const string& answer);
-+    bool is_exception_answer(const string& answer) const;
-     void set_exception_state(bool state);
- 
-     // Helpers
diff --git a/devel/ddd/patches/patch-an b/devel/ddd/patches/patch-an
deleted file mode 100644
index 0583d8f44c2..00000000000
--- a/devel/ddd/patches/patch-an
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/06/04 11:19:32 shannonjr Exp $
-
---- ddd/VarArray.h.orig	2004-05-11 15:49:41.000000000 -0600
-+++ ddd/VarArray.h
-@@ -29,7 +29,7 @@
- #ifndef _DDD_VarArray_h
- #define _DDD_VarArray_h
- 
--#if defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 5)
-+#ifdef __GNUG__
- #pragma interface
- #endif
- 
-@@ -53,7 +53,7 @@ protected:
-     // Add a value
-     virtual void add(const T& v)
-     {
--	value(_size) = v;	// gcc-2.3.3 chokes on having _size++ here
-+        this->value(_size) = v;	// gcc-2.3.3 chokes on having _size++ here
- 	_size++;
-     }
- 
-@@ -109,8 +109,10 @@ public:
-     // Assignment
-     VarArray<T>& operator = (const VarArray<T>& m)
-     { 
--	DynArray<T>::operator = (m);
--	_size = m.size();
-+        if (this != &m) {
-+	  DynArray<T>::operator = (m);
-+	  _size = m.size();
-+	}
- 	return *this;
-     }
- 
-@@ -118,7 +120,7 @@ public:
-     void operator += (const T& value) { add(value); }
-     void operator -= (const T& value) { remove(value); }
- 
--    T& operator[](int i) const 
-+    const T& operator[](int i) const 
-     { 
- 	assert(i >= 0 && i < size());
- 	return DynArray<T>::operator[](i); 
diff --git a/devel/ddd/patches/patch-ao b/devel/ddd/patches/patch-ao
deleted file mode 100644
index b7a3fa99c3e..00000000000
--- a/devel/ddd/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/06/04 11:19:32 shannonjr Exp $
-
---- ./ddd/comm-manag.C.orig	2003-10-11 05:00:23.000000000 -0600
-+++ ./ddd/comm-manag.C
-@@ -357,7 +357,7 @@ private:
- 
- static void partial_answer_received(const string&, void *);
- static void command_completed(void *);
--static void extra_completed(const StringArray&, const VoidArray&, void *);
-+static void extra_completed(StringArray&, const VoidArray&, void *);
- 
- // Handle graph command in CMD, with WHERE_ANSWER being the GDB reply
- // to a `where 1' command; return true iff recognized
-@@ -2802,7 +2802,7 @@ static void find_some_source()
- // Handle GDB answers to DDD questions sent after GDB command
- //-----------------------------------------------------------------------------
- 
--static void extra_completed (const StringArray& answers,
-+static void extra_completed (StringArray& answers,
- 			     const VoidArray& /* qu_datas */,
- 			     void*  data)
- {