Fix build on SunOS, use portable egrep construct.

4 files changed, 46 insertions, 3 deletions

diff --git a/ham/linpsk/distinfo b/ham/linpsk/distinfo
index 43c99ac7930..e897381b44b 100644
--- a/ham/linpsk/distinfo
+++ b/ham/linpsk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2013/03/02 18:06:22 joerg Exp $
+$NetBSD: distinfo,v 1.10 2014/09/25 12:29:35 jperkin Exp $
 
 SHA1 (linpsk-0.8.1.tar.gz) = d55d8c793ecd3a4395603ebdd8e795f1dc4d20f9
 RMD160 (linpsk-0.8.1.tar.gz) = 975bbdfc0b63e516f1d5fdfe6baf10fa12899219
 Size (linpsk-0.8.1.tar.gz) = 435463 bytes
-SHA1 (patch-aa) = 7b0f37ecca00fc87badb99036ea66ce47c6b0bd5
+SHA1 (patch-aa) = ac3c504022d495c619056ad0e5fd7b8e9ff6f71c
 SHA1 (patch-ab) = 0cc21222e30d9122657e5c373b19af15c39eb883
 SHA1 (patch-ac) = 5be307963474f6879490185b47bed6e50dd51ffe
 SHA1 (patch-ad) = d9a62afada11b17730e4457e73fef7e21b8bee62
@@ -11,5 +11,7 @@ SHA1 (patch-af) = 785bf818f14b1e733321a8e6cc0f998883cffe4a
 SHA1 (patch-ag) = 490d53c18ec1cb3961e7d49ec8f551c386bcec6a
 SHA1 (patch-ai) = 192112a67a4ad8d70d4f71fbb1390a1fb26d7496
 SHA1 (patch-src_csound.cpp) = 38897d8b3b07bb3e05215a2b5d49f7aa1d02c451
+SHA1 (patch-src_csound.h) = 7d7d367ee152afc8bbf7cd3e8bf3179f1d911dcc
+SHA1 (patch-src_portaudio_pa__unix__oss.c) = eb3303ed554921d98c869c457172f7f346a7b850
 SHA1 (patch-src_textinput.cpp) = e9a3881bad34d56da61881d23a7ee2b6cc52f6bb
 SHA1 (patch-src_waveinput.cpp) = 0cd36c07772448dd203108796a0c605df2b251a5
diff --git a/ham/linpsk/patches/patch-aa b/ham/linpsk/patches/patch-aa
index e3bf3255982..adfb4c42234 100644
--- a/ham/linpsk/patches/patch-aa
+++ b/ham/linpsk/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.4 2011/12/14 18:28:59 marino Exp $
+$NetBSD: patch-aa,v 1.5 2014/09/25 12:29:35 jperkin Exp $
 
 --- configure.orig	2005-03-17 20:00:57.000000000 +0000
 +++ configure
+@@ -4015,7 +4015,7 @@ echo "${ECHO_T}$QTDIR" >&6
+ # Figure out which version of Qt we are using
+ echo "$as_me:$LINENO: checking Qt version" >&5
+ echo $ECHO_N "checking Qt version... $ECHO_C" >&6
+-QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
++QT_VER=`egrep 'define.*QT_VERSION_STR[ 	]' $QTDIR/include/qglobal.h | perl -p -e 's/\D//g'`
+ case "${QT_VER}" in
+     2*)
+         QT_MAJOR="2"
 @@ -4270,7 +4270,7 @@ fi
  QT_LDADD="-L$QTDIR/lib $QT_LIB"
  if test x"$QT_IS_MT" = "xyes" ; then
diff --git a/ham/linpsk/patches/patch-src_csound.h b/ham/linpsk/patches/patch-src_csound.h
new file mode 100644
index 00000000000..900608775a1
--- /dev/null
+++ b/ham/linpsk/patches/patch-src_csound.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_csound.h,v 1.1 2014/09/25 12:29:35 jperkin Exp $
+
+SunOS needs sys/termios.h
+
+--- src/csound.h.orig	2005-02-04 15:28:23.000000000 +0000
++++ src/csound.h
+@@ -17,6 +17,10 @@
+ #ifndef CSOUND_H
+ #define CSOUND_H
+ 
++#ifdef __sun
++#include <sys/termios.h>
++#endif
++
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/ham/linpsk/patches/patch-src_portaudio_pa__unix__oss.c b/ham/linpsk/patches/patch-src_portaudio_pa__unix__oss.c
new file mode 100644
index 00000000000..6b13e9944ba
--- /dev/null
+++ b/ham/linpsk/patches/patch-src_portaudio_pa__unix__oss.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_portaudio_pa__unix__oss.c,v 1.1 2014/09/25 12:29:35 jperkin Exp $
+
+SunOS needs sys/soundcard.h
+
+--- src/portaudio/pa_unix_oss.c.orig	2005-02-12 10:40:06.000000000 +0000
++++ src/portaudio/pa_unix_oss.c
+@@ -43,6 +43,8 @@
+ 

+ #ifdef __linux__

+ #include <linux/soundcard.h>

++#elif defined(__sun)

++#include <sys/soundcard.h>

+ #else

+ #include <machine/soundcard.h> /* JH20010905 */

+ #endif