From osa@freebsd.org.ru  Tue May 13 07:50:00 2003
Return-Path: <osa@freebsd.org.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id EAB0737B407; Tue, 13 May 2003 07:50:00 -0700 (PDT)
Received: from freebsd.org.ru (freebsd.org.ru [194.84.67.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4DCB643FB1; Tue, 13 May 2003 07:50:00 -0700 (PDT)
	(envelope-from osa@freebsd.org.ru)
Received: by freebsd.org.ru (Postfix, from userid 1000)
	id 1EB7F1C0; Tue, 13 May 2003 18:49:57 +0400 (MSD)
Message-Id: <20030513144957.1EB7F1C0@freebsd.org.ru>
Date: Tue, 13 May 2003 18:49:57 +0400 (MSD)
From: Sergey A.Osokin <osa@FreeBSD.org.ru>
Reply-To: Sergey A.Osokin <osa@FreeBSD.org.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sobomax@FreeBSD.org
Subject: [PATCH] devel/sdl12: fix build under pre-4.8 versions
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         52174
>Category:       ports
>Synopsis:       [PATCH] devel/sdl12: fix build under pre-4.8 versions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sobomax
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 13 08:00:29 PDT 2003
>Closed-Date:    Thu May 22 15:57:17 PDT 2003
>Last-Modified:  Thu May 22 15:57:17 PDT 2003
>Originator:     Sergey A. Osokin
>Release:        FreeBSD 4.8-PRERELEASE i386
>Organization:
n/a
>Environment:
System: FreeBSD 4.8-PRERELEASE i386

>Description:
	devel/sdl12: fix build under pre-4.8 versions
	Tested under 5.1-BETA/4.7-RELEASE/4.8-STABLE
>How-To-Repeat:
	$ cd ports/devel/sdl12 && make
>Fix:

Index: ports/devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c
===================================================================
RCS file: /home/ncvs/ports/devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c,v
retrieving revision 1.1
diff -u -r1.1 patch-joystick::bsd::SDL_sysjoystick.c
--- ports/devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c	9 Apr 2003 04:51:09 -0000	1.1
+++ ports/devel/sdl12/files/patch-joystick::bsd::SDL_sysjoystick.c	13 May 2003 14:44:47 -0000
@@ -44,7 +44,7 @@
 -#ifdef USBHID_NEW
 +#ifdef __FreeBSD__
 +# if (__FreeBSD_version >= 470000)
-+#  if (__FreeBSD_version <= 500111)
++#  if ((__FreeBSD_version <= 500111) && (__FreeBSD_version >= 480000))
 +	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
 +#  else
 +	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sobomax 
Responsible-Changed-By: arved 
Responsible-Changed-When: Wed May 14 07:16:40 PDT 2003 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=52174 
State-Changed-From-To: open->closed 
State-Changed-By: sobomax 
State-Changed-When: Thu May 22 15:57:10 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

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