Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

16 files changed, 69 insertions, 69 deletions

diff --git a/audio/stymulator/files/patch-Makefile b/audio/stymulator/files/patch-Makefile
index 673e9282c574..698c78ea0bba 100644
--- a/audio/stymulator/files/patch-Makefile
+++ b/audio/stymulator/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./Makefile	2010-04-23 13:49:47.000000000 +0200
+--- Makefile.orig	2016-07-26 16:04:42 UTC
++++ Makefile
 @@ -1,6 +1,5 @@
  RM = rm -f
 -CC = g++
@@ -8,7 +8,7 @@
  
  LZH = stsoundlib/lzh
  STLIB = stsoundlib
-@@ -17,22 +16,22 @@
+@@ -17,22 +16,22 @@ libs:
  	done
  
  ymplayer: ymplayer.o sound.o ui.o
diff --git a/audio/stymulator/files/patch-sound.cpp b/audio/stymulator/files/patch-sound.cpp
index 29509c6be853..86dd17e30ab5 100644
--- a/audio/stymulator/files/patch-sound.cpp
+++ b/audio/stymulator/files/patch-sound.cpp
@@ -1,5 +1,5 @@
---- ./sound.cpp.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./sound.cpp	2010-04-23 13:49:47.000000000 +0200
+--- sound.cpp.orig	2016-07-26 16:04:42 UTC
++++ sound.cpp
 @@ -6,7 +6,6 @@
  	Project Page: http://atariarea.krap.pl/stymulator
  	
diff --git a/audio/stymulator/files/patch-sound.h b/audio/stymulator/files/patch-sound.h
index 16ee88dd000a..b75dce10a135 100644
--- a/audio/stymulator/files/patch-sound.h
+++ b/audio/stymulator/files/patch-sound.h
@@ -1,5 +1,5 @@
---- ./sound.h.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./sound.h	2010-04-23 13:49:47.000000000 +0200
+--- sound.h.orig	2016-07-26 16:04:42 UTC
++++ sound.h
 @@ -6,7 +6,6 @@
  	Project Page: http://atariarea.krap.pl/stymulator
  	
diff --git a/audio/stymulator/files/patch-stsoundlib__Makefile b/audio/stymulator/files/patch-stsoundlib_Makefile
index 7d8dc3ce0845..12d75fa3e04f 100644
--- a/audio/stymulator/files/patch-stsoundlib__Makefile
+++ b/audio/stymulator/files/patch-stsoundlib_Makefile
@@ -1,5 +1,5 @@
---- ./stsoundlib/Makefile.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/Makefile	2010-04-23 13:49:47.000000000 +0200
+--- stsoundlib/Makefile.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/Makefile
 @@ -1,28 +1,28 @@
 -CC = g++
 +CXX ?= g++
diff --git a/audio/stymulator/files/patch-stsoundlib__YmMusic.cpp b/audio/stymulator/files/patch-stsoundlib_YmMusic.cpp
index cbb57e079fc6..58f60414c1df 100644
--- a/audio/stymulator/files/patch-stsoundlib__YmMusic.cpp
+++ b/audio/stymulator/files/patch-stsoundlib_YmMusic.cpp
@@ -1,6 +1,6 @@
---- ./stsoundlib/YmMusic.cpp.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/YmMusic.cpp	2010-04-23 13:50:07.000000000 +0200
-@@ -167,12 +167,12 @@
+--- stsoundlib/YmMusic.cpp.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/YmMusic.cpp
+@@ -167,12 +167,12 @@ ymbool	CYmMusic::isSeekable(void)
  		return getAttrib()&A_TIMECONTROL;
  }
  
@@ -15,7 +15,7 @@
  {
  		return pLastError;
  }
-@@ -364,11 +364,14 @@
+@@ -364,11 +364,14 @@ void	CYmMusic::player(void)
  
  			if (ptr[12])
  			{
@@ -35,7 +35,7 @@
  			}
  		}
  	}
-@@ -612,7 +615,6 @@
+@@ -612,7 +615,6 @@ ymTrackerLine_t *pLine;
  	  	for (i=0;i<nbVoice;i++)
  		{
  			ymint n;
@@ -43,7 +43,7 @@
  			pVoice[i].sampleFreq = ((ymint)pLine->freqHigh<<8) | pLine->freqLow;
  			if (pVoice[i].sampleFreq)
  			{
-@@ -677,7 +679,7 @@
+@@ -677,7 +679,7 @@ double	step;
  #ifdef _LINEAR_OVRS
  			ymint vb = va;
  			if (samplePos < (sampleEnd-(1<<YMTPREC)))
diff --git a/audio/stymulator/files/patch-stsoundlib__YmMusic.h b/audio/stymulator/files/patch-stsoundlib_YmMusic.h
index 826e8d009902..eb34d1ea468c 100644
--- a/audio/stymulator/files/patch-stsoundlib__YmMusic.h
+++ b/audio/stymulator/files/patch-stsoundlib_YmMusic.h
@@ -1,5 +1,5 @@
---- ./stsoundlib/YmMusic.h.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/YmMusic.h	2010-04-23 13:50:07.000000000 +0200
+--- stsoundlib/YmMusic.h.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/YmMusic.h
 @@ -38,8 +38,6 @@
  #include "Ymload.h"
  #include "digidrum.h"
@@ -9,7 +9,7 @@
  #define	YMTPREC		16
  #define	MAX_VOICE	8
  #define	PC_DAC_FREQ	44100
-@@ -143,7 +141,7 @@
+@@ -143,7 +141,7 @@ public:
  	int		getAttrib(void);
  	void	getMusicInfo(ymMusicInfo_t *pInfo);
  	void	setLoopMode(ymbool bLoop);
@@ -18,7 +18,7 @@
  	int		 readYmRegister(ymint reg)		{ return ymChip.readRegister(reg); }
  
  //-------------------------------------------------------------
-@@ -159,7 +157,7 @@
+@@ -159,7 +157,7 @@ private:
  
  	void	setPlayerRate(int rate);
  	void	setAttrib(int _attrib);
@@ -27,7 +27,7 @@
  	ymu8 *depackFile(void);
  	ymbool	deInterleave(void);
  	void	readYm6Effect(ymu8 *pReg,int code,int prediv,int count);
-@@ -168,7 +166,7 @@
+@@ -168,7 +166,7 @@ private:
  
  
  	CYm2149Ex	ymChip;
diff --git a/audio/stymulator/files/patch-stsoundlib__YmTypes.h b/audio/stymulator/files/patch-stsoundlib_YmTypes.h
index 5cdc7b12484d..a88199d38fec 100644
--- a/audio/stymulator/files/patch-stsoundlib__YmTypes.h
+++ b/audio/stymulator/files/patch-stsoundlib_YmTypes.h
@@ -1,5 +1,5 @@
---- ./stsoundlib/YmTypes.h.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/YmTypes.h	2010-04-23 13:49:47.000000000 +0200
+--- stsoundlib/YmTypes.h.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/YmTypes.h
 @@ -44,45 +44,44 @@
  // These settings are ok for Windows 32bits platform.
  
@@ -71,7 +71,7 @@
  
  #endif
  
-@@ -93,8 +92,8 @@
+@@ -93,8 +92,8 @@ typedef		char		ymchar;			// 8 bits char 
  //-----------------------------------------------------------
  // Multi-platform
  //-----------------------------------------------------------
diff --git a/audio/stymulator/files/patch-stsoundlib__Ymload.cpp b/audio/stymulator/files/patch-stsoundlib_Ymload.cpp
index 9b5bd81f3e2c..e3b1d0dfbc49 100644
--- a/audio/stymulator/files/patch-stsoundlib__Ymload.cpp
+++ b/audio/stymulator/files/patch-stsoundlib_Ymload.cpp
@@ -1,6 +1,6 @@
---- ./stsoundlib/Ymload.cpp.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/Ymload.cpp	2010-04-23 13:50:07.000000000 +0200
-@@ -51,61 +51,98 @@
+--- stsoundlib/Ymload.cpp.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/Ymload.cpp
+@@ -51,61 +51,98 @@ static	void	signeSample(ymu8 *ptr,yms32 
  		}
  }
  
@@ -122,7 +122,7 @@
  	return v;
  }
  
-@@ -114,6 +151,13 @@
+@@ -114,6 +151,13 @@ unsigned char	*CYmMusic::depackFile(void
   lzhHeader_t *pHeader;
   ymu8	*pNew;
   ymu8	*pSrc;
@@ -136,7 +136,7 @@
  
  		pHeader = (lzhHeader_t*)pBigMalloc;
  
-@@ -123,8 +167,6 @@
+@@ -123,8 +167,6 @@ unsigned char	*CYmMusic::depackFile(void
  			return pBigMalloc;
  		}
  
@@ -145,7 +145,7 @@
  		if (pHeader->level != 0)					// NOTE: Endianness works because value is 0
  		{ // Compression LH5, header !=0 : Error.
  			free(pBigMalloc);
-@@ -133,7 +175,8 @@
+@@ -133,7 +175,8 @@ unsigned char	*CYmMusic::depackFile(void
  			return NULL;
  		}
  
@@ -155,7 +155,7 @@
  		pNew = (ymu8*)malloc(fileSize);
  		if (!pNew)
  		{
-@@ -144,10 +187,20 @@
+@@ -144,10 +187,20 @@ unsigned char	*CYmMusic::depackFile(void
  		}
  
  		pSrc = pBigMalloc+sizeof(lzhHeader_t)+pHeader->name_lenght;			// NOTE: Endianness works because name_lenght is a byte
@@ -177,7 +177,7 @@
  
  		// alloc space for depacker and depack data
  		CLzhDepacker *pDepacker = new CLzhDepacker;	
-@@ -229,19 +282,29 @@
+@@ -229,19 +282,29 @@ ymbool	CYmMusic::ymDecode(void)
   {
   ymu8 *pUD;
   ymu8	*ptr;
@@ -210,7 +210,7 @@
  				loopFrame = 0;
  				ymChip.setClock(ATARI_CLOCK);
  				setPlayerRate(50);
-@@ -256,9 +319,14 @@
+@@ -256,9 +319,14 @@ ymbool	CYmMusic::ymDecode(void)
  				pSongPlayer = mstrdup("YM-Chip driver.");
  				break;
  
@@ -226,7 +226,7 @@
  				loopFrame = 0;
  				ymChip.setClock(ATARI_CLOCK);
  				setPlayerRate(50);
-@@ -273,11 +341,24 @@
+@@ -273,11 +341,24 @@ ymbool	CYmMusic::ymDecode(void)
  				pSongPlayer = mstrdup("YM-Chip driver.");
  				break;
  
@@ -254,7 +254,7 @@
  				ymChip.setClock(ATARI_CLOCK);
  				setPlayerRate(50);
  				pDataStream = pBigMalloc+4;
-@@ -291,35 +372,62 @@
+@@ -291,35 +372,62 @@ ymbool	CYmMusic::ymDecode(void)
  				pSongPlayer = mstrdup("YM-Chip driver.");
  				break;
  
@@ -329,7 +329,7 @@
  							pDrumTab[i].pData = (ymu8*)malloc(pDrumTab[i].size);
  							memcpy(pDrumTab[i].pData,ptr,pDrumTab[i].size);
  							if (attrib&A_DRUM4BITS)
-@@ -328,23 +436,26 @@
+@@ -328,23 +436,26 @@ ymbool	CYmMusic::ymDecode(void)
  								ymu8 *pw = pDrumTab[i].pData;
  								for (j=0;j<pDrumTab[i].size;j++)
  								{
@@ -365,7 +365,7 @@
  				{
  					songType = YM_V6;
  					pSongType = mstrdup("YM 6");
-@@ -353,13 +464,28 @@
+@@ -353,13 +464,28 @@ ymbool	CYmMusic::ymDecode(void)
  				{
  					pSongType = mstrdup("YM 5");
  				}
@@ -395,7 +395,7 @@
  
  				if (strncmp((const char*)(pBigMalloc+4),"LeOnArD!",8))
  				{
-@@ -367,23 +493,50 @@
+@@ -367,23 +493,50 @@ ymbool	CYmMusic::ymDecode(void)
  					return YMFALSE;
  				}
  				ptr = pBigMalloc+12;
@@ -456,7 +456,7 @@
  
  				pBigSampleBuffer = (unsigned char*)malloc(sampleSize);
  				memcpy(pBigSampleBuffer,ptr,sampleSize);
-@@ -400,8 +553,8 @@
+@@ -400,8 +553,8 @@ ymbool	CYmMusic::ymDecode(void)
  
  				break;
  
@@ -467,7 +467,7 @@
  /*;
  ; Format du YM-Tracker-1
  ;
-@@ -418,33 +571,55 @@
+@@ -418,33 +571,55 @@ ymbool	CYmMusic::ymDecode(void)
  ; NT Music comment
  ; nb digi *
  */
@@ -537,7 +537,7 @@
  						}
  						if (pDrumTab[i].repLen>pDrumTab[i].size)
  						{
-@@ -453,19 +628,27 @@
+@@ -453,19 +628,27 @@ ymbool	CYmMusic::ymDecode(void)
  
  						if (pDrumTab[i].size)
  						{
@@ -570,7 +570,7 @@
  				{
  					ymTrackerFreqShift = (attrib>>28)&15;
  					attrib &= 0x0fffffff;
-@@ -476,18 +659,33 @@
+@@ -476,18 +659,33 @@ ymbool	CYmMusic::ymDecode(void)
  					pSongType = mstrdup("YM-T1");
  				}
  
@@ -606,7 +606,7 @@
  				return YMFALSE;
  				break;
  		}
-@@ -498,6 +696,25 @@
+@@ -498,6 +696,25 @@ ymbool	CYmMusic::ymDecode(void)
  		}
  
  		return YMTRUE;
@@ -632,7 +632,7 @@
   }
  
   
-@@ -645,12 +862,6 @@
+@@ -645,12 +862,6 @@ ymbool	CYmMusic::loadMemory(void *pBlock
  		return YMTRUE;
   }
  
diff --git a/audio/stymulator/files/patch-stsoundlib__digidrum.cpp b/audio/stymulator/files/patch-stsoundlib_digidrum.cpp
index 747de1b03097..b2a86a16348d 100644
--- a/audio/stymulator/files/patch-stsoundlib__digidrum.cpp
+++ b/audio/stymulator/files/patch-stsoundlib_digidrum.cpp
@@ -1,5 +1,5 @@
---- ./stsoundlib/digidrum.cpp.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/digidrum.cpp	2010-04-23 13:50:07.000000000 +0200
+--- stsoundlib/digidrum.cpp.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/digidrum.cpp
 @@ -30,6 +30,7 @@
  -----------------------------------------------------------------------------*/
  
@@ -8,7 +8,7 @@
  
  static ymu8	sample00[631]={
  		0xCC,0x84,0xB4,0x70,0x90,0x94,0x70,0x80,0x80,0xAC,
-@@ -2565,7 +2566,7 @@
+@@ -2565,7 +2566,7 @@ static ymu8	sample39[656]={
  		0x80,0x80,0x80,0x80,0x80,0x80,};
  /***********************************************************/
  
@@ -17,7 +17,7 @@
  		sample00,sample01,sample02,sample03,sample04,sample05,sample06,sample07,
  		sample08,sample09,sample10,sample11,sample12,sample13,sample14,sample15,
  		sample16,sample17,sample18,sample19,sample20,sample21,sample22,sample23,
-@@ -2574,7 +2575,7 @@
+@@ -2574,7 +2575,7 @@ ymu8 *sampleAdress[40] = {
  
  /***********************************************************/
  
diff --git a/audio/stymulator/files/patch-stsoundlib__digidrum.h b/audio/stymulator/files/patch-stsoundlib_digidrum.h
index 0f1757dac54c..c187c4411a73 100644
--- a/audio/stymulator/files/patch-stsoundlib__digidrum.h
+++ b/audio/stymulator/files/patch-stsoundlib_digidrum.h
@@ -1,5 +1,5 @@
---- ./stsoundlib/digidrum.h.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/digidrum.h	2010-04-23 13:50:07.000000000 +0200
+--- stsoundlib/digidrum.h.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/digidrum.h
 @@ -32,6 +32,8 @@
  #ifndef __DIGIDRUM__
  #define __DIGIDRUM__
diff --git a/audio/stymulator/files/patch-stsoundlib__lzh__Makefile b/audio/stymulator/files/patch-stsoundlib_lzh_Makefile
index 8d3ad20f557a..21326d69513e 100644
--- a/audio/stymulator/files/patch-stsoundlib__lzh__Makefile
+++ b/audio/stymulator/files/patch-stsoundlib_lzh_Makefile
@@ -1,5 +1,5 @@
---- ./stsoundlib/lzh/Makefile.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/lzh/Makefile	2010-04-23 13:49:47.000000000 +0200
+--- stsoundlib/lzh/Makefile.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/lzh/Makefile
 @@ -1,14 +1,14 @@
 -CC = gcc
 +CC ?= gcc
diff --git a/audio/stymulator/files/patch-stsoundlib__lzh__lzhlib.cpp b/audio/stymulator/files/patch-stsoundlib_lzh_lzhlib.cpp
index 6be183f017b4..985c11dde8f7 100644
--- a/audio/stymulator/files/patch-stsoundlib__lzh__lzhlib.cpp
+++ b/audio/stymulator/files/patch-stsoundlib_lzh_lzhlib.cpp
@@ -1,6 +1,6 @@
---- ./stsoundlib/lzh/lzhlib.cpp.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./stsoundlib/lzh/lzhlib.cpp	2010-04-23 13:49:47.000000000 +0200
-@@ -413,10 +413,10 @@
+--- stsoundlib/lzh/lzhlib.cpp.orig	2016-07-26 16:04:42 UTC
++++ stsoundlib/lzh/lzhlib.cpp
+@@ -413,10 +413,10 @@ bool	CLzhDepacker::LzUnpack(void *pSrc,i
  
      decode_start ();
  
diff --git a/audio/stymulator/files/patch-ui.c b/audio/stymulator/files/patch-ui.c
index dc0591c6f9d9..8a06916a00e2 100644
--- a/audio/stymulator/files/patch-ui.c
+++ b/audio/stymulator/files/patch-ui.c
@@ -1,5 +1,5 @@
---- ./ui.c.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./ui.c	2010-04-23 13:49:47.000000000 +0200
+--- ui.c.orig	2016-07-26 16:04:42 UTC
++++ ui.c
 @@ -6,7 +6,6 @@
  	Project Page: http://atariarea.krap.pl/stymulator
  	
diff --git a/audio/stymulator/files/patch-ui.h b/audio/stymulator/files/patch-ui.h
index e42eb6b15278..d3c4ca2170a1 100644
--- a/audio/stymulator/files/patch-ui.h
+++ b/audio/stymulator/files/patch-ui.h
@@ -1,5 +1,5 @@
---- ./ui.h.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./ui.h	2010-04-23 13:49:47.000000000 +0200
+--- ui.h.orig	2016-07-26 16:04:42 UTC
++++ ui.h
 @@ -6,7 +6,6 @@
  	Project Page: http://atariarea.krap.pl/stymulator
  	
diff --git a/audio/stymulator/files/patch-ym2wav.cpp b/audio/stymulator/files/patch-ym2wav.cpp
index 5b3d814dc6a6..e791ed96df1c 100644
--- a/audio/stymulator/files/patch-ym2wav.cpp
+++ b/audio/stymulator/files/patch-ym2wav.cpp
@@ -1,6 +1,6 @@
---- ./ym2wav.cpp.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./ym2wav.cpp	2010-04-23 13:49:47.000000000 +0200
-@@ -71,7 +71,7 @@
+--- ym2wav.cpp.orig	2016-07-26 16:04:42 UTC
++++ ym2wav.cpp
+@@ -71,7 +71,7 @@ typedef struct
  
  int main(int argc, char* argv[])
  {
diff --git a/audio/stymulator/files/patch-ymplayer.cpp b/audio/stymulator/files/patch-ymplayer.cpp
index 010795b1c6d6..dff56c8f7dac 100644
--- a/audio/stymulator/files/patch-ymplayer.cpp
+++ b/audio/stymulator/files/patch-ymplayer.cpp
@@ -1,5 +1,5 @@
---- ./ymplayer.cpp.orig	2010-04-23 13:49:47.000000000 +0200
-+++ ./ymplayer.cpp	2010-04-23 13:49:47.000000000 +0200
+--- ymplayer.cpp.orig	2016-07-26 16:04:42 UTC
++++ ymplayer.cpp
 @@ -6,7 +6,6 @@
  	Project Page: http://atariarea.krap.pl/stymulator
  	
@@ -27,7 +27,7 @@
  bool digi;
  
  int main(int argc, char **argv)
-@@ -55,7 +58,7 @@
+@@ -55,7 +58,7 @@ bool playing;
  bool ff = false;
  bool rew = false;
  	
@@ -36,7 +36,7 @@
  
  	if (PLATFORM)
  		platform = "64bit";
-@@ -69,30 +72,22 @@
+@@ -69,30 +72,22 @@ char *platform;
  		return -1;
  	}
  
@@ -73,7 +73,7 @@
  			exit(EXIT_FAILURE);
  		}
  
-@@ -113,15 +108,10 @@
+@@ -113,15 +108,10 @@ char *platform;
  			if (digi)
  				draw_time(ymMusicGetPos(pMusic) / 1000);
  
@@ -93,7 +93,7 @@
  			switch(getch()) {
  				case 27: case 'q':	quit = true; break;
  				case 'z':	pmode = true;	break; //play
-@@ -132,6 +122,7 @@
+@@ -132,6 +122,7 @@ char *platform;
  				case 'n':	rew = true; break;
  			}
  			if (rmode)
@@ -101,7 +101,7 @@
  				if (repeat) {
  					ymMusicSetLoopMode(pMusic,YMTRUE);
  					mvaddstr(pos_y+7,pos_x+67,"Yes");
-@@ -143,7 +134,7 @@
+@@ -143,7 +134,7 @@ char *platform;
  					rmode = false;
  					repeat = true;
  				}
@@ -110,7 +110,7 @@
  			if (!stop && playing) {
  				if (pmode && !paused)
  					mvaddstr(pos_y+6,pos_x+67,"Play");	//play
-@@ -168,18 +159,20 @@
+@@ -168,18 +159,20 @@ char *platform;
  				pmode = false;
  			}