- rename and merge patches

(for better CVS tracking of next updates)

27 files changed, 13 insertions, 13 deletions

diff --git a/misc/estic/files/patch-ae b/misc/estic/files/patch-ae
deleted file mode 100644
index 862a176ccc34..000000000000
--- a/misc/estic/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-spunk_check.cc b/misc/estic/files/patch-check.cc
index c62be9001a20..c62be9001a20 100644
--- a/misc/estic/files/patch-spunk_check.cc
+++ b/misc/estic/files/patch-check.cc
diff --git a/misc/estic/files/patch-spunk_check.h b/misc/estic/files/patch-check.h
index 6b112002607c..6b112002607c 100644
--- a/misc/estic/files/patch-spunk_check.h
+++ b/misc/estic/files/patch-check.h
diff --git a/misc/estic/files/patch-spunk_coll.h b/misc/estic/files/patch-coll.h
index 30ab6b294e21..3b35317799fa 100644
--- a/misc/estic/files/patch-spunk_coll.h
+++ b/misc/estic/files/patch-coll.h
@@ -1,3 +1,16 @@
+--- 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
+ 
+ 
+ 
 --- spunk/coll.h.orig	Thu Dec 23 20:58:57 2004
 +++ spunk/coll.h	Thu Dec 23 20:50:11 2004
 @@ -418,15 +418,15 @@
diff --git a/misc/estic/files/patch-ag b/misc/estic/files/patch-console.cc
index a99ac0dc7444..a99ac0dc7444 100644
--- a/misc/estic/files/patch-ag
+++ b/misc/estic/files/patch-console.cc
diff --git a/misc/estic/files/patch-ah b/misc/estic/files/patch-delay.cc
index acdbfb29b3fe..acdbfb29b3fe 100644
--- a/misc/estic/files/patch-ah
+++ b/misc/estic/files/patch-delay.cc
diff --git a/misc/estic/files/patch-aa b/misc/estic/files/patch-estic-freebsd-x.mak
index 5da664d178bf..5da664d178bf 100644
--- a/misc/estic/files/patch-aa
+++ b/misc/estic/files/patch-estic-freebsd-x.mak
diff --git a/misc/estic/files/patch-ab b/misc/estic/files/patch-estic-freebsd.mak
index 07436f2a2027..07436f2a2027 100644
--- a/misc/estic/files/patch-ab
+++ b/misc/estic/files/patch-estic-freebsd.mak
diff --git a/misc/estic/files/patch-av b/misc/estic/files/patch-estic.cc
index 3fdd9369e53e..3fdd9369e53e 100644
--- a/misc/estic/files/patch-av
+++ b/misc/estic/files/patch-estic.cc
diff --git a/misc/estic/files/patch-ak b/misc/estic/files/patch-filepath.h
index afe9739d61f9..afe9739d61f9 100644
--- a/misc/estic/files/patch-ak
+++ b/misc/estic/files/patch-filepath.h
diff --git a/misc/estic/files/patch-al b/misc/estic/files/patch-filesys.cc
index a131bd552eb1..a131bd552eb1 100644
--- a/misc/estic/files/patch-al
+++ b/misc/estic/files/patch-filesys.cc
diff --git a/misc/estic/files/patch-ai b/misc/estic/files/patch-filesys.h
index 92dd800ebfb1..92dd800ebfb1 100644
--- a/misc/estic/files/patch-ai
+++ b/misc/estic/files/patch-filesys.h
diff --git a/misc/estic/files/patch-aw b/misc/estic/files/patch-icbaseed.cc
index 5abfd37ee8a3..5abfd37ee8a3 100644
--- a/misc/estic/files/patch-aw
+++ b/misc/estic/files/patch-icbaseed.cc
diff --git a/misc/estic/files/patch-ax b/misc/estic/files/patch-icdevs.cc
index 80eaa7dbd172..80eaa7dbd172 100644
--- a/misc/estic/files/patch-ax
+++ b/misc/estic/files/patch-icdevs.cc
diff --git a/misc/estic/files/patch-ac b/misc/estic/files/patch-icfile.cc
index 5b9a65ac60ec..5b9a65ac60ec 100644
--- a/misc/estic/files/patch-ac
+++ b/misc/estic/files/patch-icfile.cc
diff --git a/misc/estic/files/patch-ay b/misc/estic/files/patch-imon.cc
index 8d0552ee962c..8d0552ee962c 100644
--- a/misc/estic/files/patch-ay
+++ b/misc/estic/files/patch-imon.cc
diff --git a/misc/estic/files/patch-am b/misc/estic/files/patch-menue.cc
index a3243e2cb5b7..a3243e2cb5b7 100644
--- a/misc/estic/files/patch-am
+++ b/misc/estic/files/patch-menue.cc
diff --git a/misc/estic/files/patch-aj b/misc/estic/files/patch-palette.h
index 27efe1f6cf66..27efe1f6cf66 100644
--- a/misc/estic/files/patch-aj
+++ b/misc/estic/files/patch-palette.h
diff --git a/misc/estic/files/patch-an b/misc/estic/files/patch-password.cc
index 77354ad3aaa9..77354ad3aaa9 100644
--- a/misc/estic/files/patch-an
+++ b/misc/estic/files/patch-password.cc
diff --git a/misc/estic/files/patch-at b/misc/estic/files/patch-resitem.cc
index 087de120ca56..087de120ca56 100644
--- a/misc/estic/files/patch-at
+++ b/misc/estic/files/patch-resitem.cc
diff --git a/misc/estic/files/patch-ao b/misc/estic/files/patch-sercom.h
index 260735ff12e8..260735ff12e8 100644
--- a/misc/estic/files/patch-ao
+++ b/misc/estic/files/patch-sercom.h
diff --git a/misc/estic/files/patch-au b/misc/estic/files/patch-spunk-freebsd-x.mak
index aa2a0569ab32..aa2a0569ab32 100644
--- a/misc/estic/files/patch-au
+++ b/misc/estic/files/patch-spunk-freebsd-x.mak
diff --git a/misc/estic/files/patch-ap b/misc/estic/files/patch-stream.cc
index 61060394a628..61060394a628 100644
--- a/misc/estic/files/patch-ap
+++ b/misc/estic/files/patch-stream.cc
diff --git a/misc/estic/files/patch-af b/misc/estic/files/patch-stream.h
index c05e9f3c89ec..c05e9f3c89ec 100644
--- a/misc/estic/files/patch-af
+++ b/misc/estic/files/patch-stream.h
diff --git a/misc/estic/files/patch-aq b/misc/estic/files/patch-syserror.cc
index 1759c799acf5..1759c799acf5 100644
--- a/misc/estic/files/patch-aq
+++ b/misc/estic/files/patch-syserror.cc
diff --git a/misc/estic/files/patch-ar b/misc/estic/files/patch-textstrm.cc
index 71d1464a4424..71d1464a4424 100644
--- a/misc/estic/files/patch-ar
+++ b/misc/estic/files/patch-textstrm.cc
diff --git a/misc/estic/files/patch-as b/misc/estic/files/patch-window.cc
index e422f6f8cb1a..e422f6f8cb1a 100644
--- a/misc/estic/files/patch-as
+++ b/misc/estic/files/patch-window.cc