Update to version 1.9.2

PR:		ports/73343
Submitted by:	Ports Fury

7 files changed, 24 insertions, 83 deletions

diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 394ce3c67b32..d793c6b12c11 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	extace
-PORTVERSION=	1.9.0
-PORTREVISION=	1
+PORTVERSION=	1.9.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,10 +17,17 @@ COMMENT=	An Audio Visualization plugin for the X Window System
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
 USE_X_PREFIX=	yes
-USE_GNOME=	esound imlib gnomehack gnomeprefix
-USE_LIBTOOL_VER=	13
+USE_GNOME=	esound imlib gnomehack gnometarget gnomeprefix
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-alsa
+
+PLIST_FILES=	bin/extace \
+		share/gnome/apps/Multimedia/extace.desktop
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O2 |$$CFLAGS|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^LIBS =|#LIBS =|g' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/audio/extace/distinfo b/audio/extace/distinfo
index d1b2a075cd43..48ae49efa279 100644
--- a/audio/extace/distinfo
+++ b/audio/extace/distinfo
@@ -1,2 +1,2 @@
-MD5 (extace-1.9.0.tar.gz) = e866d9408b07223f924663283056922b
-SIZE (extace-1.9.0.tar.gz) = 275528
+MD5 (extace-1.9.2.tar.gz) = 4e8296008d313611b287191d30fd07e5
+SIZE (extace-1.9.2.tar.gz) = 390477
diff --git a/audio/extace/files/patch-aa b/audio/extace/files/patch-aa
deleted file mode 100644
index a0fb87b71389..000000000000
--- a/audio/extace/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Sun May 26 19:57:47 2002
-+++ configure	Sat Aug  3 10:36:04 2002
-@@ -6717,7 +6717,7 @@
- done
- 
- 
--CFLAGS="-O2 "
-+CFLAGS="$CFLAGS"
- 
- 
- EFENCE=""
-@@ -7149,7 +7149,8 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgdk_imlib `gtk-config --libs`  $LIBS"
-+GDK_IMLIB_LIBS=`imlib-config --libs-gdk`
-+LIBS="${GTK_LIBS} ${GDK_IMLIB_LIBS}  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 7155 "configure"
- #include "confdefs.h"
-@@ -7383,6 +7384,7 @@
- s%@GTK_CONFIG@%$GTK_CONFIG%g
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
-+s%@GDK_IMLIB_LIBS@%$GDK_IMLIB_LIBS%g
- s%@GLIB_CONFIG@%$GLIB_CONFIG%g
- s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
- s%@GLIB_LIBS@%$GLIB_LIBS%g
diff --git a/audio/extace/files/patch-ab b/audio/extace/files/patch-ab
deleted file mode 100644
index a122511a4b6c..000000000000
--- a/audio/extace/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Makefile.in.orig	Wed Apr  9 12:19:08 2003
-+++ src/Makefile.in	Fri May 23 18:05:51 2003
-@@ -107,9 +107,9 @@
- extace_SOURCES =  	Makefile 	globals.h 	enums.h 	defaults.h 	defines.h 	protos.h 	convolve.h 	configfile.h 	stars.h 	logo.xpm    	stars.c 	init.c 	main.c 	draw.c 	land3d.c 	gc_maker.c 	dir.c 	audio_processing.c 	events.c 	configfile.c 	buttons.c 	color_win.c 	reducer.c 	convolve.c 	win_func.c 	2d_eq.c 	scope.c 	markers.c 	spike_3d.c 	sound.c 	vert_specgram.c 	horiz_specgram.c  	options.c 
- 
- 
--extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib 
-+extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ @GDK_IMLIB_LIBS@
- 
--LIBS = -lpthread
-+#LIBS = -lpthread
- 
- COMMON_FLAGS = @PFLAGS@ @DFLAGS@ 
- 
diff --git a/audio/extace/files/patch-src::input.c b/audio/extace/files/patch-src::input.c
index 9ad6b53da7a1..ea9cef9348f3 100644
--- a/audio/extace/files/patch-src::input.c
+++ b/audio/extace/files/patch-src::input.c
@@ -1,20 +1,11 @@
---- 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.
-  */
+--- src/input.c.orig	Mon Aug 23 23:35:00 2004
++++ src/input.c	Sun Oct 31 00:44:56 2004
+@@ -52,8 +52,12 @@
+ } handles[MAX_HANDLES];
  
--#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;
+ static GtkWidget *errbox;
 +GtkWidget *label;
- int errorbox_up;
+ static int errorbox_up =0;
  gint tag;		/* Used by gdk_input_* */
 +gint timeo;
 +gint res;
@@ -22,15 +13,15 @@
  
  /*--- globals to this file */
  
-@@ -151,7 +155,6 @@
- 
+@@ -295,7 +299,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 @@
+@@ -536,9 +539,9 @@
  	struct pollfd ufds;
  	ufds.fd = source;
  	ufds.events = POLLIN;
@@ -41,5 +32,5 @@
 +	res = -1;
 +	to_get = 0;
       
- 	/* reset data ring buffer */
- 	ring_pos=0;
+ 	/* adjust position in ring buffer to be on first channel */
+ 	ring_pos -= ring_pos%ring_channels;
diff --git a/audio/extace/files/patch-src::input_processing.c b/audio/extace/files/patch-src::input_processing.c
deleted file mode 100644
index 9442c93b7094..000000000000
--- a/audio/extace/files/patch-src::input_processing.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
diff --git a/audio/extace/pkg-plist b/audio/extace/pkg-plist
deleted file mode 100644
index 184a75c53d82..000000000000
--- a/audio/extace/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/extace
-share/gnome/apps/Multimedia/extace.desktop