diff options
| author | roy <roy@pkgsrc.org> | 2017-01-04 16:47:59 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2017-01-04 16:47:59 +0000 |
| commit | 33500907cfc6bf3dc4f7dca86052dda843da0523 (patch) | |
| tree | d6c3291097e79de9c9060124bd6b77486780965a /audio/herrie | |
| parent | 85aba1c791661cf1c84e6fd223ddb628d8cf7008 (diff) | |
| download | pkgsrc-33500907cfc6bf3dc4f7dca86052dda843da0523.tar.gz | |
Use the curses framework.
Diffstat (limited to 'audio/herrie')
| -rw-r--r-- | audio/herrie/Makefile | 11 | ||||
| -rw-r--r-- | audio/herrie/options.mk | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile index eebdb3908a5..3875ec2d984 100644 --- a/audio/herrie/Makefile +++ b/audio/herrie/Makefile @@ -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}/${PKGLOCALEDIR}/locale 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 --git a/audio/herrie/options.mk b/audio/herrie/options.mk index 4927b4c481a..bc77a08a225 100644 --- a/audio/herrie/options.mk +++ b/audio/herrie/options.mk @@ -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 modplug libspiff sndfile \ 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 |