CVS commit: pkgsrc/audio/herrie

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Wed Jan  4 16:47:59 UTC 2017

Modified Files:
        pkgsrc/audio/herrie: Makefile options.mk

Log Message:
Use the curses framework.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/audio/herrie/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/herrie/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/herrie/Makefile
diff -u pkgsrc/audio/herrie/Makefile:1.29 pkgsrc/audio/herrie/Makefile:1.30
--- pkgsrc/audio/herrie/Makefile:1.29   Sun Jan  1 16:06:03 2017
+++ pkgsrc/audio/herrie/Makefile        Wed Jan  4 16:47:59 2017
@@ -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 @@ CONFIGURE_ENV+=             TRANSDIR=${PREFIX}/${PK
 
 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

Index: pkgsrc/audio/herrie/options.mk
diff -u pkgsrc/audio/herrie/options.mk:1.8 pkgsrc/audio/herrie/options.mk:1.9
--- pkgsrc/audio/herrie/options.mk:1.8  Sun Jul 10 09:42:07 2016
+++ pkgsrc/audio/herrie/options.mk      Wed Jan  4 16:47:59 2017
@@ -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_SUPPORTED_OPTIONS=          curl libao modpl
 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 @@ CONFIGURE_ARGS+=     no_strip strict
 .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