From 761684eda6b4b01895e2a069835b72bc8b3f6bf1 Mon Sep 17 00:00:00 2001
From: gls <gls>
Date: Sun, 31 Jul 2011 20:05:58 +0000
Subject: Add sys/socket.h to backend/magicolor.c and backend/xerox_mfp-tcp.c.
 Should fix PR pkg/45196 by Alex Hornung.

---
 graphics/sane-backends/Makefile                        |  7 ++++---
 graphics/sane-backends/distinfo                        |  4 +++-
 .../sane-backends/patches/patch-backend_magicolor.c    | 18 ++++++++++++++++++
 .../patches/patch-backend_xerox__mfp-tcp.c             | 17 +++++++++++++++++
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 graphics/sane-backends/patches/patch-backend_magicolor.c
 create mode 100644 graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index be9759b4dc2..4a3433b9102 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2011/07/12 13:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2011/07/31 20:05:58 gls Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+PKGREVISION=	1
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers etc.
@@ -58,9 +59,9 @@ CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .endfor
 
 .if (${OPSYS} == "Linux")
-.for f in qcam.conf v4l.conf
+.  for f in qcam.conf v4l.conf
 CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
-.endfor
+.  endfor
 .endif
 
 .include "options.mk"
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 79b9345657b..ef1f56091a5 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2011/07/12 12:19:40 wiz Exp $
+$NetBSD: distinfo,v 1.33 2011/07/31 20:05:58 gls Exp $
 
 SHA1 (sane-backends-1.0.22.tar.gz) = dc04d6e6fd18791d8002c3fdb23e89fef3327135
 RMD160 (sane-backends-1.0.22.tar.gz) = 524713474a819331d0179fa642fef710d073f1d1
@@ -14,3 +14,5 @@ SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
 SHA1 (patch-ai) = 74f27b5a66e3dfd96337cb00a4ff3bc48804256b
 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
+SHA1 (patch-backend_magicolor.c) = d717160eef83b7f412f55ca2716ebf76f3fb1900
+SHA1 (patch-backend_xerox__mfp-tcp.c) = 45cf630762ec9757aa8e1306190641dd99dcc673
diff --git a/graphics/sane-backends/patches/patch-backend_magicolor.c b/graphics/sane-backends/patches/patch-backend_magicolor.c
new file mode 100644
index 00000000000..b845eb08bff
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-backend_magicolor.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-backend_magicolor.c,v 1.1 2011/07/31 20:05:58 gls Exp $
+
+Fix for pkg/45196. Add sys/socket.h header.
+
+--- backend/magicolor.c.orig	2011-01-30 18:49:46.000000000 +0000
++++ backend/magicolor.c
+@@ -50,6 +50,11 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/time.h>
++
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++
+ #include <math.h>
+ #include <poll.h>
+ 
diff --git a/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c b/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c
new file mode 100644
index 00000000000..4b8835ad1ce
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-backend_xerox__mfp-tcp.c,v 1.1 2011/07/31 20:05:58 gls Exp $
+
+Fix for pkg/45196. Add sys/socket.h header.
+
+--- backend/xerox_mfp-tcp.c.orig	2010-12-01 23:49:58.000000000 +0000
++++ backend/xerox_mfp-tcp.c
+@@ -28,6 +28,10 @@
+ #include <errno.h>
+ #include <sys/time.h>
+ 
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++
+ #include "sane/saneopts.h"
+ #include "sane/sanei_scsi.h"
+ #include "sane/sanei_usb.h"
-- 
cgit v1.2.3