From 39bc94f5643c5fab21d5739d318e3805d06f6801 Mon Sep 17 00:00:00 2001
From: nia <nia@pkgsrc.org>
Date: Mon, 20 Jan 2020 21:29:07 +0000
Subject: madplay: Remove esound support; add alsa option.

Remove OSS option because it does absolutely nothing, OSS support
is autodetected if the OS supports it.

Bump PKGREVISION because this changes default options (on Linux only)
---
 audio/madplay/Makefile   |  4 ++--
 audio/madplay/options.mk | 18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'audio')

diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 4e7da2fdc03..bc5613847f8 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2017/08/16 20:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2020/01/20 21:29:07 nia Exp $
 #
 
 DISTNAME=	madplay-0.15.2b
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mad/}
 
diff --git a/audio/madplay/options.mk b/audio/madplay/options.mk
index 282d99befe7..103a9f5494c 100644
--- a/audio/madplay/options.mk
+++ b/audio/madplay/options.mk
@@ -1,16 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2007/02/22 19:26:06 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2020/01/20 21:29:07 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.madplay
-PKG_SUPPORTED_OPTIONS=	esound oss
+PKG_OPTIONS_VAR=		PKG_OPTIONS.madplay
+PKG_SUPPORTED_OPTIONS=		alsa
+PKG_SUGGESTED_OPTIONS.Linux=	alsa
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-esd
-.endif
-
-.if !empty(PKG_OPTIONS:Moss)
-.include "../../mk/oss.buildlink3.mk"
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+=	--with-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
 .endif
-- 
cgit v1.2.3