Attachment #24106 for bug #41280

View | Details | Raw Unified | Return to bug 41280
Collapse All | Expand All




#

PORTNAME=	extace
PORTVERSION=	1.7.3
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	extace

MAINTAINER=	sobomax@FreeBSD.org

BROKEN=		"Configure fails"

LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw

USE_X_PREFIX=	yes

CONFIGURE_ARGS=	--disable-alsa
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \
		LIBS="-L${LOCALBASE}/lib"
USE_REINPLACE=	YES

.include <bsd.port.pre.mk>


.endif

pre-patch:
	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g"  \
		-e "s|DATADIRNAME=lib|DATADIRNAME=share|g"  ${WRKSRC}/configure
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g'

.include <bsd.port.post.mk>

Line 1 Link Here

(-)/usr/ports/audio/extace/distinfo (-1 / +1 lines)
1	MD5 (extace-1.4.5.tar.gz) = eb3975c05dbf94a3d52b3aea495349a2	1	MD5 (extace-1.7.3.tar.gz) = b12ca26f98da7e306df1d3777b1cb77a




--- 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=
   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=
+#    CFLAGS=
   fi
@@ -6717,7 +6717,7 @@
 
@@ -2764,7 +2764,7 @@
 done
 
 

+#CFLAGS="-O2 "
 
 
 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"
+IMLIB_LIBS=`imlib-config --libs`
+LIBS="-lgdk_imlib ${GTK_LIBS} ${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%@IMLIB_LIBS@%$IMLIB_LIBS%g
 s%@GLIB_CONFIG@%$GLIB_CONFIG%g
 s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
 s%@GLIB_LIBS@%$GLIB_LIBS%g




--- 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 
 
 
-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 
 
-LIBS = -lpthread
+#LIBS = -lpthread
 
 COMMON_FLAGS = @PFLAGS@ @DFLAGS@ 
 
@@ -156,7 +156,9 @@
 
 EXTRA_DIST = extace.desktop README NEWS TODO Colormap-format
 
+.ifdef HAVE_GNOME
 Multimedia_DATA = extace.desktop
+.endif
 subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -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




--- extace/misc.c	2001/01/02 09:29:43	1.1
+++ extace/misc.c	2001/01/02 09:30:30
@@ -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>

Lines 1-6 Link Here

(-)/usr/ports/audio/extace/files/patch-ad (-3 / +3 lines)
1	--- extace/sound.c 2001/01/02 09:31:56 1.1	1	--- src/sound.c.orig Sat Aug 3 10:25:15 2002
2	+++ extace/sound.c 2001/01/02 09:32:16	2	+++ src/sound.c Sat Aug 3 10:25:49 2002
3	@@ -24,7 +24,9 @@	3	@@ -23,7 +23,9 @@
4	#include <fcntl.h>	4	#include <fcntl.h>
5	#include <gtk/gtk.h>	5	#include <gtk/gtk.h>
6	#include <esd.h>	6	#include <esd.h>




--- src/getfft.c.orig	Sat Aug  3 10:25:11 2002
+++ src/getfft.c	Sat Aug  3 10:25:40 2002
@@ -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>

Return to bug 41280

Lines 6-20 Link Here

(-)/usr/ports/audio/extace/Makefile (-7 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= extace	8	PORTNAME= extace
9	PORTVERSION= 1.4.5	9	PORTVERSION= 1.7.3
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= eXtace	12	MASTER_SITE_SUBDIR= extace
13		13
14	MAINTAINER= sobomax@FreeBSD.org	14	MAINTAINER= sobomax@FreeBSD.org
15		15
16	BROKEN= "Configure fails"
17
18	LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw	16	LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
19		17
20	USE_X_PREFIX= yes	18	USE_X_PREFIX= yes
Lines 25-30 Link Here
25	CONFIGURE_ARGS= --disable-alsa	23	CONFIGURE_ARGS= --disable-alsa
26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \	24	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \
27	LIBS="-L${LOCALBASE}/lib"	25	LIBS="-L${LOCALBASE}/lib"
		26	USE_REINPLACE= YES
28		27
29	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
30		29
Lines 33-41 Link Here
33	.endif	32	.endif
34		33
35	pre-patch:	34	pre-patch:
36	@${PERL} -pi -e 's\|-lpthread\|${PTHREAD_LIBS}\|g ; \	35	@${REINPLACE_CMD} -e "s\|-lpthread\|${PTHREAD_LIBS}\|g" \
37	s\|DATADIRNAME=lib\|DATADIRNAME=share\|g' ${WRKSRC}/configure	36	-e "s\|DATADIRNAME=lib\|DATADIRNAME=share\|g" ${WRKSRC}/configure
38	@find ${WRKSRC} -name "Makefile.in" \| xargs ${PERL} -pi -e \	37	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
39	's\|\$$\(datadir\)/gnome/\|\$$\(datadir\)/\|g'	38	's\|\$$\(datadir\)/gnome/\|\$$\(datadir\)/\|g'
40		39
41	.include <bsd.port.post.mk>	40	.include <bsd.port.post.mk>

Lines 1-30 Link Here

(-)/usr/ports/audio/extace/files/patch-aa (-17 / +34 lines)
1	--- configure.orig Sat Jul 22 07:40:27 2000	1	--- configure.orig Sun May 26 19:57:47 2002
2	+++ configure Mon Jul 31 12:39:34 2000	2	+++ configure Sat Aug 3 10:36:04 2002
3	@@ -1210,9 +1210,9 @@	3	@@ -1595,13 +1595,13 @@
		4	CFLAGS="$ac_save_CFLAGS"
		5	elif test $ac_cv_prog_cc_g = yes; then
		6	if test "$GCC" = yes; then
		7	- CFLAGS="-g -O2"
		8	+# CFLAGS="-g -O2"
		9	else
		10	CFLAGS="-g"
4	fi	11	fi
5	else	12	else
6	if test "$GCC" = yes; then	13	if test "$GCC" = yes; then
7	- CFLAGS="-O2"	14	- CFLAGS="-O2"
8	+# CFLAGS="-O2"	15	+# CFLAGS="-O2"
9	else	16	else
10	- CFLAGS=	17	CFLAGS=
11	+# CFLAGS=
12	fi	18	fi
13	fi	19	@@ -5706,13 +5706,13 @@
14		20	CFLAGS="$ac_save_CFLAGS"
15	@@ -1748,9 +1748,9 @@	21	elif test $ac_cv_prog_cc_g = yes; then
		22	if test "$GCC" = yes; then
		23	- CFLAGS="-g -O2"
		24	+# CFLAGS="-g -O2"
		25	else
		26	CFLAGS="-g"
16	fi	27	fi
17	else	28	else
18	if test "$GCC" = yes; then	29	if test "$GCC" = yes; then
19	- CFLAGS="-O2"	30	- CFLAGS="-O2"
20	+# CFLAGS="-O2"	31	+# CFLAGS="-O2"
21	else	32	else
22	- CFLAGS=	33	CFLAGS=
23	+# CFLAGS=
24	fi	34	fi
25	fi	35	@@ -6717,7 +6717,7 @@
26
27	@@ -2764,7 +2764,7 @@
28	done	36	done
29		37
30		38
Lines 32-44 Link Here
32	+#CFLAGS="-O2 "	40	+#CFLAGS="-O2 "
33		41
34		42
35	EXTRA_LIBS=""	43	EFENCE=""
36	@@ -3301,7 +3301,7 @@	44	@@ -7149,7 +7149,8 @@
37	echo $ac_n "(cached) $ac_c" 1>&6	45	echo $ac_n "(cached) $ac_c" 1>&6
38	else	46	else
39	ac_save_LIBS="$LIBS"	47	ac_save_LIBS="$LIBS"
40	-LIBS="-lgdk_imlib `gtk-config --libs` $LIBS"	48	-LIBS="-lgdk_imlib `gtk-config --libs` $LIBS"
41	+LIBS="-lgdk_imlib `$GTK_CONFIG --libs` $LIBS"	49	+IMLIB_LIBS=`imlib-config --libs`
		50	+LIBS="-lgdk_imlib ${GTK_LIBS} ${IMLIB_LIBS} $LIBS"
42	cat > conftest.$ac_ext <<EOF	51	cat > conftest.$ac_ext <<EOF
43	#line 3307 "configure"	52	#line 7155 "configure"
44	#include "confdefs.h"	53	#include "confdefs.h"
		54	@@ -7383,6 +7384,7 @@
		55	s%@GTK_CONFIG@%$GTK_CONFIG%g
		56	s%@GTK_CFLAGS@%$GTK_CFLAGS%g
		57	s%@GTK_LIBS@%$GTK_LIBS%g
		58	+s%@IMLIB_LIBS@%$IMLIB_LIBS%g
		59	s%@GLIB_CONFIG@%$GLIB_CONFIG%g
		60	s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
		61	s%@GLIB_LIBS@%$GLIB_LIBS%g

Lines 1-38 Link Here

(-)/usr/ports/audio/extace/files/patch-ab (-20 / +23 lines)
1	--- extace/Makefile.in.orig Tue Jan 2 11:26:24 2001	1	--- src/Makefile.in.orig Sun May 26 19:59:24 2002
2	+++ extace/Makefile.in Tue Jan 2 11:33:29 2001	2	+++ src/Makefile.in Sat Aug 3 10:36:57 2002
3	@@ -101,7 +101,7 @@	3	@@ -146,9 +146,9 @@
4	extace_LDADD = @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib	4	options.c
5	#extace_LDADD = -lefence @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib	5
		6
		7	-extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib
		8	+extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ @IMLIB_LIBS@ -lgdk_imlib
6		9
7	-LIBS = -lpthread	10	-LIBS = -lpthread
8	+LIBS = #-lpthread	11	+#LIBS = -lpthread
9		12
10	COMMON_FLAGS = @PFLAGS@ @DFLAGS@	13	COMMON_FLAGS = @PFLAGS@ @DFLAGS@
11		14
12	@@ -109,7 +109,9 @@	15	@@ -156,7 +156,9 @@
13		16
14	EXTRA_DIST = extace.desktop README NEWS TODO	17	EXTRA_DIST = extace.desktop README NEWS TODO Colormap-format
15		18
16	+.ifdef HAVE_GNOME	19	+.ifdef HAVE_GNOME
17	Multimedia_DATA = extace.desktop	20	Multimedia_DATA = extace.desktop
18	+.endif	21	+.endif
		22	subdir = src
19	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	23	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
20	CONFIG_HEADER = ../config.h	24	CONFIG_HEADER = $(top_builddir)/config.h
21	CONFIG_CLEAN_FILES =	25	@@ -321,7 +323,6 @@
22	@@ -239,7 +241,6 @@	26	uninstall-info-am:
23
24	install-MultimediaDATA: $(Multimedia_DATA)	27	install-MultimediaDATA: $(Multimedia_DATA)
25	@$(NORMAL_INSTALL)	28	@$(NORMAL_INSTALL)
26	- $(mkinstalldirs) $(DESTDIR)$(Multimediadir)	29	- $(mkinstalldirs) $(DESTDIR)$(Multimediadir)
27	@list='$(Multimedia_DATA)'; for p in $$list; do \	30	@list='$(Multimedia_DATA)'; for p in $$list; do \
28	if test -f $(srcdir)/$$p; then \	31	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
29	echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Multimediadir)/$$p"; \	32	f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \
30	@@ -325,7 +326,7 @@	33	@@ -395,7 +396,7 @@
31	install-strip:	34	all-am: Makefile $(PROGRAMS) $(DATA)
32	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install	35
33	installdirs:	36	installdirs:
34	- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(Multimediadir)	37	- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(Multimediadir)
35	+ $(mkinstalldirs) $(DESTDIR)$(bindir)	38	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
36		39
37		40	install: install-am
38	mostlyclean-generic:	41	install-exec: install-exec-am

Lines 1-12 Link Here

(-)/usr/ports/audio/extace/files/patch-ac (-12 lines)
1	--- extace/misc.c 2001/01/02 09:29:43 1.1
2	+++ extace/misc.c 2001/01/02 09:30:30
3	@@ -20,7 +20,9 @@
4	#include <protos.h>
5	#include <math.h>
6	#include <gtk/gtk.h>
7	+#ifndef __FreeBSD__
8	#include <asm/errno.h>
9	+#endif
10	#include "convolve.h"
11	#ifdef HAVE_LIBRFFTW
12	#include <rfftw.h>

Line 0 Link Here

(-)/usr/ports/audio/extace/files/patch-ae (+12 lines)
	1	--- src/getfft.c.orig Sat Aug 3 10:25:11 2002
	2	+++ src/getfft.c Sat Aug 3 10:25:40 2002
	3	@@ -20,7 +20,9 @@
	4	#include <protos.h>
	5	#include <math.h>
	6	#include <gtk/gtk.h>
	7	+#ifndef __FreeBSD__
	8	#include <asm/errno.h>
	9	+#endif
	10	#include "convolve.h"
	11	#ifdef HAVE_LIBRFFTW
	12	#include <rfftw.h>