Mon Jan 20 21:31:02 2020 UTC ()
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.


(nia)
diff -r1.41 -r1.42 pkgsrc/audio/mp3blaster/Makefile
diff -r1.2 -r1.3 pkgsrc/audio/mp3blaster/options.mk
cvs diff -r1.41 -r1.42 pkgsrc/audio/mp3blaster/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mp3blaster/Makefile 2020/01/18 23:30:02 1.41
+++ pkgsrc/audio/mp3blaster/Makefile 2020/01/20 21:31:02 1.42
@@ -1,33 +1,36 @@ @@ -1,33 +1,36 @@
1# $NetBSD: Makefile,v 1.41 2020/01/18 23:30:02 rillig Exp $ 1# $NetBSD: Makefile,v 1.42 2020/01/20 21:31:02 nia Exp $
2 2
3DISTNAME= mp3blaster-3.2.6 3DISTNAME= mp3blaster-3.2.6
 4PKGREVISION= 1
4CATEGORIES= audio 5CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3blaster/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3blaster/}
6 7
7MAINTAINER= rxg@NetBSD.org 8MAINTAINER= rxg@NetBSD.org
8HOMEPAGE= https://mp3blaster.sourceforge.net/ 9HOMEPAGE= https://mp3blaster.sourceforge.net/
9COMMENT= MP3 console curses-based player 10COMMENT= MP3 console curses-based player
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12CONFLICTS= splay-[0-9]* 13CONFLICTS= splay-[0-9]*
13 14
14PTHREAD_OPTS+= require 15PTHREAD_OPTS+= require
15USE_LANGUAGES= c c++03 16USE_LANGUAGES= c c++03
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
17 18
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19 20
20CPPFLAGS.SunOS+= -Du_int16_t=uint16_t -Du_int32_t=uint32_t 21CPPFLAGS.SunOS+= -Du_int16_t=uint16_t -Du_int32_t=uint32_t
21LIBS.SunOS+= -lsocket -lnsl 22LIBS.SunOS+= -lsocket -lnsl
22 23
 24CONFIGURE_ARGS+= --without-esd
 25
23.include "../../mk/pthread.buildlink3.mk" 26.include "../../mk/pthread.buildlink3.mk"
24 27
25.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 28.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
26CONFIGURE_ARGS+= --enable-newthreads 29CONFIGURE_ARGS+= --enable-newthreads
27.endif 30.endif
28 31
29.include "options.mk" 32.include "options.mk"
30 33
31.include "../../audio/libvorbis/buildlink3.mk" 34.include "../../audio/libvorbis/buildlink3.mk"
32.include "../../mk/curses.buildlink3.mk" 35.include "../../mk/curses.buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/audio/mp3blaster/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/mp3blaster/options.mk 2015/12/29 04:54:35 1.2
+++ pkgsrc/audio/mp3blaster/options.mk 2020/01/20 21:31:02 1.3
@@ -1,26 +1,16 @@ @@ -1,26 +1,16 @@
1# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:35 dholland Exp $ 1# $NetBSD: options.mk,v 1.3 2020/01/20 21:31:02 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mp3blaster 3PKG_OPTIONS_VAR= PKG_OPTIONS.mp3blaster
4PKG_SUPPORTED_OPTIONS= esound oss sdl 4PKG_SUPPORTED_OPTIONS= sdl
5PKG_SUGGESTED_OPTIONS= oss 
6 5
7.if ${OPSYS} == "Darwin" 6.include "../../mk/oss.buildlink3.mk"
 7.if ${OSS_TYPE} == "none"
8PKG_SUGGESTED_OPTIONS= sdl 8PKG_SUGGESTED_OPTIONS= sdl
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13.if !empty(PKG_OPTIONS:Mesound) 
14CONFIGURE_ARGS+= --with-esd=yes 
15.include "../../audio/esound/buildlink3.mk" 
16.endif 
17 
18.if !empty(PKG_OPTIONS:Moss) 
19CONFIGURE_ARGS+= --with-oss=yes 
20.include "../../mk/oss.buildlink3.mk" 
21.endif 
22 
23.if !empty(PKG_OPTIONS:Msdl) 13.if !empty(PKG_OPTIONS:Msdl)
24CONFIGURE_ARGS+= --with-sdl=yes 14CONFIGURE_ARGS+= --with-sdl=yes
25.include "../../devel/SDL/buildlink3.mk" 15.include "../../devel/SDL/buildlink3.mk"
26.endif 16.endif