From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 18 12:00:09 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02487106566B for ; Thu, 18 Jun 2009 12:00:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C0F688FC13 for ; Thu, 18 Jun 2009 12:00:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5IC08OE021366 for ; Thu, 18 Jun 2009 12:00:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5IC08OD021365; Thu, 18 Jun 2009 12:00:08 GMT (envelope-from gnats) Resent-Date: Thu, 18 Jun 2009 12:00:08 GMT Resent-Message-Id: <200906181200.n5IC08OD021365@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, Ulrich Spoerlein Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67244106564A for ; Thu, 18 Jun 2009 11:59:40 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from acme.spoerlein.net (cl-43.dus-01.de.sixxs.net [IPv6:2a01:198:200:2a::2]) by mx1.freebsd.org (Postfix) with ESMTP id ED3DE8FC16; Thu, 18 Jun 2009 11:59:39 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from roadrunner.spoerlein.net (e180190083.adsl.alicedsl.de [85.180.190.83]) by acme.spoerlein.net (8.14.3/8.14.3) with ESMTP id n5IBxbYZ057802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 18 Jun 2009 13:59:38 +0200 (CEST) (envelope-from uspoerlein@gmail.com) Received: from roadrunner.spoerlein.net (localhost [127.0.0.1]) by roadrunner.spoerlein.net (8.14.3/8.14.3) with ESMTP id n5IBxXaq047492 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 18 Jun 2009 13:59:33 +0200 (CEST) (envelope-from uqs@roadrunner.spoerlein.net) Received: (from uqs@localhost) by roadrunner.spoerlein.net (8.14.3/8.14.3/Submit) id n5IBxX6n047491; Thu, 18 Jun 2009 13:59:33 +0200 (CEST) (envelope-from uqs) Message-Id: <200906181159.n5IBxX6n047491@roadrunner.spoerlein.net> Date: Thu, 18 Jun 2009 13:59:33 +0200 (CEST) From: Ulrich Spoerlein To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: samm@os2.kiev.ua, hps@FreeBSD.org Subject: ports/135694: [PATCH] palm/pilot-link: Unbreak on 8-CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2009 12:00:09 -0000 >Number: 135694 >Category: ports >Synopsis: [PATCH] palm/pilot-link: Unbreak on 8-CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 18 12:00:07 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: >Description: The legacy USB stack has been removed, this port no longer builds. I mapped the ioctls as best as I could and compile-tested on 7.2/i386 and 8.0/amd64. @Hans Petter: Could you please take a look at the patch to see if it is the right approach? Many thanks! Port maintainer (samm@os2.kiev.ua) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- pilot-link-0.12.3,1.patch begins here --- Index: files/patch-libpisock_freebsdusb.c =================================================================== RCS file: /tank/ncvs/ports/palm/pilot-link/files/patch-libpisock_freebsdusb.c,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-libpisock_freebsdusb.c --- files/patch-libpisock_freebsdusb.c 2 Apr 2009 11:44:53 -0000 1.1 +++ files/patch-libpisock_freebsdusb.c 18 Jun 2009 11:56:45 -0000 @@ -1,15 +1,36 @@ ---- libpisock/freebsdusb.c.orig 2006-10-12 06:21:22.000000000 -0800 -+++ libpisock/freebsdusb.c 2009-03-02 10:06:01.000000000 -0900 -@@ -48,7 +48,12 @@ +--- libpisock/freebsdusb.c.orig 2006-10-12 16:21:22.000000000 +0200 ++++ libpisock/freebsdusb.c 2009-06-18 13:05:35.383212316 +0200 +@@ -48,7 +48,15 @@ #if defined(__FreeBSD__) /* freebsd usb header */ +#include -+#if __FreeBSD_version+0 >= 800064 -+#include -+#else #include ++#if __FreeBSD_version+0 >= 800092 ++#include ++#else ++/* redefine to legacy names, so this continues to build on FreeBSD 7.x */ ++#define USB_SET_TX_TIMEOUT USB_SET_TIMEOUT ++#define USB_SET_RX_SHORT_XFER USB_SET_SHORT_XFER +#endif #define MAX_BUF 256 #endif +@@ -173,7 +181,7 @@ + will don't know exactly + what is coming so we can't specify exact byte amounts */ + i = 1; +- if (ioctl(endpoint_fd, USB_SET_SHORT_XFER, &i) < 0) { ++ if (ioctl(endpoint_fd, USB_SET_RX_SHORT_XFER, &i) < 0) { + LOG((PI_DBG_DEV, PI_DBG_LVL_WARN, + "DEV USB_SET_SHORT_XFER USB FreeBSD fd: %d failed\n", + endpoint_fd)); +@@ -182,7 +190,7 @@ + /* 0 timeout value will cause us the wait until the device has data + available or is disconnected */ + i = 0; +- if (ioctl(endpoint_fd, USB_SET_TIMEOUT, &i) < 0) { ++ if (ioctl(endpoint_fd, USB_SET_TX_TIMEOUT, &i) < 0) { + LOG((PI_DBG_DEV, PI_DBG_LVL_WARN, + "DEV USB_SET_TIMEOUT USB FreeBSD fd: %d failed\n", + endpoint_fd)); --- pilot-link-0.12.3,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: