[pkgsrc/trunk]: pkgsrc/audio/mp3blaster mp3blaster: Remove esound support; us...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e61eb25ddd78
branches:  trunk
changeset: 422120:e61eb25ddd78
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jan 20 21:31:02 2020 +0000

description:
mp3blaster: Remove esound support; use sdl on all non-OSS platforms.

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

Bump PKGREVISION because this changes default options on platforms that
don't support OSS.

diffstat:

 audio/mp3blaster/Makefile   |   5 ++++-
 audio/mp3blaster/options.mk |  18 ++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diffs (54 lines):

diff -r 2d15bae2a91d -r e61eb25ddd78 audio/mp3blaster/Makefile
--- a/audio/mp3blaster/Makefile Mon Jan 20 21:29:07 2020 +0000
+++ b/audio/mp3blaster/Makefile Mon Jan 20 21:31:02 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2020/01/18 23:30:02 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2020/01/20 21:31:02 nia Exp $
 
 DISTNAME=      mp3blaster-3.2.6
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mp3blaster/}
 
@@ -20,6 +21,8 @@
 CPPFLAGS.SunOS+=       -Du_int16_t=uint16_t -Du_int32_t=uint32_t
 LIBS.SunOS+=           -lsocket -lnsl
 
+CONFIGURE_ARGS+=       --without-esd
+
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
diff -r 2d15bae2a91d -r e61eb25ddd78 audio/mp3blaster/options.mk
--- a/audio/mp3blaster/options.mk       Mon Jan 20 21:29:07 2020 +0000
+++ b/audio/mp3blaster/options.mk       Mon Jan 20 21:31:02 2020 +0000
@@ -1,25 +1,15 @@
-# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:35 dholland Exp $
+# $NetBSD: options.mk,v 1.3 2020/01/20 21:31:02 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mp3blaster
-PKG_SUPPORTED_OPTIONS= esound oss sdl
-PKG_SUGGESTED_OPTIONS= oss
+PKG_SUPPORTED_OPTIONS= sdl
 
-.if ${OPSYS} == "Darwin"
+.include "../../mk/oss.buildlink3.mk"
+.if ${OSS_TYPE} == "none"
 PKG_SUGGESTED_OPTIONS= sdl
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=       --with-esd=yes
-.include "../../audio/esound/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=       --with-oss=yes
-.include "../../mk/oss.buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=       --with-sdl=yes
 .include "../../devel/SDL/buildlink3.mk"