- Introduce USE_OPENAL variable for OpenAL consumers

- Switch to openal-soft as a default OpenAL implementation

PR:		ports/142123
Submitted by:	mva
Tested by:	pointyhat exp-run
Approved by:	portmgr (hat)

6 files changed, 14 insertions, 13 deletions

diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 0a92767b92b8..c250604571ff 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Coin
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.coin3d.org/coin/src/all/ \
 		ftp://ftp.coin3d.org/pub/coin/src/all/
@@ -14,9 +15,9 @@ MASTER_SITES=	http://ftp.coin3d.org/coin/src/all/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ 3D graphics library based on the Open Inventor 2.1 API
 
-LIB_DEPENDS=	openal.0:${PORTSDIR}/audio/openal \
-		simage.26:${PORTSDIR}/graphics/simage
+LIB_DEPENDS=	simage.26:${PORTSDIR}/graphics/simage
 
+USE_OPENAL=	al
 USE_GL=		yes
 USE_XORG=	xt x11
 GNU_CONFIGURE=	yes
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 4352aaf53d31..2c17e34c6388 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	blender
 PORTVERSION=	2.49b
+PORTREVISION=	1
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@@ -147,8 +148,7 @@ CFLAGS+=	-O3 -ffast-math
 .if defined(WITH_OPENAL)
 MAKE_ENV+=	NAN_NO_OPENAL="false"
 MAKE_ENV+=	NAN_OPENAL="${LOCALBASE}/"
-LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal \
-		alut.1:${PORTSDIR}/audio/freealut
+USE_OPENAL=	al alut
 .else
 MAKE_ENV+=	NAN_NO_OPENAL="true"
 .endif
diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile
index 4604c287963f..2a0cc9632023 100644
--- a/graphics/crystalspace/Makefile
+++ b/graphics/crystalspace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crystalspace
 PORTVERSION=	1.0.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF/crystal/crystal/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/$/-src/}-${PORTVERSION}
@@ -22,14 +22,13 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.10:${PORTSDIR}/graphics/jpeg \
 		aa.1:${PORTSDIR}/graphics/aalib \
-		openal.0:${PORTSDIR}/audio/openal \
-		alut.1:${PORTSDIR}/audio/freealut \
 		CEGUIBase.3:${PORTSDIR}/graphics/cegui
 
 CONFLICTS=	crystalspace-devel-[0-9]*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_OPENAL=	al alut
 USE_GL=		yes
 WANT_PERL=	yes
 LDFLAGS+=	-L/usr/lib -lc
diff --git a/graphics/py-pyglet/Makefile b/graphics/py-pyglet/Makefile
index f24dcda26ad5..1ba44aac5a27 100644
--- a/graphics/py-pyglet/Makefile
+++ b/graphics/py-pyglet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyglet
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia x11-toolkits python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,12 +16,12 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Cross-platform windowing and multimedia library for Python
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		openal.0:${PORTSDIR}/audio/openal
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_GL=		gl glu
+USE_OPENAL=	al
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile
index 6aaeff827fdd..8d956148b637 100644
--- a/graphics/py-soya3d/Makefile
+++ b/graphics/py-soya3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soya3d
 PORTVERSION=	0.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics python
 MASTER_SITES=	http://download.gna.org/soya/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,8 +22,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 LIB_DEPENDS=	cal3d.12:${PORTSDIR}/graphics/cal3d \
 		GLEW.1:${PORTSDIR}/graphics/glew \
-		openal.0:${PORTSDIR}/audio/openal \
-		alut.1:${PORTSDIR}/audio/freealut \
 		freetype.9:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-editobj \
 		${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \
@@ -32,6 +30,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-edit
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_OPENAL=	al alut
 USE_GL=		gl
 USE_GMAKE=	yes
 USE_SDL=	sdl
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 70cfe5026fa5..eceb6372afe6 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/rss-glx/rss-glx/${PORTVERSION}
 DISTNAME=	rss-glx_${PORTVERSION}
@@ -39,7 +40,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FREEALUT)
-LIB_DEPENDS+=	alut.1:${PORTSDIR}/audio/freealut
+USE_OPENAL=	alut
 .else
 CONFIGURE_ARGS+=	--disable-sound
 .endif