Remove some unnecessary stuff now that pth is --enable-syscall-hard.

Bump PKGREVISION.

OK'd by Rene.

5 files changed, 7 insertions, 88 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 8eb4b74772a..16afcc78f21 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2002/10/14 09:46:59 rh Exp $
+# $NetBSD: Makefile,v 1.37 2002/10/25 08:59:04 skrll Exp $
 #
 
 DISTNAME=	xmms-1.2.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index ffff4fb3838..349fbe71ca9 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/10/14 09:46:59 rh Exp $
+$NetBSD: distinfo,v 1.11 2002/10/25 08:59:04 skrll Exp $
 
 SHA1 (xmms-1.2.7.tar.gz) = 2f910d88af9bb5e8d54e796653beef969b555c68
 Size (xmms-1.2.7.tar.gz) = 2860908 bytes
@@ -6,11 +6,10 @@ SHA1 (patch-aa) = b1945d9d161cc538e5dda1014571f582be1a951c
 SHA1 (patch-ab) = 6f236de07dcd7ce8a2325effe038e42ea4222250
 SHA1 (patch-ac) = 4c3dc43fd83bacfacd376235d3723aeee96570f2
 SHA1 (patch-ad) = 7645b1a2bbb338c9bea8b2015d5763486f77d16a
-SHA1 (patch-ae) = 1e486f43bfe8dbafbbea3db3781ec08196184ee2
 SHA1 (patch-af) = 472e2504fae530b34785e18d38d6f45891494a6d
 SHA1 (patch-ag) = 24a56ba54752994806518872d03709559f5ac620
-SHA1 (patch-ah) = 1c83d665d2473692a3a9feae625f48c420849d6a
-SHA1 (patch-ai) = 5d22db1a133b3580d6fb241835a30259567b838a
+SHA1 (patch-ah) = 3d03813b29a1d0fe734c209e707264551ecd7138
+SHA1 (patch-ai) = 26f4c8b4addbd58b585ba3f1c9885228805bdfe3
 SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
 SHA1 (patch-ak) = 83f26d8d0a80def2ee28aa09f3261ff97d019dbf
 SHA1 (patch-al) = caae7feb9ddc7a1d51c734b5f9a1eb669279066e
diff --git a/audio/xmms/patches/patch-ae b/audio/xmms/patches/patch-ae
deleted file mode 100644
index 31eb8444105..00000000000
--- a/audio/xmms/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2001/05/06 18:23:52 rh Exp $
-
---- libxmms/xmmsctrl.c.orig	Sun May  6 19:29:48 2001
-+++ libxmms/xmmsctrl.c
-@@ -18,6 +18,7 @@
- 
- #include <glib.h>
- #include <sys/types.h>
-+#include <pthread.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
- #include <sys/un.h>
diff --git a/audio/xmms/patches/patch-ah b/audio/xmms/patches/patch-ah
index d2633b6f238..80be912013c 100644
--- a/audio/xmms/patches/patch-ah
+++ b/audio/xmms/patches/patch-ah
@@ -1,18 +1,7 @@
-$NetBSD: patch-ah,v 1.4 2001/08/11 20:48:46 fredb Exp $
+$NetBSD: patch-ah,v 1.5 2002/10/25 08:59:05 skrll Exp $
 
 --- libxmms/util.c.orig	Fri Jun  1 08:07:49 2001
 +++ libxmms/util.c
-@@ -32,6 +32,10 @@
- # endif
- #endif
- 
-+#ifdef __NetBSD__
-+#include <pthread.h>
-+#endif
-+
- 
- GtkWidget *xmms_show_message(gchar * title, gchar * text, gchar * button_text, gboolean modal, GtkSignalFunc button_action, gpointer action_data)
- {
 @@ -72,7 +76,7 @@
  
  gboolean xmms_check_realtime_priority(void)
@@ -22,26 +11,3 @@ $NetBSD: patch-ah,v 1.4 2001/08/11 20:48:46 fredb Exp $
  #ifdef __FreeBSD__
  	/*
  	 * Check if priority scheduling is enabled in the kernel
-@@ -98,11 +102,22 @@
- #ifdef HAVE_NANOSLEEP
- 	struct timespec req;
- 
-+#ifdef __NetBSD__
-+	unsigned long n = usec / 50000;
-+	usec %= 50000;
-+	do {
-+#endif
-+
- 	req.tv_sec = usec / 1000000;
- 	usec -= req.tv_sec * 1000000;
- 	req.tv_nsec = usec * 1000;
- 
- 	nanosleep(&req, NULL);
-+
-+#ifdef __NetBSD__
-+	pthread_yield_np();
-+	} while (n--);
-+#endif
- #else
- 	struct timeval tv;
- 	
diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai
index b9854e37e68..80c904eb001 100644
--- a/audio/xmms/patches/patch-ai
+++ b/audio/xmms/patches/patch-ai
@@ -1,31 +1,7 @@
-$NetBSD: patch-ai,v 1.5 2002/03/21 18:52:31 drochner Exp $
+$NetBSD: patch-ai,v 1.6 2002/10/25 08:59:05 skrll Exp $
 
 --- xmms/main.c.orig	Wed Feb 27 15:30:28 2002
 +++ xmms/main.c	Thu Mar 21 12:58:10 2002
-@@ -37,6 +37,23 @@
- #include "libxmms/dirbrowser.h"
- #include "xmms_mini.xpm"
- 
-+#ifdef __NetBSD__
-+#include <gtk/gtk.h>
-+#include <pthread.h>
-+
-+/*
-+ * NetBSD uses non-preemptive pth, so we yield the processor periodically
-+ */
-+
-+gint
-+pth_nbschedule (gpointer data)
-+{
-+	pthread_yield_np();
-+
-+	return TRUE;
-+}
-+#endif
-+
- GtkWidget *mainwin, *mainwin_url_window = NULL, *mainwin_dir_browser = NULL;
- GtkWidget *mainwin_jtt = NULL, *mainwin_jtf = NULL;
- GtkItemFactory *mainwin_options_menu, *mainwin_songname_menu, *mainwin_vis_menu;
 @@ -3377,7 +3394,7 @@
  {
  	gchar *filename;
@@ -44,13 +20,3 @@ $NetBSD: patch-ai,v 1.5 2002/03/21 18:52:31 drochner Exp $
  		if (cfg.use_realtime)
  		{
  			sparam.sched_priority = sched_get_priority_max(SCHED_RR);
-@@ -3501,6 +3518,9 @@
- 	/* enable_x11r5_session_management(argc, argv); */
- 	sm_init(argc, argv);
- 	GDK_THREADS_LEAVE();
-+#ifdef __NetBSD__
-+	gtk_timeout_add (150, pth_nbschedule, NULL);
-+#endif
- 	gtk_main();
- 
- 	return 0;