Date: Sun, 15 Jan 2012 10:39:48 -0500 From: George Mitchell <george@m5p.com> To: freebsd-ports@freebsd.org Subject: Two Minor Ports Patches Message-ID: <4F12F344.2050208@m5p.com>
next in thread | raw e-mail | index | archive | help
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F12F344.2050208>