Fix build on SunOS.

6 files changed, 51 insertions, 5 deletions

diff --git a/audio/mp3check/distinfo b/audio/mp3check/distinfo
index d17bef6804d..372d376b9e3 100644
--- a/audio/mp3check/distinfo
+++ b/audio/mp3check/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2011/09/12 06:33:11 dholland Exp $
+$NetBSD: distinfo,v 1.9 2012/01/11 19:23:02 hans Exp $
 
 SHA1 (mp3check-0.8.3.tar.gz) = 4921a0f5250016abd8fe92d8ca4522c4c6e8b657
 RMD160 (mp3check-0.8.3.tar.gz) = da244159e2f6637d5bd1d386dbca6a2078329bdb
 Size (mp3check-0.8.3.tar.gz) = 163594 bytes
-SHA1 (patch-aa) = df47e94ed8a765d58da8fcabaf407df8931843e3
+SHA1 (patch-aa) = 0f2c2022951305e5efa5e057014fa17347704f47
 SHA1 (patch-ab) = 86e1da01f1407f748dbd2fa8436e2d2cdaaf3f4d
 SHA1 (patch-ad) = ca416a54a1b751f7587f977288a99b5da061a12a
 SHA1 (patch-ae) = 8858652cd376372411366d6c06e1e31e4d4b7590
diff --git a/audio/mp3check/patches/patch-aa b/audio/mp3check/patches/patch-aa
index a55be0e7947..65cbb6061fe 100644
--- a/audio/mp3check/patches/patch-aa
+++ b/audio/mp3check/patches/patch-aa
@@ -1,11 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2003/02/16 23:08:25 abs Exp $
+$NetBSD: patch-aa,v 1.4 2012/01/11 19:23:03 hans Exp $
 
 --- mp3check.cc.orig	Mon Jan 27 23:58:46 2003
 +++ mp3check.cc
-@@ -25,11 +25,11 @@
+@@ -26,11 +26,12 @@
  #include <unistd.h>
  #include <stdio.h>
  #include <stdlib.h>
++#include <termios.h>
 +#include "config.h"
  #include "tappconfig.h"
  #include "crc16.h"
diff --git a/audio/mp3diags/distinfo b/audio/mp3diags/distinfo
index 8d2151e8853..892de63b479 100644
--- a/audio/mp3diags/distinfo
+++ b/audio/mp3diags/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.9 2011/09/12 21:27:26 wiz Exp $
+$NetBSD: distinfo,v 1.10 2012/01/11 19:25:08 hans Exp $
 
 SHA1 (MP3Diags-1.0.09.063.tar.gz) = 27e95e7b92073bc9e2bae16efd5a3573e4f884c7
 RMD160 (MP3Diags-1.0.09.063.tar.gz) = a279687a2617b95f4d2d38bd9922f786043e415e
 Size (MP3Diags-1.0.09.063.tar.gz) = 958959 bytes
 SHA1 (patch-aa) = 679dcb25b6acfc9c2fcb6076a467477cb03058bb
+SHA1 (patch-src_FileRenamerDlgImpl.h) = 9448a5b364fd75119b34e82ca906eba2dd7dc960
+SHA1 (patch-src_Helpers.cpp) = 067d914b96940eb971a50bedfbb525ac7349e356
+SHA1 (patch-src_Notes.h) = 63c5f620a5c5caca4ad6b9aab3b3ab3c2f57ad30
diff --git a/audio/mp3diags/patches/patch-src_FileRenamerDlgImpl.h b/audio/mp3diags/patches/patch-src_FileRenamerDlgImpl.h
new file mode 100644
index 00000000000..9a92e130d86
--- /dev/null
+++ b/audio/mp3diags/patches/patch-src_FileRenamerDlgImpl.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_FileRenamerDlgImpl.h,v 1.1 2012/01/11 19:25:08 hans Exp $
+
+--- src/FileRenamerDlgImpl.h.orig	2009-10-20 16:15:39.000000000 +0200
++++ src/FileRenamerDlgImpl.h	2012-01-02 11:33:04.351881930 +0100
+@@ -33,6 +33,9 @@
+ 
+ #include  "ui_FileRenamer.h"
+ 
++#ifdef ERR
++#undef ERR
++#endif
+ 
+ class CommonData;
+ class QSettings;
diff --git a/audio/mp3diags/patches/patch-src_Helpers.cpp b/audio/mp3diags/patches/patch-src_Helpers.cpp
new file mode 100644
index 00000000000..81e1ad15690
--- /dev/null
+++ b/audio/mp3diags/patches/patch-src_Helpers.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Helpers.cpp,v 1.1 2012/01/11 19:25:08 hans Exp $
+
+--- src/Helpers.cpp.orig	2011-09-10 19:51:46.000000000 +0200
++++ src/Helpers.cpp	2012-01-02 11:31:20.777472032 +0100
+@@ -914,7 +914,7 @@ QString getSystemInfo() //ttt2 perhaps s
+     filters << "*-release" << "*_version";
+     dir.setNameFilters(filters);
+     QStringList lFiles (dir.entryList(QDir::Files));
+-    utsname utsInfo;
++    struct utsname utsInfo;
+     uname(&utsInfo);
+     s += utsInfo.sysname; s += " ";
+     s += utsInfo.release; s += " ";
diff --git a/audio/mp3diags/patches/patch-src_Notes.h b/audio/mp3diags/patches/patch-src_Notes.h
new file mode 100644
index 00000000000..efe1ae42a55
--- /dev/null
+++ b/audio/mp3diags/patches/patch-src_Notes.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Notes.h,v 1.1 2012/01/11 19:25:08 hans Exp $
+
+--- src/Notes.h.orig	2010-02-13 07:58:04.000000000 +0100
++++ src/Notes.h	2012-01-02 11:26:42.140106730 +0100
+@@ -32,6 +32,10 @@
+ #include  "SerSupport.h"
+ #include  <boost/serialization/split_member.hpp>
+ 
++#ifdef ERR
++#undef ERR
++#endif
++
+ /*
+ Stores a message that is added while parsing a file. Multiple messages may be added, depending on the issues found.
+