Two Minor Ports Patches

[George Mitchell]

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
-------------- next part --------------
--- 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>
-------------- next part --------------
--- 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) {