Add options for ao, arts, flac, mad, mikmod, modplug, mpcdec, vorbis

Patch from the 8th Hackathon, see
http://wiki.netbsd.se/Hackathon8#Tickets

Tested on NetBSD 4.0_RC3.

2 files changed, 112 insertions, 11 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 2f3632e1563..27040005179 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.8 2007/11/18 10:23:22 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/11/19 00:10:31 hubertf Exp $
 #
 
 DISTNAME=		cmus-2.1.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://mirror.greaterscope.net/cmus/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		webmaster@deepblack24.de
 HOMEPAGE=		http://onion.dynserv.net/~timo/files/
-COMMENT=	Cmus is an ncurses based mp3/ogg player with a lot of features
+COMMENT=		Cmus is an ncurses based mp3/ogg player with a lot of features
 
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 
 CONFIGURE_ARGS+=	prefix=${PREFIX}
 CONFIGURE_ARGS+=	CONFIG_ALSA=n
-CONFIGURE_ARGS+=	CONFIG_ARTS=n
 CONFIGURE_ARGS+=	CONFIG_OSS=y
-CONFIGURE_ARGS+=	CONFIG_MAD=y
-CONFIGURE_ARGS+=	CONFIG_AO=y
-CONFIGURE_ARGS+=	CONFIG_FLAC=y
 CONFIGURE_ARGS+=	mandir=${PREFIX}/${PKGMANDIR}/
 
 .if exists(/usr/include/sys/audioio.h)
@@ -33,10 +30,7 @@ PLIST_SUBST+=	SUN="@comment "
 CONFIGURE_ARGS+=	CONFIG_SUN=y
 .endif
 
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libao/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libmodplug/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
+.include "options.mk"
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk
new file mode 100644
index 00000000000..7805b45b7be
--- /dev/null
+++ b/audio/cmus/options.mk
@@ -0,0 +1,107 @@
+PKG_OPTIONS_VAR=				PKG_OPTIONS.cmus
+PKG_SUPPORTED_OPTIONS=			flac mad vorbis arts ao mpcdec #faad alsa
+PKG_OPTIONS_OPTIONAL_GROUPS=	mod
+PKG_OPTIONS_GROUP.mod=			modplug mikmod
+PKG_SUGGESTED_OPTIONS=			flac mad ao vorbis modplug
+  
+.include "../../mk/bsd.prefs.mk"
+    
+.include "../../mk/bsd.options.mk"
+                                      
+# Package-specific option-handling
+
+# Backends:
+#
+  
+# AO support                      
+#                                  
+.if !empty(PKG_OPTIONS:Mao)  
+.  include "../../audio/libao/buildlink3.mk"
+CONFIGURE_ARGS+=  CONFIG_AO=y
+.else
+CONFIGURE_ARGS+=  CONFIG_AO=n
+.endif                               
+
+# ARTS support
+#
+.if !empty(PKG_OPTIONS:Marts)
+.  include "../../audio/arts/buildlink3.mk"
+CONFIGURE_ARGS+=  CONFIG_ARTS=y
+.else
+CONFIGURE_ARGS+=  CONFIG_ARTS=n
+.endif
+
+# ALSA support
+#
+# UNTESTED
+#.if !empty(PKG_OPTIONS:Malsa)
+#ONLY_FOR_PLATFORM=  Linux-*-* # Alsa is Linux only
+#CONFIGURE_ARGS+=  CONFIG_ALSA=y
+#.endif
+
+# Codecs:
+#
+
+# MAD support
+#
+.if !empty(PKG_OPTIONS:Mmad)
+.include "../../audio/libmad/buildlink3.mk" 
+CONFIGURE_ARGS+=  CONFIG_MAD=y
+.else
+CONFIGURE_ARGS+=  CONFIG_MAD=n
+.endif
+
+# VORBIS support
+#
+.if !empty(PKG_OPTIONS:Mvorbis)
+.include "../../audio/libvorbis/buildlink3.mk"                            
+CONFIGURE_ARGS+=  CONFIG_VORBIS=y
+.else
+CONFIGURE_ARGS+=  CONFIG_VORBIS=n
+.endif
+
+# FLAC support
+#
+.if !empty(PKG_OPTIONS:Mflac)
+.include "../../audio/flac/buildlink3.mk"                            
+CONFIGURE_ARGS+=  CONFIG_FLAC=y
+.else
+CONFIGURE_ARGS+=  CONFIG_FLAC=n
+.endif
+
+# MPCDEC support
+#
+.if !empty(PKG_OPTIONS:Mmpcdec)
+.include "../../audio/libmpcdec/buildlink3.mk"                           
+CONFIGURE_ARGS+=  CONFIG_MPC=y
+.else
+CONFIGURE_ARGS+=  CONFIG_MPC=n
+.endif
+
+###
+### modplay support
+###
+.if !empty(PKG_OPTIONS:Mmikmod)
+.include "../../audio/libmikmod/buildlink3.mk"
+CONFIGURE_ARGS+=  CONFIG_MODPLUG=n
+CONFIGURE_ARGS+=  CONFIG_MIKMOD=y
+.endif
+.if !empty(PKG_OPTIONS:Mmodplug)
+.include "../../audio/libmodplug/buildlink3.mk"
+CONFIGURE_ARGS+=  CONFIG_MODPLUG=y
+CONFIGURE_ARGS+=  CONFIG_MIKMOD=n
+.endif
+
+
+# FAAD support
+#
+# XXX: faad2 in pkgsrc is heavily outdated as of 2007Q3, cmus needs newer.
+#
+#.if !empty(PKG_OPTIONS:Mfaad)
+#.include "../../audio/faad2/buildlink3.mk" 
+#CONFIGURE_ARGS+=  CONFIG_AAC=y
+#CONFIGURE_ARGS+=  CONFIG_MP4=y
+#.else
+#CONFIGURE_ARGS+=  CONFIG_AAC=n
+#CONFIGURE_ARGS+=  CONFIG_MP4=n
+#.endif