summaryrefslogtreecommitdiff
path: root/misc/kdepim2
diff options
context:
space:
mode:
authorjmc <jmc>2003-05-13 20:02:50 +0000
committerjmc <jmc>2003-05-13 20:02:50 +0000
commit4b9ebcdb605ae432ee08209000ee5ae3a059342f (patch)
treeaac8566f47ce51ea860407d94bf5550159c40dbe /misc/kdepim2
parentbb8c7e98a2bd4f4b406ee42bdfc07f8a8c7e5433 (diff)
downloadpkgsrc-4b9ebcdb605ae432ee08209000ee5ae3a059342f.tar.gz
Patch for current pilot-libs and re-enable this package
Diffstat (limited to 'misc/kdepim2')
-rw-r--r--misc/kdepim2/Makefile4
-rw-r--r--misc/kdepim2/distinfo4
-rw-r--r--misc/kdepim2/patches/patch-ad30
-rw-r--r--misc/kdepim2/patches/patch-ae13
4 files changed, 47 insertions, 4 deletions
diff --git a/misc/kdepim2/Makefile b/misc/kdepim2/Makefile
index 366e1169c18..7ed9440eedb 100644
--- a/misc/kdepim2/Makefile
+++ b/misc/kdepim2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:54 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/13 20:02:50 jmc Exp $
DISTNAME= kdepim-2.2.2
PKGREVISION= 3
@@ -12,8 +12,6 @@ BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK2= YES
LTCONFIG_OVERRIDE+= ${WRKSRC}/libical/ltconfig
-BROKEN= Problems with kpilot compilation
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
diff --git a/misc/kdepim2/distinfo b/misc/kdepim2/distinfo
index 5bf8f615764..8f6a8925651 100644
--- a/misc/kdepim2/distinfo
+++ b/misc/kdepim2/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.7 2002/10/26 13:20:21 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2003/05/13 20:02:50 jmc Exp $
SHA1 (kdepim-2.2.2.tar.bz2) = b33bd17cfabda2d447932a28084241006cb2edd5
Size (kdepim-2.2.2.tar.bz2) = 2428768 bytes
SHA1 (patch-aa) = 73ec76d8150c8a5a633c79abe56ff6dde4ec85af
SHA1 (patch-ab) = 0ee579e364790f0ae4aff83b0d60dd5b77933a67
SHA1 (patch-ac) = 22c2ef81a5ef0b5746161f2fe2bfc63e1fcafd77
+SHA1 (patch-ad) = 121c3fdfcdb812cbbe02c90f2c16ce43007e0c89
+SHA1 (patch-ae) = 5214afa5145740d2ba02ba51f17306b20689d418
diff --git a/misc/kdepim2/patches/patch-ad b/misc/kdepim2/patches/patch-ad
new file mode 100644
index 00000000000..b23eb85171c
--- /dev/null
+++ b/misc/kdepim2/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.1 2003/05/13 20:02:51 jmc Exp $
+
+--- kpilot/kpilot/kpilotlink.cc.orig Tue May 13 13:09:06 2003
++++ kpilot/kpilot/kpilotlink.cc Tue May 13 16:21:46 2003
+@@ -51,6 +51,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <iostream.h>
+@@ -254,7 +255,7 @@
+ }
+
+ if (!(fPilotMasterSocket =
+- pi_socket(PI_AF_SLP, PI_SOCK_STREAM, PI_PF_PADP)))
++ pi_socket(PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_PADP)))
+ {
+ e = errno;
+ msg = i18n("Cannot create socket for communicating "
+@@ -262,7 +263,7 @@
+ goto errInit;
+ }
+
+- addr.pi_family = PI_AF_SLP;
++ addr.pi_family = PI_AF_PILOT;
+ strcpy(addr.pi_device, QFile::encodeName(fPilotPath));
+
+ ret = pi_bind(fPilotMasterSocket,
diff --git a/misc/kdepim2/patches/patch-ae b/misc/kdepim2/patches/patch-ae
new file mode 100644
index 00000000000..0f6b0824ba7
--- /dev/null
+++ b/misc/kdepim2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/05/13 20:02:51 jmc Exp $
+
+--- kpilot/conduits/popmail/popmail-conduit.cc.orig Tue May 13 19:23:30 2003
++++ kpilot/conduits/popmail/popmail-conduit.cc Tue May 13 19:24:32 2003
+@@ -48,6 +48,8 @@
+ #include <sys/socket.h>
+ #include <ctype.h>
+ #include <iostream.h>
++#include <stdlib.h>
++#include <unistd.h>
+
+ #ifndef QDIR_H
+ #include <qdir.h>