Fix build on FreeBSD 10 and maybe other BSD:s.

3 files changed, 23 insertions, 9 deletions

diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile
index 28683866921..49f72b8788b 100644
--- a/x11/qt5-qtbase/Makefile
+++ b/x11/qt5-qtbase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/04/06 08:17:19 adam Exp $
+# $NetBSD: Makefile,v 1.20 2015/04/08 10:31:28 nros Exp $
 
 DISTNAME=	qtbase-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtbase-${QTVERSION}
@@ -83,7 +83,7 @@ LDFLAGS+=		-lresolv
 .  endif
 .elif ${OPSYS} == "Linux"
 LDFLAGS+=		-ldl
-.elif ${OPSYS} == "NetBSD"
+.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
 .  if exists(/usr/lib/libexecinfo.so)
 LDFLAGS+=		-lexecinfo
 .  endif
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index c29e4a14e8e..e540128309c 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2015/04/03 09:28:20 mrg Exp $
+$NetBSD: distinfo,v 1.19 2015/04/08 10:31:28 nros Exp $
 
 SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd
 RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909
@@ -18,7 +18,7 @@ SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66
 SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180
 SHA1 (patch-src_corelib_io_io.pri) = c4bb37370849bfbc994809825ff94090d71a7116
 SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 7732cae95975af17e0618667b979c3b84d51adae
-SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 271f12fc32ffea7c72e62e8add20abf6939b275a
+SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 0bdd882056e4015cd2277c5b53451c563895b3e7
 SHA1 (patch-src_gui_image_qbmphandler.cpp) = 1e540711365f056657100ec84b22789e60443c98
 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d
 SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
index a6ebbd0059a..140d5bb5145 100644
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
@@ -1,8 +1,18 @@
-$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.2 2015/02/14 22:12:34 nros Exp $
+$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.3 2015/04/08 10:31:28 nros Exp $
+* make statvfs available on non-NetBSD BSD platforms
+* NetBSD uses struct statvfs as first argument to getmntinfo
 * fix build on SunOS
 --- src/corelib/io/qstorageinfo_unix.cpp.orig	2014-12-05 16:24:37.000000000 +0000
 +++ src/corelib/io/qstorageinfo_unix.cpp
-@@ -63,6 +63,8 @@
+@@ -52,6 +52,7 @@
+ 
+ #if defined(Q_OS_BSD4)
+ #  include <sys/mount.h>
++#  include <sys/statvfs.h>
+ #elif defined(Q_OS_ANDROID)
+ #  include <sys/mount.h>
+ #  include <sys/vfs.h>
+@@ -63,6 +64,8 @@
  #  include <sys/statvfs.h>
  #elif defined(Q_OS_SOLARIS)
  #  include <sys/mnttab.h>
@@ -11,7 +21,7 @@ $NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.2 2015/02/14 22:12:34 nr
  #endif
  
  #if defined(Q_OS_BSD4)
-@@ -74,6 +76,9 @@
+@@ -74,6 +77,9 @@
  #  if !defined(ST_RDONLY)
  #    define ST_RDONLY 1 // hack for missing define on Android
  #  endif
@@ -21,16 +31,20 @@ $NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.2 2015/02/14 22:12:34 nr
  #else
  #  if defined(QT_LARGEFILE_SUPPORT)
  #    define QT_STATFSBUF struct statvfs64
-@@ -118,7 +123,7 @@ public:
+@@ -118,7 +124,11 @@ public:
      inline QByteArray device() const;
  private:
  #if defined(Q_OS_BSD4)
 -    statfs *stat_buf;
++#if defined(Q_OS_NETBSD)
 +    QT_STATFSBUF *stat_buf;
++#else
++    struct statfs *stat_buf;
++#endif
      int entryCount;
      int currentIndex;
  #elif defined(Q_OS_SOLARIS)
-@@ -196,22 +201,22 @@ inline bool QStorageIterator::isValid()
+@@ -196,22 +206,22 @@ inline bool QStorageIterator::isValid() 
  
  inline bool QStorageIterator::next()
  {