Patch kdemultimedia's configure-script to prevent it from bailing

in certain environments/sh versions.

Reported & submitted by: Steven Friedrich <FreeBSD@insightbb.com>

13 files changed, 44 insertions, 0 deletions

diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile
index 01b463b36837..f971cbebb8e9 100644
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Jack output plugin for akode
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile
index d77e08ce9e9f..f02cc3838519 100644
--- a/audio/akode-plugins-mpc/Makefile
+++ b/audio/akode-plugins-mpc/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Musepack decoder plugin for akode
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
 PLUGIN=		mpc_decoder
diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile
index 5c255409f605..7820012eef7f 100644
--- a/audio/akode-plugins-mpeg/Makefile
+++ b/audio/akode-plugins-mpeg/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	MPEG audio decoder plugin for akode
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile
index e71eaebbe3ac..7cc458617229 100644
--- a/audio/akode-plugins-oss/Makefile
+++ b/audio/akode-plugins-oss/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	OSS output plugin for akode
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
 PLUGIN=		oss_sink
diff --git a/audio/akode-plugins-polypaudio/Makefile b/audio/akode-plugins-polypaudio/Makefile
index bc79e8a2175f..ff3eba7fbc3f 100644
--- a/audio/akode-plugins-polypaudio/Makefile
+++ b/audio/akode-plugins-polypaudio/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Polypaudio output plugin for akode
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	polyp-simple:${PORTSDIR}/audio/polypaudio
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile
index f516d8a346d2..1626993e7ae0 100644
--- a/audio/akode-plugins-resampler/Makefile
+++ b/audio/akode-plugins-resampler/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Resampler plugin for akode
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile
index 9af089f664fd..0f8dd43fab9b 100644
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	FLAC/Speex/Vorbis decoder plugin for akode
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 		ogg:${PORTSDIR}/audio/libogg \
 		speex:${PORTSDIR}/audio/speex \
diff --git a/audio/akode/Makefile b/audio/akode/Makefile
index ead14e6a06dd..a6d3d6ab1c23 100644
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Default KDE audio backend
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 445e511d2cc7..f0ef7b0a783b 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE audio player
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	akode:${PORTSDIR}/audio/akode \
 		musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
 		tag:${PORTSDIR}/audio/taglib \
diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile
index 1f7cd3dd2962..f1d48fed21af 100644
--- a/audio/mpeglib_artsplug/Makefile
+++ b/audio/mpeglib_artsplug/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Legacy KDE audio backend
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
 		vorbis.3:${PORTSDIR}/audio/libvorbis
 
diff --git a/multimedia/kdemultimedia3/files/patch-configure b/multimedia/kdemultimedia3/files/patch-configure
new file mode 100644
index 000000000000..32db97a1e6d3
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Jul  3 02:53:19 2005
++++ configure	Sun Jul  3 02:54:03 2005
+@@ -33404,7 +33404,7 @@
+ 
+ echo "$as_me:$LINENO: result: $ac_cv_x86_sse" >&5
+ echo "${ECHO_T}$ac_cv_x86_sse" >&6
+-if eval "test \"`echo `$ac_cv_x86_sse\" = yes"; then
++if eval "test \" `echo `$ac_cv_x86_sse\" = yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_X86_SSE 1
diff --git a/multimedia/kdemultimedia4/files/patch-configure b/multimedia/kdemultimedia4/files/patch-configure
new file mode 100644
index 000000000000..32db97a1e6d3
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Jul  3 02:53:19 2005
++++ configure	Sun Jul  3 02:54:03 2005
+@@ -33404,7 +33404,7 @@
+ 
+ echo "$as_me:$LINENO: result: $ac_cv_x86_sse" >&5
+ echo "${ECHO_T}$ac_cv_x86_sse" >&6
+-if eval "test \"`echo `$ac_cv_x86_sse\" = yes"; then
++if eval "test \" `echo `$ac_cv_x86_sse\" = yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_X86_SSE 1
diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile
index 52e966297271..a97d525b2081 100644
--- a/multimedia/xine_artsplugin/Makefile
+++ b/multimedia/xine_artsplugin/Makefile
@@ -17,6 +17,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Xine-based multimedia backend for KDE
 
+EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
+
 LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 
 CONFLICTS=	kdemultimedia-3.1.* kdemultimedia-3.2.[0-3]