revert library changes from previous commit pending further discussion.

audio/openal/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2011/06/26 09:58:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2011/06/26 10:36:16 sthen Exp $
 
 COMMENT =	cross-platform 3D audio API
 
 V =		20110624
 DISTNAME =	openal-soft-$V
 PKGNAME =	openal-$V
-REVISION =	0
+REVISION =	1
 CATEGORIES =	audio
 SHARED_LIBS =	openal	2.0
 
@@ -17,17 +17,14 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		c m pthread sndio
+WANTLIB =		c m pthread sndio portaudio
 
 MASTER_SITES =		${HOMEPAGE:S,.html,-releases/,} \
 			http://openbsd.fi/dist/
 
+LIB_DEPENDS =		audio/portaudio-svn
 MODULES =		devel/cmake
 
-CONFIGURE_STYLE =	cmake
-CONFIGURE_ARGS =	-DALSA=off -DOSS=off -DSOLARIS=off -DPORTAUDIO=off \
-			-DPULSEAUDIO=off -DDLOPEN=off
-
 NO_REGRESS =		Yes
 
 pre-build:

audio/openal/patches/patch-CMakeLists_txt

@@ -1,6 +1,15 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2011/06/26 09:58:08 sthen Exp $
---- CMakeLists.txt.orig	Thu Jun 23 20:02:57 2011
-+++ CMakeLists.txt	Sat Jun 25 19:27:55 2011
+$OpenBSD: patch-CMakeLists_txt,v 1.3 2011/06/26 10:36:16 sthen Exp $
+--- CMakeLists.txt.orig	Fri Jun 24 03:02:57 2011
++++ CMakeLists.txt	Sat Jun 25 20:46:26 2011
+@@ -50,7 +50,7 @@ OPTION(REQUIRE_PULSEAUDIO "Require PulseAudio backend"
+ OPTION(REQUIRE_COREAUDIO  "Require CoreAudio backend"          OFF)
+ OPTION(REQUIRE_OPENSL     "Require OpenSL backend"             OFF)
+ 
+-OPTION(DLOPEN  "Check for the dlopen API for loading optional libs"  ON)
++OPTION(DLOPEN  "Check for the dlopen API for loading optional libs"  OFF)
+ 
+ OPTION(WERROR  "Treat compile warnings as errors"      OFF)
+ 
 @@ -145,13 +145,13 @@ ELSE()
          ADD_DEFINITIONS(-Werror)
      ENDIF()
@@ -18,3 +27,19 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2011/06/26 09:58:08 sthen Exp $
          "Flags used by the compiler during release builds"
          FORCE)
      SET(CMAKE_C_FLAGS_DEBUG "-g3 -D_DEBUG" CACHE STRING
+@@ -508,6 +508,15 @@ ENDIF()
+ 
+ # Check PortAudio backend
+ IF(PORTAUDIO)
++    IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++        INCLUDE(FindPkgConfig)
++        PKG_CHECK_MODULES(PORTAUDIO REQUIRED portaudio-2.0)
++        INCLUDE_DIRECTORIES("${PORTAUDIO_INCLUDE_DIRS}")
++        LINK_DIRECTORIES("${PORTAUDIO_LIBRARY_DIRS}")
++        SET(HAVE_PORTAUDIO 1)
++        SET(HAVE_LIBPORTAUDIO 1)
++        SET(HAVE_PORTAUDIO_H 1)
++    ENDIF()
+     CHECK_INCLUDE_FILE(portaudio.h HAVE_PORTAUDIO_H)
+     IF(HAVE_PORTAUDIO_H)
+         CHECK_SHARED_LIBRARY_EXISTS(portaudio Pa_Initialize 0 "" HAVE_LIBPORTAUDIO)

audio/openal/patches/patch-openal_pc_in

@@ -1,4 +1,14 @@
-$OpenBSD: patch-openal_pc_in,v 1.1 2011/06/26 09:58:08 sthen Exp $
+$OpenBSD: patch-openal_pc_in,v 1.2 2011/06/26 10:36:16 sthen Exp $
+--- openal.pc.in.orig	Sat Jun 25 21:24:40 2011
++++ openal.pc.in	Sat Jun 25 21:28:26 2011
+@@ -7,5 +7,5 @@ Name: OpenAL
+ Description: OpenAL is a cross-platform 3D audio API
+ Requires: @PKG_CONFIG_REQUIRES@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@
++Libs: -L${libdir} -l@LIBNAME@ @PKG_CONFIG_LIBS@ -lm -lsndio -pthread
+ Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@
+$OpenBSD: patch-openal_pc_in,v 1.2 2011/06/26 10:36:16 sthen Exp $
 --- openal.pc.in.orig	Sat Jun 25 21:24:40 2011
 +++ openal.pc.in	Sat Jun 25 21:28:26 2011
 @@ -7,5 +7,5 @@ Name: OpenAL