- 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)

5 files changed, 18 insertions, 15 deletions

diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile
index 951e56c88fec..e77177113832 100644
--- a/audio/freealut/Makefile
+++ b/audio/freealut/Makefile
@@ -7,20 +7,19 @@
 
 PORTNAME=	freealut
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://connect.creativelabs.com/openal/Downloads/ALUT/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	The OpenAL Utility Toolkit
 
-LIB_DEPENDS=	openal.0:${PORTSDIR}/audio/openal
-
 USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnomehack
+USE_OPENAL=	al
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index a6a4fdeb074d..e992ee842989 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ALUT
 PORTVERSION=	2.2.0.0
+PORTREVISION=	1
 CATEGORIES=	audio haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -20,14 +21,13 @@ BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
 		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
 		hs-OpenAL>=1.4.0.0:${PORTSDIR}/audio/hs-OpenAL
-LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal \
-		alut.1:${PORTSDIR}/audio/freealut
 
 GHC_VERSION=	6.10.4
 HSALUT_VERSION=	${PORTVERSION}
 
 GHC_CMD=	${LOCALBASE}/bin/ghc
 SETUP_CMD=	./setup
+USE_OPENAL=	al alut
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index 209e18952361..e5ed4c0776bb 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	OpenAL
 PORTVERSION=	1.4.0.0
+PORTREVISION=	1
 CATEGORIES=	audio haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -22,8 +23,8 @@ RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
 		hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \
 		hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor \
 		hs-ObjectName>=1.0.0.0:${PORTSDIR}/devel/hs-ObjectName
-LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
 
+USE_OPENAL=	al
 GHC_VERSION=		6.10.4
 HSOPENAL_VERSION=	${PORTVERSION}
 
diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile
index 58158de3af57..8d92acdb0f76 100644
--- a/audio/py-openal/Makefile
+++ b/audio/py-openal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openal
 PORTVERSION=	0.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio python
 MASTER_SITES=	http://download.gna.org/pyopenal/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,10 +16,8 @@ DISTNAME=	PyOpenAL-${PORTVERSION}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	PyOpenAL is a binding of OpenAL for Python
 
-LIB_DEPENDS=	openal.0:${PORTSDIR}/audio/openal \
-		alut.1:${PORTSDIR}/audio/freealut
-
 DIST_SUBDIR=	python
+USE_OPENAL=	al alut
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyOpenAL
diff --git a/audio/py-openal/files/patch-setup.py b/audio/py-openal/files/patch-setup.py
index 4c19744e6b7e..676207cddf3c 100644
--- a/audio/py-openal/files/patch-setup.py
+++ b/audio/py-openal/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py	Sun Apr 30 10:23:44 2006
-+++ setup.py	Mon Aug 21 00:25:58 2006
-@@ -1,14 +1,14 @@
+--- setup.py.orig	2006-04-30 17:23:44.000000000 +0200
++++ setup.py	2009-12-26 17:50:57.000000000 +0100
+@@ -1,17 +1,17 @@
  import os
  from distutils.core import setup, Extension
  
@@ -9,7 +9,8 @@
  LIBS    = ["openal", "alut"]
  
  try:
-   openal_version = os.popen("openal-config --version").read()
+-  openal_version = os.popen("openal-config --version").read()
++  openal_version = os.popen("pkg-config --modversion openal").read()
    if openal_version[0] == "0":
 -    LIBDIRS = ["/usr/lib", "/usr/local/lib"]
 -    LIBS    = ["openal"]
@@ -17,7 +18,11 @@
 +    LIBS    = ["openal","alut"]
      
  except:
-   print "Warning: error while running 'openal-config --version', using default values..."
+-  print "Warning: error while running 'openal-config --version', using default values..."
++  print "Warning: error while running 'pkg-config --modversion', using default values..."
+ 
+ 
+ setup(
 @@ -38,7 +38,7 @@
    
    ext_modules  = [Extension("_openal",