Make gnustep-examples compile with clang. Bump PKGREVISION.

5 files changed, 64 insertions, 3 deletions

diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index 34b367bbba0..4541426a05a 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2011/04/07 02:17:00 rh Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/22 02:39:53 rh Exp $
 #
 
 DISTNAME=	gnustep-examples-1.3.0
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -17,8 +18,8 @@ USE_LANGUAGES=	objc
 NO_CONFIGURE=	yes
 MAKE_FILE=	GNUmakefile
 
+.include "../../x11/gnustep-back/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gnustep-back/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnustep-examples/distinfo b/devel/gnustep-examples/distinfo
index 20eeefcca2a..2ea9de0fe24 100644
--- a/devel/gnustep-examples/distinfo
+++ b/devel/gnustep-examples/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/04/07 02:17:00 rh Exp $
+$NetBSD: distinfo,v 1.6 2012/10/22 02:39:53 rh Exp $
 
 SHA1 (gnustep-examples-1.3.0.tar.gz) = d3370b66b4c83a9920509e15af561a57d04594e6
 RMD160 (gnustep-examples-1.3.0.tar.gz) = f0b02657b97fdba230c0076a6e4100f196476d86
 Size (gnustep-examples-1.3.0.tar.gz) = 295888 bytes
+SHA1 (patch-aa) = e319f2dda7d024ccd293cdfb00b7cad51af8bac4
+SHA1 (patch-ab) = bcfafcaab05c542020373f9189eb69a365054c16
+SHA1 (patch-ac) = 1d6b7ec5b3f9c69be13c8b4b883be797f02ece3a
diff --git a/devel/gnustep-examples/patches/patch-aa b/devel/gnustep-examples/patches/patch-aa
new file mode 100644
index 00000000000..9b9a08deb8b
--- /dev/null
+++ b/devel/gnustep-examples/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1 2012/10/22 02:39:53 rh Exp $
+
+Remove duplicate instance variables from @implementation
+
+--- gui/Calculator/CalcBrain.m.orig	1999-10-07 20:48:52.000000000 +0000
++++ gui/Calculator/CalcBrain.m
+@@ -27,15 +27,7 @@
+ #include <math.h>
+ 
+ @implementation CalcBrain: NSObject
+-{
+-  CalcFace *face;
+-  double result;
+-  double enteredNumber;
+-  calcOperation operation;
+-  int fractionalDigits;
+-  BOOL decimalSeparator;
+-  BOOL editing;
+-}
++
+ -(id) init
+ {
+   [super init];
diff --git a/devel/gnustep-examples/patches/patch-ab b/devel/gnustep-examples/patches/patch-ab
new file mode 100644
index 00000000000..d290bdf23fc
--- /dev/null
+++ b/devel/gnustep-examples/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2012/10/22 02:39:53 rh Exp $
+
+Remove duplicate instance variables from @implementation
+
+--- gui/Calculator/CalcFace.m.orig	2001-01-22 00:54:30.000000000 +0000
++++ gui/Calculator/CalcFace.m
+@@ -30,10 +30,6 @@
+ //
+ 
+ @implementation CalcFace: NSWindow
+-{
+-  NSButton *buttons[18];
+-  NSTextField *display;
+-}
+ 
+ -(id)init
+ {
diff --git a/devel/gnustep-examples/patches/patch-ac b/devel/gnustep-examples/patches/patch-ac
new file mode 100644
index 00000000000..04515842faa
--- /dev/null
+++ b/devel/gnustep-examples/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2012/10/22 02:39:54 rh Exp $
+
+Remove duplicate instance variables from @implementation
+
+--- gui/GSTest/StringDrawing-test/StringDrawing-test.m.orig	2003-08-25 20:26:11.000000000 +0000
++++ gui/GSTest/StringDrawing-test/StringDrawing-test.m
+@@ -50,9 +50,7 @@
+ @end
+ 
+ @implementation TrivialTextView: NSView
+-{
+-  NSAttributedString *attr;
+-}
++
+ -(void) dealloc
+ {
+   TEST_RELEASE (attr);