diff options
| author | Will Andrews <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
| commit | d075bf0f8668353d166ce921b27af99b645d652c (patch) | |
| tree | 345dd3d2608a097c43d147cb2254e11aebc56937 /multimedia | |
| parent | Add cxmon 3.0, interactive file manipulation tool and disassembler. (diff) | |
Fix the -pthread problem in case the option gets removed again. This
patch involved patching the core auto* routines in KDE to accept the
PTHREAD_* variables in the environment, with fallbacks. We decided the
easiest way to implement this in ports was to generate configure instead
of risking incorrect generation at port configure time.
Said patch has already been committed to HEAD in KDE and as such will be
removed with the 3.2 upgrade once it is released.
Ports using Makefile.kde that shouldn't be using them (i.e. non-KDE
modules) have this support commented out due to lack of patch.
Helped out: Adriaan de Groot <adridg@cs.kun.nl>
Lauri Watts <lauri@kde.org>
Andy Fawcett <andy@athame.co.uk>
Notes
Notes:
svn path=/head/; revision=90174
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/kdemultimedia3/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/kdemultimedia3/distinfo | 2 | ||||
| -rw-r--r-- | multimedia/kdemultimedia3/files/patch-configure | 11 | ||||
| -rw-r--r-- | multimedia/kdemultimedia4/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/kdemultimedia4/distinfo | 2 | ||||
| -rw-r--r-- | multimedia/kdemultimedia4/files/patch-configure | 11 |
6 files changed, 4 insertions, 28 deletions
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index bc025f8ad8b4..52d07ba205b3 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -40,9 +40,6 @@ CONFIGURE_ARGS+= --with-vorbis="${LOCALBASE}" \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -pre-configure:: - ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure - .if defined(WITH_MIDI) || defined(WITH_KMIDI) PLIST_APPEND+= plist.midi .if ${MACHINE_ARCH} == "alpha" diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 15167176e7e9..3cc70f1a834a 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1 +1,3 @@ MD5 (KDE/kdemultimedia-3.1.4.tar.bz2) = f9f2b0b79a6a9ced3ae601b57da53129 +MD5 (KDE/kdemultimedia-2003092201-configure.tar.bz2) = 2895c980fe38846439a6628a1ea786b0 +MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1 diff --git a/multimedia/kdemultimedia3/files/patch-configure b/multimedia/kdemultimedia3/files/patch-configure deleted file mode 100644 index b2f41eae0b19..000000000000 --- a/multimedia/kdemultimedia3/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Fri May 2 15:23:56 2003 -+++ configure Fri May 2 15:24:28 2003 -@@ -26016,7 +26016,7 @@ fi - - 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 test $ac_cv_x86_sse = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_X86_SSE 1 diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index bc025f8ad8b4..52d07ba205b3 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -40,9 +40,6 @@ CONFIGURE_ARGS+= --with-vorbis="${LOCALBASE}" \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -pre-configure:: - ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure - .if defined(WITH_MIDI) || defined(WITH_KMIDI) PLIST_APPEND+= plist.midi .if ${MACHINE_ARCH} == "alpha" diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index 15167176e7e9..3cc70f1a834a 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1 +1,3 @@ MD5 (KDE/kdemultimedia-3.1.4.tar.bz2) = f9f2b0b79a6a9ced3ae601b57da53129 +MD5 (KDE/kdemultimedia-2003092201-configure.tar.bz2) = 2895c980fe38846439a6628a1ea786b0 +MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1 diff --git a/multimedia/kdemultimedia4/files/patch-configure b/multimedia/kdemultimedia4/files/patch-configure deleted file mode 100644 index b2f41eae0b19..000000000000 --- a/multimedia/kdemultimedia4/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Fri May 2 15:23:56 2003 -+++ configure Fri May 2 15:24:28 2003 -@@ -26016,7 +26016,7 @@ fi - - 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 test $ac_cv_x86_sse = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_X86_SSE 1 |