summaryrefslogtreecommitdiff
path: root/audio/herrie
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2007-11-08 04:08:46 +0000
committerbjs <bjs@pkgsrc.org>2007-11-08 04:08:46 +0000
commitdb0e6871ca33650f05ca6f5d219bf35b8d49f25c (patch)
tree8e73e6404a88e3812c323e7831f0335478d42305 /audio/herrie
parentef4d69bf5da8391774c43d11772b7fe2c8edde74 (diff)
downloadpkgsrc-db0e6871ca33650f05ca6f5d219bf35b8d49f25c.tar.gz
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 (limited to 'audio/herrie')
-rw-r--r--audio/herrie/Makefile5
-rw-r--r--audio/herrie/options.mk11
2 files changed, 11 insertions, 5 deletions
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index d8d79a79f60..6fc07a8b47e 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -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_LIBTOOL= yes
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 @@ post-install:
.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 --git a/audio/herrie/options.mk b/audio/herrie/options.mk
index 5619c9e3923..990e8c3039f 100644
--- a/audio/herrie/options.mk
+++ b/audio/herrie/options.mk
@@ -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 @@ PKG_SUGGESTED_OPTIONS+= libao
. include "../../www/curl/buildlink3.mk"
.else
CONFIGURE_ARGS+= no_http
+CONFIGURE_ARGS+= no_scrobbler
.endif
.if !empty(PKG_OPTIONS:Mncurses)
@@ -60,3 +61,9 @@ CONFIGURE_ARGS+= no_sndfile
.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