--- a/ChangeLog	Thu Sep 17 08:55:55 2009 +0000
+++ b/ChangeLog	Thu Sep 17 23:37:46 2009 +0000
@@ -1,3 +1,8 @@
+2009-09-17  Albert Lee  <[email protected]>
+
+	* patches/wildmidi-01-solaris.diff: Remove old Studio fix
+	* patches/wildmidi-02-sunstudio.diff: Fix additional build system issues
+	
 2009-09-17  Milan Jurik <[email protected]>
 
 	* SFElibnids.spec, SFEdsniff.spec: Cleanup of linker problems

--- a/patches/wildmidi-01-solaris.diff	Thu Sep 17 08:55:55 2009 +0000
+++ b/patches/wildmidi-01-solaris.diff	Thu Sep 17 23:37:46 2009 +0000
@@ -1,13 +1,3 @@
---- wildmidi-0.2.2.orig/configure.ac	2004-01-28 13:25:44.000000000 -0500
-+++ wildmidi-0.2.2/configure.ac	2008-12-11 01:55:03.377322800 -0500
-@@ -95,7 +95,6 @@
- 
- AC_C_BIGENDIAN
- 
--CFLAGS="$CFLAGS -Wall"
- AC_ARG_ENABLE(werror,
-     [  --disable-werror      disable fail on compile warnings],    werror=$enable_werror,
- 	werror=yes
 --- wildmidi-0.2.2.orig/src/wildmidi.c	2004-01-28 13:13:46.000000000 -0500
 +++ wildmidi-0.2.2/src/wildmidi.c	2008-12-11 02:39:52.831957387 -0500
 @@ -63,7 +63,11 @@

--- a/patches/wildmidi-02-sunstudio.diff	Thu Sep 17 08:55:55 2009 +0000
+++ b/patches/wildmidi-02-sunstudio.diff	Thu Sep 17 23:37:46 2009 +0000
@@ -1,3 +1,90 @@
+--- wildmidi-0.2.2.orig/configure.ac	2004-01-28 13:25:44.000000000 -0500
++++ wildmidi-0.2.2/configure.ac	2009-09-17 17:33:28.773882786 -0400
+@@ -44,12 +44,9 @@
+ AM_PROG_LIBTOOL
+ 
+ 
+-set $CC
+-if test "$1" = gcc; then
+-	shift
+-	args="$*"
++if test "$GCC" = "yes"; then
+ 	AC_MSG_CHECKING(for gcc version)
+-	CCVER="gcc `gcc --version`"
++	CCVER="gcc `$CC --version`"
+ 	AC_MSG_RESULT($CCVER)
+ fi
+ 
+@@ -95,14 +92,16 @@
+ 
+ AC_C_BIGENDIAN
+ 
+-CFLAGS="$CFLAGS -Wall"
++if test "$GCC" = "yes"; then
++	CFLAGS="$CFLAGS -Wall"
++fi
+ AC_ARG_ENABLE(werror,
+     [  --disable-werror      disable fail on compile warnings],    werror=$enable_werror,
+ 	werror=yes
+ )
+ 
+ AC_MSG_CHECKING(for Werror)
+-if test "x$werror" = xyes; then
++if test "x$werror" = xyes -a "$GCC" = "yes"; then
+ 	AC_MSG_RESULT(yes)
+ 	CFLAGS="$CFLAGS -Werror"
+ else 
+@@ -170,7 +169,7 @@
+ 	[  --enable-profile        compile with profiling (for development)],
+ 	profile=$enable_profile
+ )
+-if test "x$profile" = xyes; then
++if test "x$profile" = xyes -a "$GCC" = "yes"; then
+ 	BUILD_TYPE="$BUILD_TYPE Profile"
+ 	CFLAGS="`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` -pg -fprofile-arcs"
+ 	LDFLAGS="$LDFLAGS -pg -fprofile-arcs"
+@@ -180,7 +179,7 @@
+ 	[  --enable-temps        compile with save-temps],
+ 	temps=$enable_temps
+ )
+-if test "x$temps" = xyes; then
++if test "x$temps" = xyes -a "$GCC" = "yes"; then
+ 	CFLAGS="$CFLAGS -save-temps"
+ fi
+ 
+@@ -227,18 +226,22 @@
+ 
+ case "$arch" in
+ 	auto)
+-		case "${host_cpu}" in
+-			i?86)
+-				if test "x$HAVE_AMD" = "xyes"; then
+-					CFLAGS="$CFLAGS -march=k6"
+-				else
+-					CFLAGS="$CFLAGS -march=${host_cpu}"
+-				fi
+-				;;
+-		esac
++		if test "$GCC" = "yes"; then
++			case "${host_cpu}" in
++				i?86)
++					if test "x$HAVE_AMD" = "xyes"; then
++						CFLAGS="$CFLAGS -march=k6"
++					else
++						CFLAGS="$CFLAGS -march=${host_cpu}"
++					fi
++					;;
++			esac
++		fi
+ 		;;
+ 	*)
+-		CFLAGS="$CFLAGS -march=$arch"
++		if test "$GCC" = "yes"; then
++			CFLAGS="$CFLAGS -march=$arch"
++		fi
+ 		;;
+ 									
+ esac
 --- wildmidi-0.2.2/src/wildmidi_lib.c	2009-06-13 19:01:17.737707714 +0200
 +++ wildmidi-0.2.2-patch/src/wildmidi_lib.c	2009-06-13 19:01:14.950440156 +0200
 @@ -584,8 +584,8 @@