Normalized the format of the patches.

3 files changed, 43 insertions, 61 deletions

diff --git a/audio/amp/distinfo b/audio/amp/distinfo
index 13c407d7693..471121331da 100644
--- a/audio/amp/distinfo
+++ b/audio/amp/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:43 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/05/31 21:44:42 rillig Exp $
 
 SHA1 (amp-0.7.6.tgz) = 6c49d027754615677ad398c1eea858536ec804c2
 RMD160 (amp-0.7.6.tgz) = 34053f8a050ff3aafb2e723c283ac2aa0f4e2a67
 Size (amp-0.7.6.tgz) = 100337 bytes
-SHA1 (patch-aa) = e62709809b7b51b046b94bbf80dba27faa2257d9
+SHA1 (patch-aa) = 56696e88276b770d24b20076e780bc28798d5f8c
 SHA1 (patch-ab) = 9f14872524bb4f451e5cd8c5cc5d48f74c38c2f2
 SHA1 (patch-ac) = 9d63992ce148b978b2a6b5179d97e23154e18833
-SHA1 (patch-ad) = 6ca0a1d150d0c67ccea109b2adc7c38099ccd6f9
+SHA1 (patch-ad) = 96946cc2fb7a17ca5b7e693370224e903b0a381b
 SHA1 (patch-ae) = c084fa45bc144c29ed7548ffc609fb964d375ac8
 SHA1 (patch-af) = d0f8561557277d6674cb956dca42b793cb63ae2c
diff --git a/audio/amp/patches/patch-aa b/audio/amp/patches/patch-aa
index 31ba9573330..6597b4acd57 100644
--- a/audio/amp/patches/patch-aa
+++ b/audio/amp/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2003/03/22 05:44:37 dillo Exp $
+$NetBSD: patch-aa,v 1.4 2005/05/31 21:44:42 rillig Exp $
 
---- audioIO.c.old	Sun Oct 26 10:55:27 1997
-+++ audioIO.c	Sun Oct 26 10:56:03 1997
+--- audioIO.c.orig	Sat May 31 19:47:58 1997
++++ audioIO.c	Tue May 31 23:42:01 2005
 @@ -18,7 +18,7 @@
    #include "audioIO_HPUX.c"
  #endif
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.3 2003/03/22 05:44:37 dillo Exp $
 +#if defined(OS_SunOS) || defined(OS_NetBSD)
    #include "audioIO_SunOS.c"
  #endif
-
+ 
diff --git a/audio/amp/patches/patch-ad b/audio/amp/patches/patch-ad
index 856b13e6fbe..600f10842e9 100644
--- a/audio/amp/patches/patch-ad
+++ b/audio/amp/patches/patch-ad
@@ -1,55 +1,37 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:35:53 agc Exp $
+$NetBSD: patch-ad,v 1.3 2005/05/31 21:44:42 rillig Exp $
 
-*** guicontrol.c~	Sat Aug 23 07:30:51 1997
---- guicontrol.c	Thu Mar  5 21:31:06 1998
-***************
-*** 312,317 ****
---- 312,325 ----
-        if (quit_flag)
-  	{
-  /* 	  fprintf(stderr, "quit_flag is true\n"); */
-+ 
-+ 	  if((flags = fcntl(STDOUT_FILENO, F_GETFL, 0)) < 0)
-+ 	    perror("fcntl");
-+ 	  flags &= ~O_NONBLOCK;
-+   
-+ 	  if(fcntl(STDOUT_FILENO, F_SETFL, flags) < 0)
-+ 	    perror("fcntl");
-+ 
-  	  exit(0);
-  	}
-        while(GUI_FD_TO_PLAY != -1)
-***************
-*** 334,340 ****
-  	 
-  	 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-  	   perror("fcntl");
-! 	 flags ^= O_NONBLOCK;
-  	 
-  	 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-  	   perror("fcntl");
---- 342,348 ----
-  	 
-  	 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-  	   perror("fcntl");
-! 	 flags &= ~O_NONBLOCK;
-  	 
-  	 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-  	   perror("fcntl");
-***************
-*** 394,400 ****
-                  /* Set stdin to blocking */
-                  if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-                          perror("fcntl");
-!                 flags ^= O_NONBLOCK;
-                  if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-                          perror("fcntl");
-          }
---- 402,408 ----
-                  /* Set stdin to blocking */
-                  if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
-                          perror("fcntl");
-!                 flags &= ~O_NONBLOCK;
-                  if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
-                          perror("fcntl");
-          }
+--- guicontrol.c.orig	Sat Aug 23 13:30:51 1997
++++ guicontrol.c	Tue May 31 23:42:01 2005
+@@ -312,6 +312,14 @@ void gui_control(void)
+       if (quit_flag)
+ 	{
+ /* 	  fprintf(stderr, "quit_flag is true\n"); */
++
++	  if((flags = fcntl(STDOUT_FILENO, F_GETFL, 0)) < 0)
++	    perror("fcntl");
++	  flags &= ~O_NONBLOCK;
++  
++	  if(fcntl(STDOUT_FILENO, F_SETFL, flags) < 0)
++	    perror("fcntl");
++
+ 	  exit(0);
+ 	}
+       while(GUI_FD_TO_PLAY != -1)
+@@ -334,7 +342,7 @@ void gui_control(void)
+ 	 
+ 	 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
+ 	   perror("fcntl");
+-	 flags ^= O_NONBLOCK;
++	 flags &= ~O_NONBLOCK;
+ 	 
+ 	 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
+ 	   perror("fcntl");
+@@ -394,7 +402,7 @@ int decodeMPEG_2(int inFilefd)
+                 /* Set stdin to blocking */
+                 if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
+                         perror("fcntl");
+-                flags ^= O_NONBLOCK;
++                flags &= ~O_NONBLOCK;
+                 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
+                         perror("fcntl");
+         }