7 files changed, 50 insertions, 125 deletions

diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 0975d841e04a..7c26512c28c7 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	extace
-PORTVERSION=	1.7.3
+PORTVERSION=	1.7.8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	extace
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Audio Visualization plugin for the X Window System
 
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
-.include <bsd.port.pre.mk>
-
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk12 imlib esound
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--disable-alsa
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g"  \
 		-e "s|DATADIRNAME=lib|DATADIRNAME=share|g"  ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/extace ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/src/extace.desktop \
+		${PREFIX}/share/gnome/apps/Multimedia
+
+.include <bsd.port.mk>
diff --git a/audio/extace/distinfo b/audio/extace/distinfo
index 091d497bc6de..72e0793fecef 100644
--- a/audio/extace/distinfo
+++ b/audio/extace/distinfo
@@ -1 +1 @@
-MD5 (extace-1.7.3.tar.gz) = b12ca26f98da7e306df1d3777b1cb77a
+MD5 (extace-1.7.8.tar.gz) = 3a8023e5028d679352c755c3084bb867
diff --git a/audio/extace/files/patch-aa b/audio/extace/files/patch-aa
index b35fd39b80fe..a0fb87b71389 100644
--- a/audio/extace/files/patch-aa
+++ b/audio/extace/files/patch-aa
@@ -1,43 +1,11 @@
 --- configure.orig	Sun May 26 19:57:47 2002
 +++ configure	Sat Aug  3 10:36:04 2002
-@@ -1595,13 +1595,13 @@
-   CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+#    CFLAGS="-g -O2"
-   else
-     CFLAGS="-g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+#    CFLAGS="-O2"
-   else
-     CFLAGS=
-   fi
-@@ -5706,13 +5706,13 @@
-   CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+#    CFLAGS="-g -O2"
-   else
-     CFLAGS="-g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+#    CFLAGS="-O2"
-   else
-     CFLAGS=
-   fi
 @@ -6717,7 +6717,7 @@
  done
  
  
 -CFLAGS="-O2 "
-+#CFLAGS="-O2 "
++CFLAGS="$CFLAGS"
  
  
  EFENCE=""
@@ -46,8 +14,8 @@
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lgdk_imlib `gtk-config --libs`  $LIBS"
-+IMLIB_LIBS=`imlib-config --libs`
-+LIBS="-lgdk_imlib ${GTK_LIBS} ${IMLIB_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"
@@ -55,7 +23,7 @@
  s%@GTK_CONFIG@%$GTK_CONFIG%g
  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
  s%@GTK_LIBS@%$GTK_LIBS%g
-+s%@IMLIB_LIBS@%$IMLIB_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
index f51002a1f103..a122511a4b6c 100644
--- a/audio/extace/files/patch-ab
+++ b/audio/extace/files/patch-ab
@@ -1,31 +1,14 @@
---- src/Makefile.in.orig	Sun May 26 19:59:24 2002
-+++ src/Makefile.in	Sat Aug  3 10:36:57 2002
-@@ -146,9 +146,9 @@
- 	options.c 
+--- 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@ @IMLIB_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@ 
  
-@@ -321,7 +323,6 @@
- uninstall-info-am:
- install-MultimediaDATA: $(Multimedia_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(Multimediadir)
- 	@list='$(Multimedia_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-@@ -395,7 +396,7 @@
- all-am: Makefile $(PROGRAMS) $(DATA)
- 
- installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(Multimediadir)
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
- 
- install: install-am
- install-exec: install-exec-am
diff --git a/audio/extace/files/patch-src::color_win.c b/audio/extace/files/patch-src::color_win.c
index 728d2feedaf3..08be78990228 100644
--- a/audio/extace/files/patch-src::color_win.c
+++ b/audio/extace/files/patch-src::color_win.c
@@ -1,36 +1,35 @@
 
 $FreeBSD$
 
---- src/color_win.c	2002/08/30 13:00:11	1.1
-+++ src/color_win.c	2002/08/30 13:00:52
-@@ -61,18 +61,18 @@
-     //    printf("Color_button()\n");
-     switch ((gint)data)
-     {
--	case (gpointer)SET_COLOR:
-+	case (gint)SET_COLOR:
- 	    update_gradient(NULL, color_loc);
- 	    init_colortab();
- 	    gradient_update();
- 	    break;
+--- src/color_win.c.orig	Wed Feb 26 01:22:19 2003
++++ src/color_win.c	Fri May 23 18:26:18 2003
+@@ -579,12 +579,12 @@
+ 		button = gtk_button_new_with_label("Set Color");
+ 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
+-				(GtkSignalFunc)color_button, (gpointer)SET_COLOR);
++				(GtkSignalFunc)color_button, (gint)SET_COLOR);
  
--	case (gpointer)CLOSE:
-+	case (gint)CLOSE:
- 	    gtk_widget_hide(grad_win_ptr);
- 	    grad_win_present = 0;
- 	    break;
+ 		button = gtk_button_new_with_label("Close");
+ 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
+-				(GtkSignalFunc)color_button, (gpointer)CLOSE);
++				(GtkSignalFunc)color_button, (gint)CLOSE);
  
--	case (gpointer)SAVE:
-+	case (gint)SAVE:
- 	    filew = gtk_file_selection_new("Save Colormap");
- 	    gtk_signal_connect (GTK_OBJECT(filew), "destroy",
- 		    (GtkSignalFunc) gtk_widget_destroy, GTK_OBJECT (filew));
-@@ -85,7 +85,7 @@
- 	    gtk_file_selection_set_filename(GTK_FILE_SELECTION(filew),g_strconcat(g_get_home_dir(),"/.eXtace/ColorMaps/", NULL));
- 	    gtk_widget_show(filew);
- 	    break;
--	case (gpointer)LOAD:
-+	case (gint)LOAD:
- 	    filew = gtk_file_selection_new("Load Colormap");
- 	    gtk_signal_connect (GTK_OBJECT(filew), "destroy",
- 		    (GtkSignalFunc) gtk_widget_destroy, GTK_OBJECT (filew));
+ 		hbox = gtk_hbox_new(TRUE,0);
+ 		gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
+@@ -592,12 +592,12 @@
+ 		button = gtk_button_new_with_label("Save");
+ 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
+-				(GtkSignalFunc)color_button, (gpointer)SAVE);
++				(GtkSignalFunc)color_button, (gint)SAVE);
+ 
+ 		button = gtk_button_new_with_label("Load");
+ 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
+-				(GtkSignalFunc)color_button, (gpointer)LOAD);
++				(GtkSignalFunc)color_button, (gint)LOAD);
+ 
+ 		gtk_widget_show_all(grad_win);
+ 	}
diff --git a/audio/extace/files/patch-src::getfft.c b/audio/extace/files/patch-src::getfft.c
deleted file mode 100644
index eb8734c6336f..000000000000
--- a/audio/extace/files/patch-src::getfft.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/getfft.c	2002/08/30 12:59:05	1.1
-+++ src/getfft.c	2002/08/30 12:59:26
-@@ -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::globals.h b/audio/extace/files/patch-src::globals.h
deleted file mode 100644
index 9087c9873e8f..000000000000
--- a/audio/extace/files/patch-src::globals.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/globals.h.orig	Sun May 18 20:39:47 2003
-+++ src/globals.h	Sun May 18 20:40:01 2003
-@@ -255,8 +255,8 @@
- gint 		winstyle;	/* window function options */	
- gint		active_drawing_area;
- gfloat 		noise_floor;
--gfloat 		noise_floor_min;
--gfloat 		noise_floor_max;
-+extern const float 		noise_floor_min;
-+extern const float 		noise_floor_max;
- gint 		paused;
- gint		low_freq;
- gint		high_freq;