Make this work with native NetBSD threads.

Bump PKGREVISION.

4 files changed, 34 insertions, 11 deletions

diff --git a/devel/gnustep-objc/Makefile b/devel/gnustep-objc/Makefile
index b3899bacc72..e80d40fee99 100644
--- a/devel/gnustep-objc/Makefile
+++ b/devel/gnustep-objc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/27 10:44:47 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/21 12:41:26 rh Exp $
 #
 
 DISTNAME=	gnustep-objc-1.2.2
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/libs/
 
diff --git a/devel/gnustep-objc/buildlink2.mk b/devel/gnustep-objc/buildlink2.mk
index d821ed5a0d8..4efbc3e7ff4 100644
--- a/devel/gnustep-objc/buildlink2.mk
+++ b/devel/gnustep-objc/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/27 10:44:47 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/01/21 12:41:26 rh Exp $
 #
 
 .if !defined(GNUSTEP_OBJC_BUILDLINK2_MK)
 GNUSTEP_OBJC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnustep-objc
-BUILDLINK_DEPENDS.gnustep-objc?=		gnustep-objc>=1.2.2
+BUILDLINK_DEPENDS.gnustep-objc?=		gnustep-objc>1.2.2
 BUILDLINK_PKGSRCDIR.gnustep-objc?=		../../devel/gnustep-objc
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnustep-objc=gnustep-objc
diff --git a/devel/gnustep-objc/distinfo b/devel/gnustep-objc/distinfo
index 2f8a3e1e265..f301095486c 100644
--- a/devel/gnustep-objc/distinfo
+++ b/devel/gnustep-objc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/27 10:44:47 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/01/21 12:41:26 rh Exp $
 
 SHA1 (gnustep-objc-1.2.2.tar.gz) = fea6e13e476e7fbfe52d69f9d90e88d2e2f02c2f
 Size (gnustep-objc-1.2.2.tar.gz) = 119390 bytes
-SHA1 (patch-aa) = f3084143606f1ad238867324a723da4c7b52be43
+SHA1 (patch-aa) = ef2ef0e1b015d4a5a97b099628153e9fbb16b0fb
diff --git a/devel/gnustep-objc/patches/patch-aa b/devel/gnustep-objc/patches/patch-aa
index 21ff1d34201..665a73dd6ad 100644
--- a/devel/gnustep-objc/patches/patch-aa
+++ b/devel/gnustep-objc/patches/patch-aa
@@ -1,24 +1,42 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/27 10:44:47 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/21 12:41:27 rh Exp $
 
 --- thr-posix.c.orig	Sat May  5 03:23:21 2001
 +++ thr-posix.c
-@@ -96,6 +96,7 @@ __objc_thread_detach(void (*func)(void *
+@@ -96,12 +96,17 @@ __objc_thread_detach(void (*func)(void *
  int
  __objc_thread_set_priority(int priority)
  {
 +#ifndef _PTH_PTHREAD_H_
    pthread_t thread_id = pthread_self();
-   int policy;
+-  int policy;
++  int policy = 0;
    struct sched_param params;
-@@ -123,6 +124,7 @@ __objc_thread_set_priority(int priority)
+   int priority_min, priority_max;
+ 
++#ifdef __NetBSD__
++  if (pthread_attr_getschedparam(&_objc_thread_attribs, &params) == 0)
++#else
+   if (pthread_getschedparam(thread_id, &policy, &params) == 0)
++#endif
+     {
+       if ((priority_max = sched_get_priority_max(policy)) != 0)
+         return -1;
+@@ -120,9 +125,14 @@ __objc_thread_set_priority(int priority)
+        * this should be a pointer to policy but pthread.h is universally
+        * at odds with this.
+        */
++#ifdef __NetBSD__
++      if (pthread_attr_setschedparam(&_objc_thread_attribs, &params) == 0)
++#else
        if (pthread_setschedparam(thread_id, policy, &params) == 0)
++#endif
          return 0;
      }
 +#endif
    return -1;
  }
  
-@@ -130,6 +132,12 @@ __objc_thread_set_priority(int priority)
+@@ -130,13 +140,24 @@ __objc_thread_set_priority(int priority)
  int
  __objc_thread_get_priority(void)
  {
@@ -31,7 +49,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/09/27 10:44:47 rh Exp $
    int policy;
    struct sched_param params;
  
-@@ -137,6 +145,7 @@ __objc_thread_get_priority(void)
++#ifdef __NetBSD__
++  if (pthread_attr_getschedparam(&_objc_thread_attribs, &params) == 0)
++#else
+   if (pthread_getschedparam(pthread_self(), &policy, &params) == 0)
++#endif
      return params.sched_priority;
    else
      return -1;