summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2003-11-25 00:55:36 +0000
committerMax Khon <fjoe@FreeBSD.org>2003-11-25 00:55:36 +0000
commit288a568f9ef932c794a1e92b75b7fdbddde3a9b9 (patch)
treea209b3184c579ffd1c5ecda8b7b0b94ab250318b
parentCompile with -O0 on sparc64 to work around an internal compiler error. (diff)
Fix build on 5.x.
Notice by: kris Approved by: kris
Notes
Notes: svn path=/head/; revision=94771
-rw-r--r--audio/xmms-arts/files/patch-Makefile.in11
-rw-r--r--audio/xmms-arts/files/patch-ltmain.sh21
2 files changed, 26 insertions, 6 deletions
diff --git a/audio/xmms-arts/files/patch-Makefile.in b/audio/xmms-arts/files/patch-Makefile.in
new file mode 100644
index 000000000000..7010541fe805
--- /dev/null
+++ b/audio/xmms-arts/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Tue Nov 25 06:37:11 2003
++++ Makefile.in Tue Nov 25 06:37:19 2003
+@@ -83,7 +83,7 @@
+ lib_LTLIBRARIES = libartsout.la
+ CFLAGS = @CFLAGS@ @GTK_CFLAGS@ `artsc-config --cflags`
+ LIBS = @LIBS@ @GTK_LIBS@ @PTHREAD_LIBS@
+-libartsout_la_LDFLAGS = `artsc-config --libs` -lcmallocc
++libartsout_la_LDFLAGS = `artsc-config --libs`
+ libartsout_la_SOURCES = about.c artsout.c artsout.h audio.c configure.c init.c mixer.c
+ libdir = $(xmms_output_plugin_dir)
+ XMMSPATH = $(XMMS_PATH)
diff --git a/audio/xmms-arts/files/patch-ltmain.sh b/audio/xmms-arts/files/patch-ltmain.sh
index 8b4c238a1165..41741c1a9053 100644
--- a/audio/xmms-arts/files/patch-ltmain.sh
+++ b/audio/xmms-arts/files/patch-ltmain.sh
@@ -1,16 +1,25 @@
---- ltmain.sh.orig Wed Aug 6 19:13:39 2003
-+++ ltmain.sh Tue Nov 11 22:47:49 2003
-@@ -1084,6 +1084,13 @@
+--- ltmain.sh.orig Fri Sep 1 10:46:39 2000
++++ ltmain.sh Tue Nov 25 06:49:01 2003
+@@ -1091,6 +1091,13 @@
deplibs="$deplibs $arg"
- continue
;;
-+
+
+ -pthread)
+ compile_command="$compile_command -pthread"
+ finalize_command="$finalize_command -pthread"
+ compiler_flags="$compiler_flags -pthread"
+ continue
+ ;;
-
++
-module)
module=yes
+ continue
+@@ -1926,7 +1933,7 @@
+ set dummy $deplibs_check_method
+ file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name="`expr \( $a_deplib : '-l\(.*\)' \)`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" ; then
+ libname=`eval \\$echo \"$libname_spec\"`