Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_157955586276280"
MIME-Version: 1.0
Date: Mon, 20 Jan 2020 21:31:02 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/mp3blaster
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200120213102.30024FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_157955586276280
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Mon Jan 20 21:31:02 UTC 2020

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/audio/mp3blaster/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/mp3blaster/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_157955586276280
Content-Disposition: inline
Content-Length: 1841
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/mp3blaster/Makefile
diff -u pkgsrc/audio/mp3blaster/Makefile:1.41 pkgsrc/audio/mp3blaster/Makefile:1.42
--- pkgsrc/audio/mp3blaster/Makefile:1.41	Sat Jan 18 23:30:02 2020
+++ pkgsrc/audio/mp3blaster/Makefile	Mon Jan 20 21:31:02 2020
@@ -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 @@ GNU_CONFIGURE=	yes
 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")

Index: pkgsrc/audio/mp3blaster/options.mk
diff -u pkgsrc/audio/mp3blaster/options.mk:1.2 pkgsrc/audio/mp3blaster/options.mk:1.3
--- pkgsrc/audio/mp3blaster/options.mk:1.2	Tue Dec 29 04:54:35 2015
+++ pkgsrc/audio/mp3blaster/options.mk	Mon Jan 20 21:31:02 2020
@@ -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"


--_----------=_157955586276280--