[pkgsrc/trunk]: pkgsrc/audio/herrie Oops, forgot to add libvorbis/libogg supp...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47308196b9fa
branches:  trunk
changeset: 535118:47308196b9fa
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Thu Nov 08 04:08:46 2007 +0000

description:
Oops, forgot to add libvorbis/libogg support.  Also, AudioScrobbler
support only requires www/curl, so enable that too along with curl support.
I'm not bumping the revision since I just committed it.

diffstat:

 audio/herrie/Makefile   |   5 ++---
 audio/herrie/options.mk |  11 +++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 7f1a6ece26a8 -r 47308196b9fa audio/herrie/Makefile
--- a/audio/herrie/Makefile     Thu Nov 08 03:57:16 2007 +0000
+++ b/audio/herrie/Makefile     Thu Nov 08 04:08:46 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/11/08 03:52:30 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2007/11/08 04:08:46 bjs Exp $
 #
 
 DISTNAME=      herrie-1.8.4
@@ -17,8 +17,6 @@
 USE_TOOLS+=            gmake msgfmt pkg-config
 
 
-CONFIGURE_ARGS+=       no_scrobbler
-CONFIGURE_ARGS+=       no_vorbis
 CONFIGURE_ARGS+=       no_xspf
 CONFIGURE_ARGS+=       verbose
 
@@ -52,6 +50,7 @@
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/resolv.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7f1a6ece26a8 -r 47308196b9fa audio/herrie/options.mk
--- a/audio/herrie/options.mk   Thu Nov 08 03:57:16 2007 +0000
+++ b/audio/herrie/options.mk   Thu Nov 08 04:08:46 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/11/08 03:52:30 bjs Exp $
+# $NetBSD: options.mk,v 1.2 2007/11/08 04:08:46 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
+PKG_SUPPORTED_OPTIONS=         curl libao libmodplug sndfile vorbis
 PKG_SUGGESTED_OPTIONS=         ncurses curl
 
 .include "../../mk/oss.buildlink3.mk"
@@ -22,6 +22,7 @@
 .  include "../../www/curl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       no_http
+CONFIGURE_ARGS+=       no_scrobbler
 .endif
 
 .if !empty(PKG_OPTIONS:Mncurses)
@@ -60,3 +61,9 @@
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       no_strip strict
 .endif
+
+.if !empty(PKG_OPTIONS:Mvorbis)
+.  include "../../audio/libvorbis/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       no_vorbis
+.endif