Update to 3.00 and drop maintainership.

5 files changed, 12 insertions, 66 deletions

diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index 62da9a29d6f7..997bc8088b48 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	pysol-sound-server
-PORTVERSION=	2.50
+PORTVERSION=	3.00
 CATEGORIES=	audio games
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	sobomax
+MASTER_SITES=	http://www.oberhumer.com/opensource/pysol/download/ \
+		ftp://ftp.is.co.za/linux/distributions/gentoo/distfiles/
 
-MAINTAINER=	sobomax@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python extension module to play sounds and background music
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
diff --git a/audio/pysol-sound-server/distinfo b/audio/pysol-sound-server/distinfo
index 361a63f61724..3e5390b16ff5 100644
--- a/audio/pysol-sound-server/distinfo
+++ b/audio/pysol-sound-server/distinfo
@@ -1 +1 @@
-MD5 (pysol-sound-server-2.50.tar.bz2) = 0fc966c54cc41409574fc8a51c3610d3
+MD5 (pysol-sound-server-3.00.tar.bz2) = fdbfd5c5455b8b51ad469f881870d9f5
diff --git a/audio/pysol-sound-server/files/patch-aa b/audio/pysol-sound-server/files/patch-aa
index c03615f10777..e9421ebd1fb7 100644
--- a/audio/pysol-sound-server/files/patch-aa
+++ b/audio/pysol-sound-server/files/patch-aa
@@ -1,13 +1,13 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Mar  1 01:36:41 2001
-+++ configure	Tue May  8 10:33:36 2001
-@@ -15,7 +15,7 @@
+--- configure.orig	Mon Jun 24 18:01:01 2002
++++ configure	Mon May  5 18:41:52 2003
+@@ -17,7 +17,7 @@
  fi
- SDL_VERSION=`$SDL_CONFIG --version`
- SDL_CFLAGS=`$SDL_CONFIG --cflags`
--SDL_LIBS=`$SDL_CONFIG --libs`
+ 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=""
diff --git a/audio/pysol-sound-server/files/patch-ab b/audio/pysol-sound-server/files/patch-ab
deleted file mode 100644
index 5d0856b200d4..000000000000
--- a/audio/pysol-sound-server/files/patch-ab
+++ /dev/null
@@ -1,54 +0,0 @@
-
-$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 = $(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@
-@@ -20,32 +20,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_m15.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@
- 
diff --git a/audio/pysol-sound-server/pkg-plist b/audio/pysol-sound-server/pkg-plist
index fc7398378a91..6be9cadd2594 100644
--- a/audio/pysol-sound-server/pkg-plist
+++ b/audio/pysol-sound-server/pkg-plist
@@ -1 +1 @@
-lib/%%PYTHON_VERSION%%/site-packages/pysolsoundservermodule.so
+lib/%%PYTHON_VERSION%%/site-packages/pysolsoundserver.so