OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 01-Aug-2003 13:10:32
Branch: HEAD Handle: 2003080112102903
Modified files:
openpkg-re/vcheck vc.ddd
openpkg-src/ddd ddd.patch ddd.spec
openpkg-web news.txt
Log:
upgrading package: ddd 3.3.1 -> 3.3.7
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-re/vcheck/vc.ddd
1.6 +22 -1075 openpkg-src/ddd/ddd.patch
1.15 +2 -2 openpkg-src/ddd/ddd.spec
1.5998 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.ddd
============================================================================
$ cvs diff -u -r1.1 -r1.2 vc.ddd
--- openpkg-re/vcheck/vc.ddd 29 Jan 2003 17:00:51 -0000 1.1
+++ openpkg-re/vcheck/vc.ddd 1 Aug 2003 11:10:29 -0000 1.2
@@ -2,7 +2,7 @@
}
prog ddd = {
- version = 3.3.1
+ version = 3.3.7
url = ftp://ftp.gnu.org/gnu/ddd/
regex = ddd-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 ddd.patch
--- openpkg-src/ddd/ddd.patch 3 Jul 2003 11:49:05 -0000 1.5
+++ openpkg-src/ddd/ddd.patch 1 Aug 2003 11:10:32 -0000 1.6
@@ -1,573 +1,22 @@
-diff -Naur ddd-3.3.1.orig/ddd/Agent.h ddd-3.3.1/ddd/Agent.h
---- ddd-3.3.1.orig/ddd/Agent.h 1999-08-19 13:27:01.000000000 +0200
-+++ ddd-3.3.1/ddd/Agent.h 2003-07-03 12:54:26.000000000 +0200
-@@ -96,7 +96,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- #include <errno.h>
- #include <string.h>
-
-@@ -414,7 +414,7 @@
-
- string name() const
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << path();
- if (pid() > 0)
- os << " [" << pid() << "]";
-diff -Naur ddd-3.3.1.orig/ddd/ArgNode.C ddd-3.3.1/ddd/ArgNode.C
---- ddd-3.3.1.orig/ddd/ArgNode.C 1999-08-19 13:27:03.000000000 +0200
-+++ ddd-3.3.1/ddd/ArgNode.C 2003-07-03 13:04:58.000000000 +0200
-@@ -34,7 +34,7 @@
- #endif
-
-
--#include <strstream.h>
-+#include <strstream>
- #include "assert.h"
- #include "VSLLib.h"
- #include "ArgNode.h"
-@@ -61,7 +61,7 @@
-
- if (box == 0)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "arg" << _id << " cannot be isolated";
- VSLLib::eval_error(os);
- }
-@@ -70,13 +70,13 @@
- }
-
- // Dump ArgNode
--void ArgNode::dump(ostream& s) const
-+void ArgNode::dump(std::ostream& s) const
- {
- s << "arg" << _id;
- }
-
- // Dump as tree
--void ArgNode::_dumpTree(ostream& s) const
-+void ArgNode::_dumpTree(std::ostream& s) const
- {
- s << _id;
- }
-diff -Naur ddd-3.3.1.orig/ddd/AsyncAgent.C ddd-3.3.1/ddd/AsyncAgent.C
---- ddd-3.3.1.orig/ddd/AsyncAgent.C 1999-08-19 13:27:04.000000000 +0200
-+++ ddd-3.3.1/ddd/AsyncAgent.C 2003-07-03 12:58:43.000000000 +0200
-@@ -39,7 +39,7 @@
- #include "misc.h"
-
- #include <sys/types.h>
--#include <strstream.h>
-+#include <strstream>
- #include <unistd.h>
- #include <stdlib.h>
-
-diff -Naur ddd-3.3.1.orig/ddd/DataDisp.C ddd-3.3.1/ddd/DataDisp.C
---- ddd-3.3.1.orig/ddd/DataDisp.C 2001-04-26 13:08:06.000000000 +0200
-+++ ddd-3.3.1/ddd/DataDisp.C 2003-07-03 13:16:46.000000000 +0200
-@@ -2851,7 +2851,7 @@
- // Set selection.
- // If the entire graph is selected, include position info, too.
- bool include_position = (count.selected >= count.visible);
-- ostrstream os;
-+ std::ostrstream os;
- get_selection(os, include_position);
- string cmd(os);
-
-@@ -3742,7 +3742,7 @@
-
- sort(clustered_displays);
-
-- ostrstream os;
-+ std::ostrstream os;
- if (clustered_displays.size() == 0)
- {
- os << "No displays.\n";
-@@ -4892,7 +4892,7 @@
- bool unclustered = false;
-
- // Build undo command
-- ostrstream undo_commands;
-+ std::ostrstream undo_commands;
- int i;
- for (i = 0; i < display_nrs.size(); i++)
- {
-diff -Naur ddd-3.3.1.orig/ddd/DefCallN.C ddd-3.3.1/ddd/DefCallN.C
---- ddd-3.3.1.orig/ddd/DefCallN.C 2000-12-11 13:21:47.000000000 +0100
-+++ ddd-3.3.1/ddd/DefCallN.C 2003-07-03 13:05:28.000000000 +0200
-@@ -36,7 +36,7 @@
-
- #include "assert.h"
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
-
- #include "VSLLib.h"
- #include "VSLDef.h"
-@@ -150,7 +150,7 @@
- {
- const int bufsize = 1000;
- char buffer[bufsize];
-- ostrstream s(buffer, sizeof buffer);
-+ std::ostrstream s(buffer, sizeof buffer);
- s << *this << '\0';
-
- VSLLib::eval_warning("no suitable definition for " + string(buffer),
-@@ -302,7 +302,7 @@
- for (i = 0; i < _def->nargs(); i++)
- if (instances[i] > 0 && values[i] == 0)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "cannot isolate arg " << i;
- VSLLib::eval_warning(os, _def);
- fail = true;
-diff -Naur ddd-3.3.1.orig/ddd/DiagBox.C ddd-3.3.1/ddd/DiagBox.C
---- ddd-3.3.1.orig/ddd/DiagBox.C 1999-08-19 13:27:20.000000000 +0200
-+++ ddd-3.3.1/ddd/DiagBox.C 2003-07-03 13:03:34.000000000 +0200
-@@ -34,7 +34,7 @@
- #endif
-
-
--#include <strstream.h>
-+#include <strstream>
-
- #include "PrimitiveB.h"
- #include "StringBox.h"
-@@ -66,7 +66,7 @@
- origin[X], origin[Y] + i, origin[X] + space[X], origin[Y] + i);
-
- // Make space info
-- ostrstream oss;
-+ std::ostrstream oss;
- ostream& os = oss;
- os << space << '\0';
- string ss = oss;
-diff -Naur ddd-3.3.1.orig/ddd/DispBox.C ddd-3.3.1/ddd/DispBox.C
---- ddd-3.3.1.orig/ddd/DispBox.C 2000-12-20 13:30:24.000000000 +0100
-+++ ddd-3.3.1/ddd/DispBox.C 2003-07-03 13:27:50.000000000 +0200
-@@ -152,7 +152,7 @@
- "#line 1 \"" Ddd_NAME "*vslDefs\"\n" +
- vsllib_defs;
-
-- istrstream is(defs.chars());
-+ std::istrstream is(defs.chars());
- vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode());
- #else
- name = "vsllib/" ddd_NAME ".vsl";
-@@ -168,7 +168,7 @@
- "#line 1 \"" Ddd_NAME "*vslDefs\"\n" +
- vsllib_defs;
-
-- istrstream is(defs.chars());
-+ std::istrstream is(defs.chars());
- vsllib_ptr->update(is);
- vsllib_ptr->optimize(VSEFlags::optimize_mode());
- }
-diff -Naur ddd-3.3.1.orig/ddd/GraphEdit.C ddd-3.3.1/ddd/GraphEdit.C
---- ddd-3.3.1.orig/ddd/GraphEdit.C 2001-04-26 13:08:06.000000000 +0200
-+++ ddd-3.3.1/ddd/GraphEdit.C 2003-07-03 13:09:23.000000000 +0200
-@@ -37,7 +37,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
-
- #include <Xm/Xm.h>
- #include <Xm/ScrolledW.h>
-@@ -1053,7 +1053,7 @@
-
- Dimension d = *((Dimension *)fromVal->addr);
-
-- ostrstream os;
-+ std::ostrstream os;
- os << d;
- string os_s(os);
- String s = (String)XtNewString((String)os_s);
-@@ -1074,7 +1074,7 @@
-
- Cardinal d = *((Cardinal *)fromVal->addr);
-
-- ostrstream os;
-+ std::ostrstream os;
- os << d;
- string os_s(os);
- String s = (String)XtNewString((String)os_s);
-@@ -2884,7 +2884,7 @@
- Layout::remove_graph(graph_name);
-
- // ... and re-rotate it.
-- ostrstream os;
-+ std::ostrstream os;
- os << new_rotation;
-
- string rotation_s = os;
-diff -Naur ddd-3.3.1.orig/ddd/GraphNodeI.h ddd-3.3.1/ddd/GraphNodeI.h
---- ddd-3.3.1.orig/ddd/GraphNodeI.h 2001-01-09 19:15:22.000000000 +0100
-+++ ddd-3.3.1/ddd/GraphNodeI.h 2003-07-03 12:54:56.000000000 +0200
-@@ -38,7 +38,7 @@
- #include "Box.h"
- #include "bool.h"
- #include "GraphGC.h"
--#include <strstream.h>
-+#include <strstream>
-
- class GraphEdge;
- class Graph;
-@@ -121,7 +121,7 @@
- virtual const BoxRegion& sensitiveRegion(const GraphGC& gc) const = 0;
- virtual string str() const
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << id();
- return string(os);
- }
-@@ -169,7 +169,7 @@
- }
-
- // Printing
-- virtual void _print(ostream&, const GraphGC&) const
-+ virtual void _print(std::ostream&, const GraphGC&) const
- {
- // Default: do nothing
- }
-@@ -178,7 +178,7 @@
- virtual bool OK() const;
- };
-
--inline ostream& operator << (ostream& s, GraphNode& node)
-+inline std::ostream& operator << (std::ostream& s, GraphNode& node)
- {
- return s << node.str();
- }
-diff -Naur ddd-3.3.1.orig/ddd/LetNode.C ddd-3.3.1/ddd/LetNode.C
---- ddd-3.3.1.orig/ddd/LetNode.C 1999-08-19 13:27:37.000000000 +0200
-+++ ddd-3.3.1/ddd/LetNode.C 2003-07-03 13:05:57.000000000 +0200
-@@ -36,7 +36,7 @@
-
- #include "assert.h"
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
-
- #include "VSLLib.h"
-
-@@ -278,13 +278,13 @@
- {
- if (instances[i] == 0)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "invalid pattern: arg" << i << " is never instantiated";
- VSLLib::eval_error(os);
- }
- if (instances[i] > 1)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "invalid pattern: arg" << i
- << " is instantiated several times";
- VSLLib::eval_error(os);
-@@ -375,7 +375,7 @@
- for (i = _base; i < _base + _nargs; i++)
- if (instances[i] > 0 && values[i] == 0)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "cannot isolate arg" << i;
- VSLLib::eval_warning(os, cdef);
- fail = true;
-diff -Naur ddd-3.3.1.orig/ddd/LiterateA.C ddd-3.3.1/ddd/LiterateA.C
---- ddd-3.3.1.orig/ddd/LiterateA.C 2000-12-11 13:21:47.000000000 +0100
-+++ ddd-3.3.1/ddd/LiterateA.C 2003-07-03 13:01:58.000000000 +0200
-@@ -173,7 +173,7 @@
-
- if (nitems == 0 && ++failures <= 3)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "write failed (attempt #"
- << failures << ", still trying)";
- string s(os);
-diff -Naur ddd-3.3.1.orig/ddd/PlotAgent.C ddd-3.3.1/ddd/PlotAgent.C
---- ddd-3.3.1.orig/ddd/PlotAgent.C 2001-03-26 18:40:05.000000000 +0200
-+++ ddd-3.3.1/ddd/PlotAgent.C 2003-07-03 13:16:52.000000000 +0200
-@@ -111,7 +111,7 @@
-
- string PlotAgent::var(const char *name, double min, double max)
- {
-- ostrstream os;
-+ std::ostrstream os;
-
- if (min < +DBL_MAX && max > -DBL_MAX)
- {
-@@ -139,7 +139,7 @@
- else
- {
- // Issue plot command
-- ostrstream cmd;
-+ std::ostrstream cmd;
- switch (ndim)
- {
- case 0:
-@@ -395,7 +395,7 @@
- // Print plot to FILENAME
- void PlotAgent::print(const string& filename, const PrintGC& gc)
- {
-- ostrstream cmd;
-+ std::ostrstream cmd;
-
- if (gc.isFig())
- {
-diff -Naur ddd-3.3.1.orig/ddd/SourceView.C ddd-3.3.1/ddd/SourceView.C
---- ddd-3.3.1.orig/ddd/SourceView.C 2001-04-26 13:08:06.000000000 +0200
-+++ ddd-3.3.1/ddd/SourceView.C 2003-07-03 13:16:58.000000000 +0200
-@@ -978,7 +978,7 @@
-
- // Create a new breakpoint at ADDRESS, making it inherit the
- // current settings
-- ostrstream os;
-+ std::ostrstream os;
- bool ok = bp->get_state(os, 0, false, address);
- if (!ok)
- return false; // Command failed
-@@ -1042,7 +1042,7 @@
- {
- // Create a new breakpoint with a new condition COND, making it
- // inherit the current settings
-- ostrstream os;
-+ std::ostrstream os;
- bool ok = bp->get_state(os, 0, false, "", c);
- if (!ok)
- continue; // Command failed
-@@ -3955,7 +3955,7 @@
-
- bool changed = false;
- bool added = false;
-- ostrstream undo_commands;
-+ std::ostrstream undo_commands;
- string file = current_file_name;
-
- while (info_output != "")
-@@ -4038,10 +4038,10 @@
- bps_not_read -= bp_nr;
- BreakPoint *bp = bp_map.get(bp_nr);
-
-- ostrstream old_state;
-+ std::ostrstream old_state;
- undo_buffer.add_breakpoint_state(old_state, bp);
-
-- ostrstream local_commands;
-+ std::ostrstream local_commands;
- bool need_total_undo = false;
-
- bool bp_changed =
-diff -Naur ddd-3.3.1.orig/ddd/StringBox.C ddd-3.3.1/ddd/StringBox.C
---- ddd-3.3.1.orig/ddd/StringBox.C 2000-12-11 13:21:47.000000000 +0100
-+++ ddd-3.3.1/ddd/StringBox.C 2003-07-03 13:00:48.000000000 +0200
-@@ -44,7 +44,7 @@
- #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
- #include <ctype.h>
--#include <strstream.h>
-+#include <strstream>
-
- #include "VSEFlags.h"
-
-diff -Naur ddd-3.3.1.orig/ddd/Tool.C ddd-3.3.1/ddd/Tool.C
---- ddd-3.3.1.orig/ddd/Tool.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/Tool.C 2003-07-03 13:17:12.000000000 +0200
-@@ -143,7 +143,7 @@
- Position pos_x, pos_y;
- get_transient_pos(XtScreen(tool_shell_parent), pos_x, pos_y);
-
-- ostrstream os;
-+ std::ostrstream os;
- #if FIXED_COMMAND_TOOL
- os << size.width << "x" << size.height;
- #endif
-diff -Naur ddd-3.3.1.orig/ddd/VSEFlags.C ddd-3.3.1/ddd/VSEFlags.C
---- ddd-3.3.1.orig/ddd/VSEFlags.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/VSEFlags.C 2003-07-03 13:06:28.000000000 +0200
-@@ -32,7 +32,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <strstream.h>
-+#include <strstream>
- #include <ctype.h>
- #include <X11/Intrinsic.h>
-
-@@ -594,7 +594,7 @@
-
- if (intptr)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << " (default: " << *intptr << ")";
- deflt = string(os);
- }
-diff -Naur ddd-3.3.1.orig/ddd/VSLDef.C ddd-3.3.1/ddd/VSLDef.C
---- ddd-3.3.1.orig/ddd/VSLDef.C 2000-06-06 21:40:19.000000000 +0200
-+++ ddd-3.3.1/ddd/VSLDef.C 2003-07-03 13:07:18.000000000 +0200
-@@ -36,7 +36,7 @@
-
-
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- #include <stdlib.h>
-
- #include "assert.h"
-@@ -257,14 +257,14 @@
- {
- if (instances[i] == 0)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "invalid pattern: arg" << i
- << " is never instantiated";
- VSLLib::eval_error(os, this);
- }
- if (instances[i] > 1)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "invalid pattern: arg" << i
- << " is instantiated several times";
- VSLLib::eval_error(os, this);
-@@ -438,7 +438,7 @@
- if ((deflist->func_name())[0] == '#')
- return string("");
-
-- ostrstream os;
-+ std::ostrstream os;
-
- if (_node_pattern->isArgNode())
- os << "(" << *_node_pattern << "...)";
-@@ -463,7 +463,7 @@
- // External function name, including location
- string VSLDef::longname() const
- {
-- ostrstream os;
-+ std::ostrstream os;
- ostream& s = os;
-
- if (_filename != "")
-diff -Naur ddd-3.3.1.orig/ddd/VSLDefList.C ddd-3.3.1/ddd/VSLDefList.C
---- ddd-3.3.1.orig/ddd/VSLDefList.C 2000-12-19 01:21:47.000000000 +0100
-+++ ddd-3.3.1/ddd/VSLDefList.C 2003-07-03 13:07:41.000000000 +0200
-@@ -36,7 +36,7 @@
-
-
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- #include "assert.h"
-
- #include "VSEFlags.h"
-@@ -66,7 +66,7 @@
- const int bufsize = 1000;
- char buffer[bufsize];
-
-- ostrstream s(buffer, sizeof buffer);
-+ std::ostrstream s(buffer, sizeof buffer);
- s << *arg << '\0';
-
- VSLLib::eval_error("no suiting definition for " + f_name() + buffer);
-@@ -178,7 +178,7 @@
- // Override
- void VSLDefList::override()
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << UniqueId();
-
- _func_name += "'";
-diff -Naur ddd-3.3.1.orig/ddd/VSLErr.C ddd-3.3.1/ddd/VSLErr.C
---- ddd-3.3.1.orig/ddd/VSLErr.C 2000-06-19 19:13:21.000000000 +0200
-+++ ddd-3.3.1/ddd/VSLErr.C 2003-07-03 13:07:57.000000000 +0200
-@@ -30,7 +30,7 @@
- "$Id: ddd.patch,v 1.5 2003/07/03 11:49:05 ms Exp $";
-
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- #include "strclass.h"
-
- #include "VSLLib.h"
-@@ -77,7 +77,7 @@
-
- for (i--; i >= 0; i--)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << i << " -- " << VSLDef::backtrace[i]->longname()
- << *VSLDef::backtrace_args[i];
-
-diff -Naur ddd-3.3.1.orig/ddd/VSLRead.C ddd-3.3.1/ddd/VSLRead.C
---- ddd-3.3.1.orig/ddd/VSLRead.C 2000-12-11 13:21:48.000000000 +0100
-+++ ddd-3.3.1/ddd/VSLRead.C 2003-07-03 13:08:22.000000000 +0200
-@@ -37,7 +37,7 @@
- #include <limits.h>
- #include <iostream.h>
- #include <fstream.h>
--#include <strstream.h>
-+#include <strstream>
-
- #include "assert.h"
- #include "strclass.h"
-@@ -187,7 +187,7 @@
- // Parsing message
- void VSLLib::parse_echo(const string& msg)
- {
-- ostrstream os;
-+ std::ostrstream os;
- ostream& s = os;
-
- if (vsllinenumber > 0)
-diff -Naur ddd-3.3.1.orig/ddd/cook.C ddd-3.3.1/ddd/cook.C
---- ddd-3.3.1.orig/ddd/cook.C 2000-05-29 16:07:26.000000000 +0200
-+++ ddd-3.3.1/ddd/cook.C 2003-07-03 12:56:54.000000000 +0200
-@@ -34,7 +34,7 @@
- #endif
-
- #include <ctype.h>
--#include <strstream.h>
-+#include <strstream>
- #include <stdio.h>
-
- #include "bool.h"
-@@ -43,7 +43,7 @@
- // Transform RAW into C string
- string _cook(const string& raw, bool for_postscript)
- {
-- ostrstream cooked;
-+ std::ostrstream cooked;
- const char *raw_s = (char *)raw;
-
- for (unsigned i = 0; i < raw.length(); i++)
-@@ -189,7 +189,7 @@
- // Transform COOKED into C string
- string uncook(const string& cooked)
- {
-- ostrstream uncooked;
-+ std::ostrstream uncooked;
- int n;
- int count;
-
-diff -Naur ddd-3.3.1.orig/ddd/ddd.C ddd-3.3.1/ddd/ddd.C
---- ddd-3.3.1.orig/ddd/ddd.C 2001-04-26 16:53:45.000000000 +0200
-+++ ddd-3.3.1/ddd/ddd.C 2003-07-03 12:55:36.000000000 +0200
-@@ -872,7 +872,7 @@
+diff -Naur ddd-3.3.7.orig/ddd/PannedGE.C ddd-3.3.7/ddd/PannedGE.C
+--- ddd-3.3.7.orig/ddd/PannedGE.C Sat May 24 17:27:04 2003
++++ ddd-3.3.7/ddd/PannedGE.C Fri Aug 1 12:09:16 2003
+@@ -395,9 +395,9 @@
+ static bool warned = false;
+ if (!warned)
+ {
+- cerr << "Warning: panned graph editors are not supported "
++ std::cerr << "Warning: panned graph editors are not supported "
+ "in this configuration.\n";
+- cerr << "Using scrolled graph editors instead.\n";
++ std::cerr << "Using scrolled graph editors instead.\n";
+ warned = true;
+ }
+
+diff -Naur ddd-3.3.7.orig/ddd/ddd.C ddd-3.3.7/ddd/ddd.C
+--- ddd-3.3.7.orig/ddd/ddd.C 2003-05-24 17:27:06.000000000 +0200
++++ ddd-3.3.7/ddd/ddd.C 2003-08-01 07:59:08.677245000 +0200
+@@ -883,7 +883,7 @@
//-----------------------------------------------------------------------------
struct RecentItems {
@@ -576,503 +25,9 @@
};
#define RECENT_MENU \
-@@ -2030,7 +2030,7 @@
- ddd_install_x_fatal();
- ddd_install_x_error();
-
-- ostrstream messages;
-+ std::ostrstream messages;
-
- // Set up a `~/.ddd/' directory hierarchy
- create_session_dir(DEFAULT_SESSION, messages);
-@@ -3244,7 +3244,7 @@
- // Check for expired versions
- if (ddd_expired())
- {
-- ostrstream msg;
-+ std::ostrstream msg;
- msg << "This " DDD_NAME " version (" DDD_VERSION ") has expired since "
- << ddd_expiration_date() << ".\n"
- << "Please upgrade to the recent " DDD_NAME " version.";
-@@ -3355,7 +3355,7 @@
- // Install DDD log
- //-----------------------------------------------------------------------------
-
--static ostrstream devnull;
-+static std::ostrstream devnull;
- ostream *_dddlog = &devnull;
-
- void init_dddlog()
-@@ -3748,7 +3748,7 @@
- string geometry;
- if (lock_dialog_x >= 0 && lock_dialog_y >= 0)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "+" << lock_dialog_x << "+" << lock_dialog_y;
- geometry = string(os);
- XtSetArg(args[arg], XmNgeometry, geometry.chars()); arg++;
-@@ -5611,7 +5611,7 @@
-
- static void report_languageHP(Agent *, void *, void *)
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "Current language: " << gdb->program_language();
- set_status(string(os));
- }
-@@ -7209,7 +7209,7 @@
- // `helpOnVersionString' resource.
- static void setup_version_info()
- {
-- ostrstream os;
-+ std::ostrstream os;
- show_configuration(os);
- string cinfo(os);
-
-@@ -7653,7 +7653,7 @@
- if (prefix.length() < 3)
- {
- // No prefix or insufficient prefix -- generate a new one
-- ostrstream key;
-+ std::ostrstream key;
- key << ddd_NAME << "-" << getpid() << "-"
- << (long)time((time_t *)0) << ": ";
- prefix = key;
-diff -Naur ddd-3.3.1.orig/ddd/decoration.C ddd-3.3.1/ddd/decoration.C
---- ddd-3.3.1.orig/ddd/decoration.C 2000-12-11 13:21:48.000000000 +0100
-+++ ddd-3.3.1/ddd/decoration.C 2003-07-03 13:11:03.000000000 +0200
-@@ -78,7 +78,7 @@
- Position pos_x, pos_y;
- get_transient_pos(XtScreen(parent), pos_x, pos_y);
-
-- ostrstream os;
-+ std::ostrstream os;
- os << "+" << pos_x << "+" << pos_y;
- string geometry(os);
-
-diff -Naur ddd-3.3.1.orig/ddd/exectty.C ddd-3.3.1/ddd/exectty.C
---- ddd-3.3.1.orig/ddd/exectty.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/exectty.C 2003-07-03 13:12:17.000000000 +0200
-@@ -216,7 +216,7 @@
- {
- // We're already running. Don't start a new tty
- // if the old one is still running.
-- ostrstream os;
-+ std::ostrstream os;
- os << "kill -2 " << pid << " 2>/dev/null"
- << " || ( " << command << " )";
- command = string(os);
-@@ -237,7 +237,7 @@
-
- if (reply.length() > 2)
- {
-- istrstream is((const char *)reply);
-+ std::istrstream is((const char *)reply);
- is >> ttyname >> pid >> term >> windowid;
- }
-
-@@ -971,7 +971,7 @@
-
- if (remote_gdb())
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "kill -" << SIGHUP << " " << separate_tty_pid
- << " >/dev/null </dev/null 2>&1 &";
- Agent agent(sh_command(string(os)));
-diff -Naur ddd-3.3.1.orig/ddd/file.C ddd-3.3.1/ddd/file.C
---- ddd-3.3.1.orig/ddd/file.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/file.C 2003-07-03 13:12:56.000000000 +0200
-@@ -342,7 +342,7 @@
-
- if (nitems == 1 || nitems % 10 == 0)
- {
-- ostrstream status;
-+ std::ostrstream status;
- status << delay_message << "... ("
- << nitems << " processed)";
- string s(status);
-@@ -449,7 +449,7 @@
- int old_percent = ((i - 1) * 100) / count;
- if (percent % 10 == 0 && old_percent % 10 != 0)
- {
-- ostrstream status;
-+ std::ostrstream status;
- status << delay_message << "... ("
- << percent << "% processed)";
- string s(status);
-@@ -1115,7 +1115,7 @@
- // Fix for Sun: use /usr/bin/kill
- string kill_result;
- {
-- ostrstream os;
-+ std::ostrstream os;
- kill += " 2>&1";
- FILE *fp = popen(kill.chars(), "r");
- if (fp != 0)
-diff -Naur ddd-3.3.1.orig/ddd/gcore.C ddd-3.3.1/ddd/gcore.C
---- ddd-3.3.1.orig/ddd/gcore.C 1999-08-19 13:28:36.000000000 +0200
-+++ ddd-3.3.1/ddd/gcore.C 2003-07-03 13:17:20.000000000 +0200
-@@ -109,7 +109,7 @@
- for (; optind < argc; optind++)
- {
- int pid = atoi(argv[optind]);
-- ostrstream diag;
-+ std::ostrstream diag;
- diag << "gcore: " << pid;
- string msg(diag);
-
-@@ -123,7 +123,7 @@
- }
-
- // 2. Get a core file from the running process
-- ostrstream target;
-+ std::ostrstream target;
- target << filename << "." << pid;
- string gcore_target(target);
- ok = ptrace(PTRACE_DUMPCORE, pid,
-diff -Naur ddd-3.3.1.orig/ddd/logplayer.C ddd-3.3.1/ddd/logplayer.C
---- ddd-3.3.1.orig/ddd/logplayer.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/logplayer.C 2003-07-03 13:14:00.000000000 +0200
-@@ -42,12 +42,14 @@
- #include "config.h"
- #include "streampos.h"
-
--#include <iostream.h>
--#include <fstream.h>
--#include <stdlib.h>
--#include <stdio.h>
-+#include <iostream>
-+#include <fstream>
-+#include <cstdlib>
-+#include <cstdio>
- #include <unistd.h>
--#include <ctype.h>
-+#include <cctype>
-+
-+using std::ifstream;
-
- #include <setjmp.h>
- #include <signal.h>
-@@ -232,7 +234,7 @@
- // Report line
- char buffer[256];
- sprintf(buffer, "%4d", command_no);
-- ostrstream os;
-+ std::ostrstream os;
- os << buffer << " " << in << "\n";
- put(os);
-
-@@ -302,7 +304,7 @@
- int line = 1;
- bool at_start_of_line = true;
-
-- ostrstream os;
-+ std::ostrstream os;
- for (;;)
- {
- char c;
-@@ -332,7 +334,7 @@
-
- if (!scanning && ddd_line == ".")
- {
-- ostrstream os;
-+ std::ostrstream os;
- os << "Expecting "
- << command_no << " " << quote(in) << "\n";
- put(os);
-diff -Naur ddd-3.3.1.orig/ddd/options.C ddd-3.3.1/ddd/options.C
---- ddd-3.3.1.orig/ddd/options.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/options.C 2003-07-03 13:14:32.000000000 +0200
-@@ -1529,7 +1529,7 @@
- gcore.gsub("@FILE@", target);
- gcore.gsub("@PID@", itostring(info.pid));
- string cmd = sh_command(gcore, true) + " 2>&1";
-- ostrstream errs;
-+ std::ostrstream errs;
- FILE *fp = popen(cmd, "r");
- if (fp != 0)
- {
-@@ -1607,7 +1607,7 @@
- // Kill the process, hopefully leaving a core file.
-
- // Since g77 catches SIGABRT, we disable its handler first.
-- ostrstream os;
-+ std::ostrstream os;
- os << "signal(" << SIGABRT << ", "
- << (unsigned long)SIG_DFL << ")";
- gdb_question(gdb->print_command(string(os)));
-@@ -2148,7 +2148,7 @@
- XWindowAttributes attr;
- XGetWindowAttributes(XtDisplay(w), frame(w), &attr);
-
-- ostrstream geometry;
-+ std::ostrstream geometry;
- if (include_size)
- geometry << width << "x" << height;
- geometry << "+" << attr.x << "+" << attr.y;
-@@ -2208,7 +2208,7 @@
- }
-
- // Stream to hold data and breakpoints
-- ostrstream rs;
-+ std::ostrstream rs;
-
- // Get breakpoints and cursor position
- bool breakpoints_ok = source_view->get_state(rs);
-@@ -2261,7 +2261,7 @@
- }
-
- // Stream to hold exec and core file specs
-- ostrstream es;
-+ std::ostrstream es;
-
- if (reload_file)
- {
-@@ -2589,7 +2589,7 @@
-
- // Themes
- os << "\n! Themes.\n";
-- ostrstream themes;
-+ std::ostrstream themes;
- themes << DispBox::theme_manager;
- static string themes_s;
- themes_s = themes;
-diff -Naur ddd-3.3.1.orig/ddd/plotter.C ddd-3.3.1/ddd/plotter.C
---- ddd-3.3.1.orig/ddd/plotter.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/plotter.C 2003-07-03 13:15:14.000000000 +0200
-@@ -276,7 +276,7 @@
- return;
- }
-
-- ostrstream s;
-+ std::ostrstream s;
- int c;
- while ((c = is.get()) != EOF)
- s << (unsigned char)c;
-diff -Naur ddd-3.3.1.orig/ddd/session.C ddd-3.3.1/ddd/session.C
---- ddd-3.3.1.orig/ddd/session.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/session.C 2003-07-03 13:17:25.000000000 +0200
-@@ -312,7 +312,7 @@
- // Same, but issue messages in status line
- void create_session_dir(const string& session)
- {
-- ostrstream messages;
-+ std::ostrstream messages;
- create_session_dir(session, messages);
- string msg(messages);
- while (msg != "")
-diff -Naur ddd-3.3.1.orig/ddd/settings.C ddd-3.3.1/ddd/settings.C
---- ddd-3.3.1.orig/ddd/settings.C 2001-04-30 09:55:19.000000000 +0200
-+++ ddd-3.3.1/ddd/settings.C 2003-07-03 13:17:29.000000000 +0200
-@@ -350,7 +350,7 @@
- FILE *fp = popen(sh_command(cmd), "r");
- if (fp != 0)
- {
-- ostrstream info;
-+ std::ostrstream info;
- int c;
- while ((c = getc(fp)) != EOF)
- info << char(c);
-@@ -497,7 +497,7 @@
- if (DispBox::theme_manager.has_pattern(theme))
- p = DispBox::theme_manager.pattern(theme);
-
-- ostrstream os;
-+ std::ostrstream os;
- os << p;
- string current_value = string(os);
-
-@@ -511,7 +511,7 @@
- if (have_pattern)
- {
- ThemePattern p = old_tm.pattern(theme);
-- ostrstream os;
-+ std::ostrstream os;
- os << p;
- old_value = string(os);
- }
-@@ -803,7 +803,7 @@
- if (!init)
- {
- // Save current state in undo buffer
-- ostrstream command;
-+ std::ostrstream command;
- get_setting(command, gdb->type(), XtName(button),
- settings_values[button]);
- undo_buffer.add_command(string(command));
-@@ -2908,7 +2908,7 @@
- set = DispBox::theme_manager.pattern(theme).active();
- }
-
-- ostrstream os;
-+ std::ostrstream os;
- os << p;
- string value = string(os);
- if (value == "")
-@@ -3162,7 +3162,7 @@
- if (settings == 0)
- return "";
-
-- ostrstream command;
-+ std::ostrstream command;
- for (int i = 0; i < settings_entries.size(); i++)
- {
- Widget entry = settings_entries[i];
-diff -Naur ddd-3.3.1.orig/ddd/show.C ddd-3.3.1/ddd/show.C
---- ddd-3.3.1.orig/ddd/show.C 2001-04-26 16:17:19.000000000 +0200
-+++ ddd-3.3.1/ddd/show.C 2003-07-03 13:17:36.000000000 +0200
-@@ -471,7 +471,7 @@
- }
- else
- {
-- ostrstream text;
-+ std::ostrstream text;
- formatter(text);
- string s(text);
-
-@@ -531,7 +531,7 @@
- {
- StatusMsg msg("Invoking " DDD_NAME " license browser");
-
-- ostrstream license;
-+ std::ostrstream license;
- int ret = ddd_license(license);
- string s(license);
- s.prepend("@license@");
-@@ -571,7 +571,7 @@
- {
- StatusMsg msg("Invoking " DDD_NAME " news browser");
-
-- ostrstream news;
-+ std::ostrstream news;
- int ret = ddd_news(news);
- string s(news);
- s.prepend("@news@");
-@@ -625,7 +625,7 @@
- {
- StatusMsg msg("Invoking " DDD_NAME " manual browser");
-
-- ostrstream man;
-+ std::ostrstream man;
- int ret = ddd_man(man);
- string s(man);
-
-@@ -664,7 +664,7 @@
- FILE *fp = popen(sh_command(cmd), "r");
- if (fp != 0)
- {
-- ostrstream man;
-+ std::ostrstream man;
- int c;
- int i = 0;
- while ((c = getc(fp)) != EOF)
-diff -Naur ddd-3.3.1.orig/ddd/strclass.C ddd-3.3.1/ddd/strclass.C
---- ddd-3.3.1.orig/ddd/strclass.C 2001-03-30 14:31:46.000000000 +0200
-+++ ddd-3.3.1/ddd/strclass.C 2003-07-03 12:27:00.000000000 +0200
-@@ -41,15 +41,17 @@
- #include "strclass.h"
- #include "config.h"
- #include "return.h"
--#include <ctype.h>
--#include <limits.h>
--#include <new.h>
--#include <stdlib.h>
-+#include <cctype>
-+#include <climits>
-+#include <new>
-+#include <cstdlib>
-
- #if HAVE_LIMITS_H
--#include <limits.h>
-+#include <climits>
- #endif
-
-+using std::ifstream;
-+
- void string::error(const char* msg) const
- {
- cerr << "string: " << msg << "\n";
-diff -Naur ddd-3.3.1.orig/ddd/strclass.h ddd-3.3.1/ddd/strclass.h
---- ddd-3.3.1.orig/ddd/strclass.h 2000-12-20 13:30:25.000000000 +0100
-+++ ddd-3.3.1/ddd/strclass.h 2003-07-03 12:50:02.000000000 +0200
-@@ -410,7 +410,11 @@
- #endif
-
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
-+#include <string>
-+#include <sstream>
-+#include <ostream>
-+#include <istream>
- #include "rxclass.h"
- #include "config.h"
- #include "bool.h"
-@@ -540,7 +544,7 @@
- string(const char* t);
- string(const char* t, int len);
- string(char c);
-- string(ostrstream& os); // should be const
-+ string(std::ostrstream& os); // should be const
-
- ~string();
-
-@@ -552,7 +556,7 @@
- string& operator = (char* y);
- string& operator = (char c);
- string& operator = (const subString& y);
-- string& operator = (ostrstream& os);
-+ string& operator = (std::ostrstream& os);
-
- // Concatenation
- string& operator += (const string& y);
-@@ -1046,7 +1050,7 @@
- rep = string_Salloc(rep, &c, 1, 1); return *this;
- }
-
--inline string& string::operator = (ostrstream& os)
-+inline string& string::operator = (std::ostrstream& os)
- {
- assert(!consuming());
-
-@@ -1080,7 +1084,7 @@
- return *this;
- }
-
--inline string::string(ostrstream& os)
-+inline string::string(std::ostrstream& os)
- : rep(&_nilstrRep)
- #if STRING_CHECK_CONSUME
- , consume(false)
-diff -Naur ddd-3.3.1.orig/ddd/vsldoc.C ddd-3.3.1/ddd/vsldoc.C
---- ddd-3.3.1.orig/ddd/vsldoc.C 2000-06-16 13:29:16.000000000 +0200
-+++ ddd-3.3.1/ddd/vsldoc.C 2003-07-03 13:17:44.000000000 +0200
-@@ -80,7 +80,7 @@
- if (fp == 0)
- return "";
-
-- ostrstream os;
-+ std::ostrstream os;
- int c;
- while ((c = getc(fp)) != EOF)
- os << (char)c;
-diff -Naur ddd-3.3.1.orig/ddd/windows.C ddd-3.3.1/ddd/windows.C
---- ddd-3.3.1.orig/ddd/windows.C 2001-04-26 13:08:07.000000000 +0200
-+++ ddd-3.3.1/ddd/windows.C 2003-07-03 13:26:28.000000000 +0200
-@@ -266,7 +266,7 @@
-
- BoxPoint given_pos = pos + tool_shell_move_offset;
-
-- ostrstream os;
-+ std::ostrstream os;
- os << "+" << given_pos[X] << "+" << given_pos[Y];
- last_tool_shell_geometry = string(os);
- last_tool_shell_position = pos;
-diff -Naur ddd-3.3.1.orig/termcap/termcap.h ddd-3.3.1/termcap/termcap.h
---- ddd-3.3.1.orig/termcap/termcap.h 1995-05-17 20:47:28.000000000 +0200
-+++ ddd-3.3.1/termcap/termcap.h 2003-07-03 12:27:00.000000000 +0200
+diff -Naur ddd-3.3.7.orig/termcap/termcap.h ddd-3.3.7/termcap/termcap.h
+--- ddd-3.3.7.orig/termcap/termcap.h 2003-03-03 01:49:15.000000000 +0100
++++ ddd-3.3.7/termcap/termcap.h 2003-08-01 08:10:11.616917000 +0200
@@ -26,7 +26,6 @@
extern int tgetflag (const char *name);
extern char *tgetstr (const char *name, char **area);
@@ -1081,11 +36,3 @@
extern short ospeed;
extern void tputs (const char *string, int nlines, int (*outfun) ());
-@@ -45,7 +44,6 @@
- extern int tgetflag ();
- extern char *tgetstr ();
-
--extern char PC;
- extern short ospeed;
-
- extern void tputs ();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 ddd.spec
--- openpkg-src/ddd/ddd.spec 24 Jul 2003 11:09:23 -0000 1.14
+++ openpkg-src/ddd/ddd.spec 1 Aug 2003 11:10:32 -0000 1.15
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group: Development
License: GPL
-Version: 3.3.1
-Release: 20030724
+Version: 3.3.7
+Release: 20030801
# list of sources
Source0: ftp://ftp.gnu.org/gnu/ddd/ddd-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5997 -r1.5998 news.txt
--- openpkg-web/news.txt 1 Aug 2003 10:45:41 -0000 1.5997
+++ openpkg-web/news.txt 1 Aug 2003 11:10:30 -0000 1.5998
@@ -1,3 +1,4 @@
+01-Aug-2003: Upgraded package: P<ddd-3.3.7-20030801>
01-Aug-2003: Upgraded package: P<tetex-2.0.2-20030801>
01-Aug-2003: Upgraded package: P<amd-6.0.9-20030801>
01-Aug-2003: Upgraded package: P<magicpoint-1.10a-20030801>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
