11 files changed, 177 insertions, 0 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 4c02897e6f13..053b60bd6b04 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -69,6 +69,7 @@
     SUBDIR += rplay
     SUBDIR += rsynth
     SUBDIR += s3mod
+    SUBDIR += sdl_mixer
     SUBDIR += shorten
     SUBDIR += sidplay
     SUBDIR += snowstar
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
new file mode 100644
index 000000000000..468558df60e0
--- /dev/null
+++ b/audio/sdl_mixer/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	sdl_mixer
+# Date created:		24 Aprim 2000
+# Whom:			Maxim Sobolev <sobomax@altavista.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	sdl_mixer
+PORTVERSION=	1.0.5
+CATEGORIES=	audio
+MASTER_SITES=	http://www.devolution.com/~slouken/SDL/projects/SDL_mixer/src/
+DISTNAME=	SDL_mixer-${PORTVERSION}
+
+MAINTAINER=	sobomax@altavista.net
+
+LIB_DEPENDS=  	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel \
+		smpeg-0.3.0:${PORTSDIR}/graphics/smpeg \
+		mikmod.2:${PORTSDIR}/audio/libmikmod
+
+SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
+		CPPFLAGS="-I${X11BASE}/include"
+
+.include <bsd.port.mk>
diff --git a/audio/sdl_mixer/distinfo b/audio/sdl_mixer/distinfo
new file mode 100644
index 000000000000..dd0c349b141d
--- /dev/null
+++ b/audio/sdl_mixer/distinfo
@@ -0,0 +1 @@
+MD5 (SDL_mixer-1.0.5.tar.gz) = 45fff1d83465d81da252873d8cf85556
diff --git a/audio/sdl_mixer/files/patch-aa b/audio/sdl_mixer/files/patch-aa
new file mode 100644
index 000000000000..b103989b6794
--- /dev/null
+++ b/audio/sdl_mixer/files/patch-aa
@@ -0,0 +1,44 @@
+--- Makefile.in.orig	Sat Mar  4 06:54:37 2000
++++ Makefile.in	Mon Apr 24 12:39:34 2000
+@@ -91,15 +91,15 @@
+ lib_LTLIBRARIES = libSDL_mixer.la
+ 
+ SUBDIRS = @MUSIC_SUBDIRS@
+-DIST_SUBIDRS = mikmod timidity
++DIST_SUBIDRS = timidity
+ 
+-libSDL_mixerincludedir = $(includedir)/SDL
++libSDL_mixerincludedir = $(includedir)/SDL11
+ libSDL_mixerinclude_HEADERS =  	SDL_mixer.h
+ 
+ 
+ libSDL_mixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wave.h				wavestream.c			wavestream.h
+ 
+-@USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la
++@USE_MIKMOD_TRUE@MIKMOD_LIB = -lmikmod
+ @USE_MIKMOD_FALSE@MIKMOD_LIB = 
+ @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
+ @USE_TIMIDITY_FALSE@TIMIDITY_LIB = 
+@@ -107,7 +107,7 @@
+ EXTRA_DIST =  	CHANGES				VisualC.zip			MPWmake.sea.hqx			autogen.sh
+ 
+ 
+-libSDL_mixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libSDL_mixer_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
+ 
+@@ -127,12 +127,10 @@
+ LIBS = @LIBS@
+ @USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES = 
+ @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =  \
+-@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \
+ @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la
+ @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDL_mixer_la_DEPENDENCIES =  \
+ @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la
+-@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =  \
+-@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la
++@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDL_mixer_la_DEPENDENCIES =
+ libSDL_mixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo wavestream.lo
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
diff --git a/audio/sdl_mixer/files/patch-ab b/audio/sdl_mixer/files/patch-ab
new file mode 100644
index 000000000000..b294897e5ba4
--- /dev/null
+++ b/audio/sdl_mixer/files/patch-ab
@@ -0,0 +1,13 @@
+--- configure.orig	Mon Apr 24 12:40:12 2000
++++ configure	Mon Apr 24 12:43:53 2000
+@@ -2232,8 +2232,8 @@
+ fi
+ 
+ if test x$enable_music_mod = xyes; then
+-    CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
+-    MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
++    CFLAGS="$CFLAGS -DMOD_MUSIC"
++#    MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
+ fi
+ # Check whether --enable-music-midi or --disable-music-midi was given.
+ if test "${enable_music_midi+set}" = set; then
diff --git a/audio/sdl_mixer/files/patch-ac b/audio/sdl_mixer/files/patch-ac
new file mode 100644
index 000000000000..1cece5d00f9c
--- /dev/null
+++ b/audio/sdl_mixer/files/patch-ac
@@ -0,0 +1,49 @@
+--- timidity/config.h.orig	Tue Feb  1 23:16:29 2000
++++ timidity/config.h	Mon Apr 24 12:53:43 2000
+@@ -156,6 +156,22 @@
+ # endif
+ #endif /* linux */
+ 
++#ifdef __FreeBSD__
++#include <errno.h>
++#include <machine/endian.h>
++#if BYTE_ORDER == LITTLE_ENDIAN
++#undef BIG_ENDIAN
++#undef PDP_ENDIAN
++#elif BYTE_ORDER == BIG_ENDIAN
++#undef LITTLE_ENDIAN
++#undef PDP_ENDIAN
++#else
++# error No valid byte sex defined
++#endif
++#define USE_LDEXP
++#define PI M_PI
++#endif
++
+ /* Win32 on Intel machines */
+ #ifdef __WIN32__
+ #  define LITTLE_ENDIAN
+@@ -186,13 +202,23 @@
+ #ifdef LITTLE_ENDIAN
+ #define LE_SHORT(x) x
+ #define LE_LONG(x) x
++#if defined(__FreeBSD__) && !defined(__alpha__)
++#define BE_SHORT(x) __byte_swap_word(x)
++#define BE_LONG(x) __byte_swap_long(x)
++#else
+ #define BE_SHORT(x) XCHG_SHORT(x)
+ #define BE_LONG(x) XCHG_LONG(x)
++#endif
+ #else
+ #define BE_SHORT(x) x
+ #define BE_LONG(x) x
++#ifdef __FreeBSD__
++#define LE_SHORT(x) __byte_swap_word(x)
++#define LE_LONG(x) __byte_swap_long(x)
++#else
+ #define LE_SHORT(x) XCHG_SHORT(x)
+ #define LE_LONG(x) XCHG_LONG(x)
++#endif
+ #endif
+ 
+ #define MAX_AMPLIFICATION 800
diff --git a/audio/sdl_mixer/files/patch-ad b/audio/sdl_mixer/files/patch-ad
new file mode 100644
index 000000000000..de5965d20b66
--- /dev/null
+++ b/audio/sdl_mixer/files/patch-ad
@@ -0,0 +1,14 @@
+--- timidity/resample.c.orig	Tue Feb  1 23:16:29 2000
++++ timidity/resample.c	Mon Apr 24 12:53:27 2000
+@@ -22,7 +22,11 @@
+ 
+ #include <math.h>
+ #include <stdio.h>
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ 
+ #include "config.h"
+ #include "common.h"
diff --git a/audio/sdl_mixer/files/patch-ae b/audio/sdl_mixer/files/patch-ae
new file mode 100644
index 000000000000..b4c308e879fb
--- /dev/null
+++ b/audio/sdl_mixer/files/patch-ae
@@ -0,0 +1,14 @@
+--- timidity/mix.c.orig	Tue Feb  1 23:16:29 2000
++++ timidity/mix.c	Mon Apr 24 12:53:27 2000
+@@ -23,7 +23,11 @@
+ 
+ #include <math.h>
+ #include <stdio.h>
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ 
+ #include "config.h"
+ #include "common.h"
diff --git a/audio/sdl_mixer/pkg-comment b/audio/sdl_mixer/pkg-comment
new file mode 100644
index 000000000000..2f8ad35a511b
--- /dev/null
+++ b/audio/sdl_mixer/pkg-comment
@@ -0,0 +1 @@
+SDL_mixer is a sample multi-channel audio mixer library
diff --git a/audio/sdl_mixer/pkg-descr b/audio/sdl_mixer/pkg-descr
new file mode 100644
index 000000000000..b1458a4ce57c
--- /dev/null
+++ b/audio/sdl_mixer/pkg-descr
@@ -0,0 +1,6 @@
+SDL_mixer is a sample multi-channel audio mixer library. It supports any number
+of simultaneously playing channels of 16 bit stereo audio, plus a single
+channel of music, mixed by the popular MikMod MOD, Timidity MIDI and SMPEG MP3
+libraries.
+
+WWW: http://www.devolution.com/~slouken/SDL/projects/SDL_mixer/index.html
diff --git a/audio/sdl_mixer/pkg-plist b/audio/sdl_mixer/pkg-plist
new file mode 100644
index 000000000000..7f28d84b0f05
--- /dev/null
+++ b/audio/sdl_mixer/pkg-plist
@@ -0,0 +1,8 @@
+bin/playmus
+bin/playwave
+include/SDL11/SDL_mixer.h
+lib/libSDL_mixer.so
+lib/libSDL_mixer.so.2
+lib/libSDL_mixer.a
+lib/libSDL_mixer.la
+