6 files changed, 59 insertions, 27 deletions

diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 2d918b3a5f50..aacb77d1f778 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	extace
-PORTVERSION=	1.8.11
+PORTVERSION=	1.9.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 USE_X_PREFIX=	yes
 USE_GNOME=	esound imlib gnomehack gnomeprefix
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-alsa
 
diff --git a/audio/extace/distinfo b/audio/extace/distinfo
index 428deef5265b..31c74fa3f907 100644
--- a/audio/extace/distinfo
+++ b/audio/extace/distinfo
@@ -1 +1 @@
-MD5 (extace-1.8.11.tar.gz) = d194f7aae9d4f7650b50524f2c90c227
+MD5 (extace-1.9.0.tar.gz) = e866d9408b07223f924663283056922b
diff --git a/audio/extace/files/patch-ad b/audio/extace/files/patch-ad
deleted file mode 100644
index 9e9a468fabd6..000000000000
--- a/audio/extace/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sound.c.orig	Sat Aug  3 10:25:15 2002
-+++ src/sound.c	Sat Aug  3 10:25:49 2002
-@@ -23,7 +23,9 @@
- #include <fcntl.h>
- #include <gtk/gtk.h>
- #include <esd.h>
-+#ifndef __FreeBSD__
- #include <asm/errno.h>
-+#endif
- #ifdef HAVE_PTHREAD_H
- #include <pthread.h>
- #endif
diff --git a/audio/extace/files/patch-src::audio_processing.c b/audio/extace/files/patch-src::audio_processing.c
deleted file mode 100644
index 7251f9c27333..000000000000
--- a/audio/extace/files/patch-src::audio_processing.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/audio_processing.c.orig	Thu Jun  5 17:20:26 2003
-+++ src/audio_processing.c	Thu Jun  5 17:20:45 2003
-@@ -20,7 +20,9 @@
- #include <protos.h>
- #include <math.h>
- #include <gtk/gtk.h>
-+#ifndef __FreeBSD__
- #include <asm/errno.h>
-+#endif
- #include "convolve.h"
- #ifdef HAVE_LIBRFFTW
- #include <rfftw.h>
diff --git a/audio/extace/files/patch-src::input.c b/audio/extace/files/patch-src::input.c
new file mode 100644
index 000000000000..9ad6b53da7a1
--- /dev/null
+++ b/audio/extace/files/patch-src::input.c
@@ -0,0 +1,45 @@
+--- src/input.c.orig	Sat Nov 29 14:05:28 2003
++++ src/input.c	Sun Nov 30 13:24:14 2003
+@@ -15,7 +15,7 @@
+  * No warranty is made or implied. You use this program at your own risk.
+  */
+ 
+-#include <asm/errno.h>
++#include <errno.h>
+ #include <config.h>
+ #include <enums.h>
+ #include <fcntl.h>
+@@ -76,8 +76,12 @@
+ static gchar channel_numbers[MAX_STR][10];  /* string containing integers */
+ #endif
+ GtkWidget *errbox;
++GtkWidget *label;
+ int errorbox_up;
+ gint tag;		/* Used by gdk_input_* */
++gint timeo;
++gint res;
++gint to_get;
+ 
+ /*--- globals to this file */
+ 
+@@ -151,7 +155,6 @@
+ 
+ 	/* The rest is error handling */
+ 
+-	GtkWidget *label;
+ 	if (errorbox_up)
+ 		return(-1); /* ERROR window already onscreen */
+ 	errbox = gtk_window_new(GTK_WINDOW_DIALOG);
+@@ -380,9 +383,9 @@
+ 	struct pollfd ufds;
+ 	ufds.fd = source;
+ 	ufds.events = POLLIN;
+-	gint timeo = 100; /* wait 100ms max before timeout */
+-	gint res = -1;
+-	gint to_get = 0;
++	timeo = 100; /* wait 100ms max before timeout */
++	res = -1;
++	to_get = 0;
+      
+ 	/* reset data ring buffer */
+ 	ring_pos=0;
diff --git a/audio/extace/files/patch-src::input_processing.c b/audio/extace/files/patch-src::input_processing.c
new file mode 100644
index 000000000000..9442c93b7094
--- /dev/null
+++ b/audio/extace/files/patch-src::input_processing.c
@@ -0,0 +1,11 @@
+--- src/input_processing.c.orig	Sat Nov 29 06:25:58 2003
++++ src/input_processing.c	Sun Nov 30 13:24:48 2003
+@@ -15,7 +15,7 @@
+  * No warranty is made or implied. You use this program at your own risk.
+  */
+ 
+-#include <asm/errno.h>
++#include <errno.h>
+ #include <input_processing.h>
+ #include <config.h>
+ #include <convolve.h>