Fix build on Solaris.

5 files changed, 47 insertions, 3 deletions

diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 3cd9c80de4b..44c4d91f72d 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.39 2006/01/31 22:37:34 markd Exp $
+$NetBSD: distinfo,v 1.40 2006/02/07 10:10:42 markd Exp $
 
 SHA1 (kdepim-3.5.1.tar.bz2) = 746a46e909c973175c134f040c5d137e60b64777
 RMD160 (kdepim-3.5.1.tar.bz2) = 9270aea41b18ffe3465ccafccb4283fdd5c8a2b2
 Size (kdepim-3.5.1.tar.bz2) = 12885355 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
+SHA1 (patch-ac) = 2ead8593be03d780cf5b4e333dc4ead1d29b8073
 SHA1 (patch-ai) = e323770b352d0a3876f8380bb31aa30615866dd4
 SHA1 (patch-aj) = 1fd187c4c9ddb4f6380265853feb7eb04cf4b740
 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
new file mode 100644
index 00000000000..aa271fb9788
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.11 2006/02/07 10:10:42 markd Exp $
+
+--- kpilot/lib/options.cc.orig	2005-09-10 20:24:40.000000000 +1200
++++ kpilot/lib/options.cc
+@@ -90,7 +90,9 @@ struct tm writeTm(const QDateTime &dt)
+   t.tm_wday = 0; // unimplemented
+   t.tm_yday = 0; // unimplemented
+   t.tm_isdst = 0; // unimplemented
++#ifndef Q_OS_SOLARIS
+   t.tm_zone = 0; // unimplemented
++#endif
+ 
+   t.tm_year = dt.date().year() - 1900;
+   t.tm_mon = dt.date().month() - 1;
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index fa7d73aea88..574e2260aba 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2006/02/05 23:11:38 joerg Exp $
+# $NetBSD: Makefile,v 1.104 2006/02/07 10:06:53 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGREVISION=	1
@@ -25,6 +25,10 @@ SGML_CATALOGS+=		${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docboo
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+USE_TOOLS+=		gawk:pkgsrc
+.endif
+
 LIBS.NetBSD+=			${EXPORT_SYMBOLS_LDFLAGS}
 
 REQD_DIRS+=	${KDE3_DIRS:O:S/^/${PREFIX}\//}
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 669b8546d2b..c141030dc07 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2006/01/31 22:20:41 markd Exp $
+$NetBSD: distinfo,v 1.68 2006/02/07 10:06:53 markd Exp $
 
 SHA1 (kdelibs-3.5.1.tar.bz2) = 669dbefc1880f17493462ce724d4c38520724ece
 RMD160 (kdelibs-3.5.1.tar.bz2) = db974aa14ff8f8d5a9d279ba8cabb5dcdc3ecc1c
@@ -9,6 +9,7 @@ SHA1 (patch-ad) = 861b2b4a82ef8075bc03d073396d0c6411ae12ba
 SHA1 (patch-ae) = a85911eb156ea53aca02bb2f3d550edbf377981d
 SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
+SHA1 (patch-ah) = 467772a737072baa4af76b22f58bf1741b6633eb
 SHA1 (patch-an) = a65dd672b26a12a6690d1109ba5ee6f58c69457a
 SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
 SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
diff --git a/x11/kdelibs3/patches/patch-ah b/x11/kdelibs3/patches/patch-ah
new file mode 100644
index 00000000000..2512d6b7ccb
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ah
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.8 2006/02/07 10:06:53 markd Exp $
+
+--- kdecore/ksycoca.cpp.orig	2006-01-20 06:06:18.000000000 +1300
++++ kdecore/ksycoca.cpp
+@@ -42,6 +42,10 @@
+ #include <sys/mman.h>
+ #endif
+ 
++#ifdef Q_OS_SOLARIS
++extern "C" int madvise(caddr_t, size_t, int);
++#endif
++
+ #ifndef MAP_FAILED
+ #define MAP_FAILED ((void *) -1)
+ #endif
+@@ -145,7 +149,7 @@ bool KSycoca::openDatabase( bool openDum
+      else
+      {
+ #ifdef HAVE_MADVISE
+-	(void) madvise((void*)m_sycoca_mmap, m_sycoca_size, MADV_WILLNEED);
++	(void) madvise((char*)m_sycoca_mmap, m_sycoca_size, MADV_WILLNEED);
+ #endif
+         QByteArray b_array;
+         b_array.setRawData(m_sycoca_mmap, m_sycoca_size);