diff options
Diffstat (limited to 'audio/herrie')
-rw-r--r-- | audio/herrie/Makefile | 3 | ||||
-rw-r--r-- | audio/herrie/options.mk | 32 |
2 files changed, 18 insertions, 17 deletions
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile index 016482840c7..5a6fc3092dd 100644 --- a/audio/herrie/Makefile +++ b/audio/herrie/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2007/12/19 08:13:11 bjs Exp $ +# $NetBSD: Makefile,v 1.7 2008/02/22 16:59:56 jlam Exp $ # DISTNAME= herrie-1.9.1 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://herrie.info/distfiles/ EXTRACT_SUFX= .tar.bz2 diff --git a/audio/herrie/options.mk b/audio/herrie/options.mk index 4b909ac540e..68743cee5ce 100644 --- a/audio/herrie/options.mk +++ b/audio/herrie/options.mk @@ -1,18 +1,18 @@ -# $NetBSD: options.mk,v 1.4 2007/11/23 05:40:02 bjs Exp $ +# $NetBSD: options.mk,v 1.5 2008/02/22 16:59:56 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.herrie -PKG_OPTIONS_GROUP.curses= ncurses ncursesw -PKG_OPTIONS_OPTIONAL_GROUPS= curses -PKG_SUPPORTED_OPTIONS= curl libao modplug libspiff sndfile vorbis -PKG_SUGGESTED_OPTIONS= ncurses curl +PKG_SUPPORTED_OPTIONS= curl libao modplug libspiff sndfile \ + vorbis wide-curses +PKG_SUGGESTED_OPTIONS= curl +PKG_LEGACY_OPTS+= ncursesw:wide-curses .include "../../mk/oss.buildlink3.mk" .if ${OSS_TYPE} == "native" -PKG_SUPPORTED_OPTIONS+= oss -PKG_SUGGESTED_OPTIONS+= oss +PKG_SUPPORTED_OPTIONS+= oss +PKG_SUGGESTED_OPTIONS+= oss .elif ${OSS_TYPE} == "none" -PKG_SUGGESTED_OPTIONS+= libao +PKG_SUGGESTED_OPTIONS+= libao .endif .include "../../mk/bsd.fast.prefs.mk" @@ -25,14 +25,6 @@ CONFIGURE_ARGS+= no_http CONFIGURE_ARGS+= no_scrobbler .endif -.if !empty(PKG_OPTIONS:Mncurses) -CONFIGURE_ARGS+= ncurses -. include "../../devel/ncurses/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Mncursesw) -CONFIGURE_ARGS+= ncursesw -. include "../../devel/ncursesw/buildlink3.mk" -.endif - .if !empty(PKG_OPTIONS:Mlibao) CONFIGURE_ARGS+= ao . include "../../audio/libao/buildlink3.mk" @@ -73,3 +65,11 @@ CONFIGURE_ARGS+= no_strip strict .else CONFIGURE_ARGS+= no_vorbis .endif + +.if !empty(PKG_OPTIONS:Mwide-curses) +CONFIGURE_ARGS+= ncursesw +. include "../../devel/ncursesw/buildlink3.mk" +.else +CONFIGURE_ARGS+= ncurses +. include "../../devel/ncurses/buildlink3.mk" +.endif |