From sheepkiller@cultdeadsheep.org  Tue Nov 18 08:58:25 2003
Return-Path: <sheepkiller@cultdeadsheep.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0FE5616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Nov 2003 08:58:25 -0800 (PST)
Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5645643FE1
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Nov 2003 08:58:22 -0800 (PST)
	(envelope-from sheepkiller@cultdeadsheep.org)
Received: (qmail 37714 invoked by uid 85); 18 Nov 2003 17:58:20 +0100
Received: from sheepkiller@cultdeadsheep.org by goofy.cultdeadsheep.org by uid 82 with qmail-scanner-1.20rc2 
 ( Clear:RC:1:. 
 Processed in 0.039787 secs); 18 Nov 2003 16:58:20 -0000
Received: from lucifer.cultdeadsheep.org (192.168.0.2)
  by goofy.cultdeadsheep.org with SMTP; 18 Nov 2003 17:58:20 +0100
Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Tue, 18 Nov 2003 17:58:22 +0100
Message-Id: <20031118165822.5645643FE1@mx1.FreeBSD.org>
Date: Tue, 18 Nov 2003 17:58:22 +0100
From: "Clement Laforet" <sheepkiller@cultdeadsheep.org>
Reply-To: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Clement Laforet <sheepkiller@cultdeadsheep.org>
Subject: [fix] net/sharity-light: Fix build due to recent change on NFS code
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59425
>Category:       ports
>Synopsis:       [fix] net/sharity-light: Fix build due to recent change on NFS code
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 18 09:00:31 PST 2003
>Closed-Date:    Thu Nov 20 06:45:25 PST 2003
>Last-Modified:  Thu Nov 20 06:45:25 PST 2003
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Tue Jan 21 01:15:24 CET 2003 root@lucifer.cultdeadsheep.org:/usr/src/sys/i386/compile/LUCIFER i386


	
>Description:
	Fix Compilation due to NFSv4 import.
>How-To-Repeat:
	See:
	http://bento.freebsd.org/errorlogs/i386-5-latest/sharity-light-1.2_1.log
>Fix:

	

--- sharity-light.diff begins here ---
Index: sharity-light/files/patch-ae
===================================================================
RCS file: /WORK/REPO/FreeBSD/ports/net/sharity-light/files/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- sharity-light/files/patch-ae	11 Oct 2001 12:44:46 -0000	1.1
+++ sharity-light/files/patch-ae	18 Nov 2003 16:52:42 -0000
@@ -1,6 +1,18 @@
---- nfs/syscalls.c.orig	Thu Oct 11 14:20:28 2001
-+++ nfs/syscalls.c	Thu Oct 11 14:20:33 2001
-@@ -56,7 +56,16 @@
+--- nfs/syscalls.c.orig	Tue Jun 30 12:24:56 1998
++++ nfs/syscalls.c	Tue Nov 18 16:52:35 2003
+@@ -12,8 +12,10 @@
+ #define NFSCLIENT
+ #include "syshdr.h"
+ #include <rpc/rpc.h>
+-#if !(defined HP || defined IRIX)
++#if !(defined HP || defined IRIX || __FreeBSD_version >= 501113) 
+ #include "nfs_prot.h"
++#else
++#include <nfs/nfsproto.h>
+ #endif
+ #include <netdb.h>
+ #include <arpa/inet.h>
+@@ -56,7 +58,16 @@
  #define NFSX_V2FH 32
  #ifdef BSD4_4_LITE2
  #	include <nfs/rpcv2.h>
--- sharity-light.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Thu Nov 20 06:45:16 PST 2003 
State-Changed-Why:  
Committed, thanks! 

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