diff options
| author | rh <rh> | 2002-10-27 07:53:58 +0000 |
|---|---|---|
| committer | rh <rh> | 2002-10-27 07:53:58 +0000 |
| commit | 2567893444fd4e5058bdeb5c1aaeeb6d8c8dce97 (patch) | |
| tree | 7e1907740a58f720904a6c3a51732c72b8f0dd0d /net | |
| parent | fd64c56bb84161026bcc799618b6eaffa35aa303 (diff) | |
| download | pkgsrc-2567893444fd4e5058bdeb5c1aaeeb6d8c8dce97.tar.gz | |
Check for pth, not NetBSD, so this compiles with native threads.
Bump PKGREVISION.
Diffstat (limited to 'net')
| -rw-r--r-- | net/gftp/Makefile | 3 | ||||
| -rw-r--r-- | net/gftp/distinfo | 4 | ||||
| -rw-r--r-- | net/gftp/patches/patch-ab | 19 |
3 files changed, 15 insertions, 11 deletions
diff --git a/net/gftp/Makefile b/net/gftp/Makefile index df78c0743e9..4dd854da714 100644 --- a/net/gftp/Makefile +++ b/net/gftp/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2002/10/21 15:07:22 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/10/27 07:53:58 rh Exp $ DISTNAME= gftp-2.0.8 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://gftp.seul.org/ \ ftp://gftp.seul.org/pub/gftp/ \ diff --git a/net/gftp/distinfo b/net/gftp/distinfo index f09db736657..5f0dbf2061a 100644 --- a/net/gftp/distinfo +++ b/net/gftp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/05/15 07:56:44 rh Exp $ +$NetBSD: distinfo,v 1.3 2002/10/27 07:53:58 rh Exp $ SHA1 (gftp-2.0.8.tar.gz) = 67a93e1b2e6f67a19bb8b6429be99e1870e57430 Size (gftp-2.0.8.tar.gz) = 786985 bytes SHA1 (patch-aa) = dc1720a8d18c2fcbdc45832431d6d68a4501c0ae -SHA1 (patch-ab) = 629fdd242045ae82b9bc44413767735d1762ac03 +SHA1 (patch-ab) = 71780f1a5e110e2e61889778e65f5ff92e086af4 diff --git a/net/gftp/patches/patch-ab b/net/gftp/patches/patch-ab index 8dc2c447b34..c57be046307 100644 --- a/net/gftp/patches/patch-ab +++ b/net/gftp/patches/patch-ab @@ -1,35 +1,38 @@ -$NetBSD: patch-ab,v 1.2 2001/05/15 07:56:44 rh Exp $ +$NetBSD: patch-ab,v 1.3 2002/10/27 07:53:58 rh Exp $ ---- src/gtk/gftp-gtk.c.orig Fri Mar 30 04:53:01 2001 +--- src/gtk/gftp-gtk.c.orig Fri Mar 30 12:53:01 2001 +++ src/gtk/gftp-gtk.c -@@ -68,6 +68,21 @@ +@@ -68,6 +68,24 @@ GtkItemFactory * factory = NULL; pthread_mutex_t transfer_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t log_mutex = PTHREAD_MUTEX_INITIALIZER; +#ifdef __NetBSD__ -+#include <gtk/gtk.h> +#include <pthread.h> + ++#ifdef _PTH_PTHREAD_H_ ++#include <gtk/gtk.h> ++ +/* -+ * NetBSD uses non-preemptive pth, so we yield the processor periodically ++ * Pth is non-preemptive, so we yield the processor periodically + */ +gint +pth_nbschedule (gpointer data) +{ -+ pthread_yield_np(); ++ sched_yield(); + return TRUE; +} +#endif ++#endif + int main (int argc, char *argv[]) { -@@ -119,6 +134,10 @@ +@@ -119,6 +137,10 @@ main (int argc, char *argv[]) gftp_set_directory (window1.request, startup_directory); gftp_connect (window1.request); ftp_list_files (&window1, 0); + -+#ifdef __NetBSD__ ++#ifdef _PTH_PTHREAD_H_ + gtk_timeout_add (200, pth_nbschedule, NULL); +#endif |