[pkgsrc/trunk]: pkgsrc/audio/herrie Use the curses framework.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/66b913f759c9
branches:  trunk
changeset: 356771:66b913f759c9
user:      roy <roy%pkgsrc.org@localhost>
date:      Wed Jan 04 16:47:59 2017 +0000

description:
Use the curses framework.

diffstat:

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

diffs (61 lines):

diff -r a233f022c2ea -r 66b913f759c9 audio/herrie/Makefile
--- a/audio/herrie/Makefile     Wed Jan 04 16:45:24 2017 +0000
+++ b/audio/herrie/Makefile     Wed Jan 04 16:47:59 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2017/01/01 16:06:03 adam Exp $
+# $NetBSD: Makefile,v 1.30 2017/01/04 16:47:59 roy Exp $
 #
 
 DISTNAME=      herrie-2.2
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    audio
 MASTER_SITES=  http://herrie.info/distfiles/
 EXTRACT_SUFX=  .tar.bz2
@@ -28,12 +28,17 @@
 
 RESOLV_AUTO_VARS=      yes
 USE_FEATURES=          snprintf regcomp
-USE_NCURSES=           yes
 
 AUTO_MKDIRS=           yes
 
+FAKE_NCURSES=          yes
+
 .include "options.mk"
 
+.if ${CURSES_TYPE} != "ncursesw"
+CONFIGURE_ARGS+=       ncurses
+.endif
+
 SUBST_CLASSES+=                conf
 SUBST_STAGE.conf=      pre-configure
 SUBST_FILES.conf=      ${WRKDIR}/herrie.conf
diff -r a233f022c2ea -r 66b913f759c9 audio/herrie/options.mk
--- a/audio/herrie/options.mk   Wed Jan 04 16:45:24 2017 +0000
+++ b/audio/herrie/options.mk   Wed Jan 04 16:47:59 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2016/07/10 09:42:07 rillig Exp $
+# $NetBSD: options.mk,v 1.9 2017/01/04 16:47:59 roy Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.herrie
 PKG_SUPPORTED_OPTIONS=         curl libao modplug libspiff sndfile     \
@@ -6,6 +6,7 @@
 PKG_SUGGESTED_OPTIONS=         curl
 PKG_OPTIONS_LEGACY_OPTS+=      ncursesw:wide-curses
 
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .if ${OSS_TYPE} == "native"
@@ -65,10 +66,3 @@
 .else
 CONFIGURE_ARGS+=       no_vorbis
 .endif
-
-.if !empty(PKG_OPTIONS:Mwide-curses)
-.  include "../../devel/ncursesw/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       ncurses
-.  include "../../devel/ncurses/buildlink3.mk"
-.endif