Oops, I didn't want to touch patch-ab.

2 files changed, 7 insertions, 41 deletions

diff --git a/audio/nosefart/distinfo b/audio/nosefart/distinfo
index 89b71b48e33..795c447a3ca 100644
--- a/audio/nosefart/distinfo
+++ b/audio/nosefart/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/09/29 11:31:09 rillig Exp $
+$NetBSD: distinfo,v 1.5 2007/09/29 11:35:11 rillig Exp $
 
 SHA1 (nosefart-2.3-mls.tar.bz2) = ab5755674adefa3f6f63e0772245831e7c0be2f7
 RMD160 (nosefart-2.3-mls.tar.bz2) = 54365aaf542d76f726a9b9ebb0d93a7a219c2e5e
 Size (nosefart-2.3-mls.tar.bz2) = 531605 bytes
 SHA1 (patch-aa) = 0ccefb7d1e9cfa7ca147624ac117c9570f012609
-SHA1 (patch-ab) = d70cf260fe4c92b5dbdf286e412f97093a631a1b
+SHA1 (patch-ab) = 325c4038a865ec686a33d440540be16a46445564
 SHA1 (patch-ac) = fc606d92877bc5f83c149b42570249d5f5778219
diff --git a/audio/nosefart/patches/patch-ab b/audio/nosefart/patches/patch-ab
index c3e20a51263..40f9e5b99d2 100644
--- a/audio/nosefart/patches/patch-ab
+++ b/audio/nosefart/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2007/09/29 11:31:09 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2007/09/29 11:35:11 rillig Exp $
 
---- src/linux/main_linux.c.orig	2004-05-02 01:53:54.000000000 +0200
-+++ src/linux/main_linux.c	2007-09-29 13:23:40.000000000 +0200
+--- src/linux/main_linux.c.orig	Sat May  1 16:53:54 2004
++++ src/linux/main_linux.c	Thu Dec  2 01:58:01 2004
 @@ -3,6 +3,7 @@
  UNIX systems */
  
@@ -10,32 +10,7 @@ $NetBSD: patch-ab,v 1.3 2007/09/29 11:31:09 rillig Exp $
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -218,12 +219,12 @@ static void open_hardware(const char *de
-          exit(1);
-       }
-    }
--   /* if it's not a char device and it's not /dev/dsp */
--   /* The second check is because when run with esddsp, /dev/dsp
-+   /* if it's not a char device and it's not /dev/sound */
-+   /* The second check is because when run with esddsp, /dev/sound
-    doesn't show up as a char device. The original author (Matthew Conte) seems
-    to have thought that esddsp should work without this hack.  Is doing this 
-    bad? --Matthew Strait */
--   if( !S_ISCHR(status.st_mode) && strcmp("/dev/dsp", device))
-+   if( !S_ISCHR(status.st_mode) && strcmp("/dev/sound", device))
-    {
-       printf("%s is not a character device.\n", device);
-       exit(1);
-@@ -305,7 +306,7 @@ static void show_help(void)
-    printf("\t-h  \tHelp\n");
-    printf("\t-v  \tVersion information\n");
-    printf("\n\t-t x\tStart playing track x (default: 1)\n");
--   printf("\n\t-d x\tUse device x (default: /dev/dsp)\n");
-+   printf("\n\t-d x\tUse device x (default: /dev/sound)\n");
-    printf("\t-s x\tPlay at x times the normal speed.\n");
-    printf("\t-f x\tUse x sampling rate (default: 44100)\n");
-    printf("\t-l x\tLimit total playing time to x seconds (0 = unlimited)\n");
-@@ -342,12 +343,59 @@ static void show_info(void)
+@@ -342,12 +343,59 @@
  static void printsonginfo(int current_frame, int total_frames, int limited)
  {
     /*Why not printf directly?  Our termios hijinks for input kills the output*/
@@ -95,7 +70,7 @@ $NetBSD: patch-ab,v 1.3 2007/09/29 11:31:09 rillig Exp $
     snprintf(hi, 254, 
     total_frames != 0 ? 
     "Playing track %d/%d, channels %c%c%c%c%c%c, %d/%d sec, %d/%d frames\r":
-@@ -363,9 +411,16 @@ static void printsonginfo(int current_fr
+@@ -363,9 +411,16 @@
     current_frame,
     total_frames
     );
@@ -112,12 +87,3 @@ $NetBSD: patch-ab,v 1.3 2007/09/29 11:31:09 rillig Exp $
  
     write(STDOUT_FILENO, (void *)hi, strlen(hi));
     free(hi);
-@@ -565,7 +620,7 @@ static void close_nsf_file(void)
- /* HAS ROOT PERMISSIONS -- BE CAREFUL */
- int main(int argc, char **argv)
- {
--   char *device = "/dev/dsp";
-+   char *device = "/dev/sound";
-    char *filename;
-    int track = 1;
-    int done = 0;