diff options
Diffstat (limited to 'comms/estic/patches')
44 files changed, 255 insertions, 217 deletions
diff --git a/comms/estic/patches/patch-.._spunk_coll.cc b/comms/estic/patches/patch-.._spunk_coll.cc deleted file mode 100644 index 9d0649e06c1..00000000000 --- a/comms/estic/patches/patch-.._spunk_coll.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-.._spunk_coll.cc,v 1.1 2011/11/27 19:36:09 joerg Exp $ - ---- ../spunk/coll.cc.orig 2011-11-27 02:13:15.000000000 +0000 -+++ ../spunk/coll.cc -@@ -21,7 +21,7 @@ - - #include <stdlib.h> - #include <string.h> --#include <iostream.h> -+#include <iostream> - - #include "machine.h" - #include "check.h" diff --git a/comms/estic/patches/patch-.._spunk_menuedit.h b/comms/estic/patches/patch-.._spunk_menuedit.h deleted file mode 100644 index 1763c5f683f..00000000000 --- a/comms/estic/patches/patch-.._spunk_menuedit.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-.._spunk_menuedit.h,v 1.1 2012/02/16 16:47:58 hans Exp $ - ---- ../spunk/menuedit.h.orig 1996-11-07 18:06:48.000000000 +0100 -+++ ../spunk/menuedit.h 2012-01-25 18:38:05.997403890 +0100 -@@ -28,6 +28,7 @@ - #include "datetime.h" - #include "charset.h" - -+#undef CS - - - /*****************************************************************************/ diff --git a/comms/estic/patches/patch-.._spunk_str.cc b/comms/estic/patches/patch-.._spunk_str.cc deleted file mode 100644 index 6f966b22ddb..00000000000 --- a/comms/estic/patches/patch-.._spunk_str.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-.._spunk_str.cc,v 1.1 2012/02/16 16:47:58 hans Exp $ - ---- ../spunk/str.cc.orig 1996-12-01 11:23:50.000000000 +0100 -+++ ../spunk/str.cc 2012-01-25 18:54:36.312130772 +0100 -@@ -31,6 +31,7 @@ - #include "stream.h" - #include "streamid.h" - -+#undef CS - - - // Register class String diff --git a/comms/estic/patches/patch-.._spunk_xsrc_screen.cc b/comms/estic/patches/patch-.._spunk_xsrc_screen.cc deleted file mode 100644 index 7b90923ce0a..00000000000 --- a/comms/estic/patches/patch-.._spunk_xsrc_screen.cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-.._spunk_xsrc_screen.cc,v 1.1 2012/02/16 16:47:58 hans Exp $ - ---- ../spunk/xsrc/screen.cc.orig 1996-11-07 18:06:58.000000000 +0100 -+++ ../spunk/xsrc/screen.cc 2012-01-25 18:43:41.244123272 +0100 -@@ -21,6 +21,10 @@ - - #include <string.h> - -+#ifdef __sun -+#include <alloca.h> -+#endif -+ - #include "../cont.h" - #include "../winattr.h" - #include "../environ.h" diff --git a/comms/estic/patches/patch-ah b/comms/estic/patches/patch-ah deleted file mode 100644 index 239a24046ef..00000000000 --- a/comms/estic/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ - ---- ../spunk/unixsrc/delay.cc.orig Thu Nov 7 18:06:58 1996 -+++ ../spunk/unixsrc/delay.cc Sat Feb 10 18:38:34 2001 -@@ -73,7 +73,7 @@ - // - // The function returns the real time passed or just ms. - { -- const ChunkSize = 256; -+ const u32 ChunkSize = 256; - - // Check the argument... - if (ms <= ChunkSize) { diff --git a/comms/estic/patches/patch-aj b/comms/estic/patches/patch-aj deleted file mode 100644 index 13c0f1b823a..00000000000 --- a/comms/estic/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ - ---- ../spunk/xsrc/console.cc.orig Tue Feb 18 14:32:40 1997 -+++ ../spunk/xsrc/console.cc Sat Feb 10 18:38:34 2001 -@@ -1013,7 +1013,7 @@ - void ScrSetMode (unsigned Mode) - // Set a screen mode - { -- unsigned XSize, YSize; -+ int XSize, YSize; - _ColorMode NewColorMode = ColorMode; - - // Check the new dimensions diff --git a/comms/estic/patches/patch-ax b/comms/estic/patches/patch-ax deleted file mode 100644 index a1eda62b1ad..00000000000 --- a/comms/estic/patches/patch-ax +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2003/12/28 21:53:45 tron Exp $ - ---- ../spunk/check.cc.orig 1996-11-07 18:06:46.000000000 +0100 -+++ ../spunk/check.cc 2003-12-28 22:48:02.000000000 +0100 -@@ -50,9 +50,6 @@ - - - // The fail vector --#ifdef __GNUC__ --volatile --#endif - void (*CheckFailed) (const char*, const char* Cond, - int Code, const char* File, int Line) = _CheckFailed; - diff --git a/comms/estic/patches/patch-devstate.cc b/comms/estic/patches/patch-devstate.cc index b3201341545..e69de29bb2d 100644 --- a/comms/estic/patches/patch-devstate.cc +++ b/comms/estic/patches/patch-devstate.cc @@ -1,12 +0,0 @@ -$NetBSD: patch-devstate.cc,v 1.1 2012/02/16 16:47:58 hans Exp $ - ---- devstate.cc.orig 1997-01-31 03:57:14.000000000 +0100 -+++ devstate.cc 2012-01-25 18:49:00.031935640 +0100 -@@ -38,6 +38,7 @@ - #include "iccom.h" - #include "iclog.h" - -+#undef DS - - - /*****************************************************************************/ diff --git a/comms/estic/patches/patch-estic_devstate.cc b/comms/estic/patches/patch-estic_devstate.cc new file mode 100644 index 00000000000..042414473a0 --- /dev/null +++ b/comms/estic/patches/patch-estic_devstate.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-estic_devstate.cc,v 1.1 2012/11/16 00:37:45 joerg Exp $ + +--- estic/devstate.cc.orig 1997-01-31 03:57:14.000000000 +0000 ++++ estic/devstate.cc +@@ -38,6 +38,7 @@ + #include "iccom.h" + #include "iclog.h" + ++#undef DS + + + /*****************************************************************************/ diff --git a/comms/estic/patches/patch-aa b/comms/estic/patches/patch-estic_estic.cc index 8b48251c821..4f743bbe790 100644 --- a/comms/estic/patches/patch-aa +++ b/comms/estic/patches/patch-estic_estic.cc @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2012/02/16 16:47:58 hans Exp $ +$NetBSD: patch-estic_estic.cc,v 1.1 2012/11/16 00:37:45 joerg Exp $ ---- estic.cc.orig Wed Mar 5 21:20:42 1997 -+++ estic.cc Sat Feb 10 18:38:34 2001 +--- estic/estic.cc.orig 1997-03-05 21:20:42.000000000 +0000 ++++ estic/estic.cc @@ -1,5 +1,4 @@ -/*****************************************************************************/ -/* */ diff --git a/comms/estic/patches/patch-ab b/comms/estic/patches/patch-estic_icbaseed.cc index ea095108fc9..dd7b387875e 100644 --- a/comms/estic/patches/patch-ab +++ b/comms/estic/patches/patch-estic_icbaseed.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-estic_icbaseed.cc,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- icbaseed.cc.orig Sat Nov 30 01:00:44 1996 -+++ icbaseed.cc Sat Feb 10 18:38:34 2001 -@@ -451,26 +451,26 @@ +--- estic/icbaseed.cc.orig 1996-11-30 01:00:44.000000000 +0000 ++++ estic/icbaseed.cc +@@ -451,26 +451,26 @@ void EditBaseConfig (IstecConfig& Config // otherwise, Changed is left untouched. { // ID's of menue items for EditBaseConfig diff --git a/comms/estic/patches/patch-ad b/comms/estic/patches/patch-estic_icdevs.cc index 53e09325479..1094ef992ac 100644 --- a/comms/estic/patches/patch-ad +++ b/comms/estic/patches/patch-estic_icdevs.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-estic_icdevs.cc,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- icdevs.cc.orig Wed Mar 5 21:48:44 1997 -+++ icdevs.cc Sat Feb 10 18:38:34 2001 -@@ -157,8 +157,8 @@ +--- estic/icdevs.cc.orig 1997-03-05 21:48:44.000000000 +0000 ++++ estic/icdevs.cc +@@ -157,8 +157,8 @@ const String& DevListBox::ServiceName (u String DevListBox::RerouteName (const String& Num) // Map the reroute capability to a string with fixed length { @@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ String Res (PadLength); if (Num.IsEmpty ()) { -@@ -269,9 +269,9 @@ +@@ -269,9 +269,9 @@ static int ExtRerouteOk (const String& P static void EditExtReroute (const Point& Pos, IstecDevConfig& Config) // Edit the extended reroute capabilities of FW 2.0 in a separate menu { @@ -26,7 +26,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ // Load the menu Menue* M = (Menue*) LoadResource ("@ICDEVS.RerouteMenue"); -@@ -407,38 +407,38 @@ +@@ -407,38 +407,38 @@ static void EditDevConfig (IstecDevConfi static const String StgPosName = "EditDevConfig.ConfigMenue.Position"; // Menue constants diff --git a/comms/estic/patches/patch-estic_iclog.cc b/comms/estic/patches/patch-estic_iclog.cc new file mode 100644 index 00000000000..15c7c66d05a --- /dev/null +++ b/comms/estic/patches/patch-estic_iclog.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-estic_iclog.cc,v 1.1 2012/11/16 00:37:46 joerg Exp $ + +--- estic/iclog.cc.orig 2012-11-15 10:44:05.000000000 +0000 ++++ estic/iclog.cc +@@ -31,6 +31,7 @@ + #include "iccli.h" + #include "iclog.h" + ++#undef DS + + + /*****************************************************************************/ diff --git a/comms/estic/patches/patch-ae b/comms/estic/patches/patch-estic_icshort.cc index 5e325f88327..5c9a5c3659d 100644 --- a/comms/estic/patches/patch-ae +++ b/comms/estic/patches/patch-estic_icshort.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-estic_icshort.cc,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- icshort.cc.orig Fri Jan 31 04:29:12 1997 -+++ icshort.cc Sat Feb 10 18:38:34 2001 -@@ -574,17 +574,17 @@ +--- estic/icshort.cc.orig 2012-11-15 10:44:05.000000000 +0000 ++++ estic/icshort.cc +@@ -578,17 +578,17 @@ void ShortNumberListBox::Print (int Inde // Item numbers for the short number edit menu diff --git a/comms/estic/patches/patch-af b/comms/estic/patches/patch-estic_make_freebsd-x.mak index bb3f1b80825..7844e3669a8 100644 --- a/comms/estic/patches/patch-af +++ b/comms/estic/patches/patch-estic_make_freebsd-x.mak @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2012/02/16 16:47:58 hans Exp $ +$NetBSD: patch-estic_make_freebsd-x.mak,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- make/freebsd-x.mak.orig Fri Jan 31 03:57:24 1997 -+++ make/freebsd-x.mak Sat Feb 10 18:38:34 2001 -@@ -27,22 +27,20 @@ +--- estic/make/freebsd-x.mak.orig 1997-01-31 03:57:24.000000000 +0000 ++++ estic/make/freebsd-x.mak +@@ -27,22 +27,20 @@ AS = gas AR = ar LD = ld ZIP = zip @@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.2 2012/02/16 16:47:58 hans Exp $ # ------------------------------------------------------------------------------ # All OBJ files -@@ -71,18 +69,19 @@ +@@ -71,18 +69,19 @@ OBJS = callwin.o \ icintcon.o \ iclog.o \ icmsgwin.o \ @@ -51,7 +51,7 @@ $NetBSD: patch-af,v 1.2 2012/02/16 16:47:58 hans Exp $ # ------------------------------------------------------------------------------ -@@ -90,7 +89,7 @@ +@@ -90,7 +89,7 @@ xestic: $(LIB) $(OBJS) depend dep: @echo "Creating dependency information" diff --git a/comms/estic/patches/patch-iclog.cc b/comms/estic/patches/patch-iclog.cc index 70c474fa4ba..e69de29bb2d 100644 --- a/comms/estic/patches/patch-iclog.cc +++ b/comms/estic/patches/patch-iclog.cc @@ -1,12 +0,0 @@ -$NetBSD: patch-iclog.cc,v 1.1 2012/02/16 16:47:58 hans Exp $ - ---- iclog.cc.orig 2012-01-25 18:32:44.447476635 +0100 -+++ iclog.cc 2012-01-25 18:50:27.905634296 +0100 -@@ -31,6 +31,7 @@ - #include "iccli.h" - #include "iclog.h" - -+#undef DS - - - /*****************************************************************************/ diff --git a/comms/estic/patches/patch-spunk_check.cc b/comms/estic/patches/patch-spunk_check.cc new file mode 100644 index 00000000000..47bc53e06b4 --- /dev/null +++ b/comms/estic/patches/patch-spunk_check.cc @@ -0,0 +1,14 @@ +$NetBSD: patch-spunk_check.cc,v 1.1 2012/11/16 00:37:46 joerg Exp $ + +--- spunk/check.cc.orig 1996-11-07 18:06:46.000000000 +0000 ++++ spunk/check.cc +@@ -50,9 +50,6 @@ static void _CheckFailed (const char* Ms + + + // The fail vector +-#ifdef __GNUC__ +-volatile +-#endif + void (*CheckFailed) (const char*, const char* Cond, + int Code, const char* File, int Line) = _CheckFailed; + diff --git a/comms/estic/patches/patch-ay b/comms/estic/patches/patch-spunk_check.h index 177d8c574c6..f6860926f67 100644 --- a/comms/estic/patches/patch-ay +++ b/comms/estic/patches/patch-spunk_check.h @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.1 2003/12/28 21:53:45 tron Exp $ +$NetBSD: patch-spunk_check.h,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- ../spunk/check.h.orig 1996-11-07 18:06:46.000000000 +0100 -+++ ../spunk/check.h 2003-12-28 22:50:57.000000000 +0100 -@@ -38,9 +38,6 @@ +--- spunk/check.h.orig 1996-11-07 18:06:46.000000000 +0000 ++++ spunk/check.h +@@ -38,9 +38,6 @@ extern const char* _MsgCheckFailed; extern diff --git a/comms/estic/patches/patch-spunk_coll.cc b/comms/estic/patches/patch-spunk_coll.cc new file mode 100644 index 00000000000..79a4e911601 --- /dev/null +++ b/comms/estic/patches/patch-spunk_coll.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-spunk_coll.cc,v 1.1 2012/11/16 00:37:46 joerg Exp $ + +--- spunk/coll.cc.orig 1996-11-30 00:40:58.000000000 +0000 ++++ spunk/coll.cc +@@ -21,7 +21,7 @@ + + #include <stdlib.h> + #include <string.h> +-#include <iostream.h> ++#include <iostream> + + #include "machine.h" + #include "check.h" diff --git a/comms/estic/patches/patch-am b/comms/estic/patches/patch-spunk_coll.h index d7534b6b87f..4049361d29f 100644 --- a/comms/estic/patches/patch-am +++ b/comms/estic/patches/patch-spunk_coll.h @@ -1,7 +1,7 @@ -$NetBSD: patch-am,v 1.3 2011/11/27 19:36:09 joerg Exp $ +$NetBSD: patch-spunk_coll.h,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- ../spunk/coll.h.orig 1996-12-18 23:42:14.000000000 +0000 -+++ ../spunk/coll.h +--- spunk/coll.h.orig 1996-12-18 23:42:14.000000000 +0000 ++++ spunk/coll.h @@ -24,7 +24,7 @@ @@ -41,6 +41,15 @@ $NetBSD: patch-am,v 1.3 2011/11/27 19:36:09 joerg Exp $ // Item not found return -1; +@@ -512,7 +512,7 @@ void SortedCollection<T, U>::Insert (T* + } + + // Index points to the correct position, insert item +- AtInsert (Index, Item); ++ this->AtInsert (Index, Item); + } + + @@ -522,7 +522,7 @@ int SortedCollection<T, U>::Search (cons { // do a binary search diff --git a/comms/estic/patches/patch-aq b/comms/estic/patches/patch-spunk_filepath.h index 8f1608dcaa7..75b211b66fa 100644 --- a/comms/estic/patches/patch-aq +++ b/comms/estic/patches/patch-spunk_filepath.h @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-spunk_filepath.h,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- ../spunk/filepath.h.orig Thu Nov 14 00:12:02 1996 -+++ ../spunk/filepath.h Sat Feb 10 18:38:35 2001 -@@ -88,14 +88,6 @@ +--- spunk/filepath.h.orig 1996-11-14 00:12:02.000000000 +0000 ++++ spunk/filepath.h +@@ -88,14 +88,6 @@ int FHasWildcards (const String& Pathnam // Return 1 if the given path contains one of the wildcard characters '*', '?' // or '[]', return zero otherwise. diff --git a/comms/estic/patches/patch-ap b/comms/estic/patches/patch-spunk_filesys.h index c6f514b7194..b3fe153060a 100644 --- a/comms/estic/patches/patch-ap +++ b/comms/estic/patches/patch-spunk_filesys.h @@ -1,7 +1,7 @@ -$NetBSD: patch-ap,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-spunk_filesys.h,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- ../spunk/filesys.h.orig Thu Nov 7 18:06:48 1996 -+++ ../spunk/filesys.h Sat Feb 10 18:38:35 2001 +--- spunk/filesys.h.orig 1996-11-07 18:06:48.000000000 +0000 ++++ spunk/filesys.h @@ -44,10 +44,10 @@ extern const char FileSysPathSep; // Path separator diff --git a/comms/estic/patches/patch-az b/comms/estic/patches/patch-spunk_itemwin.h index cbebfe5d1ed..929cd07b410 100644 --- a/comms/estic/patches/patch-az +++ b/comms/estic/patches/patch-spunk_itemwin.h @@ -1,9 +1,7 @@ -$NetBSD: patch-az,v 1.1 2008/01/06 18:39:38 rillig Exp $ +$NetBSD: patch-spunk_itemwin.h,v 1.1 2012/11/16 00:37:46 joerg Exp $ -See mk/help/c++.help. - ---- ../spunk/itemwin.h.orig 1996-11-07 18:06:48.000000000 +0000 -+++ ../spunk/itemwin.h 2008-01-06 18:52:26.000000000 +0000 +--- spunk/itemwin.h.orig 1996-11-07 18:06:48.000000000 +0000 ++++ spunk/itemwin.h @@ -55,6 +55,8 @@ const u16 ifNoSub = 0x0010 /*****************************************************************************/ diff --git a/comms/estic/patches/patch-.._spunk_machine.h b/comms/estic/patches/patch-spunk_machine.h index 694622a55b8..938d2fd830b 100644 --- a/comms/estic/patches/patch-.._spunk_machine.h +++ b/comms/estic/patches/patch-spunk_machine.h @@ -1,7 +1,7 @@ -$NetBSD: patch-.._spunk_machine.h,v 1.2 2012/02/16 16:47:58 hans Exp $ +$NetBSD: patch-spunk_machine.h,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- ../spunk/machine.h.orig 2011-11-27 02:08:02.000000000 +0000 -+++ ../spunk/machine.h +--- spunk/machine.h.orig 1997-02-18 14:41:50.000000000 +0000 ++++ spunk/machine.h @@ -238,7 +238,7 @@ typedef unsigned u32; # define CPU_LITTLE_ENDIAN #elif (BYTE_ORDER == BIG_ENDIAN) diff --git a/comms/estic/patches/patch-ag b/comms/estic/patches/patch-spunk_make_freebsd-x.mak index 461ab12e59e..a6353de47bf 100644 --- a/comms/estic/patches/patch-ag +++ b/comms/estic/patches/patch-spunk_make_freebsd-x.mak @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.5 2012/02/16 16:47:58 hans Exp $ +$NetBSD: patch-spunk_make_freebsd-x.mak,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- ../spunk/make/freebsd-x.mak.orig 1996-11-24 22:33:26.000000000 +0100 -+++ ../spunk/make/freebsd-x.mak +--- spunk/make/freebsd-x.mak.orig 1996-11-24 22:33:26.000000000 +0000 ++++ spunk/make/freebsd-x.mak @@ -27,10 +27,9 @@ AS = gas AR = ar LD = ld diff --git a/comms/estic/patches/patch-ar b/comms/estic/patches/patch-spunk_menue.cc index 93783549660..5de5d15b6fa 100644 --- a/comms/estic/patches/patch-ar +++ b/comms/estic/patches/patch-spunk_menue.cc @@ -1,7 +1,7 @@ -$NetBSD: patch-ar,v 1.2 2012/02/16 16:47:58 hans Exp $ +$NetBSD: patch-spunk_menue.cc,v 1.1 2012/11/16 00:37:46 joerg Exp $ ---- ../spunk/menue.cc.orig Sun Jan 26 18:17:32 1997 -+++ ../spunk/menue.cc Sat Feb 10 18:38:35 2001 +--- spunk/menue.cc.orig 1997-01-26 18:17:32.000000000 +0000 ++++ spunk/menue.cc @@ -26,6 +26,10 @@ #include <stdlib.h> #endif diff --git a/comms/estic/patches/patch-spunk_menuedit.h b/comms/estic/patches/patch-spunk_menuedit.h new file mode 100644 index 00000000000..12e4e8667d4 --- /dev/null +++ b/comms/estic/patches/patch-spunk_menuedit.h @@ -0,0 +1,12 @@ +$NetBSD: patch-spunk_menuedit.h,v 1.1 2012/11/16 00:37:46 joerg Exp $ + +--- spunk/menuedit.h.orig 1996-11-07 18:06:48.000000000 +0000 ++++ spunk/menuedit.h +@@ -28,6 +28,7 @@ + #include "datetime.h" + #include "charset.h" + ++#undef CS + + + /*****************************************************************************/ diff --git a/comms/estic/patches/patch-.._spunk_menuitem.h b/comms/estic/patches/patch-spunk_menuitem.h index f018f8292e1..8cfeddc1755 100644 --- a/comms/estic/patches/patch-.._spunk_menuitem.h +++ b/comms/estic/patches/patch-spunk_menuitem.h @@ -1,7 +1,7 @@ -$NetBSD: patch-.._spunk_menuitem.h,v 1.1 2012/02/16 16:47:58 hans Exp $ +$NetBSD: patch-spunk_menuitem.h,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/menuitem.h.orig 1996-12-10 14:41:04.000000000 +0100 -+++ ../spunk/menuitem.h 2012-01-25 18:39:54.872853784 +0100 +--- spunk/menuitem.h.orig 1996-12-10 14:41:04.000000000 +0000 ++++ spunk/menuitem.h @@ -27,7 +27,7 @@ #include "datetime.h" #include "charset.h" diff --git a/comms/estic/patches/patch-as b/comms/estic/patches/patch-spunk_messages.txt index 959c2ec4050..126cefe3dc3 100644 --- a/comms/estic/patches/patch-as +++ b/comms/estic/patches/patch-spunk_messages.txt @@ -1,7 +1,7 @@ -$NetBSD: patch-as,v 1.1.1.1 2001/02/10 18:34:25 tron Exp $ +$NetBSD: patch-spunk_messages.txt,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/messages.txt.orig Thu Nov 7 18:06:48 1996 -+++ ../spunk/messages.txt Sat Feb 10 19:00:19 2001 +--- spunk/messages.txt.orig 1996-11-07 18:06:48.000000000 +0000 ++++ spunk/messages.txt @@ -6,7 +6,7 @@ ; \n newline, Zeilenumbruch in einem Menue ; \c center, Zeile zentrieren (Textfenster) diff --git a/comms/estic/patches/patch-al b/comms/estic/patches/patch-spunk_palette.h index 753fb9aca68..1b94214c187 100644 --- a/comms/estic/patches/patch-al +++ b/comms/estic/patches/patch-spunk_palette.h @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-spunk_palette.h,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/palette.h.orig Thu Nov 7 18:06:48 1996 -+++ ../spunk/palette.h Sat Feb 10 18:38:34 2001 -@@ -40,19 +40,19 @@ +--- spunk/palette.h.orig 1996-11-07 18:06:48.000000000 +0000 ++++ spunk/palette.h +@@ -40,19 +40,19 @@ extern class Palette* Pal; // Indices into the palette arrays diff --git a/comms/estic/patches/patch-ac b/comms/estic/patches/patch-spunk_password.cc index 5355bfad7ad..b08d4ccab83 100644 --- a/comms/estic/patches/patch-ac +++ b/comms/estic/patches/patch-spunk_password.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2001/10/14 17:19:58 tron Exp $ +$NetBSD: patch-spunk_password.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/password.cc.orig Thu Nov 7 18:06:48 1996 -+++ ../spunk/password.cc Sun Oct 14 19:09:32 2001 -@@ -525,14 +525,14 @@ +--- spunk/password.cc.orig 1996-11-07 18:06:48.000000000 +0000 ++++ spunk/password.cc +@@ -525,14 +525,14 @@ LINK (PasswordColl, ID_PasswordColl); diff --git a/comms/estic/patches/patch-at b/comms/estic/patches/patch-spunk_resitem.cc index 206ac11205b..2e1bd15f65e 100644 --- a/comms/estic/patches/patch-at +++ b/comms/estic/patches/patch-spunk_resitem.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1.1.1 2001/02/10 18:34:25 tron Exp $ +$NetBSD: patch-spunk_resitem.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/resitem.cc.orig Fri Feb 21 12:05:30 1997 -+++ ../spunk/resitem.cc Sat Feb 10 19:08:38 2001 -@@ -1539,16 +1539,16 @@ +--- spunk/resitem.cc.orig 1997-02-21 12:05:30.000000000 +0000 ++++ spunk/resitem.cc +@@ -1539,16 +1539,16 @@ void ResEditApp::ItemMenue (WindowItem* // Data edit menue { // Menue IDs @@ -29,7 +29,7 @@ $NetBSD: patch-at,v 1.1.1.1 2001/02/10 18:34:25 tron Exp $ // Load the menue from the resource Menue* M = (Menue*) LoadResource ("@RESITEM.ItemDataMenue"); -@@ -1785,13 +1785,13 @@ +@@ -1785,13 +1785,13 @@ void ResEditApp::ChangeLimits (WindowIte void ResEditApp::ChangeCharset (WindowItem* Item) { diff --git a/comms/estic/patches/patch-an b/comms/estic/patches/patch-spunk_sercom.h index 09cfad5d3bb..fdb1a016459 100644 --- a/comms/estic/patches/patch-an +++ b/comms/estic/patches/patch-spunk_sercom.h @@ -1,7 +1,7 @@ -$NetBSD: patch-an,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-spunk_sercom.h,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/sercom.h.orig Thu Nov 7 18:06:52 1996 -+++ ../spunk/sercom.h Sat Feb 10 18:38:35 2001 +--- spunk/sercom.h.orig 1996-11-07 18:06:52.000000000 +0000 ++++ spunk/sercom.h @@ -43,29 +43,29 @@ diff --git a/comms/estic/patches/patch-ao b/comms/estic/patches/patch-spunk_statdef.h index 07482acffd7..ed740378e7d 100644 --- a/comms/estic/patches/patch-ao +++ b/comms/estic/patches/patch-spunk_statdef.h @@ -1,7 +1,7 @@ -$NetBSD: patch-ao,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-spunk_statdef.h,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/statdef.h.orig Thu Nov 7 18:06:52 1996 -+++ ../spunk/statdef.h Sat Feb 10 18:38:35 2001 +--- spunk/statdef.h.orig 1996-11-07 18:06:52.000000000 +0000 ++++ spunk/statdef.h @@ -33,120 +33,6 @@ diff --git a/comms/estic/patches/patch-spunk_str.cc b/comms/estic/patches/patch-spunk_str.cc new file mode 100644 index 00000000000..38059de8855 --- /dev/null +++ b/comms/estic/patches/patch-spunk_str.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-spunk_str.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ + +--- spunk/str.cc.orig 1996-12-01 11:23:50.000000000 +0000 ++++ spunk/str.cc +@@ -31,6 +31,7 @@ + #include "stream.h" + #include "streamid.h" + ++#undef CS + + + // Register class String diff --git a/comms/estic/patches/patch-ba b/comms/estic/patches/patch-spunk_str.h index 5535fcc5e04..2dba91e1ff7 100644 --- a/comms/estic/patches/patch-ba +++ b/comms/estic/patches/patch-spunk_str.h @@ -1,9 +1,7 @@ -$NetBSD: patch-ba,v 1.1 2008/01/06 18:39:39 rillig Exp $ +$NetBSD: patch-spunk_str.h,v 1.1 2012/11/16 00:37:47 joerg Exp $ -See mk/help/c++.help. - ---- ../spunk/str.h.orig 1996-12-18 13:18:50.000000000 +0000 -+++ ../spunk/str.h 2008-01-06 19:26:53.000000000 +0000 +--- spunk/str.h.orig 1996-12-18 13:18:50.000000000 +0000 ++++ spunk/str.h @@ -91,6 +91,13 @@ extern const class String EmptyString; // Note: This string class may not work with strings greater than INT_MAX or // 0xFFFF, whichever is less diff --git a/comms/estic/patches/patch-au b/comms/estic/patches/patch-spunk_stream.cc index 331a7821a31..fab029ea407 100644 --- a/comms/estic/patches/patch-au +++ b/comms/estic/patches/patch-spunk_stream.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.1 2001/10/14 17:19:59 tron Exp $ +$NetBSD: patch-spunk_stream.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/stream.cc.orig Wed Dec 18 13:09:02 1996 -+++ ../spunk/stream.cc Sun Oct 14 19:12:10 2001 -@@ -347,7 +347,7 @@ +--- spunk/stream.cc.orig 1996-12-18 13:09:02.000000000 +0000 ++++ spunk/stream.cc +@@ -347,7 +347,7 @@ void Stream::Write (const void*, size_t) void Stream::CopyFrom (Stream& S, size_t Count) { diff --git a/comms/estic/patches/patch-ak b/comms/estic/patches/patch-spunk_stream.h index e94521f7ea3..676d1ed0d4e 100644 --- a/comms/estic/patches/patch-ak +++ b/comms/estic/patches/patch-spunk_stream.h @@ -1,8 +1,41 @@ -$NetBSD: patch-ak,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-spunk_stream.h,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/stream.h.orig Thu Nov 7 18:06:52 1996 -+++ ../spunk/stream.h Sat Feb 10 18:38:34 2001 -@@ -50,19 +50,19 @@ +--- spunk/stream.h.orig 1996-11-07 18:06:52.000000000 +0000 ++++ spunk/stream.h +@@ -44,25 +44,52 @@ + #include <stdio.h> + #include <string.h> + ++#include "machine.h" ++ ++class Stream; ++ ++Stream& operator << (Stream&, char); ++Stream& operator << (Stream&, unsigned char); ++Stream& operator << (Stream&, signed char); ++Stream& operator << (Stream&, i16); ++Stream& operator << (Stream&, u16); ++Stream& operator << (Stream&, i32); ++Stream& operator << (Stream&, u32); ++Stream& operator << (Stream&, float); ++Stream& operator << (Stream&, double); ++Stream& operator << (Stream&, char*); ++ ++Stream& operator >> (Stream&, char&); ++Stream& operator >> (Stream&, unsigned char&); ++Stream& operator >> (Stream&, signed char&); ++Stream& operator >> (Stream&, i16&); ++Stream& operator >> (Stream&, u16&); ++Stream& operator >> (Stream&, i32&); ++Stream& operator >> (Stream&, u32&); ++Stream& operator >> (Stream&, float&); ++Stream& operator >> (Stream&, double&); ++Stream& operator >> (Stream&, char*); ++ ++ + #include "strmable.h" + #include "coll.h" + #include "str.h" diff --git a/comms/estic/patches/patch-av b/comms/estic/patches/patch-spunk_textstrm.cc index 9ba771a96b3..12fd4af9c97 100644 --- a/comms/estic/patches/patch-av +++ b/comms/estic/patches/patch-spunk_textstrm.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.1 2001/10/14 17:19:59 tron Exp $ +$NetBSD: patch-spunk_textstrm.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/textstrm.cc.orig Thu Nov 7 18:06:52 1996 -+++ ../spunk/textstrm.cc Sun Oct 14 19:14:11 2001 -@@ -66,8 +66,8 @@ +--- spunk/textstrm.cc.orig 1996-11-07 18:06:52.000000000 +0000 ++++ spunk/textstrm.cc +@@ -66,8 +66,8 @@ void TextFileStream::MakeLineIndex (int // LineLen is the estimated length of a line in the file used for // estimating the size of the buffer. { diff --git a/comms/estic/patches/patch-spunk_unixsrc_delay.cc b/comms/estic/patches/patch-spunk_unixsrc_delay.cc new file mode 100644 index 00000000000..b5845814115 --- /dev/null +++ b/comms/estic/patches/patch-spunk_unixsrc_delay.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-spunk_unixsrc_delay.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ + +--- spunk/unixsrc/delay.cc.orig 1996-11-07 18:06:58.000000000 +0000 ++++ spunk/unixsrc/delay.cc +@@ -73,7 +73,7 @@ u32 Delay (u32 ms) + // + // The function returns the real time passed or just ms. + { +- const ChunkSize = 256; ++ const u32 ChunkSize = 256; + + // Check the argument... + if (ms <= ChunkSize) { diff --git a/comms/estic/patches/patch-ai b/comms/estic/patches/patch-spunk_unixsrc_filesys.cc index ec6aae4ef64..457a53042ad 100644 --- a/comms/estic/patches/patch-ai +++ b/comms/estic/patches/patch-spunk_unixsrc_filesys.cc @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $ +$NetBSD: patch-spunk_unixsrc_filesys.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/unixsrc/filesys.cc.orig Thu Nov 7 18:06:58 1996 -+++ ../spunk/unixsrc/filesys.cc Sat Feb 10 18:38:34 2001 +--- spunk/unixsrc/filesys.cc.orig 1996-11-07 18:06:58.000000000 +0000 ++++ spunk/unixsrc/filesys.cc @@ -42,10 +42,10 @@ extern const char FileSysPathSep = '/'; // Path separator diff --git a/comms/estic/patches/patch-aw b/comms/estic/patches/patch-spunk_window.cc index 02dcbc6e906..ae821123b23 100644 --- a/comms/estic/patches/patch-aw +++ b/comms/estic/patches/patch-spunk_window.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.1 2001/10/14 17:19:59 tron Exp $ +$NetBSD: patch-spunk_window.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ ---- ../spunk/window.cc.orig Sun Jan 26 18:17:38 1997 -+++ ../spunk/window.cc Sun Oct 14 19:15:25 2001 -@@ -1432,7 +1432,7 @@ +--- spunk/window.cc.orig 1997-01-26 18:17:38.000000000 +0000 ++++ spunk/window.cc +@@ -1432,7 +1432,7 @@ void Window::Write (int X, int Y, const // Write a string to the inner window. Note: Attr is an index, not a real // attribute ! { @@ -11,7 +11,7 @@ $NetBSD: patch-aw,v 1.1 2001/10/14 17:19:59 tron Exp $ u16 Buf [256]; // Check if the given string is empty -@@ -1554,7 +1554,7 @@ +@@ -1554,7 +1554,7 @@ void Window::CWrite (int X, int Y, const // Write a string to the inner window. Note: Attr is an index, not a real // attribute ! { diff --git a/comms/estic/patches/patch-spunk_xsrc_console.cc b/comms/estic/patches/patch-spunk_xsrc_console.cc new file mode 100644 index 00000000000..ba768418dd1 --- /dev/null +++ b/comms/estic/patches/patch-spunk_xsrc_console.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-spunk_xsrc_console.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ + +--- spunk/xsrc/console.cc.orig 1997-02-18 14:32:40.000000000 +0000 ++++ spunk/xsrc/console.cc +@@ -1013,7 +1013,7 @@ void ScrSetCursorPos (unsigned X, unsign + void ScrSetMode (unsigned Mode) + // Set a screen mode + { +- unsigned XSize, YSize; ++ int XSize, YSize; + _ColorMode NewColorMode = ColorMode; + + // Check the new dimensions diff --git a/comms/estic/patches/patch-spunk_xsrc_screen.cc b/comms/estic/patches/patch-spunk_xsrc_screen.cc new file mode 100644 index 00000000000..e18cacc75ae --- /dev/null +++ b/comms/estic/patches/patch-spunk_xsrc_screen.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-spunk_xsrc_screen.cc,v 1.1 2012/11/16 00:37:47 joerg Exp $ + +--- spunk/xsrc/screen.cc.orig 1996-11-07 18:06:58.000000000 +0000 ++++ spunk/xsrc/screen.cc +@@ -21,6 +21,10 @@ + + #include <string.h> + ++#ifdef __sun ++#include <alloca.h> ++#endif ++ + #include "../cont.h" + #include "../winattr.h" + #include "../environ.h" |