5 files changed, 14 insertions, 34 deletions

diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index be7ab90fd7ad..fe49fc5b0452 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sndstretch
-PORTVERSION=	0.5
+PORTVERSION=	0.7
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/harpin_floh/mysoft/
 PKGNAMEPREFIX=	xmms-
diff --git a/audio/xmms-sndstretch/distinfo b/audio/xmms-sndstretch/distinfo
index 682d24a4e041..08f337e007fe 100644
--- a/audio/xmms-sndstretch/distinfo
+++ b/audio/xmms-sndstretch/distinfo
@@ -1 +1 @@
-MD5 (sndstretch_xmms-0.5.tar.gz) = adc805ead49861c6e55490f0b18e78ce
+MD5 (sndstretch_xmms-0.7.tar.gz) = fb3b902649a221d651626dd42721789e
diff --git a/audio/xmms-sndstretch/files/patch-Makefile b/audio/xmms-sndstretch/files/patch-Makefile
index 6a69dab01246..2c10fd439500 100644
--- a/audio/xmms-sndstretch/files/patch-Makefile
+++ b/audio/xmms-sndstretch/files/patch-Makefile
@@ -1,27 +1,23 @@
---- Makefile.orig	Thu Mar 15 18:15:55 2001
-+++ Makefile	Mon Dec  3 00:55:22 2001
-@@ -1,27 +1,28 @@
+--- Makefile.orig	Sun Feb 10 14:56:42 2002
++++ Makefile	Sun Dec  7 23:38:40 2003
+@@ -1,6 +1,6 @@
 -CC      = gcc
 +CC      ?= gcc
  #INCDIR  = -I sndstretch
--CFLAGS  = -Wall -O6 $(INCDIR)
-+CFLAGS  += -Wall $(INCDIR)
-+THREADS= ${PTHREAD_LIBS}
- 
- # maybe you will have to change this
--XMMS_EPLUGIN_DIR = /usr/X11/lib/xmms/Output
--XMMS_OPLUGIN_DIR = /usr/X11/lib/xmms/Effect
-+XMMS_EPLUGIN_DIR = ${PREFIX}/lib/xmms/Output
-+XMMS_OPLUGIN_DIR = ${PREFIX}/lib/xmms/Effect
+-CFLAGS  = -Wall -O6 $(INCDIR) `xmms-config --cflags`
++CFLAGS  += -Wall $(INCDIR) `xmms-config --cflags`
+ #LDFLAGS = -lgthread -lpthread 
+ LDFLAGS = -gthread -pthread `xmms-config --libs`
  
+@@ -11,19 +11,19 @@
  all: effect_plugin output_plugin
  
  effect_plugin: sndstretch_xmms_eff.lo sndstretch.lo
--	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `gtk-config --libs` -lgthread -lpthread -lpthread -lc -o sndstretch_xmms_eff.so
+-	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `gtk-config --libs` $(LDFLAGS) -lc -o sndstretch_xmms_eff.so
 +	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `${GTK_CONFIG} --libs` ${THREADS} -lc -o sndstretch_xmms_eff.so
  
  output_plugin: sndstretch_xmms_out.lo sndstretch.lo
--	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `gtk-config --libs` -lgthread -lpthread -lpthread -lc -o sndstretch_xmms_out.so
+-	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `gtk-config --libs` $(LDFLAGS) -lc -o sndstretch_xmms_out.so
 +	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `${GTK_CONFIG} --libs` ${THREADS} -lc -o sndstretch_xmms_out.so
  
  sndstretch_xmms_eff.lo: sndstretch_xmms.h sndstretch_xmms_eff.c sndstretch_xmms.c FB_logo.xpm sndstretch_xmms-logo.xpm
diff --git a/audio/xmms-sndstretch/files/patch-sndstretch_xmms.c b/audio/xmms-sndstretch/files/patch-sndstretch_xmms.c
deleted file mode 100644
index 529e650b6638..000000000000
--- a/audio/xmms-sndstretch/files/patch-sndstretch_xmms.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$FreeBSD$
-
---- sndstretch_xmms.c.orig	Thu Sep 27 17:32:50 2001
-+++ sndstretch_xmms.c	Sat Nov 10 12:54:24 2001
-@@ -27,7 +27,11 @@
- #include "sndstretch.h"
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#ifdef __FreeBSD__
-+#include <sys/soundcard.h>
-+#else
- #include <linux/soundcard.h>
-+#endif
- #include <unistd.h>
- #include <math.h>
- #include <stdlib.h>
diff --git a/audio/xmms-sndstretch/pkg-plist b/audio/xmms-sndstretch/pkg-plist
index 53c5f112c2a0..47ab7d88b4cb 100644
--- a/audio/xmms-sndstretch/pkg-plist
+++ b/audio/xmms-sndstretch/pkg-plist
@@ -1,2 +1,2 @@
-lib/xmms/Effect/sndstretch_xmms_out.so
-lib/xmms/Output/sndstretch_xmms_eff.so
+lib/xmms/Output/sndstretch_xmms_out.so
+lib/xmms/Effect/sndstretch_xmms_eff.so