Wed Jul 16 07:21:23 2008 UTC ()
Update to herrie-2.1.  NOTE: the OSSv4 audio volume API change only applies
if OSSv4 is installed, so functionality should be retained on OSS-emulating
platforms, e.g. NetBSD and OpenBSD.

2008-07-15 -- Herrie 2.1:
 * Added: -p switch to start playback on startup - Phillip Warner
 * Fixed: Crash in seek time format parsing
 * Added: 'F' button to jump to files in the file browser
 * Improved: Use OSSv4 volume adjustment API - Paulo Matias


(bjs)
diff -r1.9 -r1.10 pkgsrc/audio/herrie/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/herrie/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/herrie/patches/patch-aa
cvs diff -r1.9 -r1.10 pkgsrc/audio/herrie/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/herrie/Makefile 2008/03/27 14:24:36 1.9
+++ pkgsrc/audio/herrie/Makefile 2008/07/16 07:21:23 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2008/03/27 14:24:36 bjs Exp $ 1# $NetBSD: Makefile,v 1.10 2008/07/16 07:21:23 bjs Exp $
2# 2#
3 3
4DISTNAME= herrie-2.0 4DISTNAME= herrie-2.1
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= http://herrie.info/distfiles/ 6MASTER_SITES= http://herrie.info/distfiles/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= bjs@NetBSD.org 9MAINTAINER= bjs@NetBSD.org
10HOMEPAGE= http://herrie.info/ 10HOMEPAGE= http://herrie.info/
11COMMENT= Minimalistic, ncurses-based audio player 11COMMENT= Minimalistic, ncurses-based audio player
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake msgfmt pkg-config 17USE_TOOLS+= gmake msgfmt pkg-config
cvs diff -r1.3 -r1.4 pkgsrc/audio/herrie/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/herrie/distinfo 2008/03/27 14:24:36 1.3
+++ pkgsrc/audio/herrie/distinfo 2008/07/16 07:21:23 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2008/03/27 14:24:36 bjs Exp $ 1$NetBSD: distinfo,v 1.4 2008/07/16 07:21:23 bjs Exp $
2 2
3SHA1 (herrie-2.0.tar.bz2) = 560b8dc591e0f2d5e84ae33843e42fe726dd828e 3SHA1 (herrie-2.1.tar.bz2) = da9f0838826954066abe9900e618ed8ad4da85ca
4RMD160 (herrie-2.0.tar.bz2) = f53ed76f578ad92a6146fe2a19c5b6a4decf35a6 4RMD160 (herrie-2.1.tar.bz2) = 638561a51aad2ee46a5915dc0ff921e5468218d3
5Size (herrie-2.0.tar.bz2) = 69438 bytes 5Size (herrie-2.1.tar.bz2) = 70592 bytes
6SHA1 (patch-aa) = 6721730981182b07a668525e919cd5ec8cb4d9fa 6SHA1 (patch-aa) = ee64594d6a4157869e6c99dd419c9c538c78bb52
cvs diff -r1.3 -r1.4 pkgsrc/audio/herrie/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/herrie/patches/patch-aa 2008/03/27 14:24:36 1.3
+++ pkgsrc/audio/herrie/patches/patch-aa 2008/07/16 07:21:23 1.4
@@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
1$NetBSD: patch-aa,v 1.3 2008/03/27 14:24:36 bjs Exp $ 1$NetBSD: patch-aa,v 1.4 2008/07/16 07:21:23 bjs Exp $
2 2
3--- configure.orig 2008-03-16 09:09:14.000000000 -0400 3--- configure.orig 2008-07-15 11:59:07.000000000 -0400
4+++ configure 4+++ configure
5@@ -33,7 +33,7 @@ APP_LINGUAS='ca da de es fi ga nl pl pt_ 5@@ -33,7 +33,7 @@ APP_LINGUAS='ca da de es fi ga nl pl pt_
6 CFG_AO=oss 6 CFG_AO=oss
7 unset CFG_BINEXT 7 unset CFG_BINEXT
8 CFG_CURSES_HEADER=ncurses 8 CFG_CURSES_HEADER=ncurses
9-CFG_CURSES_LIB=ncursesw 9-CFG_CURSES_LIB=ncursesw
10+CFG_CURSES_LIB=ncurses 10+CFG_CURSES_LIB=ncurses
11 CFG_HTTP=yes 11 CFG_HTTP=yes
12 CFG_MODPLUG=yes 12 CFG_MODPLUG=yes
13 CFG_MP3=yes 13 CFG_MP3=yes
14@@ -64,7 +64,7 @@ Darwin) 14@@ -64,7 +64,7 @@ Darwin)
15 LDFLAGS="$LDFLAGS -lresolv" 15 LDFLAGS="$LDFLAGS -lresolv"
16 [ "$PREFIX" = "" ] && PREFIX=/opt/local 16 [ "$PREFIX" = "" ] && PREFIX=/opt/local
17 ;; 17 ;;
18-FreeBSD) 18-FreeBSD)
19+FreeBSD|DragonFly) 19+FreeBSD|DragonFly)
20 CFG_SETPROCTITLE=yes 20 CFG_SETPROCTITLE=yes
21 [ "$PREFIX" = "" ] && PREFIX=/usr/local 21 [ "$PREFIX" = "" ] && PREFIX=/usr/local
22 [ "$MANDIR" = "" ] && MANDIR=$PREFIX/man 22 [ "$MANDIR" = "" ] && MANDIR=$PREFIX/man
23@@ -319,13 +319,13 @@ oss) 23@@ -320,13 +320,13 @@ oss)
24 NetBSD|OpenBSD) 24 NetBSD|OpenBSD)
25 CFLAGS="$CFLAGS -DOSS_HEADER=\\<soundcard.h\\>" 25 CFLAGS="$CFLAGS -DOSS_HEADER=\\<soundcard.h\\>"
26 LDFLAGS="$LDFLAGS -lossaudio" 26 LDFLAGS="$LDFLAGS -lossaudio"
27- OSS_DEVICE="/dev/audio" 27- OSS_DEVICE="/dev/audio"
28+ OSS_DEVICE="$DEVOSSAUDIO" 28+ OSS_DEVICE="$DEVOSSAUDIO"
29 ;; 29 ;;
30 *) 30 *)
31 # The OSS-through-ALSA compat may generate noise 31 # The OSS-through-ALSA compat may generate noise
32 [ "$OS" = "Linux" ] && CFLAGS_main="$CFLAGS_main -DCLOSE_STDERR" 32 [ "$OS" = "Linux" ] && CFLAGS_main="$CFLAGS_main -DCLOSE_STDERR"
33 CFLAGS="$CFLAGS -DOSS_HEADER=\\<sys/soundcard.h\\>" 33 CFLAGS="$CFLAGS -DOSS_HEADER=\\<sys/soundcard.h\\>"
34- OSS_DEVICE="/dev/dsp" 34- OSS_DEVICE="/dev/dsp"
35+ OSS_DEVICE="$DEVOSSAUDIO" 35+ OSS_DEVICE="$DEVOSSAUDIO"
36 ;; 36 ;;
37 esac 37 esac
38 CFG_VOLUME=yes 38 CFG_VOLUME=yes
39@@ -363,7 +363,7 @@ echo "- Using $CFG_AO audio output" 39@@ -364,7 +364,7 @@ echo "- Using $CFG_AO audio output"
40 echo 40 echo
41  41
42 # Perform a simple compiler test 42 # Perform a simple compiler test
43-eval $CC $SRCDIR/src/conftest.c $CFLAGS $LDFLAGS -o conftest$CFG_BINEXT 43-eval $CC $SRCDIR/src/conftest.c $CFLAGS $LDFLAGS -o conftest$CFG_BINEXT
44+eval ${LIBTOOL} --mode=link $CC $SRCDIR/src/conftest.c $CFLAGS $LDFLAGS -o conftest$CFG_BINEXT 44+eval ${LIBTOOL} --mode=link $CC $SRCDIR/src/conftest.c $CFLAGS $LDFLAGS -o conftest$CFG_BINEXT
45 if [ $? -ne 0 ] 45 if [ $? -ne 0 ]
46 then 46 then
47 echo "Error: some dependencies are missing" 47 echo "Error: some dependencies are missing"
48@@ -390,13 +390,13 @@ done 48@@ -391,13 +391,13 @@ done
49 all: $APP_NAME$CFG_BINEXT $APP_NAME.1.gz $SRCDIR/$APP_NAME.conf.sample $MOS 49 all: $APP_NAME$CFG_BINEXT $APP_NAME.1.gz $SRCDIR/$APP_NAME.conf.sample $MOS
50 $APP_NAME$CFG_BINEXT: $OBJS 50 $APP_NAME$CFG_BINEXT: $OBJS
51 # Linking $APP_NAME$CFG_BINEXT 51 # Linking $APP_NAME$CFG_BINEXT
52- $DOIT$CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT 52- $DOIT$CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT
53+ $DOIT\${LIBTOOL} --mode=link $CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT 53+ $DOIT\${LIBTOOL} --mode=link $CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT
54 $APP_NAME.1.gz: $MANFILES Makefile 54 $APP_NAME.1.gz: $MANFILES Makefile
55 # Generating manual page $APP_NAME.1.gz 55 # Generating manual page $APP_NAME.1.gz
56- ${DOIT}sed $MANREGEX $MANFILES | gzip -9 > $APP_NAME.1.gz 56- ${DOIT}sed $MANREGEX $MANFILES | gzip -9 > $APP_NAME.1.gz
57+ ${DOIT}sed $MANREGEX $MANFILES > $APP_NAME.1 57+ ${DOIT}sed $MANREGEX $MANFILES > $APP_NAME.1
58 clean: 58 clean:
59 # Removing $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.dSYM *.mo *.o 59 # Removing $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.dSYM *.mo *.o
60- ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o 60- ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o
61+ ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1 *.mo *.o 61+ ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1 *.mo *.o
62 ${DOIT}rm -Rf *.dSYM 62 ${DOIT}rm -Rf *.dSYM
63 distclean: clean 63 distclean: clean
64 # Removing Makefile 64 # Removing Makefile
65@@ -405,29 +405,29 @@ Makefile: $0 `dirname $0`/depends 65@@ -406,29 +406,29 @@ Makefile: $0 `dirname $0`/depends
66 # WARNING: Your Makefile is outdated. Please re-run $0! 66 # WARNING: Your Makefile is outdated. Please re-run $0!
67 install: all 67 install: all
68 # Installing \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT 68 # Installing \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
69- ${DOIT}mkdir -p \$(DESTDIR)$BINDIR 69- ${DOIT}mkdir -p \$(DESTDIR)$BINDIR
70- $DOIT$INSTALL $CFG_STRIP $APP_NAME$CFG_BINEXT \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT 70- $DOIT$INSTALL $CFG_STRIP $APP_NAME$CFG_BINEXT \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
71+ ${DOIT}\${BSD_INSTALL_PROGRAM_DIR} \$(DESTDIR)$BINDIR 71+ ${DOIT}\${BSD_INSTALL_PROGRAM_DIR} \$(DESTDIR)$BINDIR
72+ $DOIT\${BSD_INSTALL_PROGRAM} $CFG_STRIP $APP_NAME$CFG_BINEXT \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT 72+ $DOIT\${BSD_INSTALL_PROGRAM} $CFG_STRIP $APP_NAME$CFG_BINEXT \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
73 # Installing \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz 73 # Installing \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
74- ${DOIT}mkdir -p \$(DESTDIR)$MANDIR/man1 74- ${DOIT}mkdir -p \$(DESTDIR)$MANDIR/man1
75- $DOIT$INSTALL -m 444 $APP_NAME.1.gz \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz 75- $DOIT$INSTALL -m 444 $APP_NAME.1.gz \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
76+ ${DOIT}\${BSD_INSTALL_MAN_DIR} \$(DESTDIR)$MANDIR/man1 76+ ${DOIT}\${BSD_INSTALL_MAN_DIR} \$(DESTDIR)$MANDIR/man1
77+ $DOIT\${BSD_INSTALL_MAN} $APP_NAME.1 \$(DESTDIR)$MANDIR/man1/$APP_NAME.1 77+ $DOIT\${BSD_INSTALL_MAN} $APP_NAME.1 \$(DESTDIR)$MANDIR/man1/$APP_NAME.1
78 # Installing \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample 78 # Installing \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample
@@ -94,22 +94,22 @@ $NetBSD: patch-aa,v 1.3 2008/03/27 14:24 @@ -94,22 +94,22 @@ $NetBSD: patch-aa,v 1.3 2008/03/27 14:24
94 # Uninstalling \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT 94 # Uninstalling \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
95 ${DOIT}rm -f \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT 95 ${DOIT}rm -f \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
96- # Uninstalling \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz 96- # Uninstalling \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
97- ${DOIT}rm -f \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz 97- ${DOIT}rm -f \$(DESTDIR)$MANDIR/man1/$APP_NAME.1.gz
98- # Uninstalling \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample 98- # Uninstalling \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample
99- ${DOIT}rm -f \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample 99- ${DOIT}rm -f \$(DESTDIR)$CONFDIR/$APP_NAME.conf.sample
100+ # Uninstalling \$(DESTDIR)$MANDIR/man1/$APP_NAME.1 100+ # Uninstalling \$(DESTDIR)$MANDIR/man1/$APP_NAME.1
101+ ${DOIT}rm -f \$(DESTDIR)$MANDIR/man1/$APP_NAME.1 101+ ${DOIT}rm -f \$(DESTDIR)$MANDIR/man1/$APP_NAME.1
102+ # Uninstalling \$(DESTDIR)$EGDIR/$APP_NAME.conf 102+ # Uninstalling \$(DESTDIR)$EGDIR/$APP_NAME.conf
103+ ${DOIT}rm -f \$(DESTDIR)$EGDIR/$APP_NAME.conf 103+ ${DOIT}rm -f \$(DESTDIR)$EGDIR/$APP_NAME.conf
104 EOF 104 EOF
105 for i in $CFG_LINGUAS 105 for i in $CFG_LINGUAS
106 do 106 do
107@@ -444,7 +444,7 @@ do 107@@ -445,7 +445,7 @@ do
108 done 108 done
109 echo "$i.o: Makefile $SRCDIR/src/$i.c $SRCDIR/src/stdinc.h $DEPS" 109 echo "$i.o: Makefile $SRCDIR/src/$i.c $SRCDIR/src/stdinc.h $DEPS"
110 echo " # Compiling $i.o" 110 echo " # Compiling $i.o"
111- echo " $DOIT$CC -c $SRCDIR/src/$i.c $CFLAGS `eval echo \\\$CFLAGS_\$i` -o $i.o" 111- echo " $DOIT$CC -c $SRCDIR/src/$i.c $CFLAGS `eval echo \\\$CFLAGS_\$i` -o $i.o"
112+ echo " $DOIT\${LIBTOOL} --mode=compile $CC -c $SRCDIR/src/$i.c $CFLAGS `eval echo \\\$CFLAGS_\$i` -o $i.o" 112+ echo " $DOIT\${LIBTOOL} --mode=compile $CC -c $SRCDIR/src/$i.c $CFLAGS `eval echo \\\$CFLAGS_\$i` -o $i.o"
113 done 113 done
114 for i in $CFG_LINGUAS 114 for i in $CFG_LINGUAS
115 do 115 do