6 files changed, 41 insertions, 78 deletions
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index a2c4fb2..586ea1a 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -6,24 +6,20 @@
 #
 
 PORTNAME=	openal
-PORTVERSION=	20050401
-PORTREVISION=	1
+PORTVERSION=	20060211
 CATEGORIES=	audio
-MASTER_SITES=	http://math.missouristate.edu/~erik/files/fbsd/\
-		http://www.smluc.org/~erik/files/fbsd/
+MASTER_SITES=	http://openal.org/openal_webstf/downloads/
+DISTVERSION=	0.0.8
 
 MAINTAINER=	erik@smluc.org
 COMMENT=	A 3D positional spatialized sound library
 
-INFO=		openal
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/linux
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-capture
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
+USE_GNOME=	pkgconfig gnomehack
 WANT_SDL=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
@@ -43,27 +39,37 @@ WITH_SDL=	yes	# smpeg requires SDL
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=--enable-arts
+.else
+CONFIGURE_ARGS+=--disable-arts
 .endif
 
 .if defined(WITH_ESD)
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=--enable-esd
+.else
+CONFIGURE_ARGS+=--disable-esd
 .endif
 
 .if defined(WITH_SDL)
 USE_SDL+=	sdl
 CONFIGURE_ENV+=	HAVESDL="${SDL_CONFIG}"
 CONFIGURE_ARGS+=--enable-sdl
+.else
+CONFIGURE_ARGS+=--disable-sdl
 .endif
 
 .if defined(WITH_VORBIS)
 LIB_DEPENDS+=	vorbisfile.4:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--enable-vorbis
+.else
+CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
 .if defined(WITH_SMPEG)
 LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 CONFIGURE_ARGS+=--enable-smpeg
+.else
+CONFIGURE_ARGS+=--disable-smpeg
 .endif
 
 post-patch:
@@ -72,7 +78,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/#include/ s|SDL/||' \
 		${WRKSRC}/src/extensions/al_ext_mp3.c
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info
-
 .include <bsd.port.post.mk>
diff --git a/audio/openal/distinfo b/audio/openal/distinfo
index b8938570..5e0d016 100644
--- a/audio/openal/distinfo
+++ b/audio/openal/distinfo
@@ -1,3 +1,3 @@
-MD5 (openal-20050401.tar.gz) = a715c159a1de35e743ca5ccb13f6d118
-SHA256 (openal-20050401.tar.gz) = 36873403226a225987038186296393d6e8eee6caf7e10c4fe8eaafbbb139f55b
-SIZE (openal-20050401.tar.gz) = 346077
+MD5 (openal-0.0.8.tar.gz) = 641cf53761f35ee979f3e888614797a0
+SHA256 (openal-0.0.8.tar.gz) = 723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
+SIZE (openal-0.0.8.tar.gz) = 870671
diff --git a/audio/openal/files/patch-src-backends-alc_backend_bsd.c b/audio/openal/files/patch-src-backends-alc_backend_bsd.c
new file mode 100644
index 0000000..8ee8e3c
--- /dev/null
+++ b/audio/openal/files/patch-src-backends-alc_backend_bsd.c
@@ -0,0 +1,13 @@
+--- src/backends/alc_backend_bsd.c.orig	Sat Apr 22 12:25:15 2006
++++ src/backends/alc_backend_bsd.c	Sat Apr 22 12:26:15 2006
+@@ -9,7 +9,10 @@
+  */
+ #include "al_siteconfig.h"
+ 
++#define __BSD_VISIBLE 1
++
+ #include <AL/al.h>
++#include <AL/alext.h>
+ #include <assert.h>
+ #include <fcntl.h>
+ #include <sys/soundcard.h>
diff --git a/audio/openal/files/patch-src-backends-alc_backend_esd.c b/audio/openal/files/patch-src-backends-alc_backend_esd.c
new file mode 100644
index 0000000..ad1f5d1
--- /dev/null
+++ b/audio/openal/files/patch-src-backends-alc_backend_esd.c
@@ -0,0 +1,10 @@
+--- src/backends/alc_backend_esd.c.orig	Sat Apr 22 21:06:15 2006
++++ src/backends/alc_backend_esd.c	Sat Apr 22 21:05:33 2006
+@@ -15,6 +15,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
++#include <sys/select.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/audio/openal/files/patch-src_arch_bsd_bsd__dsp.c b/audio/openal/files/patch-src_arch_bsd_bsd__dsp.c
deleted file mode 100644
index ce94d0e..0000000
--- a/audio/openal/files/patch-src_arch_bsd_bsd__dsp.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/arch/bsd/bsd_dsp.c.orig	Wed Nov  9 13:15:27 2005
-+++ src/arch/bsd/bsd_dsp.c	Wed Nov  9 14:09:12 2005
-@@ -113,7 +113,6 @@
-  */
- void *grab_write_native(void) {
- 	const char *dsppath = "/dev/dsp";
--	int divisor = _alSpot(_AL_DEF_BUFSIZ) | (2<<16);
- 
- 	dsp_fd = open(dsppath, O_WRONLY | O_NONBLOCK);
- 
-@@ -126,10 +125,6 @@
- 		perror("fcntl");
- 	}
- 
--	if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
--		perror("ioctl SETFRAGMENT");
--	}
--
- 	_alBlitBuffer = native_blitbuffer;
- 
- 	FD_ZERO(&dsp_fd_set);
-@@ -320,10 +315,11 @@
- }
- 
- ALboolean set_write_native(UNUSED(void *handle),
--		     UNUSED(unsigned int *bufsiz),
-+		     unsigned int *bufsiz,
- 		     ALenum *fmt,
- 		     unsigned int *speed) {
- 	ALuint channels = _al_ALCHANNELS(*fmt);
-+	int divisor;
- 
- 	if(dsp_fd < 0) {
- 		return AL_FALSE;
-@@ -365,6 +361,23 @@
- 
- 
- 	*fmt = BSD2ALFMT(*fmt, channels);
-+
-+	if(ioctl(dsp_fd, SNDCTL_DSP_GETBLKSIZE, bufsiz) < 0) {
-+#ifdef DEBUG_MAXIMUS
-+		fprintf(stderr, "blksize %d\n", *bufsiz);
-+		perror("get_devsp blksize ioctl");
-+#endif
-+		return AL_FALSE;
-+	}
-+
-+	divisor = _alSpot(*bufsiz) | (2<<16);
-+	if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
-+#ifdef DEBUG_MAXIMUS
-+		fprintf(stderr, "divisor %d\n", divisor);
-+		perror("set_devsp fragment ioctl");
-+#endif
-+		return AL_FALSE;
-+	}
- 
- 	return AL_TRUE;
- }
diff --git a/audio/openal/pkg-plist b/audio/openal/pkg-plist
index 8a64e49c..bb4ccc3 100644
--- a/audio/openal/pkg-plist
+++ b/audio/openal/pkg-plist
@@ -1,15 +1,10 @@
 bin/openal-config
 include/AL/al.h
 include/AL/alc.h
-include/AL/alctypes.h
 include/AL/alext.h
-include/AL/alexttypes.h
-include/AL/altypes.h
-include/AL/alut.h
-include/AL/aluttypes.h
 lib/libopenal.a
+lib/libopenal.la
 lib/libopenal.so
 lib/libopenal.so.0
-lib/libopenal.so.0.0.8
 libdata/pkgconfig/openal.pc
 @dirrm include/AL