Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 20 insertions, 17 deletions

diff --git a/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c
index 2826201f10a5..814076306326 100644
--- a/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c
+++ b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c
@@ -1,4 +1,4 @@
---- arcam-av/arcam_av.c.orig
+--- arcam-av/arcam_av.c.orig	2016-03-31 13:11:29 UTC
 +++ arcam-av/arcam_av.c
 @@ -27,6 +27,7 @@
  #include <signal.h>
@@ -8,7 +8,7 @@
  #include <termios.h>
  #include <unistd.h>
  
-@@ -37,6 +38,8 @@
+@@ -38,6 +39,8 @@
  #include <sys/socket.h>
  #include <sys/un.h>
  
diff --git a/audio/alsa-plugins/files/patch-configure b/audio/alsa-plugins/files/patch-configure
index a0da753a0c6d..a44bae152692 100644
--- a/audio/alsa-plugins/files/patch-configure
+++ b/audio/alsa-plugins/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2010-04-16 13:18:56.000000000 +0200
-+++ configure	2010-05-11 00:08:29.000000000 +0200
-@@ -19608,14 +19608,6 @@ else
+--- configure.orig	2016-03-31 13:14:07 UTC
++++ configure
+@@ -12402,14 +12402,6 @@ else
  $as_echo "yes" >&6; }
  	HAVE_SPEEXDSP="yes"
  fi
@@ -15,7 +15,7 @@
  
  
  # Check whether --with-speex was given.
-@@ -19626,6 +19618,15 @@ else
+@@ -12420,6 +12412,15 @@ else
  fi
  
  
diff --git a/audio/alsa-plugins/files/patch-oss-ctl_oss.c b/audio/alsa-plugins/files/patch-oss_ctl__oss.c
index e7e38139f7d9..0e103a7fa1d8 100644
--- a/audio/alsa-plugins/files/patch-oss-ctl_oss.c
+++ b/audio/alsa-plugins/files/patch-oss_ctl__oss.c
@@ -1,4 +1,4 @@
---- oss/ctl_oss.c.orig	2008-10-29 08:42:13.000000000 -0400
+--- oss/ctl_oss.c.orig	2016-07-26 13:27:23 UTC
 +++ oss/ctl_oss.c
 @@ -26,7 +26,11 @@
  #include <sys/ioctl.h>
diff --git a/audio/alsa-plugins/files/patch-oss-pcm_oss.c b/audio/alsa-plugins/files/patch-oss_pcm__oss.c
index 98de34bb8d74..79966ae29fb8 100644
--- a/audio/alsa-plugins/files/patch-oss-pcm_oss.c
+++ b/audio/alsa-plugins/files/patch-oss_pcm__oss.c
@@ -1,6 +1,6 @@
---- oss/pcm_oss.c.orig	2008-10-29 08:42:13.000000000 -0400
+--- oss/pcm_oss.c.orig	2016-07-26 13:27:23 UTC
 +++ oss/pcm_oss.c
-@@ -22,4 +22,8 @@
+@@ -22,7 +22,11 @@
  #include <sys/ioctl.h>
  #include <alsa/asoundlib.h>
  #include <alsa/pcm_external.h>
@@ -9,8 +9,11 @@
 +#else
 +#include <sys/soundcard.h>
 +#endif
-@@ -116,7 +120,7 @@ static int oss_drain(snd_pcm_ioplug_t *i
- 	snd_pcm_oss_t *oss = io->private_data;
+ 
+ #define ARRAY_SIZE(x)	(sizeof(x) / sizeof(*(x)))
+ 
+@@ -258,7 +262,7 @@ static int oss_drain(snd_pcm_ioplug_t *i
+ #endif
  
  	if (io->stream == SND_PCM_STREAM_PLAYBACK)
 -		ioctl(oss->fd, SNDCTL_DSP_SYNC);
@@ -18,9 +21,9 @@
  	return 0;
  }
  
-@@ -125,7 +129,7 @@ static int oss_prepare(snd_pcm_ioplug_t 
- 	snd_pcm_oss_t *oss = io->private_data;
- 	int tmp;
+@@ -272,7 +276,7 @@ static int oss_prepare(snd_pcm_ioplug_t 
+ 	fprintf(stderr, "%s()\n", __func__);
+ #endif
  
 -	ioctl(oss->fd, SNDCTL_DSP_RESET);
 +	ioctl(oss->fd, SNDCTL_DSP_RESET, NULL);
diff --git a/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c
index 5dd11f5555ce..89923343718c 100644
--- a/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c
+++ b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c
@@ -1,8 +1,8 @@
 based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c
 
---- usb_stream/pcm_usb_stream.c.orig
+--- usb_stream/pcm_usb_stream.c.orig	2016-03-31 13:11:29 UTC
 +++ usb_stream/pcm_usb_stream.c
-@@ -79,6 +81,69 @@ typedef struct {
+@@ -79,6 +79,69 @@ typedef struct {
  static struct user_usb_stream *uus;
  static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;
  
@@ -72,7 +72,7 @@ based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-Free
  static struct user_usb_stream *get_uus(const char *card)
  {
  	pthread_mutex_lock(&uus_mutex);
-@@ -219,7 +284,11 @@ static int snd_pcm_us_prepare(snd_pcm_io
+@@ -219,7 +282,11 @@ static int snd_pcm_us_prepare(snd_pcm_io
  		}