pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/ivtools Update ivtools to version 1.1.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/59594a4fba66
branches: trunk
changeset: 464678:59594a4fba66
user: markd <markd%pkgsrc.org@localhost>
date: Sun Dec 14 12:02:17 2003 +0000
description:
Update ivtools to version 1.1.2.
Changes from 1.1.0: incorporation of our patches in the standard
distribution.
diffstat:
graphics/ivtools/Makefile | 8 +++--
graphics/ivtools/distinfo | 23 ++-------------
graphics/ivtools/patches/patch-ad | 13 --------
graphics/ivtools/patches/patch-ae | 38 -------------------------
graphics/ivtools/patches/patch-af | 22 --------------
graphics/ivtools/patches/patch-ag | 45 ------------------------------
graphics/ivtools/patches/patch-ah | 22 --------------
graphics/ivtools/patches/patch-ai | 22 --------------
graphics/ivtools/patches/patch-aj | 22 --------------
graphics/ivtools/patches/patch-ak | 31 --------------------
graphics/ivtools/patches/patch-al | 22 --------------
graphics/ivtools/patches/patch-am | 31 --------------------
graphics/ivtools/patches/patch-an | 58 ---------------------------------------
graphics/ivtools/patches/patch-ao | 40 --------------------------
graphics/ivtools/patches/patch-ap | 58 ---------------------------------------
graphics/ivtools/patches/patch-aq | 22 --------------
graphics/ivtools/patches/patch-ar | 48 --------------------------------
graphics/ivtools/patches/patch-as | 22 --------------
graphics/ivtools/patches/patch-at | 13 --------
19 files changed, 8 insertions(+), 552 deletions(-)
diffs (truncated from 651 to 300 lines):
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/Makefile
--- a/graphics/ivtools/Makefile Sun Dec 14 11:52:44 2003 +0000
+++ b/graphics/ivtools/Makefile Sun Dec 14 12:02:17 2003 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/11/18 21:09:18 markd Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/14 12:02:17 markd Exp $
-DISTNAME= ivtools-1.1
-PKGNAME= ivtools-1.1.0
+DISTNAME= ivtools-1.1.2
WRKSRC= ${WRKDIR}/${PKGNAME:C/\.[0-9]$//}
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ivtools/}
@@ -16,6 +15,9 @@
GNU_CONFIGURE= YES
USE_X11= YES
+post-patch:
+ ${RM} -f ${WRKSRC}/src/include/ivstd/strstream.h
+
pre-install:
${RM} -f ${WRKSRC}/config/local.def.orig
${RM} -f ${WRKSRC}/config/site.def.NETBSD.orig
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/distinfo
--- a/graphics/ivtools/distinfo Sun Dec 14 11:52:44 2003 +0000
+++ b/graphics/ivtools/distinfo Sun Dec 14 12:02:17 2003 +0000
@@ -1,24 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/11/18 21:09:18 markd Exp $
+$NetBSD: distinfo,v 1.4 2003/12/14 12:02:17 markd Exp $
-SHA1 (ivtools-1.1.tgz) = ae5728ea757f69fea8ab58dc31d360b13537e416
-Size (ivtools-1.1.tgz) = 2158051 bytes
+SHA1 (ivtools-1.1.2.tgz) = 806ef6c2e86e9e4ef786511154410488554657ae
+Size (ivtools-1.1.2.tgz) = 2159581 bytes
SHA1 (patch-aa) = 191619b7db43c47d7cc991bc33787434f0ef6948
SHA1 (patch-ab) = d333341342e946e1bb44c332f35f1601dd29fce3
SHA1 (patch-ac) = bcda1a0b71b669ad6a4900077564c226af262708
-SHA1 (patch-ad) = d375d49cfa97eb0a0d8bbdc46d598ba90f2c4d94
-SHA1 (patch-ae) = 9d4ef9a95199b3de9ea8b9a6999aa554d89de8f5
-SHA1 (patch-af) = f1c280983e03f678972d375d6c2d2d0f11099b3b
-SHA1 (patch-ag) = 1b2759aeca1f9e96b9ae6e9be425c89098a05aa5
-SHA1 (patch-ah) = b1b437c3e2e88d07896548933a88bd6fe521892f
-SHA1 (patch-ai) = 9439ab915855a4447c53ed300ca08f7a3f02969c
-SHA1 (patch-aj) = 20ce90a636eac6127d580730af19aaa9dc4dd4f9
-SHA1 (patch-ak) = b8156a5df4f2f69326cc6dac24e1024d02a5877b
-SHA1 (patch-al) = 00c28ec931991a833d7ea0136ecf2badfedd1ec3
-SHA1 (patch-am) = 61482cebd89e91202e3804d735da12dfa7a96e80
-SHA1 (patch-an) = c4b8a320f81bcd44fb89278e7cd9a5acb0337eb4
-SHA1 (patch-ao) = ffa68faf07bd473075b33372bb6a9731a5a4bfbb
-SHA1 (patch-ap) = 08a299a614ec3f561b3c4fa5cb0abbc829935a30
-SHA1 (patch-aq) = b6efcf11b3e8e5ddd324be86d446f1ef3dc11857
-SHA1 (patch-ar) = 88d07fccb61c8bbb679cd6bbad7a3299a90cb02f
-SHA1 (patch-as) = 0b8c22854ba66d29f09741b914b03a1487e82f76
-SHA1 (patch-at) = 702ee07cea0299507c801840e1dcda930931b557
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-ad
--- a/graphics/ivtools/patches/patch-ad Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/ComTerp/comterp.c.orig 2003-10-23 07:13:57.000000000 +1300
-+++ src/ComTerp/comterp.c
-@@ -58,7 +58,7 @@
- #include <ctype.h>
- #include <iostream.h>
- #include <string.h>
--#include <strstream.h>
-+#include <strstream>
- #include <unistd.h>
- #if __GNUC__>=3
- #include <fstream.h>
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-ae
--- a/graphics/ivtools/patches/patch-ae Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/ComTerp/debugfunc.c.orig 2003-10-23 07:13:58.000000000 +1300
-+++ src/ComTerp/debugfunc.c
-@@ -26,7 +26,7 @@
-
- #include <ComTerp/debugfunc.h>
- #include <ComTerp/comterpserv.h>
--#include <strstream.h>
-+#include <strstream>
- #if __GNUC__==2 && __GNUC_MINOR__<=7
- #else
- #include <vector.h>
-@@ -76,13 +76,13 @@ void ComterpPauseFunc::execute_body(ComV
- comterp()->npause()++;
-
- if (msgstrv.is_string()) {
-- ostrstream sbuf1_s;
-+ std::ostrstream sbuf1_s;
- sbuf1_s << (stepfunc() ? "step(" : "pause(") << comterp()->npause() << "): "
- << msgstrv.string_ptr() << "\n";
- sbuf1_s.put('\0');
- cerr << sbuf1_s.str();
- }
-- ostrstream sbuf2_s;
-+ std::ostrstream sbuf2_s;
- sbuf2_s << (stepfunc() ? "step(" : "pause(") << comterp()->npause() << "): enter command or press C/R to continue\n";
- sbuf2_s.put('\0');
- cerr << sbuf2_s.str();
-@@ -149,7 +149,7 @@ void ComterpPauseFunc::execute_body(ComV
- }
- } while (cvect[0] != '\n');
- comterp()->pop_servstate();
-- ostrstream sbuf_e;
-+ std::ostrstream sbuf_e;
- sbuf_e << (stepfunc() ? "end of step(" : "end of pause(") << comterp()->npause()-- << ")\n";
- sbuf_e.put('\0');
- cerr << sbuf_e.str();
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-af
--- a/graphics/ivtools/patches/patch-af Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/ComTerp/helpfunc.c.orig 2003-10-23 07:13:58.000000000 +1300
-+++ src/ComTerp/helpfunc.c
-@@ -34,7 +34,7 @@ vv * FROM LOSS OF USE, DATA OR PROFITS,
- #include <OS/math.h>
-
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- #if __GNUC__>=3
- #include <fstream.h>
- #endif
-@@ -127,7 +127,7 @@ void HelpFunc::execute() {
-
- reset_stack();
-
-- strstreambuf sbuf;
-+ std::strstreambuf sbuf;
- #if __GNUC__<3
- filebuf fbuf;
- if (comterp()->handler()) {
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-ag
--- a/graphics/ivtools/patches/patch-ag Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/ComTerp/iofunc.c.orig 2003-10-23 07:13:58.000000000 +1300
-+++ src/ComTerp/iofunc.c
-@@ -31,7 +31,7 @@
- #include <Attribute/attrlist.h>
- #include <OS/math.h>
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- #if __GNUC__>=3
- #include <fstream.h>
- #endif
-@@ -73,7 +73,7 @@ void PrintFunc::execute() {
- } else
- fbuf->attach(fileno(errflag.is_false() ? stdout : stderr));
- } else {
-- strmbuf = new strstreambuf();
-+ strmbuf = new std::strstreambuf();
- }
- #else
- streambuf* strmbuf = nil;
-@@ -87,7 +87,7 @@ void PrintFunc::execute() {
- fbuf = new fileptr_filebuf(errflag.is_false() ? stdout : stderr, ios_base::out);
- strmbuf = fbuf;
- } else
-- strmbuf = new strstreambuf();
-+ strmbuf = new std::strstreambuf();
- #endif
- ostream out(strmbuf);
-
-@@ -177,11 +177,11 @@ void PrintFunc::execute() {
-
- if (stringflag.is_true() || strflag.is_true()) {
- out << '\0';
-- ComValue retval(((strstreambuf*)strmbuf)->str());
-+ ComValue retval(((std::strstreambuf*)strmbuf)->str());
- push_stack(retval);
- } else if (symbolflag.is_true() || symflag.is_true()) {
- out << '\0';
-- int symbol_id = symbol_add(((strstreambuf*)strmbuf)->str());
-+ int symbol_id = symbol_add(((std::strstreambuf*)strmbuf)->str());
- ComValue retval(symbol_id, ComValue::SymbolType);
- push_stack(retval);
- }
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-ah
--- a/graphics/ivtools/patches/patch-ah Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/IV-X11/xdrag.c.orig 2003-10-23 07:15:47.000000000 +1300
-+++ src/IV-X11/xdrag.c
-@@ -41,7 +41,7 @@
- #include <OS/math.h>
- #include <OS/types.h>
- #include <string.h>
--#include <strstream.h>
-+#include <strstream>
-
- // how is this done portably? it is used to generate a name unique to
- // this process.
-@@ -129,7 +129,7 @@ static void setDragProperty(
- Atom property = None;
- if (length != 0) {
- char buffer[256];
-- ostrstream name(buffer, 256);
-+ std::ostrstream name(buffer, 256);
- name << dragName << "_" << Host::name() << "_" << getpid() << "_" <<
- dropUid++ << '\0';
- property = XInternAtom(display, name.str(), False);
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-ai
--- a/graphics/ivtools/patches/patch-ai Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/AttrGlyph/attredit.c.orig 2003-10-23 07:13:40.000000000 +1300
-+++ src/AttrGlyph/attredit.c
-@@ -41,7 +41,7 @@
-
- #include <IVGlyph/textedit.h>
-
--#include <strstream.h>
-+#include <strstream>
- #include <string.h>
- #if __GNUC__==2 && __GNUC_MINOR__<=7
- #else
-@@ -139,7 +139,7 @@ void AttributeListEditor::update_text(bo
- #else
- vbuf.push_back(' ');
- #endif
-- strstream valstr;
-+ std::strstream valstr;
- valstr << *attr->Value() << '\0';
- const char* val = valstr.str();
- int vallen = val ? strlen(val) : 0;
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-aj
--- a/graphics/ivtools/patches/patch-aj Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/ComGlyph/attrdialog.c.orig 2003-10-23 07:13:49.000000000 +1300
-+++ src/ComGlyph/attrdialog.c
-@@ -49,7 +49,7 @@
- #include <iostream.h>
- #include <stdio.h>
- #include <string.h>
--#include <strstream.h>
-+#include <strstream>
-
- /*****************************************************************************/
-
-@@ -186,7 +186,7 @@ void AttrDialogImpl::eval() {
-
- const int bufsiz = BUFSIZ;
- char buf[bufsiz];
-- strstream outstr(buf, bufsiz);
-+ std::strstream outstr(buf, bufsiz);
- outstr << retval;
- outstr.put('\0');
- result_->textvalue(buf);
diff -r 67a9738400b6 -r 59594a4fba66 graphics/ivtools/patches/patch-ak
--- a/graphics/ivtools/patches/patch-ak Sun Dec 14 11:52:44 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/11/18 21:09:18 markd Exp $
-
---- src/ComGlyph/comtextview.c.orig 2003-10-23 07:13:47.000000000 +1300
-+++ src/ComGlyph/comtextview.c
-@@ -49,7 +49,7 @@
- #include <ComTerp/comvalue.h>
- #include <ctype.h>
- #include <iostream.h>
--#include <strstream.h>
-+#include <strstream>
- #include <string.h>
-
- #define XK_MISCELLANY /* to get the keysym's we need */
-@@ -232,7 +232,7 @@ void ComTE_View::newline()
- #else
- ComValue result(comterp()->pop_stack());
- #endif
-- ostream* out = new strstream();
-+ ostream* out = new std::strstream();
- if (*comterp()->errmsg()) {
- *out << comterp()->errmsg() << "\n";
- } else {
-@@ -248,7 +248,7 @@ void ComTE_View::newline()
- }
- out->put('\0');
- out->flush();
-- strstream* sout = (strstream*)out;
-+ std::strstream* sout = (std::strstream*)out;
- insert_string(sout->str(), strlen(sout->str()));
- comterp()->brief(old_brief);
Home |
Main Index |
Thread Index |
Old Index