- Update to 2.1.6

- Enable sound via alsa-lib

Differential Revision:	https://reviews.freebsd.org/D1670
Reviewed by:	amdmi3
Approved by:	amdmi3 (maintainer)
Approved by:	bapt (mentor)

ChangeLog:
* Point to new leaderboard server
* Make name resolve non-fatal
* Debian patch for gcc-4.4 integrated

6 files changed, 15 insertions, 9 deletions

diff --git a/games/stormbaancoureur/Makefile b/games/stormbaancoureur/Makefile
index d377a15764a3..87bf1b964852 100644
--- a/games/stormbaancoureur/Makefile
+++ b/games/stormbaancoureur/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	stormbaancoureur
-PORTVERSION=	2.1.5
-PORTREVISION=	5
+PORTVERSION=	2.1.6
 CATEGORIES=	games
-MASTER_SITES=	http://bram.creative4vision.nl/stormbaancoureur/download/ \
+MASTER_SITES=	http://www.stolk.org/stormbaancoureur/download/ \
 		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -25,7 +24,14 @@ PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTDATA=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	ALSA DOCS
+OPTIONS_DEFAULT=ALSA
+
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_MAKE_ENV=		ALSA_LIBS="-lasound"
+ALSA_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-src-common-soundenginealsa.cxx \
+			${FILESDIR}/extra-patch-src-common-soundenginealsa.h
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|__DATADIR|"${DATADIR}"|' \
diff --git a/games/stormbaancoureur/distinfo b/games/stormbaancoureur/distinfo
index 65bf44a58e35..04a492117fe7 100644
--- a/games/stormbaancoureur/distinfo
+++ b/games/stormbaancoureur/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stormbaancoureur-2.1.5.tar.gz) = cd18ec1bf68db37cb5e77081fdc2863da4f921a69438a274a62e61ab42b94be0
-SIZE (stormbaancoureur-2.1.5.tar.gz) = 3976376
+SHA256 (stormbaancoureur-2.1.6.tar.gz) = c6bd67695734fd430ce8e8d744710531ed4dae1bc78d5cd0529af930144e7903
+SIZE (stormbaancoureur-2.1.6.tar.gz) = 3976459
diff --git a/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx b/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx
index 291de32a38bd..aabda65bafde 100644
--- a/games/stormbaancoureur/files/patch-src-common-soundenginealsa.cxx
+++ b/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.cxx
@@ -189,7 +189,7 @@
 -  if (delay < (int) buffersz)
 -  {
 -    int todo = buffersz - delay;
--#if 0
+-#if 1
 -    int cnt  = (todo + periodsz-1) / periodsz; // Use this with pulse audio (fedora)
 -#else
 -    int cnt  = todo / periodsz; // Use this with all other alsa implementations
diff --git a/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h b/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h
index fbfdeb7a2289..fbfdeb7a2289 100644
--- a/games/stormbaancoureur/files/patch-src-common-soundenginealsa.h
+++ b/games/stormbaancoureur/files/extra-patch-src-common-soundenginealsa.h
diff --git a/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile b/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
index 44de7704e713..2aa671670680 100644
--- a/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
+++ b/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile
@@ -37,7 +37,7 @@
 +  $(LOCALBASE)/lib/libode.a \
    -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \
 -  -lglut -lGLU -lGL -lasound
-+  -lglut -lGLU -lGL
++  -lglut -lGLU -lGL $(ALSA_LIBS)
  
  
  all: stormbaancoureur
diff --git a/games/stormbaancoureur/pkg-descr b/games/stormbaancoureur/pkg-descr
index 68b361cc732f..7bec48bb6414 100644
--- a/games/stormbaancoureur/pkg-descr
+++ b/games/stormbaancoureur/pkg-descr
@@ -6,4 +6,4 @@ try to have the laws of physics work with you, not against you.
 
 Stormbaan Coureur is a game by Bram Stolk.
 
-WWW: http://bram.creative4vision.nl/stormbaancoureur/
+WWW: http://www.stolk.org/stormbaancoureur/