Patches to build on SunOS (OI here)

Declare license

6 files changed, 75 insertions, 3 deletions

diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 20be7a287b3..d4907d3c9b6 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2014/05/29 23:36:29 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2015/01/23 14:31:38 hauke Exp $
 #
 
 DISTNAME=	rpc2-2.10
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.coda.cs.cmu.edu/pub/rpc2/src/
 
@@ -10,6 +10,7 @@ MAINTAINER=	phil@cs.wwu.edu
 # also gdt@NetBSD.org
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 COMMENT=	CMU (Coda) remote procedure call package
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=		gmake perl pkg-config
 # Earlier we had a patch to put
diff --git a/devel/rpc2/distinfo b/devel/rpc2/distinfo
index 18b312df93d..48a00b36e04 100644
--- a/devel/rpc2/distinfo
+++ b/devel/rpc2/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.17 2012/04/19 21:04:02 joerg Exp $
+$NetBSD: distinfo,v 1.18 2015/01/23 14:31:38 hauke Exp $
 
 SHA1 (rpc2-2.10.tar.gz) = cec3c836e29ca1263156c314af662d8e087e0ab5
 RMD160 (rpc2-2.10.tar.gz) = f155cc33c91d6b354376228027a1474e12b0bb28
 Size (rpc2-2.10.tar.gz) = 595825 bytes
+SHA1 (patch-rpc2-src_host.c) = 8c453258ae82418ef6e4b5464e544b2b9253b93d
+SHA1 (patch-rpc2-src_multi3.c) = eb6a6606e2e6e5be1e3602f87286e384488a188d
+SHA1 (patch-rpc2-src_rpc2.private.h) = ff7d0b02f2003b906a34261289cd4e4de1148a92
+SHA1 (patch-rpc2-src_rpc2b.c) = d8ed6aabc062be887056a10098084bdc75329879
 SHA1 (patch-rpc2-src_stest.c) = 04fc28fffa48f9c8b21e240003f2950429522ff3
diff --git a/devel/rpc2/patches/patch-rpc2-src_host.c b/devel/rpc2/patches/patch-rpc2-src_host.c
new file mode 100644
index 00000000000..cd5f4b4ca85
--- /dev/null
+++ b/devel/rpc2/patches/patch-rpc2-src_host.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-rpc2-src_host.c,v 1.1 2015/01/23 14:31:38 hauke Exp $
+
+SunOS doesn't have u_int*_t
+
+--- rpc2-src/host.c.orig	2009-03-13 20:26:35.000000000 +0000
++++ rpc2-src/host.c
+@@ -80,7 +80,7 @@ int HASHHOST(struct RPC2_addrinfo *ai)
+     case PF_INET6:
+ 	{
+ 	    struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)ai->ai_addr;
+-	    lsb = ((u_int32_t *)&sin6->sin6_addr)[3] ^ sin6->sin6_port;
++	    lsb = ((uint32_t *)&sin6->sin6_addr)[3] ^ sin6->sin6_port;
+ 	    break;
+ 	}
+ #endif
diff --git a/devel/rpc2/patches/patch-rpc2-src_multi3.c b/devel/rpc2/patches/patch-rpc2-src_multi3.c
new file mode 100644
index 00000000000..16d4844a548
--- /dev/null
+++ b/devel/rpc2/patches/patch-rpc2-src_multi3.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-rpc2-src_multi3.c,v 1.1 2015/01/23 14:31:38 hauke Exp $
+
+SunOS doesn't have u_int*_t
+
+--- rpc2-src/multi3.c.orig	2006-10-13 02:59:51.000000000 +0000
++++ rpc2-src/multi3.c
+@@ -89,7 +89,7 @@ int HASHMGRP(struct RPC2_addrinfo *ai, i
+ 
+ #if defined(PF_INET6) 
+     case PF_INET6:
+-	lsb = ((u_int32_t *)&((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr)[3];
++	lsb = ((uint32_t *)&((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr)[3];
+ 	break;
+ #endif
+     }
diff --git a/devel/rpc2/patches/patch-rpc2-src_rpc2.private.h b/devel/rpc2/patches/patch-rpc2-src_rpc2.private.h
new file mode 100644
index 00000000000..b7f21577577
--- /dev/null
+++ b/devel/rpc2/patches/patch-rpc2-src_rpc2.private.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-rpc2-src_rpc2.private.h,v 1.1 2015/01/23 14:31:38 hauke Exp $
+
+SunOS doesn't have u_int*_t
+
+--- rpc2-src/rpc2.private.h.orig	2009-03-13 20:26:35.000000000 +0000
++++ rpc2-src/rpc2.private.h
+@@ -65,12 +65,12 @@ struct sockaddr_storage {
+ 
+ #ifndef HAVE_STRUCT_SOCKADDR_IN6
+ struct in6_addr {
+-    u_int8_t u6_addr[16];
++    uint8_t u6_addr[16];
+ };
+ struct sockaddr_in6 {
+-    u_int16_t sin6_family;
+-    u_int16_t sin6_port;
+-    u_int32_t sin6_flowinfo;
++    uint16_t sin6_family;
++    uint16_t sin6_port;
++    uint32_t sin6_flowinfo;
+     struct in6_addr sin6_addr;
+ };
+ #endif
diff --git a/devel/rpc2/patches/patch-rpc2-src_rpc2b.c b/devel/rpc2/patches/patch-rpc2-src_rpc2b.c
new file mode 100644
index 00000000000..a991777601a
--- /dev/null
+++ b/devel/rpc2/patches/patch-rpc2-src_rpc2b.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-rpc2-src_rpc2b.c,v 1.1 2015/01/23 14:31:38 hauke Exp $
+
+SunOS wants the header imported explicitely.
+
+--- rpc2-src/rpc2b.c.orig	2010-03-22 19:18:30.000000000 +0000
++++ rpc2-src/rpc2b.c
+@@ -60,6 +60,7 @@ Pittsburgh, PA.
+ #include <errno.h>
+ #include <assert.h>
+ #include <sys/file.h>
++#include <fcntl.h>
+ 
+ #include <rpc2/secure.h>
+ #include "rpc2.private.h"