With the power of USES=dos2unix, get rid of most patches and files

with CRLF.

While there, run make makepatch, rename patches to use the new scheme,
and various fixes.

With hat:	portmgr
Sponsored by:	Absolight

23 files changed, 97 insertions, 96 deletions

diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index 4247c739cf07..f9eafd7900b8 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -14,7 +14,8 @@ COMMENT=	Speech recognition system
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-USES=		gmake libtool shebangfix
+USES=		dos2unix gmake libtool shebangfix
+DOS2UNIX_FILES=	src/libsphinx2fe/fe_sigproc.c
 SHEBANG_FILES=	scripts/sphinx2-demo.in
 perl_OLD_CMD=	"@PERL@ -w"
 
diff --git a/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h b/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h
deleted file mode 100644
index d7646e067e0c..000000000000
--- a/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/libsphinx2/include/pconf.h.orig	2007-12-06 18:24:09.000000000 +0100
-+++ src/libsphinx2/include/pconf.h	2007-12-06 18:24:20.000000000 +0100
-@@ -124,4 +124,4 @@
- 	   char * (*GetDefault)(char const *, char const *), char last);
- void pusage(char *prog, Config_t *cp);
- 
--#endif _PCONF_
-+#endif
diff --git a/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c b/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c
deleted file mode 100644
index c3c2650101bb..000000000000
--- a/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libsphinx2/eht_quit.c.orig	2007-12-06 18:21:53.000000000 +0100
-+++ src/libsphinx2/eht_quit.c	2007-12-06 18:22:13.000000000 +0100
-@@ -85,6 +85,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <stdarg.h>
- 
- void
diff --git a/audio/sphinx/files/patch-src-libsphinx2_prime.c b/audio/sphinx/files/patch-src-libsphinx2_prime.c
deleted file mode 100644
index 824091bf1bbc..000000000000
--- a/audio/sphinx/files/patch-src-libsphinx2_prime.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/libsphinx2/prime.c.orig	2007-12-06 18:27:41.000000000 +0100
-+++ src/libsphinx2/prime.c	2007-12-06 18:27:51.000000000 +0100
-@@ -75,5 +75,4 @@
-     }
- }
- 
--#endif MAIN
--
-+#endif
diff --git a/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c b/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c
deleted file mode 100644
index e0465672944a..000000000000
--- a/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libsphinx2/r_agc_noise.c.orig	2007-12-06 18:28:21.000000000 +0100
-+++ src/libsphinx2/r_agc_noise.c	2007-12-06 18:28:49.000000000 +0100
-@@ -34,6 +34,7 @@
-  *
-  */
- #include <stdio.h>
-+#include <string.h>
- 
- #include "s2types.h"
- #include "c.h"
diff --git a/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c b/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c
deleted file mode 100644
index 07d5965ad3cc..000000000000
--- a/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libsphinx2/sc_vq.c.orig	2007-12-06 18:38:16.000000000 +0100
-+++ src/libsphinx2/sc_vq.c	2007-12-06 18:38:36.000000000 +0100
-@@ -64,6 +64,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <assert.h>
- #include <limits.h>
- 
diff --git a/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c b/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c
deleted file mode 100644
index 20c16850739b..000000000000
--- a/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libsphinx2fe/fe_sigproc.c.orig	2007-12-06 18:34:10.000000000 +0100
-+++ src/libsphinx2fe/fe_sigproc.c	2007-12-06 18:34:25.000000000 +0100
-@@ -43,7 +43,7 @@
- 

- #ifndef	M_PI

- #define M_PI	(3.14159265358979323846)

--#endif	M_PI

-+#endif

- 

- #define FORWARD_FFT 1

- #define INVERSE_FFT -1

diff --git a/audio/sphinx/files/patch-src-examples_clicore.c b/audio/sphinx/files/patch-src_examples_clicore.c
index 1013ddc46861..e842c15fe771 100644
--- a/audio/sphinx/files/patch-src-examples_clicore.c
+++ b/audio/sphinx/files/patch-src_examples_clicore.c
@@ -1,6 +1,6 @@
---- src/examples/clicore.c.orig	2007-12-06 18:36:24.000000000 +0100
-+++ src/examples/clicore.c	2007-12-06 18:36:39.000000000 +0100
-@@ -323,7 +323,7 @@
+--- src/examples/clicore.c.orig	2001-12-13 21:11:13 UTC
++++ src/examples/clicore.c
+@@ -323,7 +323,7 @@ SOCKET cli_open (char *hostname, int32 p
  	memcpy (&addr.sin_addr, hp->h_addr, hp->h_length);
  	addr.sin_port = htons((u_short) port);
  	
diff --git a/audio/sphinx/files/patch-src-examples_srvcore.c b/audio/sphinx/files/patch-src_examples_srvcore.c
index 56fc3511d83b..64194468b326 100644
--- a/audio/sphinx/files/patch-src-examples_srvcore.c
+++ b/audio/sphinx/files/patch-src_examples_srvcore.c
@@ -1,6 +1,6 @@
---- src/examples/srvcore.c.orig	2007-12-06 18:35:25.000000000 +0100
-+++ src/examples/srvcore.c	2007-12-06 18:35:56.000000000 +0100
-@@ -381,7 +381,7 @@
+--- src/examples/srvcore.c.orig	2001-12-13 21:11:15 UTC
++++ src/examples/srvcore.c
+@@ -381,7 +381,7 @@ SOCKET server_await_conn ( void )
  
      ERRLOG((stderr, "%s(%d): Listening at port %d\n", __FILE__, __LINE__, bindport));
  
diff --git a/audio/sphinx/files/patch-src_examples_tty-continuous.c b/audio/sphinx/files/patch-src_examples_tty-continuous.c
index d3d33a53aaff..78652fcd3235 100644
--- a/audio/sphinx/files/patch-src_examples_tty-continuous.c
+++ b/audio/sphinx/files/patch-src_examples_tty-continuous.c
@@ -1,7 +1,7 @@
 author:  Andriy Gapon
 
---- src/examples/tty-continuous.c.orig	Thu Dec 13 21:11:15 2001
-+++ src/examples/tty-continuous.c	Mon Oct 20 12:12:58 2003
+--- src/examples/tty-continuous.c.orig	2001-12-13 21:11:15 UTC
++++ src/examples/tty-continuous.c
 @@ -175,7 +175,6 @@ static void utterance_loop()
  	 * listening until current utterance completely decoded
  	 */
diff --git a/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c b/audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c
index 90a67a62cf1b..21f15e5afc35 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c
@@ -1,5 +1,5 @@
---- src/libsphinx2/blk_cdcn_norm.c.orig	2007-12-06 19:23:43.000000000 +0100
-+++ src/libsphinx2/blk_cdcn_norm.c	2007-12-06 19:23:25.000000000 +0100
+--- src/libsphinx2/blk_cdcn_norm.c.orig	2001-12-13 21:11:20 UTC
++++ src/libsphinx2/blk_cdcn_norm.c
 @@ -36,6 +36,18 @@
  #include <math.h>
  #include "cdcn.h"
@@ -19,7 +19,7 @@
  /************************************************************************
   *   Dummy routine to convert from suitcase to sane varibles
   ***************************************************************************/
-@@ -46,7 +58,6 @@
+@@ -46,7 +58,6 @@ void block_cdcn_norm (float z[][NUM_COEF
  {
      /* Multidimensional arrays in C suck, so we have to
         forward-declare-hack this. */
@@ -27,7 +27,7 @@
      float *variance, *prob, *tilt, *noise, *codebook, *corrbook;
      int    num_codes;
  
-@@ -88,7 +99,6 @@
+@@ -88,7 +99,6 @@ void block_cdcn_norm (float z[][NUM_COEF
   * Coded by Alex Acero (acero@s),  November 1989 
   *
   *************************************************************************/
diff --git a/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c b/audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c
index df6ab3080271..bb94530dcf6a 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c
@@ -1,5 +1,5 @@
---- src/libsphinx2/cdcn_norm.c.orig	2007-12-06 19:24:33.000000000 +0100
-+++ src/libsphinx2/cdcn_norm.c	2007-12-06 19:26:24.000000000 +0100
+--- src/libsphinx2/cdcn_norm.c.orig	2001-12-13 21:11:20 UTC
++++ src/libsphinx2/cdcn_norm.c
 @@ -35,6 +35,15 @@
   */
  #include <math.h>
diff --git a/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c b/audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c
index 5d1168421715..b457815cc1ed 100644
--- a/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c
@@ -1,5 +1,5 @@
---- src/libsphinx2/cdcn_update.c.orig	2001-12-13 22:11:20.000000000 +0100
-+++ src/libsphinx2/cdcn_update.c	2007-12-06 19:40:02.000000000 +0100
+--- src/libsphinx2/cdcn_update.c.orig	2001-12-13 21:11:20 UTC
++++ src/libsphinx2/cdcn_update.c
 @@ -47,6 +47,11 @@
   * Modified by Uday Jain, June 95
   *
@@ -12,7 +12,7 @@
  
  float
  cdcn_update (float *z,		/* The observed cepstrum vectors */
-@@ -56,13 +61,7 @@
+@@ -56,13 +61,7 @@ cdcn_update (float *z,		/* The observed 
      float       distortion;
      float	*noise, *tilt, *codebook, *prob, *variance, *corrbook;
      int 	num_codes;
diff --git a/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c b/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c
new file mode 100644
index 000000000000..f545fff4e4ef
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c
@@ -0,0 +1,10 @@
+--- src/libsphinx2/eht_quit.c.orig	2001-12-13 21:11:20 UTC
++++ src/libsphinx2/eht_quit.c
+@@ -85,6 +85,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ 
+ void
diff --git a/audio/sphinx/files/patch-src-libsphinx2_err.c b/audio/sphinx/files/patch-src_libsphinx2_err.c
index 84d9d2fb6aa8..5c654b575287 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_err.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_err.c
@@ -1,5 +1,5 @@
---- src/libsphinx2/err.c.orig	2007-12-06 18:22:49.000000000 +0100
-+++ src/libsphinx2/err.c	2007-12-06 18:23:27.000000000 +0100
+--- src/libsphinx2/err.c.orig	2001-12-13 21:11:20 UTC
++++ src/libsphinx2/err.c
 @@ -49,6 +49,7 @@
   */
  
diff --git a/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h b/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h
new file mode 100644
index 000000000000..1a89cbebd6fa
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h
@@ -0,0 +1,8 @@
+--- src/libsphinx2/include/pconf.h.orig	2001-12-13 21:11:27 UTC
++++ src/libsphinx2/include/pconf.h
+@@ -124,4 +124,4 @@ int ppconf(int argc, char *argv[],
+ 	   char * (*GetDefault)(char const *, char const *), char last);
+ void pusage(char *prog, Config_t *cp);
+ 
+-#endif _PCONF_
++#endif
diff --git a/audio/sphinx/files/patch-src-libsphinx2_linklist.c b/audio/sphinx/files/patch-src_libsphinx2_linklist.c
index c6f3eb4c5692..d8816d04b6e7 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_linklist.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_linklist.c
@@ -1,5 +1,5 @@
---- src/libsphinx2/linklist.c.orig	2007-12-06 18:25:48.000000000 +0100
-+++ src/libsphinx2/linklist.c	2007-12-06 18:27:00.000000000 +0100
+--- src/libsphinx2/linklist.c.orig	2001-12-13 21:11:22 UTC
++++ src/libsphinx2/linklist.c
 @@ -81,7 +81,6 @@
  
  #include <stdio.h>
@@ -8,7 +8,7 @@
  
  #include "s2types.h"
  
-@@ -132,7 +131,7 @@
+@@ -132,7 +131,7 @@ void *listelem_alloc (int32 elem_size)
  	cpp = list[i].freelist = (void **) malloc (list[i].n_malloc * elem_size);
  	cp = (void *) cpp;
  	for (j = list[i].n_malloc-1; j > 0; --j) {
diff --git a/audio/sphinx/files/patch-src_libsphinx2_prime.c b/audio/sphinx/files/patch-src_libsphinx2_prime.c
new file mode 100644
index 000000000000..10bb7ff70b76
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_prime.c
@@ -0,0 +1,9 @@
+--- src/libsphinx2/prime.c.orig	2001-12-13 21:11:23 UTC
++++ src/libsphinx2/prime.c
+@@ -75,5 +75,4 @@ main ()
+     }
+ }
+ 
+-#endif MAIN
+-
++#endif
diff --git a/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c b/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c
new file mode 100644
index 000000000000..4050c77e96d7
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c
@@ -0,0 +1,10 @@
+--- src/libsphinx2/r_agc_noise.c.orig	2001-12-13 21:11:23 UTC
++++ src/libsphinx2/r_agc_noise.c
+@@ -34,6 +34,7 @@
+  *
+  */
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "s2types.h"
+ #include "c.h"
diff --git a/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c b/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c
new file mode 100644
index 000000000000..a687843c24b2
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c
@@ -0,0 +1,10 @@
+--- src/libsphinx2/sc_vq.c.orig	2001-12-13 21:11:23 UTC
++++ src/libsphinx2/sc_vq.c
+@@ -64,6 +64,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+ #include <limits.h>
+ 
diff --git a/audio/sphinx/files/patch-src-libsphinx2_search.c b/audio/sphinx/files/patch-src_libsphinx2_search.c
index 1d6f423d4bcf..69e5c737e849 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_search.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_search.c
@@ -1,6 +1,6 @@
---- src/libsphinx2/search.c.orig	2007-12-06 18:29:23.000000000 +0100
-+++ src/libsphinx2/search.c	2007-12-06 18:33:21.000000000 +0100
-@@ -2236,6 +2236,9 @@
+--- src/libsphinx2/search.c.orig	2001-12-13 21:11:24 UTC
++++ src/libsphinx2/search.c
+@@ -2236,6 +2236,9 @@ search_one_ply_fwd (void)
      lm_next_frame ();
  }
  
@@ -10,7 +10,7 @@
  void
  search_finish_fwd (void)
  {
-@@ -2245,7 +2248,6 @@
+@@ -2245,7 +2248,6 @@ search_finish_fwd (void)
      CHAN_T *hmm, /* *thmm,*/ **acl;
      /* int32 bp, bestbp, bestscore; */
      /* int32 l_scr; */
@@ -18,7 +18,7 @@
      
      if ((CurrentFrame > 0) && (topsen_window > 1)) {
  	/* Wind up remaining frames */
-@@ -2306,7 +2308,6 @@
+@@ -2306,7 +2308,6 @@ search_finish_fwd (void)
      /* Get pscr-score for fwdtree recognition */
      {
  	search_hyp_t *pscrpath;
diff --git a/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c b/audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c
index 959b25d4febd..90f9eb75ffc0 100644
--- a/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c
+++ b/audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c
@@ -1,7 +1,7 @@
 author:  Andriy Gapon
 
---- src/libsphinx2ad/ad_oss_bsd.c.orig	Thu Dec 13 21:11:27 2001
-+++ src/libsphinx2ad/ad_oss_bsd.c	Fri Oct 24 04:11:22 2003
+--- src/libsphinx2ad/ad_oss_bsd.c.orig	2001-12-13 21:11:27 UTC
++++ src/libsphinx2ad/ad_oss_bsd.c
 @@ -61,7 +61,7 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -27,7 +27,7 @@ author:  Andriy Gapon
      int32 audioFormat=AUDIO_FORMAT;
      int32 dspCaps=0;
      int32 sampleRate;
-@@ -96,7 +93,6 @@
+@@ -96,7 +93,6 @@ ad_rec_t *ad_open_sps (int32 sps) {
      }
      sampleRate = sps;
      
@@ -35,7 +35,7 @@ author:  Andriy Gapon
      if((dspFD = open ("/dev/dsp", O_RDONLY))<0){
  	if (errno == EBUSY)
  	    fprintf(stderr, "Audio device busy\n");
-@@ -105,18 +101,6 @@
+@@ -105,18 +101,6 @@ ad_rec_t *ad_open_sps (int32 sps) {
  	return NULL;
      }
      
@@ -54,7 +54,7 @@ author:  Andriy Gapon
      if (ioctl (dspFD, SNDCTL_DSP_SETFMT, &audioFormat) < 0){
  	fprintf(stderr, "Audio ioctl(SETFMT 0x%x) failed: %s\n", audioFormat, strerror(errno));
  	close (dspFD);
-@@ -139,12 +123,6 @@
+@@ -139,12 +123,6 @@ ad_rec_t *ad_open_sps (int32 sps) {
  	return NULL;
      }
      
@@ -67,7 +67,7 @@ author:  Andriy Gapon
      if (ioctl (dspFD, SNDCTL_DSP_GETCAPS, &dspCaps) < 0) {
  	fprintf(stderr, "ioctl(GETCAPS) failed: %s\n", strerror(errno));
  	close (dspFD);
-@@ -161,8 +139,6 @@
+@@ -161,8 +139,6 @@ ad_rec_t *ad_open_sps (int32 sps) {
      printf("DSP %s memory map capability.\n", (dspCaps&DSP_CAP_MMAP)?"has":"does not have");
  #endif
      
@@ -76,7 +76,7 @@ author:  Andriy Gapon
      
    /* Patched by N. Roy (nickr@ri.cmu.edu), 99/7/23. 
       Previously, mixer was set through dspFD. This is incorrect. Should
-@@ -210,10 +186,10 @@
+@@ -210,10 +186,10 @@ ad_rec_t *ad_open_sps (int32 sps) {
    }
      
    handle->dspFD = dspFD;
@@ -89,7 +89,7 @@ author:  Andriy Gapon
    return(handle);
  }
  
-@@ -224,15 +200,10 @@
+@@ -224,15 +200,10 @@ ad_rec_t *ad_open ( void )
  
  int32 ad_close (ad_rec_t *handle)
  {
@@ -106,7 +106,7 @@ author:  Andriy Gapon
      free(handle);
      
      return(0);
-@@ -240,48 +211,62 @@
+@@ -240,48 +211,62 @@ int32 ad_close (ad_rec_t *handle)
  
  int32 ad_start_rec (ad_rec_t *handle)
  {
@@ -198,7 +198,7 @@ author:  Andriy Gapon
      
      if ((length = read (handle->dspFD, buf, length)) > 0) {
  #if 0
-@@ -292,7 +277,7 @@
+@@ -292,7 +277,7 @@ int32 ad_read (ad_rec_t *handle, int16 *
      }
      
      if (length < 0) {
diff --git a/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c b/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c
new file mode 100644
index 000000000000..07f62d27a087
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c
@@ -0,0 +1,11 @@
+--- src/libsphinx2fe/fe_sigproc.c.orig	2016-06-20 13:31:26 UTC
++++ src/libsphinx2fe/fe_sigproc.c
+@@ -43,7 +43,7 @@
+ 
+ #ifndef	M_PI
+ #define M_PI	(3.14159265358979323846)
+-#endif	M_PI
++#endif
+ 
+ #define FORWARD_FFT 1
+ #define INVERSE_FFT -1