ports/59840: Update port: audio/extace to 1.9.0

[KATO Tsuguru]

>Number:         59840
>Category:       ports
>Synopsis:       Update port: audio/extace to 1.9.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 30 09:30:22 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 1.9.0

New file:
files/patch-src::input.c
files/patch-src::input_processing.c

Remove file:
files/patch-ad
files/patch-src::audio_processing.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/extace/Makefile audio/extace/Makefile
--- /usr/ports/audio/extace/Makefile	Thu Aug 21 02:58:12 2003
+++ audio/extace/Makefile	Sun Nov 30 13:25:15 2003
@@ -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 @@
 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 -urN /usr/ports/audio/extace/distinfo audio/extace/distinfo
--- /usr/ports/audio/extace/distinfo	Thu Aug 21 02:58:12 2003
+++ audio/extace/distinfo	Sun Nov 30 11:55:31 2003
@@ -1 +1 @@
-MD5 (extace-1.8.11.tar.gz) = d194f7aae9d4f7650b50524f2c90c227
+MD5 (extace-1.9.0.tar.gz) = e866d9408b07223f924663283056922b
diff -urN /usr/ports/audio/extace/files/patch-ad audio/extace/files/patch-ad
--- /usr/ports/audio/extace/files/patch-ad	Tue Sep 10 20:05:21 2002
+++ audio/extace/files/patch-ad	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/audio/extace/files/patch-src::audio_processing.c audio/extace/files/patch-src::audio_processing.c
--- /usr/ports/audio/extace/files/patch-src::audio_processing.c	Fri Jun  6 09:22:18 2003
+++ audio/extace/files/patch-src::audio_processing.c	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/audio/extace/files/patch-src::input.c audio/extace/files/patch-src::input.c
--- /usr/ports/audio/extace/files/patch-src::input.c	Thu Jan  1 09:00:00 1970
+++ audio/extace/files/patch-src::input.c	Sun Nov 30 13:24:22 2003
@@ -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 -urN /usr/ports/audio/extace/files/patch-src::input_processing.c audio/extace/files/patch-src::input_processing.c
--- /usr/ports/audio/extace/files/patch-src::input_processing.c	Thu Jan  1 09:00:00 1970
+++ audio/extace/files/patch-src::input_processing.c	Sun Nov 30 13:25:01 2003
@@ -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>
>Release-Note:
>Audit-Trail:
>Unformatted: