summaryrefslogtreecommitdiff
path: root/misc/estic
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>2000-02-27 15:04:16 +0000
committerSteve Price <steve@FreeBSD.org>2000-02-27 15:04:16 +0000
commit059a88c435c9f9cd6922bd49310ceb0980c4904b (patch)
tree178aec2237728274047a807bf339d1df8960df61 /misc/estic
parentMisc. small fixes from the maintainer. (diff)
Consolidate diffs to a single file into one patch and add a boatload
of patches to fix the build on -current.
Diffstat (limited to 'misc/estic')
-rw-r--r--misc/estic/files/patch-aa59
-rw-r--r--misc/estic/files/patch-ab20
-rw-r--r--misc/estic/files/patch-ae13
-rw-r--r--misc/estic/files/patch-af31
-rw-r--r--misc/estic/files/patch-ag11
-rw-r--r--misc/estic/files/patch-ah11
-rw-r--r--misc/estic/files/patch-ai17
-rw-r--r--misc/estic/files/patch-aj35
-rw-r--r--misc/estic/files/patch-ak18
-rw-r--r--misc/estic/files/patch-al17
-rw-r--r--misc/estic/files/patch-am13
-rw-r--r--misc/estic/files/patch-an22
-rw-r--r--misc/estic/files/patch-ao51
-rw-r--r--misc/estic/files/patch-ap11
-rw-r--r--misc/estic/files/patch-aq11
-rw-r--r--misc/estic/files/patch-ar13
-rw-r--r--misc/estic/files/patch-as20
-rw-r--r--misc/estic/files/patch-at50
-rw-r--r--misc/estic/files/patch-au20
-rw-r--r--misc/estic/files/patch-av15
-rw-r--r--misc/estic/files/patch-aw47
-rw-r--r--misc/estic/files/patch-ax82
-rw-r--r--misc/estic/files/patch-ay10
23 files changed, 538 insertions, 59 deletions
diff --git a/misc/estic/files/patch-aa b/misc/estic/files/patch-aa
index 292f70284948..2e3ce5734f67 100644
--- a/misc/estic/files/patch-aa
+++ b/misc/estic/files/patch-aa
@@ -1,39 +1,20 @@
-*** estic/make/freebsd-x.mak.orig Sat Sep 21 17:37:54 1996
---- estic/make/freebsd-x.mak Sat Sep 21 17:49:09 1996
-***************
-*** 75,81 ****
- all: xestic
-
- xestic: $(LIB) $(OBJS)
-! $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
-
-
- # ------------------------------------------------------------------------------
---- 76,82 ----
- all: xestic
-
- xestic: $(LIB) $(OBJS)
-! $(CC) -L /usr/X11R6/lib -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
-
-
- # ------------------------------------------------------------------------------
-*** spunk/make/freebsd-x.mak.orig Fri Jun 21 12:57:24 1996
---- spunk/make/freebsd-x.mak Thu Nov 21 23:01:13 1996
-***************
-*** 31,37 ****
-
- # Flags for the gnu compiler (use the second one for gcc >= 2.6.0)
- #CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include
-! CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-
- LIB = spunk.a
- ZIPFILE = spunk.zip
---- 31,38 ----
-
- # Flags for the gnu compiler (use the second one for gcc >= 2.6.0)
- #CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include
-! #CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-! CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-
- LIB = spunk.a
- ZIPFILE = spunk.zip
+--- estic/make/freebsd-x.mak.orig Sat Feb 26 18:42:30 2000
++++ estic/make/freebsd-x.mak Sat Feb 26 18:43:26 2000
+@@ -35,7 +35,7 @@
+ # Both configurations of CFLAGS will probably work since FreeBSD has a
+ # smart linker...
+ #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib
+-CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(X11BASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
+
+
+ # ------------------------------------------------------------------------------
+@@ -79,7 +79,7 @@
+ all: xestic
+
+ xestic: $(LIB) $(OBJS)
+- $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
++ $(CC) -L /usr/X11R6/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11
+
+
+ # ------------------------------------------------------------------------------
diff --git a/misc/estic/files/patch-ab b/misc/estic/files/patch-ab
index 46bf1f8c648e..9dbca3d166ab 100644
--- a/misc/estic/files/patch-ab
+++ b/misc/estic/files/patch-ab
@@ -8,26 +8,6 @@
# ovb@swissmail.com does not use -DUSE_OLD_TTY
# neither does jhs@freebsd.org need it
-*** estic/make/freebsd-x.mak.orig Sat Sep 14 15:40:16 1996
---- estic/make/freebsd-x.mak Mon Nov 18 03:08:27 1996
-***************
-*** 35,41 ****
- # Both configurations of CFLAGS will probably work since FreeBSD has a
- # smart linker...
- #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib
-! CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
-
-
- # ------------------------------------------------------------------------------
---- 35,42 ----
- # Both configurations of CFLAGS will probably work since FreeBSD has a
- # smart linker...
- #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib
-! #CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
-! CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
-
-
- # ------------------------------------------------------------------------------
*** estic/make/freebsd.mak.orig Sat Sep 14 15:40:16 1996
--- estic/make/freebsd.mak Mon Nov 18 03:08:31 1996
***************
diff --git a/misc/estic/files/patch-ae b/misc/estic/files/patch-ae
new file mode 100644
index 000000000000..862a176ccc34
--- /dev/null
+++ b/misc/estic/files/patch-ae
@@ -0,0 +1,13 @@
+--- spunk/coll.h.orig Sat Feb 26 17:44:32 2000
++++ spunk/coll.h Sat Feb 26 17:45:58 2000
+@@ -33,8 +33,8 @@
+
+
+
+-static const coIndexError = 1; // Index out of range
+-static const coOverflowError = 2; // Collection overflow
++static const int coIndexError = 1; // Index out of range
++static const int coOverflowError = 2; // Collection overflow
+
+
+
diff --git a/misc/estic/files/patch-af b/misc/estic/files/patch-af
new file mode 100644
index 000000000000..c05e9f3c89ec
--- /dev/null
+++ b/misc/estic/files/patch-af
@@ -0,0 +1,31 @@
+--- spunk/stream.h.orig Sat Feb 26 17:47:07 2000
++++ spunk/stream.h Sat Feb 26 17:47:53 2000
+@@ -33,17 +33,17 @@
+
+
+
+-static const stOk = 0; // things are allright
+-static const stInitError = 1; // error initializing the stream
+-static const stReadError = 2; // error reading from the stream
+-static const stWriteError = 3; // error writing to the stream
+-static const stGetError = 4; // get found not registered class
+-static const stPutError = 5; // put found not registered class
+-static const stMemoryError = 6; // not enough memory
+-static const stStoreError = 7; // Keine Store-Methode angegeben
+-static const stLoadError = 8; // Keine Load-Methode oder Fehler bei Load
+-static const stCopyError = 9; // CopyFrom: error of source stream
+-static const stSeekError = 10; // error using Seek, GetPos etc.
++static const int stOk = 0; // things are allright
++static const int stInitError = 1; // error initializing the stream
++static const int stReadError = 2; // error reading from the stream
++static const int stWriteError = 3; // error writing to the stream
++static const int stGetError = 4; // get found not registered class
++static const int stPutError = 5; // put found not registered class
++static const int stMemoryError = 6; // not enough memory
++static const int stStoreError = 7; // Keine Store-Methode angegeben
++static const int stLoadError = 8; // Keine Load-Methode oder Fehler bei Load
++static const int stCopyError = 9; // CopyFrom: error of source stream
++static const int stSeekError = 10; // error using Seek, GetPos etc.
+
+
+
diff --git a/misc/estic/files/patch-ag b/misc/estic/files/patch-ag
new file mode 100644
index 000000000000..a99ac0dc7444
--- /dev/null
+++ b/misc/estic/files/patch-ag
@@ -0,0 +1,11 @@
+--- spunk/xsrc/console.cc.orig Sat Feb 26 17:48:40 2000
++++ spunk/xsrc/console.cc Sat Feb 26 17:49:13 2000
+@@ -374,7 +374,7 @@
+ // the parameter following this name and remove both from the argument list.
+ {
+ // Get the argument vector
+- const char** Args = GetArgVec ();
++ const char** Args = (const char **)GetArgVec ();
+
+ // search for the given argument
+ int I = 1;
diff --git a/misc/estic/files/patch-ah b/misc/estic/files/patch-ah
new file mode 100644
index 000000000000..acdbfb29b3fe
--- /dev/null
+++ b/misc/estic/files/patch-ah
@@ -0,0 +1,11 @@
+--- spunk/unixsrc/delay.cc.orig Sat Feb 26 17:50:13 2000
++++ spunk/unixsrc/delay.cc Sat Feb 26 17:50:24 2000
+@@ -73,7 +73,7 @@
+ //
+ // The function returns the real time passed or just ms.
+ {
+- const ChunkSize = 256;
++ const int ChunkSize = 256;
+
+ // Check the argument...
+ if (ms <= ChunkSize) {
diff --git a/misc/estic/files/patch-ai b/misc/estic/files/patch-ai
new file mode 100644
index 000000000000..92dd800ebfb1
--- /dev/null
+++ b/misc/estic/files/patch-ai
@@ -0,0 +1,17 @@
+--- spunk/filesys.h.orig Sat Feb 26 17:51:00 2000
++++ spunk/filesys.h Sat Feb 26 17:51:27 2000
+@@ -44,10 +44,10 @@
+
+ extern const char FileSysPathSep; // Path separator
+ extern const char FileSysListSep; // Path list separator
+-extern const FileSysMaxPath; // Maximum path length
+-extern const FileSysMaxDir; // Maximum directory length
+-extern const FileSysMaxName; // Maximum file name length
+-extern const FileSysMaxExt; // Maximum extension length (including the dot)
++extern const int FileSysMaxPath; // Maximum path length
++extern const int FileSysMaxDir; // Maximum directory length
++extern const int FileSysMaxName; // Maximum file name length
++extern const int FileSysMaxExt; // Maximum extension length (including the dot)
+
+
+
diff --git a/misc/estic/files/patch-aj b/misc/estic/files/patch-aj
new file mode 100644
index 000000000000..27efe1f6cf66
--- /dev/null
+++ b/misc/estic/files/patch-aj
@@ -0,0 +1,35 @@
+--- spunk/palette.h.orig Sat Feb 26 17:52:03 2000
++++ spunk/palette.h Sat Feb 26 17:52:34 2000
+@@ -40,19 +40,19 @@
+
+
+ // Indices into the palette arrays
+-static const atFrameInactive = 0; // passive frame
+-static const atFrameActive = 1; // active frame
+-static const atFrameResizing = 2; // resizing frame
+-static const atTextNormal = 3; // normal text
+-static const atTextInvers = 4; // inverted text
+-static const atTextSelected = 5; // selected static text
+-static const atTextHigh = 6; // selected text (i.e. hotkeys)
+-static const atTextHighInvers = 7; // inverted selected text
+-static const atTextGrayed = 8; // grey (inactive) text
+-static const atTextGrayedInvers = 9; // dito inverted
+-static const atEditNormal = 10; // normal text in an edit window
+-static const atEditHigh = 11; // i.e. left/right arrows
+-static const atEditBar = 12; // scroll bar (use atEditNormal for text)
++static const int atFrameInactive = 0; // passive frame
++static const int atFrameActive = 1; // active frame
++static const int atFrameResizing = 2; // resizing frame
++static const int atTextNormal = 3; // normal text
++static const int atTextInvers = 4; // inverted text
++static const int atTextSelected = 5; // selected static text
++static const int atTextHigh = 6; // selected text (i.e. hotkeys)
++static const int atTextHighInvers = 7; // inverted selected text
++static const int atTextGrayed = 8; // grey (inactive) text
++static const int atTextGrayedInvers = 9; // dito inverted
++static const int atEditNormal = 10; // normal text in an edit window
++static const int atEditHigh = 11; // i.e. left/right arrows
++static const int atEditBar = 12; // scroll bar (use atEditNormal for text)
+
+
+ // Palette numbers
diff --git a/misc/estic/files/patch-ak b/misc/estic/files/patch-ak
new file mode 100644
index 000000000000..afe9739d61f9
--- /dev/null
+++ b/misc/estic/files/patch-ak
@@ -0,0 +1,18 @@
+--- spunk/filepath.h.orig Sat Feb 26 17:54:52 2000
++++ spunk/filepath.h Sat Feb 26 17:56:32 2000
+@@ -88,6 +88,7 @@
+ // Return 1 if the given path contains one of the wildcard characters '*', '?'
+ // or '[]', return zero otherwise.
+
++#if 0
+ int FMatch (const String& Source, const String& Pattern);
+ // Match the string in Source against Pattern. Pattern may contain the
+ // wildcards '*', '?', '[abcd]' '[ab-d]', '[!abcd]', '[!ab-d]'
+@@ -95,6 +96,7 @@
+ // otherwise a non zero value is returned.
+ // If Pattern contains an invalid wildcard pattern (e.g. 'A[x'), the function
+ // returns zero.
++#endif
+
+ int FIsAbsolute (const String& Path);
+ // Return true if the given path is an absolute path
diff --git a/misc/estic/files/patch-al b/misc/estic/files/patch-al
new file mode 100644
index 000000000000..a131bd552eb1
--- /dev/null
+++ b/misc/estic/files/patch-al
@@ -0,0 +1,17 @@
+--- spunk/unixsrc/filesys.cc.orig Sat Feb 26 17:57:13 2000
++++ spunk/unixsrc/filesys.cc Sat Feb 26 17:57:39 2000
+@@ -42,10 +42,10 @@
+
+ extern const char FileSysPathSep = '/'; // Path separator
+ extern const char FileSysListSep = ':'; // Path list separator
+-extern const FileSysMaxPath = 255; // Maximum path length
+-extern const FileSysMaxDir = 255; // Maximum directory length
+-extern const FileSysMaxName = 255; // Maximum file name length
+-extern const FileSysMaxExt = 255; // Maximum extension length (including the dot)
++extern const int FileSysMaxPath = 255; // Maximum path length
++extern const int FileSysMaxDir = 255; // Maximum directory length
++extern const int FileSysMaxName = 255; // Maximum file name length
++extern const int FileSysMaxExt = 255; // Maximum extension length (including the dot)
+
+
+
diff --git a/misc/estic/files/patch-am b/misc/estic/files/patch-am
new file mode 100644
index 000000000000..a3243e2cb5b7
--- /dev/null
+++ b/misc/estic/files/patch-am
@@ -0,0 +1,13 @@
+--- spunk/menue.cc.orig Sat Feb 26 17:58:13 2000
++++ spunk/menue.cc Sat Feb 26 17:58:32 2000
+@@ -495,8 +495,8 @@
+
+ i16 GenericMenue::GetChoice ()
+ {
+- const AltNextKeyCode = MaxUserID + 1;
+- const AltPrevKeyCode = MaxUserID + 2;
++ const int AltNextKeyCode = MaxUserID + 1;
++ const int AltPrevKeyCode = MaxUserID + 2;
+
+
+ // Remember old window state
diff --git a/misc/estic/files/patch-an b/misc/estic/files/patch-an
new file mode 100644
index 000000000000..77354ad3aaa9
--- /dev/null
+++ b/misc/estic/files/patch-an
@@ -0,0 +1,22 @@
+--- spunk/password.cc.orig Sat Feb 26 17:59:02 2000
++++ spunk/password.cc Sat Feb 26 18:01:24 2000
+@@ -525,14 +525,14 @@
+
+
+
+-static void EntryEditor (PasswordEntry* E, int& Abort, int& Changed)
++inline void EntryEditor (PasswordEntry* E, int& Abort, int& Changed)
+ // Allow editing of one password entry
+ {
+ // ID's of the menue items
+- const miUserID = 1;
+- const miUserName = 2;
+- const miPassword = 3;
+- const miLevel = 4;
++ const int miUserID = 1;
++ const int miUserName = 2;
++ const int miPassword = 3;
++ const int miLevel = 4;
+
+ // Remember the crc of the entry
+ u32 OldCRC = GetCRC (E);
diff --git a/misc/estic/files/patch-ao b/misc/estic/files/patch-ao
new file mode 100644
index 000000000000..260735ff12e8
--- /dev/null
+++ b/misc/estic/files/patch-ao
@@ -0,0 +1,51 @@
+--- spunk/sercom.h.orig Sat Feb 26 18:01:59 2000
++++ spunk/sercom.h Sat Feb 26 18:02:44 2000
+@@ -43,29 +43,29 @@
+
+
+ // Constants for accessing the array of error counters
+-const ceRXOverflow = 0; // Receive buffer overflow
+-const ceTXOverflow = 1; // Transmit buffer overflow
+-const ceOverrun = 2; // UART overrun
+-const ceBreak = 3; // Break received
+-const ceFrame = 4; // Framing error
+-const ceParity = 5; // Parity error
++const int ceRXOverflow = 0; // Receive buffer overflow
++const int ceTXOverflow = 1; // Transmit buffer overflow
++const int ceOverrun = 2; // UART overrun
++const int ceBreak = 3; // Break received
++const int ceFrame = 4; // Framing error
++const int ceParity = 5; // Parity error
+
+
+
+ // Bitmask constants for evaluating the result of ModemStatus
+-const csDeltaCTS = 0x01; // Delta CTS
+-const csDeltaDSR = 0x02; // Delta DSR
+-const csDeltaRI = 0x04; // Falling edge of RI
+-const csDeltaCarrierDetect = 0x08; // Delta CD
+-const csClearToSend = 0x10; // Clear To Send
+-const csDataSetReady = 0x20; // Data Set Ready
+-const csRingIndicator = 0x40; // Ring Indicator
+-const csCarrierDetect = 0x80; // Carrier Detect
+-const csCTS = csClearToSend;
+-const csDSR = csDataSetReady;
+-const csRI = csRingIndicator;
+-const csCD = csCarrierDetect;
+-const csDeltaCD = csDeltaCarrierDetect;
++const int csDeltaCTS = 0x01; // Delta CTS
++const int csDeltaDSR = 0x02; // Delta DSR
++const int csDeltaRI = 0x04; // Falling edge of RI
++const int csDeltaCarrierDetect = 0x08; // Delta CD
++const int csClearToSend = 0x10; // Clear To Send
++const int csDataSetReady = 0x20; // Data Set Ready
++const int csRingIndicator = 0x40; // Ring Indicator
++const int csCarrierDetect = 0x80; // Carrier Detect
++const int csCTS = csClearToSend;
++const int csDSR = csDataSetReady;
++const int csRI = csRingIndicator;
++const int csCD = csCarrierDetect;
++const int csDeltaCD = csDeltaCarrierDetect;
+
+
+
diff --git a/misc/estic/files/patch-ap b/misc/estic/files/patch-ap
new file mode 100644
index 000000000000..61060394a628
--- /dev/null
+++ b/misc/estic/files/patch-ap
@@ -0,0 +1,11 @@
+--- spunk/stream.cc.orig Sat Feb 26 18:03:19 2000
++++ spunk/stream.cc Sat Feb 26 18:03:35 2000
+@@ -245,7 +245,7 @@
+
+ void Stream::CopyFrom (Stream& S, size_t Count)
+ {
+- static const BufSize = 4096; // Size of copy buffer
++ static const int BufSize = 4096; // Size of copy buffer
+
+
+ // Check parameter
diff --git a/misc/estic/files/patch-aq b/misc/estic/files/patch-aq
new file mode 100644
index 000000000000..1759c799acf5
--- /dev/null
+++ b/misc/estic/files/patch-aq
@@ -0,0 +1,11 @@
+--- spunk/syserror.cc.orig Sat Feb 26 18:04:03 2000
++++ spunk/syserror.cc Sat Feb 26 18:04:18 2000
+@@ -238,7 +238,7 @@
+ return FormatStr (LoadMsg (msUnknown).GetStr (), Code);
+ } else {
+ #ifndef SOLARIS
+- char* Msg = sys_errlist [Code];
++ char* Msg = (char *)sys_errlist [Code];
+ #else
+ char* Msg = strerror (Code);
+ #endif
diff --git a/misc/estic/files/patch-ar b/misc/estic/files/patch-ar
new file mode 100644
index 000000000000..71d1464a4424
--- /dev/null
+++ b/misc/estic/files/patch-ar
@@ -0,0 +1,13 @@
+--- spunk/textstrm.cc.orig Sat Feb 26 18:05:06 2000
++++ spunk/textstrm.cc Sat Feb 26 18:05:17 2000
+@@ -66,8 +66,8 @@
+ // LineLen is the estimated length of a line in the file used for
+ // estimating the size of the buffer.
+ {
+- static const Delta = 100;
+- static const BufSize = 4096;
++ static const int Delta = 100;
++ static const int BufSize = 4096;
+
+ // Estimate the count of lines
+ if ((Limit = Size / LineLen) < 100) {
diff --git a/misc/estic/files/patch-as b/misc/estic/files/patch-as
new file mode 100644
index 000000000000..e422f6f8cb1a
--- /dev/null
+++ b/misc/estic/files/patch-as
@@ -0,0 +1,20 @@
+--- spunk/window.cc.orig Sat Feb 26 18:05:58 2000
++++ spunk/window.cc Sat Feb 26 18:06:16 2000
+@@ -1395,7 +1395,7 @@
+ // Write a string to the inner window. Note: Attr is an index, not a real
+ // attribute !
+ {
+- const BufSize = 256;
++ const int BufSize = 256;
+ u16 Buf [256];
+
+ // Check if the given string is empty
+@@ -1517,7 +1517,7 @@
+ // Write a string to the inner window. Note: Attr is an index, not a real
+ // attribute !
+ {
+- const BufSize = 256;
++ const int BufSize = 256;
+ u16 Buf [BufSize];
+
+ // If the Y coord is outside the inner window, there is nothing to do
diff --git a/misc/estic/files/patch-at b/misc/estic/files/patch-at
new file mode 100644
index 000000000000..087de120ca56
--- /dev/null
+++ b/misc/estic/files/patch-at
@@ -0,0 +1,50 @@
+--- spunk/resitem.cc.orig Sat Feb 26 18:07:02 2000
++++ spunk/resitem.cc Sat Feb 26 18:07:39 2000
+@@ -1403,16 +1403,16 @@
+ // Data edit menue
+ {
+ // Menue IDs
+- const miID = 10;
+- const miText = 20;
+- const miState = 30;
+- const miAccelKey = 40;
+- const miHelpKey = 50;
+- const miCharset = 60;
+- const miLimits = 70;
+- const miSubMenue = 80;
+- const miToggleText = 90;
+- const miToggleCount = 100;
++ const int miID = 10;
++ const int miText = 20;
++ const int miState = 30;
++ const int miAccelKey = 40;
++ const int miHelpKey = 50;
++ const int miCharset = 60;
++ const int miLimits = 70;
++ const int miSubMenue = 80;
++ const int miToggleText = 90;
++ const int miToggleCount = 100;
+
+ // Load the menue from the resource
+ Menue* M = (Menue*) LoadResource ("@RESITEM.ItemDataMenue");
+@@ -1639,13 +1639,13 @@
+
+ void ResEditApp::ChangeCharset (WindowItem* Item)
+ {
+- const miReset = 1;
+- const miAddDigits = 2;
+- const miAddHex = 3;
+- const miAddAlpha = 4;
+- const miAddAll = 5;
+- const miCustom = 6;
+- const miAllowEmpty = 7;
++ const int miReset = 1;
++ const int miAddDigits = 2;
++ const int miAddHex = 3;
++ const int miAddAlpha = 4;
++ const int miAddAll = 5;
++ const int miCustom = 6;
++ const int miAllowEmpty = 7;
+
+
+ // Only RStringItem and TextEdits are allowed to change the charset
diff --git a/misc/estic/files/patch-au b/misc/estic/files/patch-au
new file mode 100644
index 000000000000..2c95e2cc9ed2
--- /dev/null
+++ b/misc/estic/files/patch-au
@@ -0,0 +1,20 @@
+--- spunk/make/freebsd-x.mak.orig Sat Feb 26 18:19:20 2000
++++ spunk/make/freebsd-x.mak Sat Feb 26 18:26:26 2000
+@@ -31,7 +31,7 @@
+
+ # Flags for the gnu compiler (use the second one for gcc >= 2.6.0)
+ #CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include
+-CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS = -DFREEBSD -g -Wall -x c++ -I ${X11BASE}/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
+
+ LIB = spunk.a
+ ZIPFILE = spunk.zip
+@@ -206,7 +206,7 @@
+ # Dummy targets
+
+ xresed: $(LIB) $(RESEDITOBJS) $(HDRS)
+- $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L/usr/X11R6/lib -lX11
++ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L/usr/X11R6/lib -lX11
+
+ lib: $(LIB)
+
diff --git a/misc/estic/files/patch-av b/misc/estic/files/patch-av
new file mode 100644
index 000000000000..3fdd9369e53e
--- /dev/null
+++ b/misc/estic/files/patch-av
@@ -0,0 +1,15 @@
+--- estic/estic.cc.orig Sat Feb 26 18:28:17 2000
++++ estic/estic.cc Sat Feb 26 18:28:51 2000
+@@ -75,9 +75,9 @@
+
+
+ // Diag mode update
+-static const duOff = 0;
+-static const duOn = 1;
+-static const duAuto = 2; // Update if version <= 1.93
++static const int duOff = 0;
++static const int duOn = 1;
++static const int duAuto = 2; // Update if version <= 1.93
+
+ static const char VersionStr [] = "1.30"; // Also valid for 1.40
+ static const char VersionID [] = "ESTIC-Version";
diff --git a/misc/estic/files/patch-aw b/misc/estic/files/patch-aw
new file mode 100644
index 000000000000..5abfd37ee8a3
--- /dev/null
+++ b/misc/estic/files/patch-aw
@@ -0,0 +1,47 @@
+--- estic/icbaseed.cc.orig Sat Feb 26 18:29:22 2000
++++ estic/icbaseed.cc Sat Feb 26 18:30:01 2000
+@@ -387,26 +387,26 @@
+ // otherwise, Changed is left untouched.
+ {
+ // ID's of menue items for EditBaseConfig
+- const miIstecType = 10;
+- const miProtocol = 20;
+- const miExtLevel = 30;
+- const miMusic = 40;
+- const miConnection = 50;
+- const miNumber1 = 60;
+- const miNumber2 = 70;
+- const miTFEAssignment = 80;
+- const miQueryLoc = 90;
+- const miMSN = 100;
+- const miMSNGroups = 110;
+- const miEAZGroups = 120;
+- const miExternalMusicPort = 130;
+- const miCountryCode = 140;
++ const int miIstecType = 10;
++ const int miProtocol = 20;
++ const int miExtLevel = 30;
++ const int miMusic = 40;
++ const int miConnection = 50;
++ const int miNumber1 = 60;
++ const int miNumber2 = 70;
++ const int miTFEAssignment = 80;
++ const int miQueryLoc = 90;
++ const int miMSN = 100;
++ const int miMSNGroups = 110;
++ const int miEAZGroups = 120;
++ const int miExternalMusicPort = 130;
++ const int miCountryCode = 140;
+
+ // Values for the miMusic toggle item
+- const musOff = 0;
+- const musInternal = 1;
+- const musExternal = 2;
+- const musOn = musInternal;
++ const int musOff = 0;
++ const int musInternal = 1;
++ const int musExternal = 2;
++ const int musOn = musInternal;
+
+
+
diff --git a/misc/estic/files/patch-ax b/misc/estic/files/patch-ax
new file mode 100644
index 000000000000..80eaa7dbd172
--- /dev/null
+++ b/misc/estic/files/patch-ax
@@ -0,0 +1,82 @@
+--- estic/icdevs.cc.orig Sat Feb 26 18:30:40 2000
++++ estic/icdevs.cc Sat Feb 26 18:32:24 2000
+@@ -299,8 +299,8 @@
+ String DevListBox::RerouteName (unsigned Val, unsigned char* Num)
+ // Map the reroute capability to a string with fixed length
+ {
+- const StringLength = 11;
+- const PadLength = 12;
++ const int StringLength = 11;
++ const int PadLength = 12;
+ String Res (PadLength);
+
+ if (Val == 0x00) {
+@@ -427,37 +427,37 @@
+ static const String StgPosName = "EditDevConfig.ConfigMenue.Position";
+
+ // Menue constants
+- const miDialCaps = 10;
+- const miService = 20;
+- const miReroute = 30;
+- const miChargePulse = 40;
+- const miPIN = 50;
+- const miTerminalMode = 60;
+- const miKnockInt = 70;
+- const miKnockExt = 80;
+- const miKnockTFE = 90;
+- const miKnockInt21 = 1000;
+- const miKnockInt22 = 1010;
+- const miKnockInt23 = 1020;
+- const miKnockInt24 = 1030;
+- const miKnockInt25 = 1040;
+- const miKnockInt26 = 1050;
+- const miKnockInt27 = 1060;
+- const miKnockInt28 = 1070;
+- const miKnockMSN0 = 1100;
+- const miKnockMSN1 = 1110;
+- const miKnockMSN2 = 1120;
+- const miKnockMSN3 = 1130;
+- const miKnockMSN4 = 1140;
+- const miKnockMSN5 = 1150;
+- const miKnockMSN6 = 1160;
+- const miKnockMSN7 = 1170;
+- const miKnockMSN8 = 1180;
+- const miKnockMSN9 = 1190;
+- const miKnockTFE1 = 1200;
+- const miKnockTFE2 = 1210;
+- const miKnockTFE3 = 1220;
+- const miKnockTFE4 = 1230;
++ const int miDialCaps = 10;
++ const int miService = 20;
++ const int miReroute = 30;
++ const int miChargePulse = 40;
++ const int miPIN = 50;
++ const int miTerminalMode = 60;
++ const int miKnockInt = 70;
++ const int miKnockExt = 80;
++ const int miKnockTFE = 90;
++ const int miKnockInt21 = 1000;
++ const int miKnockInt22 = 1010;
++ const int miKnockInt23 = 1020;
++ const int miKnockInt24 = 1030;
++ const int miKnockInt25 = 1040;
++ const int miKnockInt26 = 1050;
++ const int miKnockInt27 = 1060;
++ const int miKnockInt28 = 1070;
++ const int miKnockMSN0 = 1100;
++ const int miKnockMSN1 = 1110;
++ const int miKnockMSN2 = 1120;
++ const int miKnockMSN3 = 1130;
++ const int miKnockMSN4 = 1140;
++ const int miKnockMSN5 = 1150;
++ const int miKnockMSN6 = 1160;
++ const int miKnockMSN7 = 1170;
++ const int miKnockMSN8 = 1180;
++ const int miKnockMSN9 = 1190;
++ const int miKnockTFE1 = 1200;
++ const int miKnockTFE2 = 1210;
++ const int miKnockTFE3 = 1220;
++ const int miKnockTFE4 = 1230;
+
+
+ // Save the configuration
diff --git a/misc/estic/files/patch-ay b/misc/estic/files/patch-ay
new file mode 100644
index 000000000000..8d0552ee962c
--- /dev/null
+++ b/misc/estic/files/patch-ay
@@ -0,0 +1,10 @@
+--- estic/imon.cc.orig Sat Feb 26 18:33:03 2000
++++ estic/imon.cc Sat Feb 26 18:33:29 2000
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <sys/time.h>
++#include <unistd.h>
+
+ #include "chartype.h"
+ #include "itemwin.h"