[pkgsrc/trunk]: pkgsrc/devel/ObjectiveLib Make ObjectiveLib compile with libo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/598c7b9588c8
branches:  trunk
changeset: 610388:598c7b9588c8
user:      rh <rh%pkgsrc.org@localhost>
date:      Mon Oct 22 22:10:14 2012 +0000

description:
Make ObjectiveLib compile with libobjc2.  Bump PKGREVISION

diffstat:

 devel/ObjectiveLib/Makefile         |   3 ++-
 devel/ObjectiveLib/distinfo         |   4 +++-
 devel/ObjectiveLib/patches/patch-aa |  31 +++++++++++++++++++++++++++++++
 devel/ObjectiveLib/patches/patch-ab |  15 +++++++++++++++
 4 files changed, 51 insertions(+), 2 deletions(-)

diffs (80 lines):

diff -r 121b4906efc8 -r 598c7b9588c8 devel/ObjectiveLib/Makefile
--- a/devel/ObjectiveLib/Makefile       Mon Oct 22 21:46:49 2012 +0000
+++ b/devel/ObjectiveLib/Makefile       Mon Oct 22 22:10:14 2012 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/22 22:10:14 rh Exp $
 #
 
 PKGNAME=       ObjectiveLib-1.0.0
 DISTNAME=      objectivelib-1.0.0
+PKGREVISION=   1
 CATEGORIES=    devel gnustep
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=objectivelib/}
 
diff -r 121b4906efc8 -r 598c7b9588c8 devel/ObjectiveLib/distinfo
--- a/devel/ObjectiveLib/distinfo       Mon Oct 22 21:46:49 2012 +0000
+++ b/devel/ObjectiveLib/distinfo       Mon Oct 22 22:10:14 2012 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/04/17 21:28:39 rh Exp $
+$NetBSD: distinfo,v 1.3 2012/10/22 22:10:14 rh Exp $
 
 SHA1 (objectivelib-1.0.0.tar.gz) = 904046406f63285d2a0e5f6b279f711b34e16ad6
 RMD160 (objectivelib-1.0.0.tar.gz) = 688b8430ea1a16482b52506157b58dedbfd35c0c
 Size (objectivelib-1.0.0.tar.gz) = 833390 bytes
+SHA1 (patch-aa) = 3604f398bba598878f731a19aab6ba55006b833d
+SHA1 (patch-ab) = bceb865ac5c72d47dfa219411836c047bfae1510
diff -r 121b4906efc8 -r 598c7b9588c8 devel/ObjectiveLib/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ObjectiveLib/patches/patch-aa       Mon Oct 22 22:10:14 2012 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2012/10/22 22:10:15 rh Exp $
+
+Make this compile with libobjc2.
+
+--- ObjectOutStream.m.orig     2007-03-25 18:12:15.000000000 +0000
++++ ObjectOutStream.m
+@@ -257,11 +257,11 @@
+         {
+             [pointerMap assign: cls];
+             [stream writeByte: WIRE_TYPE_CLASS_NAME];
+-            len = strlen(cls->name);
++            len = strlen(class_getName(cls));
+             [stream writeInt16: len];
+-            [stream completelyWriteBytes: (const uint8_t*)cls->name count: len];
+-            [stream writeInt: class_get_version(cls)];
+-            spr = class_get_super_class(cls);
++            [stream completelyWriteBytes: (const uint8_t*)class_getName(cls) count: len];
++            [stream writeInt: class_getVersion(cls)];
++            spr = class_getSuperclass(cls);
+             if (spr == cls || spr == NULL || [pointerMap lookUp: spr] != UINT32_MAX)
+                 break;
+             cls = spr;
+@@ -363,7 +363,7 @@
+             else
+             {
+                 RAISE_EXCEPTION(OLInputOutputException,
+-                    @"The object of type %s does not respond to writeSelfToStream: or to encodeWithCoder:", ((Class)[object class])->name);
++                    @"The object of type %s does not respond to writeSelfToStream: or to encodeWithCoder:", class_getName((Class)[object class]));
+             }
+             [pointerMap assign: object];
+         }
diff -r 121b4906efc8 -r 598c7b9588c8 devel/ObjectiveLib/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ObjectiveLib/patches/patch-ab       Mon Oct 22 22:10:14 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2012/10/22 22:10:15 rh Exp $
+
+Make this compile with libobjc2.
+
+--- ObjectInStream.m.orig      2007-03-25 18:12:15.000000000 +0000
++++ ObjectInStream.m
+@@ -437,7 +437,7 @@ NSString* const OLClassNotFoundException
+         else
+         {
+             RAISE_EXCEPTION(OLInputOutputException,
+-                @"Instances of the class \"%s\" do not respond to either initWithObjectInStream: or initWithCoder:", cls->name);
++                @"Instances of the class \"%s\" do not respond to either initWithObjectInStream: or initWithCoder:", class_getName(cls));
+         }
+         object = [cls alloc];
+         object = initWithStream ?