[pkgsrc/trunk]: pkgsrc/audio/herrie Update to 1.9.1.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/herrie Update to 1.9.1.
From: bjs <bjs%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:36:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc46ea167252
branches:  trunk
changeset: 536656:dc46ea167252
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Dec 19 08:13:11 2007 +0000

description:
Update to 1.9.1.

2007-12-17 -- Herrie 1.9.1:
 * Added: 'L' button to locate files in the current directory
 * Fixed: Remove almost endless recursion by not recursing on symlinks
 * Added: Input can be aborted pressing the escape button - Pieter-Paul Spiertz
 * Improved: Manual content now matches installed configuration
 * Fixed: Don't autoload the playlist when files are passed on the cmdline

2007-12-02 -- Herrie 1.9:
 * Added: Support for changing the volume
 * Improved: Make license of MD5 code in sync with the rest
 * Improved: Avoid deprecated CoreAudio calls on Leopard
 * Fixed: Stop processing of signals during shutdown
 * Added: Spanish and Catalan translations - Xavier de Blas
 * Added: '{' and '}' buttons to move tracks to top/bottom - Jille Timmermans

diffstat:

 audio/herrie/Makefile         |   5 +-
 audio/herrie/PLIST            |   6 ++-
 audio/herrie/distinfo         |  12 +++---
 audio/herrie/patches/patch-aa |  75 ++++++++++++++++--------------------------
 audio/herrie/patches/patch-ab |   4 +-
 5 files changed, 43 insertions(+), 59 deletions(-)

diffs (199 lines):

diff -r 7acec543eca1 -r dc46ea167252 audio/herrie/Makefile
--- a/audio/herrie/Makefile     Wed Dec 19 05:44:51 2007 +0000
+++ b/audio/herrie/Makefile     Wed Dec 19 08:13:11 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/11/09 05:45:15 bjs Exp $
+# $NetBSD: Makefile,v 1.6 2007/12/19 08:13:11 bjs Exp $
 #
 
-DISTNAME=      herrie-1.8.4
-PKGREVISION=   1
+DISTNAME=      herrie-1.9.1
 CATEGORIES=    audio
 MASTER_SITES=  http://herrie.info/distfiles/
 EXTRACT_SUFX=  .tar.bz2
diff -r 7acec543eca1 -r dc46ea167252 audio/herrie/PLIST
--- a/audio/herrie/PLIST        Wed Dec 19 05:44:51 2007 +0000
+++ b/audio/herrie/PLIST        Wed Dec 19 08:13:11 2007 +0000
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/08 03:52:30 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/12/19 08:13:11 bjs Exp $
 bin/herrie
+man/man1/herrie.1
 share/examples/herrie/herrie.conf
+share/locale/ca/LC_MESSAGES/herrie.mo
 share/locale/de/LC_MESSAGES/herrie.mo
+share/locale/es/LC_MESSAGES/herrie.mo
 share/locale/ga/LC_MESSAGES/herrie.mo
 share/locale/nl/LC_MESSAGES/herrie.mo
 share/locale/pl/LC_MESSAGES/herrie.mo
@@ -9,5 +12,4 @@
 share/locale/sv/LC_MESSAGES/herrie.mo
 share/locale/tr/LC_MESSAGES/herrie.mo
 share/locale/vi/LC_MESSAGES/herrie.mo
-man/man1/herrie.1
 @dirrm share/examples/herrie
diff -r 7acec543eca1 -r dc46ea167252 audio/herrie/distinfo
--- a/audio/herrie/distinfo     Wed Dec 19 05:44:51 2007 +0000
+++ b/audio/herrie/distinfo     Wed Dec 19 08:13:11 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/08 03:52:30 bjs Exp $
+$NetBSD: distinfo,v 1.2 2007/12/19 08:13:11 bjs Exp $
 
-SHA1 (herrie-1.8.4.tar.bz2) = 0e4bc632eb2bc6294c9a587c1358caf908fe35ed
-RMD160 (herrie-1.8.4.tar.bz2) = 23e5fad69f0ecde7f5001813f9c5ed280d6ee757
-Size (herrie-1.8.4.tar.bz2) = 62364 bytes
-SHA1 (patch-aa) = 8284cd2888a06f51a0a685c52c3a90d99b49b3a1
-SHA1 (patch-ab) = 90fa16d2217bff138a471a17bda3b7ce0497c724
+SHA1 (herrie-1.9.1.tar.bz2) = dc887c2a76b1427e1496c22e29340b20cc75f6c3
+RMD160 (herrie-1.9.1.tar.bz2) = 89643ffae7b3930f00d47cb3a03480273e81a5b1
+Size (herrie-1.9.1.tar.bz2) = 65212 bytes
+SHA1 (patch-aa) = d50bdaff285886541e0b143b884521453b6e78cf
+SHA1 (patch-ab) = e6b0231b4eb87e45d7e361715db4885448250a97
diff -r 7acec543eca1 -r dc46ea167252 audio/herrie/patches/patch-aa
--- a/audio/herrie/patches/patch-aa     Wed Dec 19 05:44:51 2007 +0000
+++ b/audio/herrie/patches/patch-aa     Wed Dec 19 08:13:11 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/08 03:52:30 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2007/12/19 08:13:11 bjs Exp $
 
---- configure.orig     2007-09-23 09:21:10.000000000 -0400
+--- configure.orig     2007-12-17 11:06:05.000000000 -0500
 +++ configure
-@@ -33,7 +33,7 @@ APP_LINGUAS='de ga nl pl ru sv tr vi'
- CFG_AO=ao
+@@ -33,7 +33,7 @@ APP_LINGUAS='ca de es ga nl pl ru sv tr 
+ CFG_AO=oss
  unset CFG_BINEXT
  CFG_CURSES_HEADER=ncurses
 -CFG_CURSES_LIB=ncursesw
@@ -11,16 +11,16 @@
  CFG_FTELLO=yes
  CFG_HTTP=yes
  CFG_MODPLUG=yes
-@@ -63,7 +63,7 @@ Darwin)
+@@ -66,7 +66,7 @@ Darwin)
        LDFLAGS="$LDFLAGS -lresolv"
        [ "$PREFIX" = "" ] && PREFIX=/opt/local
        ;;
 -FreeBSD)
 +FreeBSD|DragonFly)
-       CFG_AO=oss
        CFG_SETPROCTITLE=yes
        [ "$PREFIX" = "" ] && PREFIX=/usr/local
-@@ -97,7 +97,6 @@ Windows)
+       [ "$MANDIR" = "" ] && MANDIR=$PREFIX/man
+@@ -98,7 +98,6 @@ Windows)
        unset CFG_FTELLO
        unset CFG_HTTP
        unset CFG_MODPLUG
@@ -28,43 +28,23 @@
        CFG_CURSES_HEADER=curses
        CFG_CURSES_LIB=pdcurses
        ;;
-@@ -178,7 +177,7 @@ done
- [ "$CFLAGS" = "" ] && CFLAGS="-O"
- CFLAGS="$CFLAGS `pkg-config --cflags glib-2.0 gthread-2.0` \
-     -DAPP_NAME=\\\"$APP_NAME\\\" -DAPP_VERSION=\\\"$APP_VERSION\\\" \
--    -I$PREFIX/include -I$PREFIX/include/ncurses \
-+    -I$PREFIX/include/ncurses -I$PREFIX/include \
-     -DCURSES_HEADER=\\<$CFG_CURSES_HEADER.h\\>"
- if [ $? -ne 0 ]
- then
-@@ -205,7 +204,7 @@ then
-       if [ "$CFG_SCROBBLER" != "" ]
-       then
-               case $OS in
--              FreeBSD)
-+              FreeBSD|DragonFly)
-                       LDFLAGS="$LDFLAGS -lmd"
-                       ;;
-               NetBSD|OpenBSD)
-@@ -321,14 +320,14 @@ oss)
-       case $OS in
+@@ -325,13 +324,13 @@ oss)
        NetBSD|OpenBSD)
                CFLAGS="$CFLAGS -DOSS_HEADER=\\<soundcard.h\\>"
--              CFLAGS_config="-DOSS_DEVICE=\\\"/dev/audio\\\""
--              LDFLAGS="$LDFLAGS -lossaudio"
-+              CFLAGS_config="-DOSS_DEVICE=\\\"$DEVOSSAUDIO\\\""
-+              LDFLAGS="$LDFLAGS"
+               LDFLAGS="$LDFLAGS -lossaudio"
+-              OSS_DEVICE="/dev/audio"
++              OSS_DEVICE="$DEVOSSAUDIO"
                ;;
        *)
                # The OSS-through-ALSA compat may generate noise
                [ "$OS" = "Linux" ] && CFLAGS_main="$CFLAGS_main -DCLOSE_STDERR"
                CFLAGS="$CFLAGS -DOSS_HEADER=\\<sys/soundcard.h\\>"
--              CFLAGS_config="-DOSS_DEVICE=\\\"/dev/dsp\\\""
-+              CFLAGS_config="-DOSS_DEVICE=\\\"$DEVOSSAUDIO\\\""
+-              OSS_DEVICE="/dev/dsp"
++              OSS_DEVICE="$DEVOSSAUDIO"
                ;;
        esac
-       ;;
-@@ -361,7 +360,7 @@ echo "- Using $CFG_AO audio output"
+       CFG_VOLUME=yes
+@@ -375,7 +374,7 @@ echo "- Using $CFG_AO audio output"
  echo
  
  # Perform a simple compiler test
@@ -72,23 +52,26 @@
 +eval ${LIBTOOL} --mode=link $CC $SRCDIR/src/conftest.c $CFLAGS $LDFLAGS -o conftest$CFG_BINEXT
  if [ $? -ne 0 ]
  then
-       echo "Error: some dependencies are missing; please see README for a list"
-@@ -382,10 +381,10 @@ done
+       echo "Error: some dependencies are missing"
+@@ -402,13 +401,13 @@ done
  all: $APP_NAME$CFG_BINEXT $APP_NAME.1.gz $SRCDIR/$APP_NAME.conf.sample $MOS
  $APP_NAME$CFG_BINEXT: $OBJS
        # Linking $APP_NAME$CFG_BINEXT
 -      $DOIT$CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT
-+      $DOIT\${LIBTOOL} --mode=link $CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT
- $APP_NAME.1.gz: $SRCDIR/$APP_NAME.1 Makefile
--      # Generating manual page $APP_NAME.1.gz
--      ${DOIT}sed -e 's|%%CONFFILE%%|$CONFFILE|' $SRCDIR/$APP_NAME.1 | gzip -9 > $APP_NAME.1.gz
-+      # Generating manual page $APP_NAME.1
-+      ${DOIT}sed -e 's|%%CONFFILE%%|$CONFFILE|' $SRCDIR/$APP_NAME.1 > $APP_NAME.1.tmp && mv $SRCDIR/$APP_NAME.1.tmp $SRCDIR/$APP_NAME.1
++      $DOIT$\${LIBTOOL} --mode=link $CC $OBJS $LDFLAGS -o $APP_NAME$CFG_BINEXT
+ $APP_NAME.1.gz: $MANFILES Makefile
+       # Generating manual page $APP_NAME.1.gz
+-      ${DOIT}sed $MANREGEX $MANFILES | gzip -9 > $APP_NAME.1.gz
++      ${DOIT}sed $MANREGEX $MANFILES > $APP_NAME.1
  clean:
        # Removing $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o
-       ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o
-@@ -394,29 +393,29 @@ distclean: clean
+-      ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1.gz *.mo *.o
++      ${DOIT}rm -f $APP_NAME$CFG_BINEXT $APP_NAME.1 *.mo *.o
+ distclean: clean
+       # Removing Makefile
        ${DOIT}rm -f Makefile
+@@ -416,29 +415,29 @@ Makefile: $0 `dirname $0`/depends
+       # WARNING: Your Makefile is outdated. Please re-run $0!
  install: all
        # Installing \$(DESTDIR)$BINDIR/$APP_NAME$CFG_BINEXT
 -      ${DOIT}mkdir -p \$(DESTDIR)$BINDIR
@@ -129,7 +112,7 @@
  EOF
  for i in $CFG_LINGUAS
  do
-@@ -433,7 +432,7 @@ do
+@@ -455,7 +454,7 @@ do
        done
        echo "$i.o: Makefile $SRCDIR/src/$i.c $SRCDIR/src/stdinc.h $DEPS"
        echo "  # Compiling $i.o"
diff -r 7acec543eca1 -r dc46ea167252 audio/herrie/patches/patch-ab
--- a/audio/herrie/patches/patch-ab     Wed Dec 19 05:44:51 2007 +0000
+++ b/audio/herrie/patches/patch-ab     Wed Dec 19 08:13:11 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/11/08 03:52:30 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2007/12/19 08:13:11 bjs Exp $
 
---- src/stdinc.h.orig  2007-09-23 09:21:10.000000000 -0400
+--- src/stdinc.h.orig  2007-12-17 11:06:05.000000000 -0500
 +++ src/stdinc.h
 @@ -39,7 +39,14 @@
  #include <locale.h>
Prev by Date: [pkgsrc/trunk]: pkgsrc/multimedia Fix inconsistency (using "#pragma pack()" w...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc + Updated x11/xcompmgr to 1.1.3nb1 [bjs 2007-12-19]
Previous by Thread: [pkgsrc/trunk]: pkgsrc/multimedia Fix inconsistency (using "#pragma pack()" w...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc + Updated x11/xcompmgr to 1.1.3nb1 [bjs 2007-12-19]
Indexes:
Home | Main Index | Thread Index | Old Index