From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 13 08:00:31 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB9D837B404 for ; Tue, 13 May 2003 08:00:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1D0143FA3 for ; Tue, 13 May 2003 08:00:29 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4DF0TUp095578 for ; Tue, 13 May 2003 08:00:29 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4DF0T3c095577; Tue, 13 May 2003 08:00:29 -0700 (PDT) Resent-Date: Tue, 13 May 2003 08:00:29 -0700 (PDT) Resent-Message-Id: <200305131500.h4DF0T3c095577@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Sergey A.Osokin" 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" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: sobomax@FreeBSD.org Subject: ports/52174: [PATCH] devel/sdl12: fix build under pre-4.8 versions X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Sergey A.Osokin" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2003 15:00:32 -0000 >Number: 52174 >Category: ports >Synopsis: [PATCH] devel/sdl12: fix build under pre-4.8 versions >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 13 08:00:29 PDT 2003 >Closed-Date: >Last-Modified: >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: >Unformatted: