Work around a bug in pth that breaks a non-threaded applications that are

linked against SYSCALL_HARD versions of libpthread.
Add an openapp wrapper script to ${PREFIX}bin for starting GNUstep apps
Bump pkgrevision

6 files changed, 35 insertions, 9 deletions

diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 24d428eb463..86f44ab3921 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/27 10:58:42 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/27 23:56:30 rh Exp $
 #
 
 DISTNAME=		gnustep-base-1.5.0
+PKGREVISION=		1
 CATEGORIES=		devel gnustep
 MASTER_SITES=		ftp://ftp.gnustep.org/pub/gnustep/core/
 
@@ -17,7 +18,12 @@ GNU_CONFIGURE=		YES
 GNU_CONFIGURE_PREFIX=	${PREFIX}/share/GNUstep
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
 CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
-LIBS+=			-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthread
+
+pre-configure:
+	${SED} 's|@PREFIX@|${PREFIX}|g' <${FILESDIR}/openapp >${WRKDIR}/openapp
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/openapp ${PREFIX}/bin
 
 .include "../../devel/gmp/buildlink2.mk"
 .include "../../devel/ffcall/buildlink2.mk"
diff --git a/devel/gnustep-base/PLIST b/devel/gnustep-base/PLIST
index 20c5d42a37b..55ce2e04fe5 100644
--- a/devel/gnustep-base/PLIST
+++ b/devel/gnustep-base/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/27 10:58:43 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/27 23:56:30 rh Exp $
+bin/openapp
 share/GNUstep/System/Headers/Foundation/Foundation.h
 share/GNUstep/System/Headers/Foundation/GSMime.h
 share/GNUstep/System/Headers/Foundation/GSXML.h
diff --git a/devel/gnustep-base/buildlink2.mk b/devel/gnustep-base/buildlink2.mk
index ca0b7188ae0..e80559d7ec5 100644
--- a/devel/gnustep-base/buildlink2.mk
+++ b/devel/gnustep-base/buildlink2.mk
@@ -1,8 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/27 10:58:44 rh Exp $
-#
-# This Makefile fragment is included by packages that use gnustep-base.
-#
-# This file was created automatically using createbuildlink 2.0.
+# $NetBSD: buildlink2.mk,v 1.2 2002/09/27 23:56:30 rh Exp $
 #
 
 .if !defined(GNUSTEP_BASE_BUILDLINK2_MK)
@@ -15,6 +11,9 @@ BUILDLINK_PKGSRCDIR.gnustep-base?=	../../devel/gnustep-base
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnustep-base=gnustep-base
 BUILDLINK_PREFIX.gnustep-base_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.gnustep-base=	share/GNUstep/System/Headers/Foundation/*
+BUILDLINK_FILES.gnustep-base+=	share/GNUstep/System/Headers/gnustep/base/*
+BUILDLINK_FILES.gnustep-base+=	share/GNUstep/System/Headers/gnustep/unicode/*
+BUILDLINK_FILES.gnustep-base+=	share/GNUstep/System/Headers/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/*
 BUILDLINK_FILES.gnustep-base+=	share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libgnustep-base.*
 
 .include "../../devel/gmp/buildlink2.mk"
diff --git a/devel/gnustep-base/distinfo b/devel/gnustep-base/distinfo
index 89bc824b378..83ee5d46748 100644
--- a/devel/gnustep-base/distinfo
+++ b/devel/gnustep-base/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/27 10:58:43 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/09/27 23:56:30 rh Exp $
 
 SHA1 (gnustep-base-1.5.0.tar.gz) = 8dcb1ddd2a0b04e4fe476b3f03380eb75b1d5944
 Size (gnustep-base-1.5.0.tar.gz) = 1481162 bytes
 SHA1 (patch-aa) = 94e38e52508ffb63fcbbbf0d4d65bf8e0a938e55
+SHA1 (patch-ab) = 7bdb0872bcc26f805137602411ef592abf28d30d
diff --git a/devel/gnustep-base/files/openapp b/devel/gnustep-base/files/openapp
new file mode 100644
index 00000000000..922e8f98e73
--- /dev/null
+++ b/devel/gnustep-base/files/openapp
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+#	$NetBSD: openapp,v 1.1 2002/09/27 23:56:30 rh Exp $
+#
+# GNUstep openapp wrapper
+. @PREFIX@/share/GNUstep/System/Makefiles/GNUstep.sh
+@PREFIX@/share/GNUstep/System/Tools/openapp "$@"
diff --git a/devel/gnustep-base/patches/patch-ab b/devel/gnustep-base/patches/patch-ab
new file mode 100644
index 00000000000..e5b59f56458
--- /dev/null
+++ b/devel/gnustep-base/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2002/09/27 23:56:30 rh Exp $
+
+--- base.make.in.orig	Thu Jun 27 00:34:16 2002
++++ base.make.in
+@@ -40,6 +40,7 @@ ifeq ($(FOUNDATION_LIB),gnu)
+ 
+   FND_LDFLAGS =
+   FND_LIBS = -lgnustep-base
++  OBJC_LIBS = -lobjc -lpthread -lpth
+   FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
+   GNUSTEP_DEFINE = -DGNUSTEP
+   # If gc=yes was passed, use the appropriate library and defines