Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

10 files changed, 43 insertions, 43 deletions

diff --git a/audio/oss/files/patch-configure b/audio/oss/files/patch-configure
index 40eef2cdd201..e5e242017875 100644
--- a/audio/oss/files/patch-configure
+++ b/audio/oss/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2009-08-10 13:16:21.000000000 -0400
-+++ configure	2009-09-22 14:38:20.000000000 -0400
+--- configure.orig	2014-02-14 22:59:55 UTC
++++ configure
 @@ -2,7 +2,7 @@
  
  CONFIGURE=YES
@@ -9,7 +9,7 @@
  TARGETOS=
  
  unset USE_PHPMAKE
-@@ -24,11 +24,11 @@
+@@ -24,11 +24,11 @@ export CONFIGURE CONFIG_MIDI
  
  unset CDPATH >/dev/null 2>&1
  
diff --git a/audio/oss/files/patch-os_cmd-FreeBSD-.config b/audio/oss/files/patch-os__cmd_FreeBSD_.config
index bf76b057b6ac..b49025cf7382 100644
--- a/audio/oss/files/patch-os_cmd-FreeBSD-.config
+++ b/audio/oss/files/patch-os__cmd_FreeBSD_.config
@@ -1,4 +1,4 @@
---- os_cmd/FreeBSD/.config~
+--- os_cmd/FreeBSD/.config.orig	2014-02-14 22:59:55 UTC
 +++ os_cmd/FreeBSD/.config
 @@ -1,3 +1,3 @@
  targetos=FreeBSD
diff --git a/audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c b/audio/oss/files/patch-os__cmd_FreeBSD_ossdetect_ossdetect.c
index 75c1c2c3be90..200e0d98bb74 100644
--- a/audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c
+++ b/audio/oss/files/patch-os__cmd_FreeBSD_ossdetect_ossdetect.c
@@ -1,5 +1,5 @@
---- os_cmd/FreeBSD/ossdetect/ossdetect.c.orig	2011-01-05 16:06:39.000000000 -0500
-+++ os_cmd/FreeBSD/ossdetect/ossdetect.c	2011-06-21 17:49:37.000000000 -0400
+--- os_cmd/FreeBSD/ossdetect/ossdetect.c.orig	2015-01-28 08:07:32 UTC
++++ os_cmd/FreeBSD/ossdetect/ossdetect.c
 @@ -376,17 +376,20 @@ pci_detect (void)
  	  char name[32];
  
diff --git a/audio/oss/files/patch-setup-FreeBSD-make.local b/audio/oss/files/patch-setup-FreeBSD-make.local
deleted file mode 100644
index 44a98d9f427b..000000000000
--- a/audio/oss/files/patch-setup-FreeBSD-make.local
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup/FreeBSD/make.local.orig	2008-01-05 18:38:18.000000000 -0500
-+++ setup/FreeBSD/make.local	2008-01-07 11:52:17.000000000 -0500
-@@ -2,10 +2,9 @@
- 	sh build.sh
- 
- copy:	build
--	cp -R prototype/* /
- 
- package:	build
- 		sh setup/FreeBSD/mkpkg.sh
- 
- install:	copy
--		cd /usr/lib/oss/build && sh install.sh
-+		cd prototype%%PREFIX%%/lib/oss/build && sh install.sh
diff --git a/audio/oss/files/patch-setup-FreeBSD-build.sh b/audio/oss/files/patch-setup_FreeBSD_build.sh
index 40eb0ed30a1b..cdad8f5cc81a 100644
--- a/audio/oss/files/patch-setup-FreeBSD-build.sh
+++ b/audio/oss/files/patch-setup_FreeBSD_build.sh
@@ -1,6 +1,6 @@
---- setup/FreeBSD/build.sh.orig	2011-01-04 20:33:08.000000000 -0500
-+++ setup/FreeBSD/build.sh	2011-07-25 13:39:05.000000000 -0400
-@@ -7,7 +7,7 @@
+--- setup/FreeBSD/build.sh.orig	2014-02-14 22:59:55 UTC
++++ setup/FreeBSD/build.sh
+@@ -7,7 +7,7 @@ then
     TXT2MAN=$SRCDIR/setup/txt2man
  else
     echo "No gawk found. Using lesser replacement" >&2
@@ -9,7 +9,7 @@
     TXT2MAN=./txt2man
  fi
  
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ echo "OSSLIBDIR=$OSSLIBDIR" > prototype/
  
  # Regenerating the config file templates
  rm -f /tmp/confgen
@@ -18,7 +18,7 @@
  then
          echo Building confgen failed
          exit 1
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ cp .version prototype/$OSSLIBDIR/version
  # Licensing stuff
  if test -f $SRCDIR/4front-private/osslic.c
  then
@@ -27,7 +27,7 @@
  	strip prototype/usr/sbin/osslic
  
          BITS=3 # Default to 32 bit ELF format
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ fi
  if test -f 4front-private/ossupdate.c
  then
    #ossupdate
diff --git a/audio/oss/files/patch-setup_FreeBSD_make.local b/audio/oss/files/patch-setup_FreeBSD_make.local
new file mode 100644
index 000000000000..12acbd535e11
--- /dev/null
+++ b/audio/oss/files/patch-setup_FreeBSD_make.local
@@ -0,0 +1,14 @@
+--- setup/FreeBSD/make.local.orig	2015-01-24 04:25:26 UTC
++++ setup/FreeBSD/make.local
+@@ -2,10 +2,9 @@ build: 	kernel/framework/include/buildid
+ 	sh build.sh
+ 
+ copy:	build
+-	cp -R prototype/* /
+ 
+ package:	build
+ 		sh setup/FreeBSD/mkpkg.sh
+ 
+ install:	copy
+-		cd ${OSSLIBDIR}/build && sh install.sh
++		cd prototype%%PREFIX%%/lib/oss/build && sh install.sh
diff --git a/audio/oss/files/patch-setup-FreeBSD-oss-build-install.sh b/audio/oss/files/patch-setup_FreeBSD_oss_build_install.sh
index 8209cd82e239..d7b478f3eb46 100644
--- a/audio/oss/files/patch-setup-FreeBSD-oss-build-install.sh
+++ b/audio/oss/files/patch-setup_FreeBSD_oss_build_install.sh
@@ -1,5 +1,5 @@
---- setup/FreeBSD/oss/build/install.sh.orig	2007-07-18 19:21:12.000000000 -0400
-+++ setup/FreeBSD/oss/build/install.sh	2007-10-09 19:51:09.000000000 -0400
+--- setup/FreeBSD/oss/build/install.sh.orig	2014-02-14 22:59:55 UTC
++++ setup/FreeBSD/oss/build/install.sh
 @@ -1,11 +1,6 @@
  #!/bin/sh
  
@@ -13,7 +13,7 @@
  
  rm -f osscore_mainline.o
  ln -s osscore.lib osscore_mainline.o
-@@ -59,17 +54,4 @@
+@@ -59,17 +54,4 @@ do
  	rm -f Makefile
  done
  
diff --git a/audio/oss/files/patch-setup-FreeBSD-sbin-soundoff b/audio/oss/files/patch-setup_FreeBSD_sbin_soundoff
index d4a0fef76c2f..5e324f2fb19c 100644
--- a/audio/oss/files/patch-setup-FreeBSD-sbin-soundoff
+++ b/audio/oss/files/patch-setup_FreeBSD_sbin_soundoff
@@ -1,5 +1,5 @@
---- setup/FreeBSD/sbin/soundoff.orig	2011-01-04 20:33:08.000000000 -0500
-+++ setup/FreeBSD/sbin/soundoff	2011-01-06 13:59:37.000000000 -0500
+--- setup/FreeBSD/sbin/soundoff.orig	2014-02-14 22:59:55 UTC
++++ setup/FreeBSD/sbin/soundoff
 @@ -1,10 +1,10 @@
  #!/bin/sh
  
@@ -14,7 +14,7 @@
  fi
  
  if ! /sbin/kldstat | grep -q osscore.ko
-@@ -22,11 +22,11 @@
+@@ -22,11 +22,11 @@ fi
  # Save mixer settings automatically if requested
  if test -f $OSSLIBDIR/etc/userdefs && grep -q "autosave_mixer yes" $OSSLIBDIR/etc/userdefs
  then
diff --git a/audio/oss/files/patch-setup-FreeBSD-sbin-soundon b/audio/oss/files/patch-setup_FreeBSD_sbin_soundon
index 8c38a308bcbe..ac0076f71181 100644
--- a/audio/oss/files/patch-setup-FreeBSD-sbin-soundon
+++ b/audio/oss/files/patch-setup_FreeBSD_sbin_soundon
@@ -1,5 +1,5 @@
---- setup/FreeBSD/sbin/soundon.orig	2011-01-04 20:33:08.000000000 -0500
-+++ setup/FreeBSD/sbin/soundon	2011-01-06 14:48:55.000000000 -0500
+--- setup/FreeBSD/sbin/soundon.orig	2014-02-14 22:59:55 UTC
++++ setup/FreeBSD/sbin/soundon
 @@ -1,10 +1,10 @@
  #!/bin/sh
  
@@ -14,7 +14,7 @@
  fi
  
  LOG=/var/log/soundon.log
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ fi
  
  if test -f $OSSLIBDIR/etc/license.asc
  then
@@ -23,7 +23,7 @@
  fi
  
  OPTIONS=
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ do
  done
  
  echo "+++ ossinfo -v3 +++" >> $LOG
@@ -32,7 +32,7 @@
  echo "+++ /dev/sndstat +++" >> $LOG
  cat /dev/sndstat >> $LOG 2>&1
  echo "+++ dmesg +++" >> $LOG
-@@ -85,11 +85,11 @@
+@@ -85,11 +85,11 @@ then
  	sh $OSSLIBDIR/etc/legacy_devices >> $LOG 2>&1
  fi
  
@@ -46,7 +46,7 @@
  
  if test -x $OSSLIBDIR/soundon.user
  then
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ then
    $OSSLIBDIR/soundon.user >> $LOG 2>&1
  fi
  
@@ -55,7 +55,7 @@
  then
  	echo
  	echo "************************************************************"
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ then
  	sleep 1
  fi
  
diff --git a/audio/oss/files/patch-setup-srcconf.c b/audio/oss/files/patch-setup_srcconf.c
index c058fce01c82..53d97d093d40 100644
--- a/audio/oss/files/patch-setup-srcconf.c
+++ b/audio/oss/files/patch-setup_srcconf.c
@@ -1,6 +1,6 @@
---- setup/srcconf.c.orig	2009-09-03 06:14:33.000000000 -0400
-+++ setup/srcconf.c	2009-09-22 14:52:03.000000000 -0400
-@@ -195,7 +195,7 @@
+--- setup/srcconf.c.orig	2015-01-28 08:07:32 UTC
++++ setup/srcconf.c
+@@ -195,7 +195,7 @@ parse_config (FILE * f, conf_t * conf, c
  	{
  	  parms = "";
  	  if (getenv ("OGG_SUPPORT") != NULL)
@@ -9,7 +9,7 @@
  	}
  
        if (strcmp (line, "project") == 0)
-@@ -913,7 +913,7 @@
+@@ -913,7 +913,7 @@ printf("Symlink %s -> %s\n", source, tar
    if (config_phpmake)
       fprintf (f, "<?php require getenv(\"PHPMAKE_LIBPATH\") . \"library.php\"; phpmake_makefile_top_rules(); ?>\n");