Fix building with the latest GNUstep; PR #40211

4 files changed, 19 insertions, 7 deletions

diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index b2604c0cf55..517cb529395 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/06/21 22:54:04 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.32 2008/12/28 07:56:38 adam Exp $
 
 DISTNAME=	Preferences-1.2.0
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
@@ -17,7 +16,7 @@ USE_LANGUAGES=	objc
 NO_CONFIGURE=	YES
 USE_TOOLS+=	gmake
 MAKE_FILE=	GNUmakefile
-
+MAKE_JOBS_SAFE=	NO
 MAKE_FLAGS+=	GNUSTEP_USER_DIR=${WRKDIR}/fake_home/GNUstep
 
 .include "../../x11/gnustep-back/buildlink3.mk"
diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk
index d9b3621446e..ec219c8f21c 100644
--- a/x11/gnustep-preferences/buildlink3.mk
+++ b/x11/gnustep-preferences/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2008/01/18 05:09:55 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2008/12/28 07:56:38 adam Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNUSTEP_PREFERENCES_BUILDLINK3_MK:=	${GNUSTEP_PREFERENCES_BUILDLINK3_MK}+
@@ -13,10 +13,10 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-preferences
 
 .if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
-BUILDLINK_ABI_DEPENDS.gnustep-preferences?=	gnustep-preferences>=1.2.0nb16
+BUILDLINK_ABI_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0nb16
 BUILDLINK_PKGSRCDIR.gnustep-preferences?=	../../x11/gnustep-preferences
 .endif	# GNUSTEP_PREFERENCES_BUILDLINK3_MK
 
-#.include "../../x11/gnustep-back/buildlink3.mk"
+.include "../../x11/gnustep-back/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnustep-preferences/distinfo b/x11/gnustep-preferences/distinfo
index f7f396593cb..af34213d6ec 100644
--- a/x11/gnustep-preferences/distinfo
+++ b/x11/gnustep-preferences/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:11 wiz Exp $
+$NetBSD: distinfo,v 1.5 2008/12/28 07:56:38 adam Exp $
 
 SHA1 (Preferences-1.2.0.tar.bz2) = eb6b727c4f9eac2fd55237b3a3dc95e00bf748e9
 RMD160 (Preferences-1.2.0.tar.bz2) = b94629b8a8d44cbbcf7c0a8bff775d89b6865bed
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = ebe63b030deac8865addddcee8e577dd05dae515
 SHA1 (patch-ab) = b2e59ffd762d4e519aa1385a391ece62e92c8530
 SHA1 (patch-ac) = 7916a627f395a3b141d7cb1b07d7fb72f4d98da6
 SHA1 (patch-ad) = aee5e8ae6ba4546991a43c25e12b0bc8d9054139
+SHA1 (patch-ae) = 6859f82528a84a5b078721b2e93c82b347ce5f84
diff --git a/x11/gnustep-preferences/patches/patch-ae b/x11/gnustep-preferences/patches/patch-ae
new file mode 100644
index 00000000000..61af7dc1b79
--- /dev/null
+++ b/x11/gnustep-preferences/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2008/12/28 07:56:38 adam Exp $
+
+--- Modules/PrefsApp/PrefsApp.m.orig	2008-12-28 08:41:52.000000000 +0100
++++ Modules/PrefsApp/PrefsApp.m
+@@ -37,6 +37,7 @@ static const char rcsid[] = 
+ #import <Foundation/NSDebug.h>
+ #import <Foundation/NSUserDefaults.h>
+ #import <Foundation/NSValue.h>
++#import <Foundation/NSEnumerator.h>
+ 
+ #import <AppKit/NSButton.h>
+ #import <AppKit/NSNibLoading.h>