4 files changed, 29 insertions, 21 deletions

diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index 6b92baa83c91..3e786ead5644 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pysol-sound-server
-PORTVERSION=	2.30
+PORTVERSION=	2.40
 CATEGORIES=	audio games
 MASTER_SITES=	http://wildsau.idv.uni-linz.ac.at/mfx/download/pysol/pysol-sound-server/
 
@@ -16,10 +16,13 @@ LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
 		smpeg.1:${PORTSDIR}/graphics/smpeg \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+USE_BZIP2=	yes
 USE_PYTHON=	yes
 HAS_CONFIGURE=	yes
-ALL_TARGET=	pysolsoundservermodule.so
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/audio/pysol-sound-server/distinfo b/audio/pysol-sound-server/distinfo
index 5df5815b81a9..fc92bf98bbfb 100644
--- a/audio/pysol-sound-server/distinfo
+++ b/audio/pysol-sound-server/distinfo
@@ -1 +1 @@
-MD5 (pysol-sound-server-2.30.tar.gz) = e57a4e2f6fd4b8c3bff5b738711c2b36
+MD5 (pysol-sound-server-2.40.tar.bz2) = 5613db153e0228039487114b822d6c0a
diff --git a/audio/pysol-sound-server/files/patch-aa b/audio/pysol-sound-server/files/patch-aa
index 202409e26c7a..c03615f10777 100644
--- a/audio/pysol-sound-server/files/patch-aa
+++ b/audio/pysol-sound-server/files/patch-aa
@@ -1,18 +1,14 @@
---- 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"
+
+$FreeBSD$
+
+--- configure.orig	Thu Mar  1 01:36:41 2001
++++ configure	Tue May  8 10:33:36 2001
+@@ -15,7 +15,7 @@
+ fi
  SDL_VERSION=`$SDL_CONFIG --version`
  SDL_CFLAGS=`$SDL_CONFIG --cflags`
 -SDL_LIBS=`$SDL_CONFIG --libs`
 +SDL_LIBS=`$SDL_CONFIG --libs | sed 's/-pthread//'`
  
  SMPEG_CFLAGS=""
--SMPEG_LIBS="-lsmpeg"
-+SMPEG_LIBS="-lsmpeg"
- 
- 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
- 
+ SMPEG_LIBS="-lsmpeg"
diff --git a/audio/pysol-sound-server/files/patch-ab b/audio/pysol-sound-server/files/patch-ab
index 7a7afec5079e..5d0856b200d4 100644
--- a/audio/pysol-sound-server/files/patch-ab
+++ b/audio/pysol-sound-server/files/patch-ab
@@ -1,15 +1,24 @@
---- Setup.pre.in.orig	Tue Feb 15 13:15:48 2000
-+++ Setup.pre.in	Tue May 30 16:49:15 2000
-@@ -9,7 +9,7 @@
- CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+
+$FreeBSD$
+
+--- Setup.pre.in.orig	Wed Jan 31 02:03:12 2001
++++ Setup.pre.in	Tue May  8 10:35:22 2001
+@@ -6,11 +6,11 @@
  
- CFLAGS__gcc = -Wall -O2 -finline-functions -ffast-math
+ 
+ ##CFLAGS = $(OPT) $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+-CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
++CFLAGS += $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+ 
+ ##CFLAGS__gcc = -Wall -O2 -finline-functions -ffast-math
+-CFLAGS__gcc = -Wall -O2 -ffast-math
 -EXTRA_CFLAGS = -I$(srcdir) -I$(srcdir)/mikmod $(SDL_CFLAGS) $(SMPEG_CFLAGS)
++CFLAGS__gcc = -Wall -ffast-math
 +EXTRA_CFLAGS = $(SDL_CFLAGS) -I$(srcdir) $(SMPEG_CFLAGS)
  
  SMPEG_LIBS = @SMPEG_LIBS@
  SMPEG_CFLAGS = @SMPEG_CFLAGS@
-@@ -19,32 +19,6 @@
+@@ -20,32 +20,6 @@
  pysolsoundserver \
  	command.c \
  	module.c \