ports/163844: port bug: patch for nqc on FreeBSD 8.x

[Jason Bacon]

>Number:         163844
>Category:       ports
>Synopsis:       port bug: patch for nqc on FreeBSD 8.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 06 00:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason Bacon
>Release:        8.2-RELEASE
>Organization:
Acadix Consulting, LLC
>Environment:
FreeBSD sculpin.jbacon.dyndns.org 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:45:57 UTC 2011     root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Simple patch to update the USB code in NQC for newer FreeBSD versions.

>How-To-Repeat:

>Fix:
Attached.

Patch attached with submission follows:

diff -ruN /usr/ports/lang/nqc/Makefile nqc/Makefile
--- /usr/ports/lang/nqc/Makefile	2009-05-24 11:41:36.000000000 -0500
+++ nqc/Makefile	2012-01-05 18:43:09.000000000 -0600
@@ -28,7 +28,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 800064
-BROKEN=		does not build
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-rcxlib-RCX_USBTowerPipe_fbsd.cpp
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN /usr/ports/lang/nqc/distinfo nqc/distinfo
--- /usr/ports/lang/nqc/distinfo	2011-07-03 08:45:20.000000000 -0500
+++ nqc/distinfo	2012-01-05 18:43:47.000000000 -0600
@@ -1,2 +1,3 @@
+MD5 (nqc-3.1.r6.tgz) = 2ed4b2728ab6f0d21723a466996ce91b
 SHA256 (nqc-3.1.r6.tgz) = bfd5e654f639af7a588cfdef4d22bd5efcfff547b10a56cebebde58ef2bfe766
 SIZE (nqc-3.1.r6.tgz) = 329410
diff -ruN /usr/ports/lang/nqc/files/extra-patch-rcxlib-RCX_USBTowerPipe_fbsd.cpp nqc/files/extra-patch-rcxlib-RCX_USBTowerPipe_fbsd.cpp
--- /usr/ports/lang/nqc/files/extra-patch-rcxlib-RCX_USBTowerPipe_fbsd.cpp	1969-12-31 18:00:00.000000000 -0600
+++ nqc/files/extra-patch-rcxlib-RCX_USBTowerPipe_fbsd.cpp	2012-01-05 18:16:43.000000000 -0600
@@ -0,0 +1,30 @@
+--- rcxlib/RCX_USBTowerPipe_fbsd.cpp.orig	2012-01-05 18:08:27.000000000 -0600
++++ rcxlib/RCX_USBTowerPipe_fbsd.cpp	2012-01-05 18:13:13.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include <cstring>
+ #include <unistd.h>
+ #include <dev/usb/usb.h>
++#include <dev/usb/usb_ioctl.h>
+ 
+ #include "RCX_Pipe.h"
+ 
+@@ -308,15 +309,15 @@
+ 		return -1;
+ 	}
+ 	iov = 1;
+-	err = ioctl(fdRd, USB_SET_SHORT_XFER, &iov);
++	err = ioctl(fdRd, USB_SET_RX_SHORT_XFER, &iov);
+ 	if (fdRd == -1) {
+-		perror("ioctl USB_SET_SHORT_XFER");
++		perror("ioctl USB_SET_RX_SHORT_XFER");
+ 		return -1;
+ 	}
+ 	iov = 5000;
+-	err = ioctl(fdRd, USB_SET_TIMEOUT, &iov);
++	err = ioctl(fdRd, USB_SET_RX_TIMEOUT, &iov);
+ 	if (fdRd == -1) {
+-		perror("ioctl USB_SET_TIMEOUT");
++		perror("ioctl USB_SET_RX_TIMEOUT");
+ 		return -1;
+ 	}
+ 


>Release-Note:
>Audit-Trail:
>Unformatted: