diff -urN /usr/ports/audio/extace/Makefile audio/extace/Makefile --- /usr/ports/audio/extace/Makefile Fri May 23 09:37:08 2003 +++ audio/extace/Makefile Fri May 23 18:23:17 2003 @@ -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 - 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" + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --disable-alsa post-patch: @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ -e "s|DATADIRNAME=lib|DATADIRNAME=share|g" ${WRKSRC}/configure -.include +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/extace ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/src/extace.desktop \ + ${PREFIX}/share/gnome/apps/Multimedia + +.include diff -urN /usr/ports/audio/extace/distinfo audio/extace/distinfo --- /usr/ports/audio/extace/distinfo Tue Sep 10 20:05:21 2002 +++ audio/extace/distinfo Fri May 23 18:00:40 2003 @@ -1 +1 @@ -MD5 (extace-1.7.3.tar.gz) = b12ca26f98da7e306df1d3777b1cb77a +MD5 (extace-1.7.8.tar.gz) = 3a8023e5028d679352c755c3084bb867 diff -urN /usr/ports/audio/extace/files/patch-aa audio/extace/files/patch-aa --- /usr/ports/audio/extace/files/patch-aa Tue Sep 10 20:05:21 2002 +++ audio/extace/files/patch-aa Fri May 23 18:08:03 2003 @@ -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 < + #include + #include ++#ifndef __FreeBSD__ + #include ++#endif + #include "convolve.h" + #ifdef HAVE_LIBRFFTW + #include diff -urN /usr/ports/audio/extace/files/patch-src::color_win.c audio/extace/files/patch-src::color_win.c --- /usr/ports/audio/extace/files/patch-src::color_win.c Fri Aug 30 22:54:17 2002 +++ audio/extace/files/patch-src::color_win.c Fri May 23 18:41:55 2003 @@ -1,36 +1,35 @@ $FreeBSD: ports/audio/extace/files/patch-src::color_win.c,v 1.1 2002/08/30 13:54:17 sobomax Exp $ ---- 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 -urN /usr/ports/audio/extace/files/patch-src::getfft.c audio/extace/files/patch-src::getfft.c --- /usr/ports/audio/extace/files/patch-src::getfft.c Fri Aug 30 22:54:17 2002 +++ audio/extace/files/patch-src::getfft.c Thu Jan 1 09:00:00 1970 @@ -1,15 +0,0 @@ - -$FreeBSD: ports/audio/extace/files/patch-src::getfft.c,v 1.1 2002/08/30 13:54:17 sobomax Exp $ - ---- 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 - #include - #include -+#ifndef __FreeBSD__ - #include -+#endif - #include "convolve.h" - #ifdef HAVE_LIBRFFTW - #include