enable SunOS to use experimental libusb1 support.

bump PKGREVISION

5 files changed, 98 insertions, 32 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index f3beb97d622..8301cb8ac87 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2016/03/15 09:14:03 martin Exp $
+# $NetBSD: Makefile,v 1.67 2016/04/09 14:19:25 richard Exp $
 
-PKGREVISION=	3
+PKGREVISION=	4
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers, etc
 
@@ -63,10 +63,8 @@ CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .endif
 
 .include "options.mk"
-.if (${OPSYS} != "SunOS")
 .include "../../devel/libusb1/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-libusb_1_0
-.endif
 .if (${OPSYS} == "Linux")
 .include "../../graphics/libv4l/buildlink3.mk"
 .endif
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index 084f201f361..202d097da41 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2015/08/16 22:00:37 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2016/04/09 14:19:25 richard Exp $
 
 BUILDLINK_TREE+=	sane-backends
 
@@ -11,9 +11,7 @@ BUILDLINK_PKGSRCDIR.sane-backends?=	../../graphics/sane-backends
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if (${OPSYS} != "SunOS")
 . include "../../devel/libusb1/buildlink3.mk"
-.endif
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif # SANE_BACKENDS_BUILDLINK3_MK
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 831a072287a..1b46ff41261 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.43 2016/03/15 09:14:03 martin Exp $
+$NetBSD: distinfo,v 1.44 2016/04/09 14:19:25 richard Exp $
 
 SHA1 (sane-backends-1.0.25.tar.gz) = 05824922d91571e1fc2f5cdd270745783d593754
 RMD160 (sane-backends-1.0.25.tar.gz) = 1cfd81eeddf3ef3c2cea98f6ca7640522b249fab
 SHA512 (sane-backends-1.0.25.tar.gz) = b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df
 Size (sane-backends-1.0.25.tar.gz) = 5955016 bytes
 SHA1 (patch-aa) = 91f5838b7c455dc160ba22d15659c1b19a222668
-SHA1 (patch-ab) = 8fb594d82c2ecab3c7c73c28448831208fef8af9
+SHA1 (patch-ab) = f6ec74b90f5499d07117559c7079ba2efccccf17
 SHA1 (patch-ac) = 49e0cc0b6e0dfb96e5ee3cfc3f554b7e40492757
 SHA1 (patch-ae) = d374c33cad835d56fb9f2fbb2594a85e0a0d7158
 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
@@ -14,5 +14,6 @@ SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
 SHA1 (patch-backend_kodakaio.c) = f96af8b2fb0369f51d2320285253c5e67218e629
 SHA1 (patch-backend_pieusb__buffer.c) = 7e7c6dbb0798876532a04a0831be2ab2bd2931ca
+SHA1 (patch-m4_byteorder.m4) = 23f4b0256fc9980d3472e77ab558b0e24a9495b4
 SHA1 (patch-sanei_sanei__ir.c) = 66e913d7db9d03a42850778aca39da8f0dde02fa
 SHA1 (patch-sanei_sanei_usb.c) = b053c94d240580d919c418081fca5c75cf4fb1a7
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index 449b1d77f89..4dd81c4f6bc 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,30 +1,64 @@
-$NetBSD: patch-ab,v 1.15 2015/10/27 11:29:35 wiz Exp $
+$NetBSD: patch-ab,v 1.16 2016/04/09 14:19:25 richard Exp $
+
+add SunOS byteorder needs
 
 --- configure.orig	2015-10-04 13:18:39.000000000 +0000
 +++ configure
-@@ -7377,13 +7377,13 @@ if test "x$ac_cv_header_pthread_h" = xye
- #define HAVE_PTHREAD_H 1
- _ACEOF
+@@ -5979,6 +5979,36 @@ else
+ $as_echo "no" >&6; }
+ 
  
--       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
--$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
- if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSWAP_32 in sys/byteorder.h" >&5
++$as_echo_n "checking for BSWAP_32 in sys/byteorder.h... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#include <sys/byteorder.h>
++#ifdef BSWAP_32
++ 	symbol is present
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "symbol is present|\<BSWAP_32\>" >/dev/null 2>&1; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++  	 cat >> "include/byteorder.h" << EOF
++/* Define generic byte swapping functions */
++EOF
++cat >> "include/byteorder.h" << EOF
++#define swap16(x) BSWAP_16(x)
++#define swap32(x) BSWAP_32(x)
++#define swap64(x) BSWAP_64(x)
++
++EOF
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32 in machine/endian.h" >&5
+ $as_echo_n "checking for bswap32 in machine/endian.h... " >&6; }
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+@@ -6139,6 +6169,11 @@ rm -f conftest*
+ 
+ 
  
-@@ -7414,7 +7414,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
--  PTHREAD_LIBS="-lpthread"
-+  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
++fi
++rm -f conftest*
++
++
++
  
-        have_pthread=yes
+ if test "$HAVE_LE32TOH" != "1"; then
+  cat >> "$ac_byteorder" << EOF
+@@ -9148,6 +9183,8 @@ else
+ # ifdef _MSC_VER
+ #  include <malloc.h>
+ #  define alloca _alloca
++# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
++#   include <stdlib.h>
+ # else
+ #  ifdef HAVE_ALLOCA_H
+ #   include <alloca.h>
diff --git a/graphics/sane-backends/patches/patch-m4_byteorder.m4 b/graphics/sane-backends/patches/patch-m4_byteorder.m4
new file mode 100644
index 00000000000..852dde5a3d7
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-m4_byteorder.m4
@@ -0,0 +1,35 @@
+$NetBSD: patch-m4_byteorder.m4,v 1.1 2016/04/09 14:19:25 richard Exp $
+
+add SunOS byteorder needs
+
+--- m4/byteorder.m4.orig	2013-02-23 02:00:56.000000000 +0000
++++ m4/byteorder.m4
+@@ -110,6 +110,20 @@ dnl Linux GLIBC
+ EOF],
+ 
+    [
++dnl SunOS
++  	AC_HAVE_SYMBOL(BSWAP_32,sys/byteorder.h,
++dnl sys/byteorder.h should already be implicitly included
++  	 [cat >> "$1" << EOF
++/* Define generic byte swapping functions */
++EOF
++cat >> "$1" << EOF
++#define swap16(x) BSWAP_16(x)
++#define swap32(x) BSWAP_32(x)
++#define swap64(x) BSWAP_64(x)
++
++EOF],
++
++   [
+ dnl NetBSD
+   	AC_HAVE_SYMBOL(bswap32,machine/endian.h,
+     dnl We're already including machine/endian.h if this test succeeds
+@@ -194,6 +208,7 @@ EOF
+ EOF
+ 	fi
+ ])
++])
+   	  ])
+     ])
+   ])