[pkgsrc/trunk]: pkgsrc/x11/gnustep-gui Don't override IBOutlet and IBAction o...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6dcdcf24f85f
branches:  trunk
changeset: 616278:6dcdcf24f85f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Mar 23 12:20:43 2013 +0000

description:
Don't override IBOutlet and IBAction on NetBSD, the compiler has them
already. Bump revision.

diffstat:

 x11/gnustep-gui/Makefile                                         |   4 +-
 x11/gnustep-gui/distinfo                                         |   3 +-
 x11/gnustep-gui/patches/patch-Headers_AppKit_NSNibDeclarations.h |  13 ++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 7f6c11b7f274 -r 6dcdcf24f85f x11/gnustep-gui/Makefile
--- a/x11/gnustep-gui/Makefile  Sat Mar 23 12:19:14 2013 +0000
+++ b/x11/gnustep-gui/Makefile  Sat Mar 23 12:20:43 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2013/02/16 11:25:02 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2013/03/23 12:20:43 joerg Exp $
 
 DISTNAME=      gnustep-gui-0.22.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11 gnustep
 MASTER_SITES=  ${MASTER_SITE_GNUSTEP:=core/}
 
diff -r 7f6c11b7f274 -r 6dcdcf24f85f x11/gnustep-gui/distinfo
--- a/x11/gnustep-gui/distinfo  Sat Mar 23 12:19:14 2013 +0000
+++ b/x11/gnustep-gui/distinfo  Sat Mar 23 12:20:43 2013 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.24 2013/02/26 23:35:24 joerg Exp $
+$NetBSD: distinfo,v 1.25 2013/03/23 12:20:43 joerg Exp $
 
 SHA1 (gnustep-gui-0.22.0.tar.gz) = dc9654ea3437810a9b4bfd3d2193a25628a88b41
 RMD160 (gnustep-gui-0.22.0.tar.gz) = 20153480d712a148e9e504f09273f70e1ba2f6d2
 Size (gnustep-gui-0.22.0.tar.gz) = 2734733 bytes
+SHA1 (patch-Headers_AppKit_NSNibDeclarations.h) = 6195f4771b515b20a7bdf998c2f2eec37b5fb856
 SHA1 (patch-Source_NSBitmapImageRep+PNG.m) = 089f3bbb54f1fb3449cf34d69e09a82fb4dffc59
diff -r 7f6c11b7f274 -r 6dcdcf24f85f x11/gnustep-gui/patches/patch-Headers_AppKit_NSNibDeclarations.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnustep-gui/patches/patch-Headers_AppKit_NSNibDeclarations.h  Sat Mar 23 12:20:43 2013 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-Headers_AppKit_NSNibDeclarations.h,v 1.1 2013/03/23 12:20:43 joerg Exp $
+
+--- Headers/AppKit/NSNibDeclarations.h.orig    2013-03-23 11:48:31.000000000 +0000
++++ Headers/AppKit/NSNibDeclarations.h
+@@ -32,7 +32,7 @@
+ #define _NSNibDeclarations_H_
+ #import <GNUstepBase/GSVersionMacros.h>
+ 
+-#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
++#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) && !defined(__NetBSD__)
+ #define IBOutlet
+ #define IBAction void
+ #endif