[pkgsrc/trunk]: pkgsrc/audio/nosefart Update to 2.3, provided by David Griffi...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85e0e3b1a692
branches:  trunk
changeset: 485032:85e0e3b1a692
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 03 13:02:18 2004 +0000

description:
Update to 2.3, provided by David Griffith in private mail.

2.3-mls (12 Aug 2004)

Updated winamp plugin, thanks to K`rai.

2.2-mls (1 May 2004)

Added README.cl-amp (taken from Eli's page).

Added a fflush to nosefart for the benifit of gnosefart.

2.1-mls (23 April 2004)

gnosefart updated to 1.0.

2.0-mls (16 April 2004)

Added gnosefart 0.9, a GTK frontend for nosefart.

Decided to be more confident about my version numbering.

Nosefart now returns 0 if nothing went wrong.

1.92k-mls (4 April 2004)

Fixed a bug in the UI that made it not refresh properly.  Improved spec file.

1.92j-mls (21 March 2004)

A few small tweaks to nsfinfo and the interface.  Added spec file
for building RPMs.

diffstat:

 audio/nosefart/Makefile         |   5 +-
 audio/nosefart/distinfo         |  10 ++--
 audio/nosefart/patches/patch-aa |   8 ++--
 audio/nosefart/patches/patch-ab |  81 ++++++++++++++++++++++++----------------
 4 files changed, 61 insertions(+), 43 deletions(-)

diffs (167 lines):

diff -r 293ff00da369 -r 85e0e3b1a692 audio/nosefart/Makefile
--- a/audio/nosefart/Makefile   Fri Dec 03 12:59:11 2004 +0000
+++ b/audio/nosefart/Makefile   Fri Dec 03 13:02:18 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/05/30 12:47:18 seb Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/03 13:02:18 wiz Exp $
 
-DISTNAME=              nosefart-1.92i-mls
+DISTNAME=              nosefart-2.3-mls
 PKGNAME=               ${DISTNAME:S/-mls//}
+EXTRACT_SUFX=          .tar.bz2
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=nosefart/}
 
diff -r 293ff00da369 -r 85e0e3b1a692 audio/nosefart/distinfo
--- a/audio/nosefart/distinfo   Fri Dec 03 12:59:11 2004 +0000
+++ b/audio/nosefart/distinfo   Fri Dec 03 13:02:18 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/27 02:58:06 snj Exp $
+$NetBSD: distinfo,v 1.2 2004/12/03 13:02:18 wiz Exp $
 
-SHA1 (nosefart-1.92i-mls.tar.gz) = bb52a1b2f1a1a95fbdc77cf7fe06f293bd30055f
-Size (nosefart-1.92i-mls.tar.gz) = 1054405 bytes
-SHA1 (patch-aa) = 03e9b1c45d8013637d597c30e120ddb17026d44c
-SHA1 (patch-ab) = da00f888447706a2ab2f42a638fb0a11a719af15
+SHA1 (nosefart-2.3-mls.tar.bz2) = ab5755674adefa3f6f63e0772245831e7c0be2f7
+Size (nosefart-2.3-mls.tar.bz2) = 531605 bytes
+SHA1 (patch-aa) = 0ccefb7d1e9cfa7ca147624ac117c9570f012609
+SHA1 (patch-ab) = 325c4038a865ec686a33d440540be16a46445564
diff -r 293ff00da369 -r 85e0e3b1a692 audio/nosefart/patches/patch-aa
--- a/audio/nosefart/patches/patch-aa   Fri Dec 03 12:59:11 2004 +0000
+++ b/audio/nosefart/patches/patch-aa   Fri Dec 03 13:02:18 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/27 02:58:06 snj Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/03 13:02:18 wiz Exp $
 
---- Makefile.orig      2003-09-25 10:35:54.000000000 -0700
-+++ Makefile   2004-02-26 18:49:11.000000000 -0800
+--- Makefile.orig      Thu Aug 12 17:19:33 2004
++++ Makefile   Thu Dec  2 00:52:22 2004
 @@ -1,9 +1,9 @@
  ################################
  # Configuration
@@ -12,6 +12,6 @@
 +#CC = gcc
 +#CFLAGS = 
 +LDFLAGS += -lm ${LIBOSSAUDIO}
- PREFIX = /usr/local
+ PREFIX = /usr
  WANT_DEBUG=TRUE
  
diff -r 293ff00da369 -r 85e0e3b1a692 audio/nosefart/patches/patch-ab
--- a/audio/nosefart/patches/patch-ab   Fri Dec 03 12:59:11 2004 +0000
+++ b/audio/nosefart/patches/patch-ab   Fri Dec 03 13:02:18 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/27 02:58:06 snj Exp $
+$NetBSD: patch-ab,v 1.2 2004/12/03 13:02:18 wiz Exp $
 
---- src/linux/main_linux.c.orig        2003-10-22 18:31:57.000000000 +0200
-+++ src/linux/main_linux.c
+--- 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,18 +10,25 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -234,6 +235,50 @@ static void printsonginfo(int current_fr
+@@ -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*/
-    char *hi = (char *)malloc(255);
- 
 +
 +   /*
-+    * The new hijinks seem to cause trouble for NetBSD (\r sometimes
-+    * doesn't get printed), so I'm adding \r to the beginning of these
-+    * strings.  Suggested by Bruce J.A Nourish, implemented by David
-+    * Griffith.
++    * Once again, the termios hijinks cause trouble for NetBSD.  \r 
++    * sometimes doesn't get printed.  Following is a mostly complete 
++    * rewrite of the text output section as presented in my NetBSD 
++    * pkgsrc package for version 1.92i-mls.  The fix was suggested by 
++    * Bruce J.A. Nourish.  I'm David Griffith.
 +    */
 +
+    char *hi = (char *)malloc(255);
+    char blank[82]; 
+    memset(blank, ' ', 80);
+    blank[80] = '\r';
+    blank[81] = '\0';
+ 
 +   if (total_frames !=0) {
 +      if (limited) {
 +              snprintf(hi, 254, "\rPlaying track %d of %d, channels %c%c%c%c%c%c, %d/%d seconds, %d/%d frames\r",
@@ -37,36 +44,46 @@
 +              snprintf(hi, 254, "\rPlaying track %d of %d, channels %c%c%c%c%c%c, %d/? seconds, %d/? frames\r",
 +                      nsf->current_song, nsf->num_songs,
 +                      enabled[0]?'1':'-',      enabled[1]?'2':'-',
-+
-+                       enabled[2]?'3':'-',      enabled[3]?'4':'-',
-+                       enabled[4]?'5':'-',      enabled[5]?'6':'-',
-+                       (int)((float)(current_frame + nsf->playback_rate - 1)/(float)nsf->playback_rate),
-+                       current_frame);
-+       }
-+   } else {
-+       snprintf(hi, 254, "\rPlaying track %d of %d, channels %c%c%c%c%c%c, %d seconds, %d frames\r",
-+                       nsf->current_song, nsf->num_songs,
-+                       enabled[0]?'1':'-',      enabled[1]?'2':'-',
-+                       enabled[2]?'3':'-',      enabled[3]?'4':'-',
-+                       enabled[4]?'5':'-',      enabled[5]?'6':'-',
-+                       (int)((float)(current_frame + nsf->playback_rate - 1)/(float)nsf->playback_rate),
-+                       current_frame);
-+   }   
++                      enabled[2]?'3':'-',      enabled[3]?'4':'-',
++                      enabled[4]?'5':'-',      enabled[5]?'6':'-',
++                      (int)((float)(current_frame + nsf->playback_rate - 1)/(float)nsf->playback_rate),
++                      current_frame);
++      }
++  } else {
++      snprintf(hi, 254, "\rPlaying track %d of %d, channels %c%c%c%c%c%c, %d seconds, %d frames\r",
++              nsf->current_song, nsf->num_songs,
++              enabled[0]?'1':'-',      enabled[1]?'2':'-',
++              enabled[2]?'3':'-',      enabled[3]?'4':'-',
++              enabled[4]?'5':'-',      enabled[5]?'6':'-',
++              (int)((float)(current_frame + nsf->playback_rate - 1)/(float)nsf->playback_rate),
++              current_frame);
++  }   
++ 
 +
 +/*
-+ * This stuff doesn't seem to work.
++ * Not only does the following section do funny things to terminals, 
++ * it's a good example of how to use the trinary operator to make your 
++ * code very hard to understand.  Please don't use the trinary operator 
++ * when if-then-else will do.  
 + */
-+
-+/*
++#ifdef __REALLY_BIG_COMMENT__
     snprintf(hi, 254, 
     total_frames != 0 ? 
-    "Playing track %d of %d, channels %c%c%c%c%c%c, %d/%d seconds, %d/%d frames\r":
-@@ -249,7 +294,7 @@ static void printsonginfo(int current_fr
+    "Playing track %d/%d, channels %c%c%c%c%c%c, %d/%d sec, %d/%d frames\r":
+@@ -363,9 +411,16 @@
     current_frame,
     total_frames
     );
--
++#endif /* __REALLY_BIG_COMMENT__ */
++
+ 
++/*
++ * I'm not sure what this is supposed to do.  Under NetBSD it garbles 
++ * the screen, but not to the degree as the above commented-out code.
++/*
+    if(!(current_frame%10))
+       write(STDOUT_FILENO, (void *)blank, strlen(blank));
 +*/
+ 
     write(STDOUT_FILENO, (void *)hi, strlen(hi));
     free(hi);
- }