add FreeBSD Port's patches

epson2-commands.c: Include <sys/types.h> to resolve u_long.
epson2.c, magicolor.c, xerox_mfp-tcp.c: Include <sys/types.h>
and to <sys/socket.h> for anyone using setsockopt().
sanei_tcp.h: Include <sys/types.h> since ssize_t is referenced.
sanei_usb.c: Newer FreeBSD version checks.

All changes in this patch set come from FreeBSD ports patches.
Bug #312503.

ChangeLog

@@ -1,3 +1,11 @@
+2011-11-20 Chris Bagwell <chris at cnpbagwell dot com>
+	* epson2-commands.c: Include <sys/types.h> to resolve u_long.
+	* epson2.c, magicolor.c, xerox_mfp-tcp.c: Include <sys/types.h>
+	and to <sys/socket.h> for anyone using setsockopt().
+	* sanei_tcp.h: Include <sys/types.h> since ssize_t is referenced.
+	* sanei_usb.c: FreeBSD version checks.  All changes in this
+	batch come from FreeBSD ports patches. Bug #312503.
+
 2011-11-20 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys_*.[ch] doc/descriptions/genesys.desc: build
 	66. Add hp N6310 and 4850C devices. Fix gl847 calibration. 

backend/epson2-commands.c

@@ -21,6 +21,7 @@
 
 #include <byteorder.h>
 #include <math.h>
+#include <sys/types.h>
 
 #include "epson2.h"
 #include "epson2-io.h"

backend/epson2.c

@@ -57,6 +57,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
 #include "sane/saneopts.h"
 #include "sane/sanei_scsi.h"

backend/magicolor.c

@@ -52,6 +52,10 @@
 #include <sys/time.h>
 #include <math.h>
 #include <poll.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
 
 #if HAVE_LIBSNMP

backend/xerox_mfp-tcp.c

@@ -27,6 +27,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
 #include "sane/saneopts.h"
 #include "sane/sanei_scsi.h"

include/sane/sanei_tcp.h

@@ -27,6 +27,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
+#include <sys/types.h>
 
 extern SANE_Status sanei_tcp_open(const char *host, int port, int *fdp);
 extern void sanei_tcp_close(int fd);

sanei/sanei_usb.c

@@ -99,7 +99,8 @@ GetNextDescriptor( struct usb_descriptor_header *currHead, UCHAR *lastBytePtr)
 }
 #endif /* HAVE_USBCALLS */
 
-#if defined (__FreeBSD__) 
+#if (defined (__FreeBSD__) && (__FreeBSD_version < 800064))
+#include <sys/param.h>
 #include <dev/usb/usb.h>
 #endif /* __FreeBSD__ */
 #if defined (__DragonFly__)
@@ -276,7 +277,7 @@ kernel_get_vendor_product (int fd, const char *name, int *vendorID, int *product
     *vendorID = vendor;
     *productID = product;
   }
-#elif defined (__FreeBSD__) || defined (__DragonFly__)
+#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) || defined (__DragonFly__)
   {
     int controller;
     int ctrl_fd;