"""

1. Solved recent breakage due to converting SDL library to use stock c_r
   library instead of linuxthreads;
2. port now uses SDL_mixer and mkmod libraries instead of its own custom
   versions;
3. port's Makefile and patches has been cleaned to remove mandatory items.
"""

PR:		18192
Submitted by:	"Maxim Sobolev" <sobomax@altavista.net>

3 files changed, 61 insertions, 11 deletions

diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index e33f369aad8f..054c317834dc 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -13,12 +13,13 @@ MASTER_SITES=	http://wildsau.idv.uni-linz.ac.at/mfx/download/pysol/pysol-sound-s
 MAINTAINER=	sobomax@altavista.net
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl \
-		smpeg.0:${PORTSDIR}/graphics/smpeg
+LIB_DEPENDS=	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel \
+		smpeg.0:${PORTSDIR}/graphics/smpeg \
+		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	X11BASE="${X11BASE}"
+HAS_CONFIGURE=	yes
+ALL_TARGET=	pysolsoundservermodule.so
 
 .include <bsd.port.mk>
diff --git a/audio/pysol-sound-server/files/patch-aa b/audio/pysol-sound-server/files/patch-aa
index b0135171bf20..6378eaa4cce1 100644
--- a/audio/pysol-sound-server/files/patch-aa
+++ b/audio/pysol-sound-server/files/patch-aa
@@ -1,13 +1,18 @@
---- configure.orig	Tue Feb  1 01:08:47 2000
-+++ configure	Tue Feb  1 01:13:24 2000
-@@ -5,8 +5,8 @@
+--- configure.orig	Tue Jan 25 13:35:32 2000
++++ configure	Mon Apr 24 14:48:53 2000
+@@ -1,12 +1,12 @@
+ #! /bin/sh
+ 
+-SDL_CONFIG="sdl-config"
++SDL_CONFIG="sdl11-config"
+ SDL_VERSION=`$SDL_CONFIG --version`
  SDL_CFLAGS=`$SDL_CONFIG --cflags`
- SDL_LIBS=`$SDL_CONFIG --libs`
+-SDL_LIBS=`$SDL_CONFIG --libs`
++SDL_LIBS=`$SDL_CONFIG --libs | sed 's/-pthread//'`
  
--SMPEG_CFLAGS=""
+ SMPEG_CFLAGS=""
 -SMPEG_LIBS="-lsmpeg"
-+SMPEG_CFLAGS="-I""$X11BASE""/include"
-+SMPEG_LIBS="-L""$X11BASE""/lib -lsmpeg"
++SMPEG_LIBS="-lsmpeg -lgcc_r"
  
  sed -e "s|@SDL_VERSION@|$SDL_VERSION|g" -e "s|@SDL_CFLAGS@|$SDL_CFLAGS|g" -e "s|@SDL_LIBS@|$SDL_LIBS|g" -e "s|@SMPEG_CFLAGS@|$SMPEG_CFLAGS|g" -e "s|@SMPEG_LIBS@|$SMPEG_LIBS|g" < Setup.pre.in > Setup.in
  
diff --git a/audio/pysol-sound-server/files/patch-ab b/audio/pysol-sound-server/files/patch-ab
new file mode 100644
index 000000000000..042e4a303fea
--- /dev/null
+++ b/audio/pysol-sound-server/files/patch-ab
@@ -0,0 +1,44 @@
+--- Setup.pre.in.orig	Wed Feb  2 19:51:32 2000
++++ Setup.pre.in	Mon Apr 24 14:25:40 2000
+@@ -9,7 +9,7 @@
+ CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+ 
+ CFLAGS__gcc = -Wall -O2 -finline-functions -ffast-math
+-EXTRA_CFLAGS = -I$(srcdir) -I$(srcdir)/mikmod $(SDL_CFLAGS) $(SMPEG_CFLAGS)
++EXTRA_CFLAGS = $(SDL_CFLAGS) -I$(srcdir) $(SMPEG_CFLAGS)
+ 
+ SMPEG_LIBS = @SMPEG_LIBS@
+ SMPEG_CFLAGS = @SMPEG_CFLAGS@
+@@ -19,31 +19,6 @@
+ pysolsoundserver \
+ 	command.c \
+ 	module.c \
+-	mixer/mixer.c \
+-	mixer/music.c \
+-	mixer/wavestream.c \
+-	mikmod/drv_nos.c \
+-	mikmod/drv_sdl.c \
+-	mikmod/load_it.c \
+-	mikmod/load_mod.c \
+-	mikmod/load_s3m.c \
+-	mikmod/load_xm.c \
+-	mikmod/mdreg.c \
+-	mikmod/mdriver.c \
+-	mikmod/mloader.c \
+-	mikmod/mlreg.c \
+-	mikmod/mlutil.c \
+-	mikmod/mmalloc.c \
+-	mikmod/mmerror.c \
+-	mikmod/mmio.c \
+-	mikmod/mplayer.c \
+-	mikmod/munitrk.c \
+-	mikmod/mwav.c \
+-	mikmod/npertab.c \
+-	mikmod/sloader.c \
+-	mikmod/virtch.c \
+-	mikmod/virtch2.c \
+-	mikmod/virtch_common.c \
+ # *** Uncomment and edit to reflect where your SDL library is:
+-	@SDL_LIBS@ @SMPEG_LIBS@
++	@SDL_LIBS@ -lSDL_mixer @SMPEG_LIBS@
+