Apply joerg's fixes to moc here, to fix clang build issues.

3 files changed, 33 insertions, 7 deletions

diff --git a/audio/moc-devel/distinfo b/audio/moc-devel/distinfo
index dd1eec13770..245535b85ee 100644
--- a/audio/moc-devel/distinfo
+++ b/audio/moc-devel/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2011/09/04 04:37:55 dholland Exp $
+$NetBSD: distinfo,v 1.5 2011/09/12 06:27:21 dholland Exp $
 
 SHA1 (moc-2.5.0-alpha3.tar.bz2) = 59251b6239ad38f3f5ba8a1f73d1e90246765ab7
 RMD160 (moc-2.5.0-alpha3.tar.bz2) = 7a603538e2080f3e182a543bc82100a09a56c2fe
 Size (moc-2.5.0-alpha3.tar.bz2) = 489824 bytes
 SHA1 (patch-aa) = bf667dadb3fb78216dcd56d5246b33d25dd5fcf0
-SHA1 (patch-ab) = 750f9a75c368788cf7d6f55e2ef44d7e41d99aa4
+SHA1 (patch-ab) = fc111fd7808dcfb7c8e25a8ba65997682012c8d9
 SHA1 (patch-ac) = 6b42e7df0dc3dfeb0a7c5e5226a28b01d2fd27c7
-SHA1 (patch-ad) = 4816d3a17e832ee1b8be76f342a4512fad9fc642
+SHA1 (patch-ad) = 44b3ede2c3d69857e84a67ede997b429cce61a29
 SHA1 (patch-ae) = f7b98f7af3843432bab24049b17c8639a0dfce59
 SHA1 (patch-af) = 0176dff0c460a12a563df10685818face3c4b3d5
 SHA1 (patch-ag) = 818df09cf6d06165cbd1c62681a3b5d84daa30bf
diff --git a/audio/moc-devel/patches/patch-ab b/audio/moc-devel/patches/patch-ab
index af1b54952b3..51e69ea83f5 100644
--- a/audio/moc-devel/patches/patch-ab
+++ b/audio/moc-devel/patches/patch-ab
@@ -1,7 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/04/07 16:10:37 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2011/09/12 06:27:21 dholland Exp $
 
---- configure.in.orig	2008-02-25 17:37:30.000000000 -0500
+- use export-dynamic correctly
+- check for sched_get_priority_max being in -lrt
+
+--- configure.in.start	2008-02-25 22:37:30.000000000 +0000
 +++ configure.in
+@@ -39,7 +39,7 @@ case "$OS" in
+ 		;;
+ esac
+ 
+-LDFLAGS="$LDFLAGS -export-dynamic"
++LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([fcntl.h string.h strings.h sys/param.h unistd.h sys/un.h \
 @@ -49,7 +49,10 @@ AC_CHECK_HEADERS([fcntl.h string.h strin
  		 AC_MSG_ERROR([Can't find required header files.]))
  AC_CHECK_HEADERS([sys/select.h inttypes.h limits.h stdint.h])
diff --git a/audio/moc-devel/patches/patch-ad b/audio/moc-devel/patches/patch-ad
index fdc445c516d..964e55dbe53 100644
--- a/audio/moc-devel/patches/patch-ad
+++ b/audio/moc-devel/patches/patch-ad
@@ -1,7 +1,21 @@
-$NetBSD: patch-ad,v 1.2 2009/07/07 21:18:52 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2011/09/12 06:27:21 dholland Exp $
 
---- configure.orig	2008-02-25 23:38:19.000000000 +0100
+regen after patching configure.in:
+
+- use export-dynamic correctly (first hunk)
+- check for sched_get_priority_max being in -lrt
+
+--- configure.orig	2008-02-25 22:38:19.000000000 +0000
 +++ configure
+@@ -22310,7 +22310,7 @@ _ACEOF
+ 		;;
+ esac
+ 
+-LDFLAGS="$LDFLAGS -export-dynamic"
++LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 
+ { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 @@ -22895,6 +22895,72 @@ if test `eval echo '${'$as_ac_var'}'` = 
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF