Cleanup patches, a* categories.

Rename them to follow the make makepatch naming, and regenerate them.

With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 22 insertions, 22 deletions

diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-LADSPAPlugin-LADSPAInfo.h b/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-LADSPAPlugin-LADSPAInfo.h
deleted file mode 100644
index 17de851b0998..000000000000
--- a/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-LADSPAPlugin-LADSPAInfo.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h.orig	2014-02-13 05:56:16.387137838 +0400
-+++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h	2014-02-13 05:57:44.261183646 +0400
-@@ -91,7 +91,7 @@
- 		unsigned long   UniqueID;
- 		std::string     Name;
- 
--		bool operator<(const PluginEntry& pe)
-+		bool operator<(const PluginEntry& pe) const
- 		{
- 			return (Name<pe.Name);
- 		}
diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound-PluginManager.C b/audio/spiralsynthmodular/files/patch-SpiralSound_PluginManager.C
index 702073dac679..00496ebe1139 100644
--- a/audio/spiralsynthmodular/files/patch-SpiralSound-PluginManager.C
+++ b/audio/spiralsynthmodular/files/patch-SpiralSound_PluginManager.C
@@ -1,15 +1,15 @@
---- SpiralSound/PluginManager.C.orig	Mon Jan  6 01:17:04 2003
-+++ SpiralSound/PluginManager.C	Mon Jan  6 01:17:45 2003
-@@ -48,7 +48,7 @@
+--- SpiralSound/PluginManager.C.orig	2003-08-08 13:07:30 UTC
++++ SpiralSound/PluginManager.C
+@@ -49,7 +49,7 @@ PluginID PluginManager::LoadPlugin(const
      }
  		
  	// Link the neccesary functions 
 -	char *error;
 +	const char *error;
  	
- 	NewPlugin->CreateInstance  = (SpiralPlugin*(*)()) dlsym(NewPlugin->Handle, "CreateInstance"); 	
+ 	NewPlugin->CreateInstance  = (SpiralPlugin*(*)()) dlsym(NewPlugin->Handle, "SpiralPlugin_CreateInstance"); 	
  	
-@@ -89,7 +89,7 @@
+@@ -98,7 +98,7 @@ void PluginManager::UnLoadPlugin(PluginI
  	if (IsValid(ID))
      {
  		dlclose(GetPlugin(ID)->Handle);
@@ -18,7 +18,7 @@
  	    if ((error = dlerror()) != NULL)
  	    {
  			SpiralInfo::Alert("Error unlinking plugin: \n"+string(error));
-@@ -103,7 +103,7 @@
+@@ -112,7 +112,7 @@ void PluginManager::UnloadAll()
  		 i!=m_PluginVec.end(); i++)
  	{		
  		dlclose((*i)->Handle);
diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h
new file mode 100644
index 000000000000..13fd3a1b8480
--- /dev/null
+++ b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h
@@ -0,0 +1,11 @@
+--- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h.orig	2003-06-05 18:26:42 UTC
++++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h
+@@ -91,7 +91,7 @@ public:
+ 		unsigned long   UniqueID;
+ 		std::string     Name;
+ 
+-		bool operator<(const PluginEntry& pe)
++		bool operator<(const PluginEntry& pe) const
+ 		{
+ 			return (Name<pe.Name);
+ 		}
diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-OutputPlugin-OutputPlugin.C b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_OutputPlugin_OutputPlugin.C
index 7a180c71fd69..492a817892f6 100644
--- a/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-OutputPlugin-OutputPlugin.C
+++ b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_OutputPlugin_OutputPlugin.C
@@ -1,5 +1,5 @@
---- SpiralSound/Plugins/OutputPlugin/OutputPlugin.C.orig	Thu Dec 12 16:23:11 2002
-+++ SpiralSound/Plugins/OutputPlugin/OutputPlugin.C	Tue Jan  7 01:03:15 2003
+--- SpiralSound/Plugins/OutputPlugin/OutputPlugin.C.orig	2004-02-08 18:36:17 UTC
++++ SpiralSound/Plugins/OutputPlugin/OutputPlugin.C
 @@ -20,6 +20,7 @@
  #define	_ISOC9X_SOURCE	1
  #define _ISOC99_SOURCE	1
diff --git a/audio/spiralsynthmodular/files/patch-gcc46 b/audio/spiralsynthmodular/files/patch-gcc46
index 75f9e77444f1..1b0e84d66f6c 100644
--- a/audio/spiralsynthmodular/files/patch-gcc46
+++ b/audio/spiralsynthmodular/files/patch-gcc46
@@ -1,4 +1,4 @@
---- SpiralSound/ChannelHandler.C~
+--- SpiralSound/ChannelHandler.C.orig	2003-02-21 00:51:15 UTC
 +++ SpiralSound/ChannelHandler.C
 @@ -19,6 +19,9 @@
  #include "ChannelHandler.h"
@@ -10,7 +10,7 @@
  using namespace std;
  
  //#define CHANNEL_DEBUG
---- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C~
+--- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C.orig	2003-08-08 17:58:26 UTC
 +++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C
 @@ -30,6 +30,7 @@
  #include <stdio.h>
@@ -20,7 +20,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <dirent.h>
---- SpiralSound/Sample.h~
+--- SpiralSound/Sample.h.orig	2003-07-22 22:08:41 UTC
 +++ SpiralSound/Sample.h
 @@ -23,6 +23,7 @@