CVS commit: pkgsrc/audio/cmus

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Aug 24 09:34:32 UTC 2016

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

Log Message:
disable the ability to build cmus with curses libraries besides ncursesw.

cmus doesn't build with others because it uses a type MEVENT which is
only available in ncursesw.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/audio/cmus/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/cmus/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/cmus/Makefile
diff -u pkgsrc/audio/cmus/Makefile:1.62 pkgsrc/audio/cmus/Makefile:1.63
--- pkgsrc/audio/cmus/Makefile:1.62     Wed Aug 17 00:06:40 2016
+++ pkgsrc/audio/cmus/Makefile  Wed Aug 24 09:34:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2016/08/17 00:06:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2016/08/24 09:34:32 maya Exp $
 
 DISTNAME=              cmus-2.7.1
 PKGREVISION=           2
@@ -40,4 +40,5 @@ CONFIGURE_ARGS+=      CONFIG_SUN=n
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/cmus/options.mk
diff -u pkgsrc/audio/cmus/options.mk:1.14 pkgsrc/audio/cmus/options.mk:1.15
--- pkgsrc/audio/cmus/options.mk:1.14   Mon Aug 18 09:34:49 2014
+++ pkgsrc/audio/cmus/options.mk        Wed Aug 24 09:34:32 2016
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.14 2014/08/18 09:34:49 gls Exp $
+# $NetBSD: options.mk,v 1.15 2016/08/24 09:34:32 maya Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.cmus
 PKG_SUPPORTED_OPTIONS=         flac mad vorbis arts libao musepack faad wavpack pulseaudio
-PKG_SUPPORTED_OPTIONS+=                wide-curses ffmpeg opus jack
+PKG_SUPPORTED_OPTIONS+=                ffmpeg opus jack
 PKG_OPTIONS_OPTIONAL_GROUPS=   mod
 PKG_OPTIONS_GROUP.mod=         modplug mikmod
 PKG_SUGGESTED_OPTIONS=         flac libao mad modplug vorbis
@@ -167,17 +167,3 @@ PLIST.opus=                yes
 .else
 CONFIGURE_ARGS+=       CONFIG_OPUS=n
 .endif
-
-###
-### Wide curses support; otherwise, default to using narrow curses.
-###
-# cmus works fine with a 5.0+ NetBSD curses
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9].*-*)
-.    include "../../mk/curses.buildlink3.mk"
-.else
-.  if !empty(PKG_OPTIONS:Mwide-curses)
-.    include "../../devel/ncursesw/buildlink3.mk"
-.  else
-.    include "../../devel/ncurses/buildlink3.mk"
-.  endif
-.endif