From owner-freebsd-ports@FreeBSD.ORG  Sun Jan 15 15:39:55 2012
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD833106566B
	for <freebsd-ports@freebsd.org>; Sun, 15 Jan 2012 15:39:55 +0000 (UTC)
	(envelope-from george@m5p.com)
Received: from mailhost.m5p.com (ip-2-2-0-2.r20.asbnva02.us.ce.gin.ntt.net
	[IPv6:2001:418:0:5000::16])
	by mx1.freebsd.org (Postfix) with ESMTP id 486228FC0A
	for <freebsd-ports@freebsd.org>; Sun, 15 Jan 2012 15:39:55 +0000 (UTC)
Received: from wonderland.m5p.com (wonderland.m5p.com [IPv6:2001:418:3fd::19])
	by mailhost.m5p.com (8.14.4/8.14.4) with ESMTP id q0FFdnq9009163
	for <freebsd-ports@freebsd.org>; Sun, 15 Jan 2012 10:39:54 -0500 (EST)
	(envelope-from george@m5p.com)
Message-ID: <4F12F344.2050208@m5p.com>
Date: Sun, 15 Jan 2012 10:39:48 -0500
From: George Mitchell <george@m5p.com>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:9.0) Gecko/20120114 Thunderbird/9.0
MIME-Version: 1.0
To: freebsd-ports@freebsd.org
Content-Type: multipart/mixed; boundary="------------090904020902000105080109"
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.7
	(mailhost.m5p.com [IPv6:2001:418:3fd::f7]);
	Sun, 15 Jan 2012 10:39:54 -0500 (EST)
X-Scanned-By: MIMEDefang 2.72 on IPv6:2001:418:3fd::f7
Subject: Two Minor Ports Patches
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2012 15:39:55 -0000

This is a multi-part message in MIME format.
--------------090904020902000105080109
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

After csupping to 9.0-STABLE and updating my ports tree, I encountered
two compile errors during portmaster -a:

hal: USB_GET_REPORT_ID undefined in probe-hiddev.c.  See first attached
patch (which probably needs a __FreeBSD_version conditional).

sessreg: ttyslot no longer exists.  See second attached patch which is
clearly wrong, but works as a stopgap.               -- George Mitchell

--------------090904020902000105080109
Content-Type: text/plain;
 name="patch-hald_freebsd_probing_probe-hiddev.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="patch-hald_freebsd_probing_probe-hiddev.c"

--- hald/freebsd/probing/probe-hiddev.c.orig	2009-09-17 09:47:14.000000000 -0400
+++ hald/freebsd/probing/probe-hiddev.c	2012-01-14 19:45:46.000000000 -0500
@@ -33,6 +33,7 @@
 #include <sys/ioctl.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
+#include <dev/usb/usb_ioctl.h>
 #else
 #if __FreeBSD_version >= 800064
 #include <dev/usb/usbhid.h>

--------------090904020902000105080109
Content-Type: text/plain;
 name="patch-sessreg.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="patch-sessreg.c"

--- sessreg.c.orig	2011-09-26 19:01:11.000000000 -0400
+++ sessreg.c	2012-01-14 20:19:09.000000000 -0500
@@ -278,7 +278,11 @@
 		if (xflag)
 			sysnerr (slot_number = Xslot (ttys_file, xservers_file, line, host_name, aflag), "Xslot");
 		else
+#if 0
 			sysnerr (slot_number = ttyslot (), "ttyslot");
+#else
+			perror("ttyslot");
+#endif
 	}
 #endif
 	if (!lflag) {

--------------090904020902000105080109--