Only sched_yield() periodically if pth is used on NetBSD.

Add @exec/@unexec scrollkeeper-update to PLIST.
Bump PKGREVISION.

5 files changed, 34 insertions, 28 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index d065bf12bd2..735b8497864 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2002/10/07 08:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2002/10/11 09:29:59 rh Exp $
 
 DISTNAME=		evolution-1.0.8
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/evolution/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index efbecdfa675..d9fc154b773 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/07/15 18:25:49 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/10/11 09:29:59 rh Exp $
 bin/csv2vcard
 bin/evolution
 bin/evolution-addressbook
@@ -1340,3 +1340,5 @@ share/pixmaps/evolution.png
 @dirrm include/evolution
 @dirrm include/ename
 @dirrm include/camel
+@exec scrollkeeper-update
+@unexec scrollkeeper-update
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7730dd5b4ae..35b53ef3554 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2002/10/07 12:44:35 wiz Exp $
+$NetBSD: distinfo,v 1.17 2002/10/11 09:29:59 rh Exp $
 
 SHA1 (evolution-1.0.8.tar.bz2) = 68e0545f15f7ab3bc43f386ff8f829f1836e05ef
 Size (evolution-1.0.8.tar.bz2) = 10772710 bytes
 SHA1 (patch-aa) = edeb3cf97d2192a5c0045d85a589c648036116a4
-SHA1 (patch-ab) = f6f4d63255683cc613fcf89905732cbb611a98de
-SHA1 (patch-ac) = c8b2b2b1077894a34569af48544151b0c477e02d
+SHA1 (patch-ab) = 3715bf4f43c80c902bbe346a25370fd14126722f
+SHA1 (patch-ac) = c9feb5ca0dff4b4751bdd3e1d48468eb59fb14d0
 SHA1 (patch-ad) = fd7327c9cfbc52bb81304f1a80f0014f4e654d8e
 SHA1 (patch-ae) = 155e692bc82f32d25c37a5c37aa8145615a50329
 SHA1 (patch-af) = dbbd2272d21079d6fe28d59e75f9acb26634f438
diff --git a/mail/evolution/patches/patch-ab b/mail/evolution/patches/patch-ab
index 67bd69558d9..2e2be3e26d2 100644
--- a/mail/evolution/patches/patch-ab
+++ b/mail/evolution/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2002/03/26 20:50:13 rh Exp $
+$NetBSD: patch-ab,v 1.4 2002/10/11 09:29:59 rh Exp $
 
---- mail/main.c.orig	Fri Dec 14 22:28:03 2001
-+++ mail/main.c	Tue Mar 26 15:01:12 2002
-@@ -36,6 +36,24 @@
+--- mail/main.c.orig	Tue Dec 18 02:21:53 2001
++++ mail/main.c
+@@ -36,6 +36,26 @@
  #include "mail.h"
  #include "mail-mt.h"
  
@@ -12,27 +12,29 @@ $NetBSD: patch-ab,v 1.3 2002/03/26 20:50:13 rh Exp $
 +#include <pthread.h>
 +
 +/*
-+ * NetBSD uses non-preemptive pth, so we yield the processor periodically
++ * Pth is non-preemptive, so we yield the processor periodically
 + */
 +
-+gint
++#ifdef _PTH_PTHREAD_H_
++static gint
 +pth_nbschedule (gpointer data)
 +{
-+	pthread_yield_np();
++	sched_yield();
 +
 +	return TRUE;
 +}
-+#endif
++#endif /* _PTH_PTHREAD_H_ */
++#endif /* __NetBSD__ */
 +
  /*#define DO_MCHECK*/
  
  #ifdef DO_MCHECK
-@@ -152,6 +170,10 @@
+@@ -152,6 +172,10 @@ main (int argc, char *argv [])
  		g_mutex_free (gdk_threads_mutex);
  		gdk_threads_mutex = NULL;
  	}
 +
-+#ifdef __NetBSD__
++#ifdef _PTH_PTHREAD_H_
 +	gtk_timeout_add (200, pth_nbschedule, NULL);
 +#endif
  
diff --git a/mail/evolution/patches/patch-ac b/mail/evolution/patches/patch-ac
index 6ff26307d2d..55b018a85c5 100644
--- a/mail/evolution/patches/patch-ac
+++ b/mail/evolution/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2002/03/16 07:31:26 rh Exp $
+$NetBSD: patch-ac,v 1.5 2002/10/11 09:29:59 rh Exp $
 
---- shell/main.c.orig	Sat Dec 15 07:21:56 2001
+--- shell/main.c.orig	Tue Dec 18 02:21:02 2001
 +++ shell/main.c
-@@ -63,6 +63,23 @@
+@@ -63,6 +63,25 @@ static char *evolution_directory = NULL;
  static gboolean no_splash = FALSE;
  extern char *evolution_debug_log;
  
@@ -11,38 +11,40 @@ $NetBSD: patch-ac,v 1.4 2002/03/16 07:31:26 rh Exp $
 +#include <pthread.h>
 +
 +/*
-+ * NetBSD uses non-preemptive pth, so we yield the processor periodically
++ * Pth is non-preemptive, so we yield the processor periodically
 + */
 +
-+gint
++#ifdef _PTH_PTHREAD_H_
++static gint
 +pth_nbschedule (gpointer data)
 +{
-+	pthread_yield_np();
++	sched_yield();
 +
 +	return TRUE;
 +}
-+#endif
++#endif /* _PTH_PTHREAD_H_ */
++#endif /* __NetBSD__ */
 +
  
  static GtkWidget *
  quit_box_new (void)
-@@ -190,6 +207,10 @@
+@@ -190,6 +209,10 @@ idle_cb (void *data)
  
  	uri_list = (GSList *) data;
  
-+#ifdef __NetBSD__
-+	pthread_yield_np();
++#ifdef _PTH_PTHREAD_H_
++	sched_yield();
 +#endif
 +
  	shell = e_shell_new (evolution_directory, ! no_splash, &result);
  	g_free (evolution_directory);
  
-@@ -350,6 +371,10 @@
+@@ -350,6 +373,10 @@ main (int argc, char **argv)
  	}
  
  	gtk_idle_add (idle_cb, uri_list);
 +
-+#ifdef __NetBSD__
++#ifdef _PTH_PTHREAD_H_
 +	gtk_timeout_add (200, pth_nbschedule, NULL);
 +#endif