From b2b0d362a11e99de96e141aaf4ec5172c7a10899 Mon Sep 17 00:00:00 2001
From: bjs <bjs@pkgsrc.org>
Date: Thu, 8 Nov 2007 18:45:36 +0000
Subject: Add support for XML shareable playlists via audio/libspiff.  Bump
 rev. While here, kill excess indentation in DESCR.

---
 audio/herrie/DESCR      | 22 +++++++++++-----------
 audio/herrie/Makefile   |  5 ++---
 audio/herrie/options.mk | 10 ++++++++--
 3 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'audio/herrie')

diff --git a/audio/herrie/DESCR b/audio/herrie/DESCR
index 2799bca3d14..b16a2f7e219 100644
--- a/audio/herrie/DESCR
+++ b/audio/herrie/DESCR
@@ -1,12 +1,12 @@
-       herrie  is a command line music player. It supports multiple audio file
-       formats (including MP3 and Ogg Vorbis) and  has  the  ability  to  send
-       playback  statistics  to AudioScrobbler. The word `herrie' is Dutch for
-       `clamor'.
+Herrie  is a command line music player. It supports multiple audio file
+formats (including MP3 and Ogg Vorbis) and  has  the  ability  to  send
+playback  statistics  to AudioScrobbler. The word `herrie' is Dutch for
+`clamor'.
 
-       herrie uses a split-screen user interface: a playlist at the top and  a
-       filebrowser  at the bottom. The application has two modes of operation,
-       called `party mode' and `XMMS mode'. When the application is started in
-       party  mode,  the first song in the playlist gets started. It will also
-       be removed from the playlist as well. When the application  is  started
-       in  XMMS mode, any song can be started and will not be removed from the
-       playlist.  The default mode is party mode.
+herrie uses a split-screen user interface: a playlist at the top and  a
+filebrowser  at the bottom. The application has two modes of operation,
+called `party mode' and `XMMS mode'. When the application is started in
+party  mode,  the first song in the playlist gets started. It will also
+be removed from the playlist as well. When the application  is  started
+in  XMMS mode, any song can be started and will not be removed from the
+playlist.  The default mode is party mode.
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 189a983581b..e5122a27f92 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/11/08 04:11:40 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2007/11/08 18:45:36 bjs Exp $
 #
 
 DISTNAME=	herrie-1.8.4
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://herrie.info/distfiles/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,8 +17,6 @@ HAS_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake msgfmt pkg-config
 
-
-CONFIGURE_ARGS+=	no_xspf
 CONFIGURE_ARGS+=	verbose
 
 EGDIR=			${PREFIX}/share/examples/herrie
diff --git a/audio/herrie/options.mk b/audio/herrie/options.mk
index 990e8c3039f..cb7116ae061 100644
--- a/audio/herrie/options.mk
+++ b/audio/herrie/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2007/11/08 04:08:46 bjs Exp $
+# $NetBSD: options.mk,v 1.3 2007/11/08 18:45:36 bjs Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.herrie
 PKG_OPTIONS_GROUP.curses=	ncurses ncursesw
 PKG_OPTIONS_OPTIONAL_GROUPS=	curses
-PKG_SUPPORTED_OPTIONS=		curl libao libmodplug sndfile vorbis
+PKG_SUPPORTED_OPTIONS=		curl libao libmodplug libspiff sndfile vorbis
 PKG_SUGGESTED_OPTIONS=		ncurses curl
 
 .include "../../mk/oss.buildlink3.mk"
@@ -44,6 +44,12 @@ CONFIGURE_ARGS+=	ao
 CONFIGURE_ARGS+=	no_modplug
 .endif
 
+.if !empty(PKG_OPTIONS:Mlibspiff)
+.  include "../../audio/libspiff/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	no_xspf
+.endif
+
 .if !empty(PKG_OPTIONS:Moss)
 CONFIGURE_ARGS+=	oss
 LDFLAGS+=		${BUILDLINK_LDADD.oss}
-- 
cgit v1.2.3