From jr@opal.com  Fri Jan 21 09:13:46 2005
Return-Path: <jr@opal.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CFE8D16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Jan 2005 09:13:46 +0000 (GMT)
Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2AFA443D45
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Jan 2005 09:13:46 +0000 (GMT)
	(envelope-from jr@opal.com)
Received: from linwhf.opal.com (112.79.171.66.subscriber.vzavenue.net [66.171.79.112])
	by smtp.vzavenue.net (MOS 3.4.3-CR)
	with ESMTP id BRC35303;
	Fri, 21 Jan 2005 00:39:02 -0500 (EST)
Received: from linwhf.opal.com (localhost [127.0.0.1])
	by linwhf.opal.com (8.13.1/8.13.1) with ESMTP id j0L5d1Tu080757
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Jan 2005 00:39:01 -0500 (EST)
	(envelope-from jr@linwhf.opal.com)
Received: (from jr@localhost)
	by linwhf.opal.com (8.13.1/8.13.1/Submit) id j0L5d1ZZ080756;
	Fri, 21 Jan 2005 00:39:01 -0500 (EST)
	(envelope-from jr)
Message-Id: <200501210539.j0L5d1ZZ080756@linwhf.opal.com>
Date: Fri, 21 Jan 2005 00:39:01 -0500 (EST)
From: "J.R. Oldroyd" <fbsd@opal.com>
Reply-To: "J.R. Oldroyd" <fbsd@opal.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: update port: net/boinc-client fixes compilation problem on alpha/4.X
X-Send-Pr-Version: 3.113

>Number:         76528
>Category:       ports
>Synopsis:       update port: net/boinc-client fixes compilation problem on alpha/4.X
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 21 09:20:31 GMT 2005
>Closed-Date:    Wed Jan 26 00:14:03 GMT 2005
>Last-Modified:  Wed Jan 26 00:14:03 GMT 2005
>Originator:     J.R. Oldroyd
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD linwhf.opal.com 6.0-CURRENT FreeBSD 6.0-CURRENT #67: Fri Oct 8 14:11:54 EDT 2004 jr@linwhf.opal.com:/usr/src-current/sys/i386/compile/LINWHF i386

>Description:
Port would not compile for users of FreeBSD 4.X on the alpha.
Problem is, in fact, present on all 4.X systems but was only a
problem on the alpha due to type sizes being different on the 64-bit
arch.

Fix adds two new port files:
	files/extra-patch-client::gui_rpc_server.C
	files/extra-patch-client::net_xfer.C

Note that, since this patch fixes only a compilation problem on
one platform, and changes nothing else, the PORTREVISION has not
been incremented, as per the Porter's Handbook.

>How-To-Repeat:

>Fix:
diff -ruN /usr/ports/net/boinc-client/Makefile net/boinc-client/Makefile
--- /usr/ports/net/boinc-client/Makefile	Sat Jan  1 19:43:53 2005
+++ net/boinc-client/Makefile	Fri Jan 21 00:24:13 2005
@@ -35,15 +35,15 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "alpha"
-BROKEN=		"Does not compile on alpha"
-.endif
-
 .if ${OSVERSION} < 500000
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-api::boinc_api.C
 .endif
 
 post-patch:
+.if ${OSVERSION} < 500000
+	${PATCH} -d ${WRKSRC} <${FILESDIR}/extra-patch-client::gui_rpc_server.C
+	${PATCH} -d ${WRKSRC} <${FILESDIR}/extra-patch-client::net_xfer.C
+.endif
 	${CHMOD} +x ${WRKDIR}/boinc_public/configure
 
 do-build:
diff -ruN /usr/ports/net/boinc-client/files/extra-patch-client::gui_rpc_server.C net/boinc-client/files/extra-patch-client::gui_rpc_server.C
--- /usr/ports/net/boinc-client/files/extra-patch-client::gui_rpc_server.C	Wed Dec 31 19:00:00 1969
+++ net/boinc-client/files/extra-patch-client::gui_rpc_server.C	Tue Dec 21 13:32:01 2004
@@ -0,0 +1,11 @@
+--- client/gui_rpc_server.C.orig	Tue Dec 21 13:25:39 2004
++++ client/gui_rpc_server.C	Tue Dec 21 13:27:04 2004
+@@ -49,7 +49,7 @@
+ typedef int socklen_t;
+ #elif defined(__APPLE__)
+ typedef int32_t socklen_t;
+-#elif !defined(GETSOCKOPT_SOCKLEN_T) && !defined(_SOCKLEN_T_DECLARED) && !defined(socklen_t)
++#elif !defined(__FreeBSD__)
+ typedef size_t socklen_t;
+ #endif
+ 
diff -ruN /usr/ports/net/boinc-client/files/extra-patch-client::net_xfer.C net/boinc-client/files/extra-patch-client::net_xfer.C
--- /usr/ports/net/boinc-client/files/extra-patch-client::net_xfer.C	Wed Dec 31 19:00:00 1969
+++ net/boinc-client/files/extra-patch-client::net_xfer.C	Tue Dec 21 13:32:05 2004
@@ -0,0 +1,11 @@
+--- client/net_xfer.C.orig	Tue Dec 21 13:25:39 2004
++++ client/net_xfer.C	Tue Dec 21 13:28:15 2004
+@@ -80,7 +80,7 @@
+ typedef int socklen_t;
+ #elif defined(__APPLE__)
+ typedef int32_t socklen_t;
+-#elif !defined(GETSOCKOPT_SOCKLEN_T) && !defined(_SOCKLEN_T_DECLARED) && !defined(socklen_t)
++#elif !defined(__FreeBSD__)
+ typedef size_t socklen_t;
+ #endif
+ 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Mon Jan 24 17:02:18 GMT 2005 
State-Changed-Why:  
The patch to gui_rpc_server does not apply, patch have 
- #elif !defined(GETSOCKOPT_SOCKLEN_T) && !defined(_SOCKLEN_T_DECLARED) && !defined(socklen_t) 
but source have 
52 #elif !GETSOCKOPT_SOCKLEN_T 
53 #ifndef socklen_t 
any idea? 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Mon Jan 24 17:02:18 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76528 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jan 26 00:13:52 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76528 
>Unformatted:
