x11/gnustep-preferences: Fix objc errors

Importing some headers and aligning prototypes fixed what was ailing with
gnustep-preferences.  This was failing on multiple platforms.

4 files changed, 44 insertions, 5 deletions

diff --git a/x11/gnustep-preferences/distinfo b/x11/gnustep-preferences/distinfo
index af34213d6ec..ba780fac31e 100644
--- a/x11/gnustep-preferences/distinfo
+++ b/x11/gnustep-preferences/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/12/28 07:56:38 adam Exp $
+$NetBSD: distinfo,v 1.6 2011/11/27 11:17:19 marino Exp $
 
 SHA1 (Preferences-1.2.0.tar.bz2) = eb6b727c4f9eac2fd55237b3a3dc95e00bf748e9
 RMD160 (Preferences-1.2.0.tar.bz2) = b94629b8a8d44cbbcf7c0a8bff775d89b6865bed
@@ -7,4 +7,6 @@ SHA1 (patch-aa) = ebe63b030deac8865addddcee8e577dd05dae515
 SHA1 (patch-ab) = b2e59ffd762d4e519aa1385a391ece62e92c8530
 SHA1 (patch-ac) = 7916a627f395a3b141d7cb1b07d7fb72f4d98da6
 SHA1 (patch-ad) = aee5e8ae6ba4546991a43c25e12b0bc8d9054139
-SHA1 (patch-ae) = 6859f82528a84a5b078721b2e93c82b347ce5f84
+SHA1 (patch-ae) = 1212d15284513cca93957ea377272761f3818eae
+SHA1 (patch-af) = 84d2c0124de8990ac7db112c01950760b2981037
+SHA1 (patch-ag) = c4170225e6043b078662ee3201fc4c3d2c75e6c1
diff --git a/x11/gnustep-preferences/patches/patch-ae b/x11/gnustep-preferences/patches/patch-ae
index 61af7dc1b79..e5922e4dd81 100644
--- a/x11/gnustep-preferences/patches/patch-ae
+++ b/x11/gnustep-preferences/patches/patch-ae
@@ -1,12 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2008/12/28 07:56:38 adam Exp $
+$NetBSD: patch-ae,v 1.2 2011/11/27 11:17:19 marino Exp $
 
---- Modules/PrefsApp/PrefsApp.m.orig	2008-12-28 08:41:52.000000000 +0100
+--- Modules/PrefsApp/PrefsApp.m.orig	2002-06-08 08:29:36.000000000 +0000
 +++ Modules/PrefsApp/PrefsApp.m
-@@ -37,6 +37,7 @@ static const char rcsid[] = 
+@@ -37,6 +37,8 @@ static const char rcsid[] =
  #import <Foundation/NSDebug.h>
  #import <Foundation/NSUserDefaults.h>
  #import <Foundation/NSValue.h>
 +#import <Foundation/NSEnumerator.h>
++#import <Foundation/NSDictionary.h>
  
  #import <AppKit/NSButton.h>
  #import <AppKit/NSNibLoading.h>
diff --git a/x11/gnustep-preferences/patches/patch-af b/x11/gnustep-preferences/patches/patch-af
new file mode 100644
index 00000000000..34091926436
--- /dev/null
+++ b/x11/gnustep-preferences/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2011/11/27 11:17:19 marino Exp $
+
+--- Modules/Keyboard/Keyboard.m.orig	2002-06-08 08:29:36.000000000 +0000
++++ Modules/Keyboard/Keyboard.m
+@@ -34,6 +34,9 @@ static const char rcsid[] =
+ # include "Config.h"
+ #endif
+ 
++#import <Foundation/NSDictionary.h>
++#import <Foundation/Foundation.h>
++
+ #import <AppKit/NSButton.h>
+ #import <AppKit/NSNibLoading.h>
+ #import <AppKit/NSOpenPanel.h>
diff --git a/x11/gnustep-preferences/patches/patch-ag b/x11/gnustep-preferences/patches/patch-ag
new file mode 100644
index 00000000000..06bc57812a5
--- /dev/null
+++ b/x11/gnustep-preferences/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2011/11/27 11:17:19 marino Exp $
+
+--- PrefsController.m.orig	2002-06-08 09:26:13.000000000 +0000
++++ PrefsController.m
+@@ -102,7 +102,7 @@ static id <PrefsModule>	currentModule =
+ {
+ }
+ 
+-- (BOOL) registerPrefsModule: (id <PrefsModule>) aPrefsModule;
++- (BOOL) registerPrefsModule: (id) aPrefsModule;
+ {
+ 	NSButtonCell	*button = [[NSButtonCell alloc] init];
+ 
+@@ -129,7 +129,7 @@ static id <PrefsModule>	currentModule =
+ 	return YES;
+ }
+ 
+-- (BOOL) setCurrentModule: (id <PrefsModule>) aPrefsModule;
++- (BOOL) setCurrentModule: (id) aPrefsModule;
+ {
+ 	if (!aPrefsModule || ![aPrefsModule view])
+ 		return NO;