- Update to 1.9.9

PR:		120471
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 7 insertions, 46 deletions

diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 7a4d432c5ff1..5543a96963dd 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -6,19 +6,16 @@
 #
 
 PORTNAME=	extace
-PORTVERSION=	1.9.6
-PORTREVISION=	1
+PORTVERSION=	1.9.9
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Audio Visualization plugin for the X Window System
 
 LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
 
-USE_XLIB=	yes
-USE_GNOME=	esound imlib gnomehack gnometarget gnomeprefix
+USE_GNOME=	esound gnomehack gnomehier gnometarget gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -27,7 +24,7 @@ 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|^CFLAGS=|#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 a0482a2b266d..384fb80e6301 100644
--- a/audio/extace/distinfo
+++ b/audio/extace/distinfo
@@ -1,3 +1,3 @@
-MD5 (extace-1.9.6.tar.gz) = c4e3e6def72a7f79dffc538e45e65d18
-SHA256 (extace-1.9.6.tar.gz) = f5cc4a95523fc9a19909d54de6815b18b69fb0894a66b2b2f49c61d42a8ce939
-SIZE (extace-1.9.6.tar.gz) = 428608
+MD5 (extace-1.9.9.tar.gz) = 75eeed67598360ae3645797ca40e77ca
+SHA256 (extace-1.9.9.tar.gz) = 1d1e31ae2709c0e4330a2e8b71f93414d52744ffe3fd910c26b8f557add10f18
+SIZE (extace-1.9.9.tar.gz) = 425480
diff --git a/audio/extace/files/patch-src::input.c b/audio/extace/files/patch-src::input.c
deleted file mode 100644
index ea9cef9348f3..000000000000
--- a/audio/extace/files/patch-src::input.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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];
- 
- static GtkWidget *errbox;
-+GtkWidget *label;
- static int errorbox_up =0;
- gint tag;		/* Used by gdk_input_* */
-+gint timeo;
-+gint res;
-+gint to_get;
- 
- /*--- globals to this file */
- 
-@@ -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);
-@@ -536,9 +539,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;
-      
- 	/* adjust position in ring buffer to be on first channel */
- 	ring_pos -= ring_pos%ring_channels;