diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-08-30 13:54:17 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-08-30 13:54:17 +0000 |
commit | 90dee295c0ba6b67192ddb0c30b535eda5d0b086 (patch) | |
tree | 8dd1a2acf7b797cff5b6843644e66ad4fa387e4a /audio/extace | |
parent | Added "threads" to the qmake.conf file. From this message on the list: (diff) |
Update to 1.7.3.
PR: 40183 41280
Submitted by: Tilman Linneweh <tilman@arved.de>
Oliver Lehmann <lehmann@ans-netz.de>
Notes
Notes:
svn path=/head/; revision=65309
Diffstat (limited to 'audio/extace')
-rw-r--r-- | audio/extace/Makefile | 28 | ||||
-rw-r--r-- | audio/extace/distinfo | 2 | ||||
-rw-r--r-- | audio/extace/files/patch-aa | 51 | ||||
-rw-r--r-- | audio/extace/files/patch-ab | 45 | ||||
-rw-r--r-- | audio/extace/files/patch-ad | 6 | ||||
-rw-r--r-- | audio/extace/files/patch-src::color_win.c | 36 | ||||
-rw-r--r-- | audio/extace/files/patch-src::getfft.c (renamed from audio/extace/files/patch-ac) | 7 | ||||
-rw-r--r-- | audio/extace/pkg-plist | 2 |
8 files changed, 108 insertions, 69 deletions
diff --git a/audio/extace/Makefile b/audio/extace/Makefile index 2de633bcf698..a82ec1fb728d 100644 --- a/audio/extace/Makefile +++ b/audio/extace/Makefile @@ -6,36 +6,26 @@ # PORTNAME= extace -PORTVERSION= 1.4.5 +PORTVERSION= 1.7.3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= eXtace +MASTER_SITE_SUBDIR= extace MAINTAINER= sobomax@FreeBSD.org -BROKEN= "Configure fails" - LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw USE_X_PREFIX= yes -USE_IMLIB= yes -USE_ESOUND= yes -WANT_GNOME= yes +USE_GNOMENG= 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" -.include <bsd.port.pre.mk> - -.if defined(HAVE_GNOME) -USE_GNOME= yes -.endif - -pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' +post-patch: + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ + -e "s|DATADIRNAME=lib|DATADIRNAME=share|g" ${WRKSRC}/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/extace/distinfo b/audio/extace/distinfo index bd9dd4cdd576..091d497bc6de 100644 --- a/audio/extace/distinfo +++ b/audio/extace/distinfo @@ -1 +1 @@ -MD5 (extace-1.4.5.tar.gz) = eb3975c05dbf94a3d52b3aea495349a2 +MD5 (extace-1.7.3.tar.gz) = b12ca26f98da7e306df1d3777b1cb77a diff --git a/audio/extace/files/patch-aa b/audio/extace/files/patch-aa index 714b4b358bea..b35fd39b80fe 100644 --- a/audio/extace/files/patch-aa +++ b/audio/extace/files/patch-aa @@ -1,30 +1,38 @@ ---- configure.orig Sat Jul 22 07:40:27 2000 -+++ configure Mon Jul 31 12:39:34 2000 -@@ -1210,9 +1210,9 @@ +--- 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= -+# CFLAGS= + CFLAGS= fi - fi - -@@ -1748,9 +1748,9 @@ +@@ -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= -+# CFLAGS= + CFLAGS= fi - fi - -@@ -2764,7 +2764,7 @@ +@@ -6717,7 +6717,7 @@ done @@ -32,13 +40,22 @@ +#CFLAGS="-O2 " - EXTRA_LIBS="" -@@ -3301,7 +3301,7 @@ + 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" -+LIBS="-lgdk_imlib `$GTK_CONFIG --libs` $LIBS" ++IMLIB_LIBS=`imlib-config --libs` ++LIBS="-lgdk_imlib ${GTK_LIBS} ${IMLIB_LIBS} $LIBS" cat > conftest.$ac_ext <<EOF - #line 3307 "configure" + #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%@IMLIB_LIBS@%$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 dde6d284f2fa..f51002a1f103 100644 --- a/audio/extace/files/patch-ab +++ b/audio/extace/files/patch-ab @@ -1,38 +1,31 @@ ---- extace/Makefile.in.orig Tue Jan 2 11:26:24 2001 -+++ extace/Makefile.in Tue Jan 2 11:33:29 2001 -@@ -101,7 +101,7 @@ - extace_LDADD = @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib - #extace_LDADD = -lefence @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib +--- 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 --LIBS = -lpthread -+LIBS = #-lpthread - - COMMON_FLAGS = @PFLAGS@ @DFLAGS@ -@@ -109,7 +109,9 @@ +-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 - EXTRA_DIST = extace.desktop README NEWS TODO +-LIBS = -lpthread ++#LIBS = -lpthread -+.ifdef HAVE_GNOME - Multimedia_DATA = extace.desktop -+.endif - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -239,7 +241,6 @@ + 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 $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Multimediadir)/$$p"; \ -@@ -325,7 +326,7 @@ - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + 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) $(DESTDIR)$(Multimediadir) + $(mkinstalldirs) $(DESTDIR)$(bindir) - - mostlyclean-generic: + install: install-am + install-exec: install-exec-am diff --git a/audio/extace/files/patch-ad b/audio/extace/files/patch-ad index 598ac6f055b7..9e9a468fabd6 100644 --- a/audio/extace/files/patch-ad +++ b/audio/extace/files/patch-ad @@ -1,6 +1,6 @@ ---- extace/sound.c 2001/01/02 09:31:56 1.1 -+++ extace/sound.c 2001/01/02 09:32:16 -@@ -24,7 +24,9 @@ +--- 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> diff --git a/audio/extace/files/patch-src::color_win.c b/audio/extace/files/patch-src::color_win.c new file mode 100644 index 000000000000..728d2feedaf3 --- /dev/null +++ b/audio/extace/files/patch-src::color_win.c @@ -0,0 +1,36 @@ + +$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; + +- case (gpointer)CLOSE: ++ case (gint)CLOSE: + gtk_widget_hide(grad_win_ptr); + grad_win_present = 0; + break; + +- 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)); diff --git a/audio/extace/files/patch-ac b/audio/extace/files/patch-src::getfft.c index 5679e4e13371..eb8734c6336f 100644 --- a/audio/extace/files/patch-ac +++ b/audio/extace/files/patch-src::getfft.c @@ -1,5 +1,8 @@ ---- extace/misc.c 2001/01/02 09:29:43 1.1 -+++ extace/misc.c 2001/01/02 09:30:30 + +$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> diff --git a/audio/extace/pkg-plist b/audio/extace/pkg-plist index 4ce717d85627..184a75c53d82 100644 --- a/audio/extace/pkg-plist +++ b/audio/extace/pkg-plist @@ -1,2 +1,2 @@ bin/extace -%%GNOME:%%share/gnome/apps/Multimedia/extace.desktop +share/gnome/apps/Multimedia/extace.desktop |