svn commit: r380447 - head/audio/siren

[Olivier Duchateau]

Author: olivierd
Date: Wed Mar  4 18:32:35 2015
New Revision: 380447
URL: https://svnweb.freebsd.org/changeset/ports/380447
QAT: https://qat.redports.org/buildarchive/r380447/

Log:
  - Update to 0.5
  - Reoarganize options helper
  
  ChangeLog: http://www.kariliq.nl/hg/siren/raw-file/siren-0.5/CHANGES

Modified:
  head/audio/siren/Makefile
  head/audio/siren/distinfo
  head/audio/siren/pkg-plist

Modified: head/audio/siren/Makefile
==============================================================================
--- head/audio/siren/Makefile	Wed Mar  4 16:31:54 2015	(r380446)
+++ head/audio/siren/Makefile	Wed Mar  4 18:32:35 2015	(r380447)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	siren
-PORTVERSION=	0.4
-PORTREVISION=	1
+PORTVERSION=	0.5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.kariliq.nl/${PORTNAME}/dist/
 
@@ -22,7 +21,13 @@ USES=	ncurses pkgconfig
 HAS_CONFIGURE=	yes
 USE_CSTD=	c99
 
-OPTIONS_DEFINE=	PULSEAUDIO
+OPTIONS_SINGLE=	SOUND
+OPTIONS_SINGLE_SOUND=	OSS PULSEAUDIO
+OPTIONS_DEFAULT=	OSS
+OSS_CONFIGURE_ON=	oss=yes pulse=no
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ON=	oss=no pulse=yes
+OPTIONS_SUB=	yes
 
 CONFIGURE_ARGS=	sndfile=no \
 	alsa=no \
@@ -30,17 +35,4 @@ CONFIGURE_ARGS=	sndfile=no \
 	sndio=no \
 	sun=no
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=oss=no pulse=yes
-PLIST_SUB+=	OSS="@comment " \
-	PULSE=""
-.else
-CONFIGURE_ARGS+=oss=yes pulse=no
-PLIST_SUB+=	OSS="" \
-	PULSE="@comment "
-.endif
-
 .include <bsd.port.mk>

Modified: head/audio/siren/distinfo
==============================================================================
--- head/audio/siren/distinfo	Wed Mar  4 16:31:54 2015	(r380446)
+++ head/audio/siren/distinfo	Wed Mar  4 18:32:35 2015	(r380447)
@@ -1,2 +1,2 @@
-SHA256 (siren-0.4.tar.gz) = 9f7cb6cfcafe2325d79d9f27015e67a7afd4470c8e029ecf922667816d1ccd44
-SIZE (siren-0.4.tar.gz) = 87451
+SHA256 (siren-0.5.tar.gz) = 61b8599a29a8d6c09d63a6fab562ce0dc97f2aa12b008cb0f0c089c9e1011526
+SIZE (siren-0.5.tar.gz) = 92858

Modified: head/audio/siren/pkg-plist
==============================================================================
--- head/audio/siren/pkg-plist	Wed Mar  4 16:31:54 2015	(r380446)
+++ head/audio/siren/pkg-plist	Wed Mar  4 18:32:35 2015	(r380447)
@@ -4,5 +4,5 @@ lib/siren/ip/mad.so
 lib/siren/ip/vorbis.so
 lib/siren/ip/wavpack.so
 %%OSS%%lib/siren/op/oss.so
-%%PULSE%%lib/siren/op/pulse.so
+%%PULSEAUDIO%%lib/siren/op/pulse.so
 man/man1/siren.1.gz