5 files changed, 45 insertions, 87 deletions
diff --git a/devel/gnustep-objc/Makefile b/devel/gnustep-objc/Makefile
index 7f28442f91e..3a068e953d2 100644
--- a/devel/gnustep-objc/Makefile
+++ b/devel/gnustep-objc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/09/09 02:41:57 obache Exp $
+# $NetBSD: Makefile,v 1.16 2009/04/13 12:12:44 rh Exp $
 #
 
-DISTNAME=	gnustep-objc-1.3.0
-PKGREVISION=	1
+DISTNAME=	gnustep-objc-1.6.0
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=libs/}
 
@@ -10,9 +9,14 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	Objective-C runtime
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+LICENSE=		gnu-gpl-v3
+
 USE_LANGUAGES=	objc
 USE_TOOLS+=	gmake
 MAKE_FILE=	GNUmakefile
+MAKE_ENV+=	ADDITIONAL_LDFLAGS=-lpthread
 NO_CONFIGURE=	YES
 
 .include "../../devel/gnustep-make/buildlink3.mk"
diff --git a/devel/gnustep-objc/PLIST b/devel/gnustep-objc/PLIST
index d8a652e9d6f..ea5ddcb6d01 100644
--- a/devel/gnustep-objc/PLIST
+++ b/devel/gnustep-objc/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/05 09:22:26 adam Exp $
-share/GNUstep/System/Library/Headers/objc/NXConstStr.h
-share/GNUstep/System/Library/Headers/objc/Object.h
-share/GNUstep/System/Library/Headers/objc/Protocol.h
-share/GNUstep/System/Library/Headers/objc/encoding.h
-share/GNUstep/System/Library/Headers/objc/hash.h
-share/GNUstep/System/Library/Headers/objc/objc-api.h
-share/GNUstep/System/Library/Headers/objc/objc-decls.h
-share/GNUstep/System/Library/Headers/objc/objc-list.h
-share/GNUstep/System/Library/Headers/objc/objc.h
-share/GNUstep/System/Library/Headers/objc/sarray.h
-share/GNUstep/System/Library/Headers/objc/thr.h
-share/GNUstep/System/Library/Headers/objc/typedstream.h
-share/GNUstep/System/Library/Libraries/libobjc.so
-share/GNUstep/System/Library/Libraries/libobjc.so.${PKGVERSION}
-@dirrm share/GNUstep/System/Library/Headers/objc
+@comment $NetBSD: PLIST,v 1.3 2009/04/13 12:12:44 rh Exp $
+include/objc/NXConstStr.h
+include/objc/Object.h
+include/objc/Protocol.h
+include/objc/encoding.h
+include/objc/hash.h
+include/objc/objc-api.h
+include/objc/objc-decls.h
+include/objc/objc-list.h
+include/objc/objc.h
+include/objc/sarray.h
+include/objc/thr.h
+include/objc/typedstream.h
+lib/libobjc.so
+lib/libobjc.so.${PKGVERSION}
+@dirrm include/objc
diff --git a/devel/gnustep-objc/buildlink3.mk b/devel/gnustep-objc/buildlink3.mk
index 78628242f88..94ee04bed32 100644
--- a/devel/gnustep-objc/buildlink3.mk
+++ b/devel/gnustep-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/04/13 12:12:44 rh Exp $
 
 BUILDLINK_TREE+=	gnustep-objc
 
@@ -9,6 +9,11 @@ BUILDLINK_API_DEPENDS.gnustep-objc+=	gnustep-objc>=1.3.0
 BUILDLINK_ABI_DEPENDS.gnustep-objc?=	gnustep-objc>=1.3.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-objc?=	../../devel/gnustep-objc
 
+BUILDLINK_LDFLAGS.gnustep-objc+=	-lobjc -lpthread
+
+PRINT_PLIST_AWK+=	/^@dirrm include\/objc$$/ { print "@comment in devel/gnustep-objc: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/include\/objc$$/ { next; }
+
 .include "../../devel/gnustep-make/buildlink3.mk"
 .endif # GNUSTEP_OBJC_BUILDLINK3_MK
 
diff --git a/devel/gnustep-objc/distinfo b/devel/gnustep-objc/distinfo
index 17ce999e9d1..640aa80ef09 100644
--- a/devel/gnustep-objc/distinfo
+++ b/devel/gnustep-objc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:15 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/04/13 12:12:44 rh Exp $
 
-SHA1 (gnustep-objc-1.3.0.tar.gz) = 9c4002d52f1c9e1dd9238f25f1391be47c2bdefd
-RMD160 (gnustep-objc-1.3.0.tar.gz) = 55c420734d05dc8c54ca0774e13eada1a3216278
-Size (gnustep-objc-1.3.0.tar.gz) = 135408 bytes
-SHA1 (patch-aa) = ef2ef0e1b015d4a5a97b099628153e9fbb16b0fb
+SHA1 (gnustep-objc-1.6.0.tar.gz) = 6577ae955bcd1ec5ab65db570800053f78e3767a
+RMD160 (gnustep-objc-1.6.0.tar.gz) = 6eaec5ef3ce0857f07c4038f1cc6cced9d845e53
+Size (gnustep-objc-1.6.0.tar.gz) = 169586 bytes
+SHA1 (patch-aa) = d40bf234cd97d85137dc13c740c3e80b1e8b8fd6
diff --git a/devel/gnustep-objc/patches/patch-aa b/devel/gnustep-objc/patches/patch-aa
index 665a73dd6ad..de5e9772b05 100644
--- a/devel/gnustep-objc/patches/patch-aa
+++ b/devel/gnustep-objc/patches/patch-aa
@@ -1,63 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2003/01/21 12:41:27 rh Exp $
+$NetBSD: patch-aa,v 1.3 2009/04/13 12:12:44 rh Exp $
 
---- thr-posix.c.orig	Sat May  5 03:23:21 2001
-+++ thr-posix.c
-@@ -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 = 0;
-   struct sched_param params;
-   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,13 +140,24 @@ __objc_thread_set_priority(int priority)
- int
- __objc_thread_get_priority(void)
- {
-+#ifdef _PTH_PTHREAD_H_
-+  int prio = -1;
-+
-+  pthread_attr_getprio_np(&_objc_thread_attribs, &prio);
-+  return prio;
-+#else
-   int policy;
-   struct sched_param params;
- 
-+#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;
-+#endif
- }
- 
- /* Yield our process time to another thread. */
+--- GNUmakefile.orig	2007-05-08 13:41:50.000000000 +1000
++++ GNUmakefile
+@@ -49,7 +49,6 @@ CLIBRARY_NAME = libobjc
+ # dce, decosf1, irix, mach, os2, posix, pthreads, single, solaris, vxworks
+ THREADING = posix
+ ifeq ($(GNUSTEP_TARGET_OS),netbsdelf)
+-ADDITIONAL_CPPFLAGS += -DMISSING_SCHED_PARAM_STRUCT
+ endif
+ ifeq ($(GNUSTEP_TARGET_OS),mingw32)
+ THREADING = win32