13 files changed, 1 insertions, 259 deletions

diff --git a/MOVED b/MOVED
index 87fda6b24ccd..83223791ad5c 100644
--- a/MOVED
+++ b/MOVED
@@ -12204,3 +12204,4 @@ databases/zabbix32-libzbxpgsql||2019-04-28|Removed, depends on expired net-mgmt/
 databases/zabbix34-libzbxpgsql||2019-04-28|Removed, depends on expired net-mgmt/zabbix34-agent
 games/lianliankan||2019-04-30|Has expired: Depends on expired esound
 audio/extace||2019-04-30|Has expired: Depends on expired esound
+audio/openal||2019-04-30|Has expired: Abandonware. Use audio/openal-soft instead
diff --git a/audio/Makefile b/audio/Makefile
index eded5f7e4231..3f4d0ea5134c 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -570,7 +570,6 @@
     SUBDIR += nuvolaplayer
     SUBDIR += oaml
     SUBDIR += ocp
-    SUBDIR += openal
     SUBDIR += openal-soft
     SUBDIR += opencore-amr
     SUBDIR += openspc
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
deleted file mode 100644
index 2579c3aea12d..000000000000
--- a/audio/openal/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Created by: Thomas Gellekum <tg@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	openal
-PORTVERSION=	20060211
-PORTREVISION=	16
-CATEGORIES=	audio
-MASTER_SITES=	GENTOO
-DISTNAME=	${PORTNAME}-0.0.8
-
-MAINTAINER=	erik@bz.bzflag.bz
-COMMENT=	3D positional spatialized sound library
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Abandonware. Use audio/openal-soft instead
-EXPIRATION_DATE=	2019-04-30
-
-CONFLICTS=	openal-soft-[0-9]*
-
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	-Wno-return-type
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--enable-capture \
-		--disable-arts \
-		--disable-esd
-USES=		pathfix pkgconfig gmake libtool:keepla
-USE_LDCONFIG=	yes
-
-OPTIONS_DEFINE=	SDL VORBIS SMPEG ALSA
-OPTIONS_DEFINE_i386=	ASM
-OPTIONS_DEFAULT_i386=	ASM
-SMPEG_DESC=	smpeg support
-
-SDL_USE=		SDL=sdl
-SDL_CONFIGURE_ENABLE=	sdl
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
-VORBIS_CONFIGURE_ENABLE=vorbis
-SMPEG_LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
-SMPEG_CONFIGURE_ENABLE=	mp3
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_CONFIGURE_ENABLE=	alsa
-ASM_BUILD_DEPENDS=	nasm:devel/nasm
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/x86_64\*/amd64\* | \*ia64\*/g; \
-		/CPPFLAGS=/ d; s/ \*linux\*)/ \*bsd\*)/' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/#include/ s|SDL/||' \
-		${WRKSRC}/src/extensions/al_ext_mp3.c
-	@${REINPLACE_CMD} -e 's|"mixaudio16_mmx_prk.h"|"arch/i386/mixaudio16_mmx_prk.h"|' \
-		${WRKSRC}/src/mixaudio16.h
-	@${REINPLACE_CMD} -e 's|@requirements@||' \
-		${WRKSRC}/admin/pkgconfig/openal.pc.in
-post-patch-ASM-off:
-	@${REINPLACE_CMD} -e '/^NASM=/ s|=.*|=no|' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/audio/openal/distinfo b/audio/openal/distinfo
deleted file mode 100644
index 0b83f89f288f..000000000000
--- a/audio/openal/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openal-0.0.8.tar.gz) = 723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
-SIZE (openal-0.0.8.tar.gz) = 870671
diff --git a/audio/openal/files/patch-common_include_AL_alc.h b/audio/openal/files/patch-common_include_AL_alc.h
deleted file mode 100644
index 213d597df407..000000000000
--- a/audio/openal/files/patch-common_include_AL_alc.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- common/include/AL/alc.h.orig	2006-02-11 09:36:55 UTC
-+++ common/include/AL/alc.h
-@@ -187,7 +187,7 @@ ALC_API void            ALC_APIENTRY alc
- 
- ALC_API void            ALC_APIENTRY alcDestroyContext( ALCcontext *context );
- 
--ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( ALCvoid );
-+ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( void );
- 
- ALC_API ALCdevice*      ALC_APIENTRY alcGetContextsDevice( ALCcontext *context );
- 
-@@ -248,7 +248,7 @@ typedef ALCboolean     (ALC_APIENTRY *LP
- typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context );
- typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context );
- typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context );
--typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid );
-+typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void );
- typedef ALCdevice *    (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context );
- typedef ALCdevice *    (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename );
- typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device );
diff --git a/audio/openal/files/patch-src_arch_i386_memcpy__mmx__prk.nasm b/audio/openal/files/patch-src_arch_i386_memcpy__mmx__prk.nasm
deleted file mode 100644
index 56a7f9d56932..000000000000
--- a/audio/openal/files/patch-src_arch_i386_memcpy__mmx__prk.nasm
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/arch/i386/memcpy_mmx_prk.nasm.orig	2005-12-17 12:50:39 UTC
-+++ src/arch/i386/memcpy_mmx_prk.nasm
-@@ -22,6 +22,7 @@
- ; pretty straight-forward implementation
- ; by design broken for n<8, so check that before calling
- ; x86 32 bit only!
-+[Section .text]
- global __alMMXmemcpy
- global _alMMXmemcpy
- 
diff --git a/audio/openal/files/patch-src_arch_i386_x86__cpu__caps__detect__prk.nasm b/audio/openal/files/patch-src_arch_i386_x86__cpu__caps__detect__prk.nasm
deleted file mode 100644
index 0ae0826813f8..000000000000
--- a/audio/openal/files/patch-src_arch_i386_x86__cpu__caps__detect__prk.nasm
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/arch/i386/x86_cpu_caps_detect_prk.nasm.orig	2005-12-17 12:50:39 UTC
-+++ src/arch/i386/x86_cpu_caps_detect_prk.nasm
-@@ -23,6 +23,7 @@
- ; using infos from sandpile.org
- 
- ; returns 0 if no CPUID available
-+[Section .text]
- global __alDetectx86CPUCaps
- global _alDetectx86CPUCaps
- 
diff --git a/audio/openal/files/patch-src_arch_i386_x86__floatmul.c b/audio/openal/files/patch-src_arch_i386_x86__floatmul.c
deleted file mode 100644
index 3901c418dfcf..000000000000
--- a/audio/openal/files/patch-src_arch_i386_x86__floatmul.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/arch/i386/x86_floatmul.c.orig	2005-12-21 19:06:35 UTC
-+++ src/arch/i386/x86_floatmul.c
-@@ -46,7 +46,7 @@ void _alFloatMul(ALshort *bpt, ALfloat s
- 		v4hi temp;
- 		
- 		
--		samples_pre = MMX_ALIGN - (aint)bpt % MMX_ALIGN;
-+		samples_pre = (MMX_ALIGN - (aint)bpt % MMX_ALIGN) % MMX_ALIGN;
- 		samples_pre /= sizeof(ALshort);
- 		samples_main = len - samples_pre;
- 		samples_post = samples_main % 8;
-@@ -82,11 +82,27 @@ void _alFloatMul(ALshort *bpt, ALfloat s
- 			v_sa.s[3] = v_sa.s[0];
- 			
- 			while (samples_main--) {
-+				union {
-+					short s[4];
-+					v4hi v;
-+				} ALIGN16(v_one);
-+				v_one.s[0] = 1;
-+				v_one.s[1] = 0;
-+				v_one.s[2] = 0;
-+				v_one.s[3] = 0;
- 				temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
-+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__)
- 				*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
-+#else
-+				*(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
-+#endif
- 				bpt += 4;
- 				temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
-+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__)
- 				*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
-+#else
-+				*(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
-+#endif
- 				bpt += 4;
- 			}
- 		}
diff --git a/audio/openal/files/patch-src_backends_alc__backend__bsd.c b/audio/openal/files/patch-src_backends_alc__backend__bsd.c
deleted file mode 100644
index 44d53c86c317..000000000000
--- a/audio/openal/files/patch-src_backends_alc__backend__bsd.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/backends/alc_backend_bsd.c.orig	2006-01-05 15:11:20 UTC
-+++ src/backends/alc_backend_bsd.c
-@@ -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>
-@@ -113,7 +116,6 @@ static int AL2BSDFMT(int fmt)
-  */
- static 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 +128,6 @@ static void *grab_write_native(void) {
- 		perror("fcntl");
- 	}
- 
--	if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
--		perror("ioctl SETFRAGMENT");
--	}
--
- 	FD_ZERO(&dsp_fd_set);
- 	FD_SET(dsp_fd, &dsp_fd_set);
- 
-@@ -318,10 +316,12 @@ ALsizei capture_nativedevice(UNUSED(void
- }
- 
- static ALboolean set_write_native(UNUSED(void *handle),
--				  UNUSED(unsigned int *bufsiz),
-+				  unsigned int *bufsiz,
- 				  ALenum *fmt,
- 				  unsigned int *speed) {
- 	ALuint channels = _alGetChannelsFromFormat(*fmt);
-+	int divisor;
-+	char *custom_bufsiz;
- 
- 	if(dsp_fd < 0) {
- 		return AL_FALSE;
-@@ -364,6 +364,28 @@ static ALboolean set_write_native(UNUSED
- 
- 	*fmt = BSD2ALFMT(*fmt, channels);
- 
-+	custom_bufsiz = getenv("OPENAL_BUFFER_SIZE");
-+	if (custom_bufsiz != NULL)
-+		*bufsiz = atoi(custom_bufsiz);
-+	else {
-+		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/files/patch-src_backends_alc__backend__esd.c b/audio/openal/files/patch-src_backends_alc__backend__esd.c
deleted file mode 100644
index 9ea8a03e3e48..000000000000
--- a/audio/openal/files/patch-src_backends_alc__backend__esd.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/backends/alc_backend_esd.c.orig	2006-01-12 18:12:11 UTC
-+++ src/backends/alc_backend_esd.c
-@@ -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/pkg-descr b/audio/openal/pkg-descr
deleted file mode 100644
index 69f798302e1a..000000000000
--- a/audio/openal/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-The idea behind OpenAL is a 3d positional spatialized sound library analogous
-to OpenGL: instead of micromanaging each aspect of sound playback and effect,
-the application writer may limit themselves to placing the sounds in the
-scene and letting the native OpenAL implementation determine the correct
-amount of pitch alteration, gain attenuation, phase shift, etc, required to
-render the sounds correctly.
-
-That's the goal, anyway.
-
-WWW: http://www.openal.org/
diff --git a/audio/openal/pkg-message b/audio/openal/pkg-message
deleted file mode 100644
index 1331e9e0c798..000000000000
--- a/audio/openal/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-===============================================================================
-If you hear cracks and pops with some applications, adjust the
-OPENAL_BUFFER_SIZE environment variable, for instance:
-
-	export OPENAL_BUFFER_SIZE=8192
-	fgfs
-
-If the OPENAL_BUFFER_SIZE environment variable is not set, the default sound
-card buffer size is used.
-
-Increasing the audio buffer size increases the audio latency but decreases the
-CPU usage; decreasing the audio buffer size decreases the audio latency but
-increases the CPU usage (which can cause cracks and pops).
-===============================================================================
diff --git a/audio/openal/pkg-plist b/audio/openal/pkg-plist
deleted file mode 100644
index c26d7cb9fa05..000000000000
--- a/audio/openal/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/openal-config
-include/AL/al.h
-include/AL/alc.h
-include/AL/alext.h
-lib/libopenal.a
-lib/libopenal.la
-lib/libopenal.so
-lib/libopenal.so.0
-lib/libopenal.so.0.0.0
-libdata/pkgconfig/openal.pc