Patched to compile on FreeBSD (bug #197678)

Package-Manager: portage-2.1.3.19

4 files changed, 62 insertions, 21 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 45dc382bb479..e102c7e63409 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.61 2007/10/29 22:47:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.62 2007/11/14 16:46:21 lavajoe Exp $
+
+  14 Nov 2007; Joe Peterson <lavajoe@gentoo.org>
+  +files/usbutils-0.73-byteorder.patch, usbutils-0.73.ebuild:
+  Patched to compile on FreeBSD (bug #197678)
 
 *usbutils-0.73 (29 Oct 2007)
 
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index a6bb0f525d3d..d82a1cb6388a 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX usbutils-0.71-new-video-format.patch 2391 RMD160 683496cfc8a8021406083a73e011ee3e206c718a SHA1 43b7ee15f01c84681cdee9b4b547327d71534d37 SHA256 14b39cb2981ec852dc2a0bb17a5b96d4c9854db088e3b077e3f709219b6cf0e8
 MD5 e092e74597092401bebd1db3c9ce6122 files/usbutils-0.71-new-video-format.patch 2391
 RMD160 683496cfc8a8021406083a73e011ee3e206c718a files/usbutils-0.71-new-video-format.patch 2391
@@ -9,6 +6,10 @@ AUX usbutils-0.72-update-usbids.patch 819 RMD160 6e57e8f77e8c6027bc5fe7a610b5fbc
 MD5 e7c35433ad3210884f8db3f24b7ae588 files/usbutils-0.72-update-usbids.patch 819
 RMD160 6e57e8f77e8c6027bc5fe7a610b5fbc42b405f76 files/usbutils-0.72-update-usbids.patch 819
 SHA256 0baaf79aa09a5d61600ff2e4de34c3a209c9c5aed9af48d2d19b6543b4cc9cbf files/usbutils-0.72-update-usbids.patch 819
+AUX usbutils-0.73-byteorder.patch 1374 RMD160 8292886de50ff6c8cac1202106721090c0026874 SHA1 9674dea58b843814ec750319ca30f5c8d26f2a3c SHA256 917f7b0a2f935e6de7721ad6e5cf875599173bf1f954894869b70c4b8d794b44
+MD5 648ea14439db5e29e0b470038184ec44 files/usbutils-0.73-byteorder.patch 1374
+RMD160 8292886de50ff6c8cac1202106721090c0026874 files/usbutils-0.73-byteorder.patch 1374
+SHA256 917f7b0a2f935e6de7721ad6e5cf875599173bf1f954894869b70c4b8d794b44 files/usbutils-0.73-byteorder.patch 1374
 AUX usbutils.cron 42 RMD160 463be9cd3993b1abfc05be0d3f8f8deed30e83bd SHA1 d7c11c3f387f1faf9941b9e77f936558c447a6d5 SHA256 4e53150761fc4a00b2a3593edd72e61c8710d619b96f0ae88b3c73360fac15d2
 MD5 8d68566ebeefcf9fabf7c78c4dcce805 files/usbutils.cron 42
 RMD160 463be9cd3993b1abfc05be0d3f8f8deed30e83bd files/usbutils.cron 42
@@ -24,14 +25,14 @@ EBUILD usbutils-0.72-r4.ebuild 1332 RMD160 5e065eedccfb083e34fb7c201d74bacd506ee
 MD5 6cd942157a91b8b656c09f7057567123 usbutils-0.72-r4.ebuild 1332
 RMD160 5e065eedccfb083e34fb7c201d74bacd506ee072 usbutils-0.72-r4.ebuild 1332
 SHA256 062540d2da857fcbb699b17b9eb577f3c759b1ea15a320154a4dee18fa1427cf usbutils-0.72-r4.ebuild 1332
-EBUILD usbutils-0.73.ebuild 1517 RMD160 8d924e8dd1154a16bd00ecbb346befa8182db25c SHA1 ddea799aa1b11d80aac40adae70b536638e9da6e SHA256 af3ff416fe3ea1c5d0504638257863525fcab6cc3bf516611b234a2da0608ae3
-MD5 63f840cf466a602fb217c6a861641af0 usbutils-0.73.ebuild 1517
-RMD160 8d924e8dd1154a16bd00ecbb346befa8182db25c usbutils-0.73.ebuild 1517
-SHA256 af3ff416fe3ea1c5d0504638257863525fcab6cc3bf516611b234a2da0608ae3 usbutils-0.73.ebuild 1517
-MISC ChangeLog 8206 RMD160 6b5e2e09f1dcd8941e3edd17a0f069dfddcc526e SHA1 66f03701151c11e45943d056fc0c992f6b73d8b4 SHA256 65a8ea1d54600db8407bf5dc2d50e81a7b9afaeb268b090b91ff5fe302385ded
-MD5 9b98040f7a992247b8895963b15fc8e8 ChangeLog 8206
-RMD160 6b5e2e09f1dcd8941e3edd17a0f069dfddcc526e ChangeLog 8206
-SHA256 65a8ea1d54600db8407bf5dc2d50e81a7b9afaeb268b090b91ff5fe302385ded ChangeLog 8206
+EBUILD usbutils-0.73.ebuild 1584 RMD160 8163588d0c472ad4faa9176cac7ef53dfe10c1fa SHA1 05b13356f240a0c83f0a15f94262250bf3d7f2ee SHA256 03d8c1d67130a2c07f90f2c9a04fcbfe7fc929b20048c3410399c9dbceccdbaf
+MD5 6bbd3e9868367d9d0d1527a45797106d usbutils-0.73.ebuild 1584
+RMD160 8163588d0c472ad4faa9176cac7ef53dfe10c1fa usbutils-0.73.ebuild 1584
+SHA256 03d8c1d67130a2c07f90f2c9a04fcbfe7fc929b20048c3410399c9dbceccdbaf usbutils-0.73.ebuild 1584
+MISC ChangeLog 8364 RMD160 79c6ce083c6290db1823edcf318459c91d694ab1 SHA1 8e5b21a7d183924402253d3bed8fae0a276fdf9d SHA256 3a270c768f160d465971c8939c24dc18393eab4840278474fc4e1c62e1422ef0
+MD5 283fc5c9b99d3cc9acd9c99d3c4cf03a ChangeLog 8364
+RMD160 79c6ce083c6290db1823edcf318459c91d694ab1 ChangeLog 8364
+SHA256 3a270c768f160d465971c8939c24dc18393eab4840278474fc4e1c62e1422ef0 ChangeLog 8364
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -45,10 +46,3 @@ SHA256 56ba49c410664c0382d790e2dc2a9374efd331d6a1e6ea03ad0dcce0fd005323 files/di
 MD5 681921bb162bd4d68ae9919ee9e48d1e files/digest-usbutils-0.73 241
 RMD160 e196cf8e783fc6d47705926a78dd963b98cb0ead files/digest-usbutils-0.73 241
 SHA256 dcb17c1d676db50552d78759e36b05e89d03644c863aeeaca12f0cfd3701752d files/digest-usbutils-0.73 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHOACMp/wUKkr7RBoRAhN0AJ4rd6TLdrPtVdYskCdS85OHvVKyzQCg32mI
-4wpusbQOf4AmhyGOtIalLxg=
-=Xhgh
------END PGP SIGNATURE-----
diff --git a/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch b/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch
new file mode 100644
index 000000000000..76cd9505e7f9
--- /dev/null
+++ b/sys-apps/usbutils/files/usbutils-0.73-byteorder.patch
@@ -0,0 +1,40 @@
+diff -ur usbutils-0.73.old/configure.in usbutils-0.73.new/configure.in
+--- usbutils-0.73.old/configure.in	2007-11-13 10:19:41 -0500
++++ usbutils-0.73.new/configure.in	2007-11-13 10:23:12 -0500
+@@ -20,10 +20,11 @@
+ AC_FUNC_ALLOCA
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h getopt.h errno.h ])
++AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h getopt.h errno.h asm/byteorder.h machine/endian.h])
+ 
+-# Checks for typedefs, structures, and compiler characteristics.
++# Checks for typedefs, structures, byte order, and compiler characteristics.
+ AC_C_CONST
++AC_C_BIGENDIAN
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
+ 
+diff -ur usbutils-0.73.old/lsusb.c usbutils-0.73.new/lsusb.c
+--- usbutils-0.73.old/lsusb.c	2007-11-13 10:19:41 -0500
++++ usbutils-0.73.new/lsusb.c	2007-11-13 10:23:12 -0500
+@@ -35,8 +35,17 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+-#include <asm/byteorder.h>
+-#define le16_to_cpu	__le16_to_cpu
++#if defined(HAVE_ASM_BYTEORDER_H)
++# include <asm/byteorder.h>
++# define le16_to_cpu __le16_to_cpu
++#elif defined(HAVE_MACHINE_ENDIAN_H)
++# include <machine/endian.h>
++# ifdef WORDS_BIGENDIAN
++#  define le16_to_cpu __bswap16
++# else
++#  define le16_to_cpu(x) (x)
++# endif
++#endif
+ #include <usb.h>
+ 
+ /* NOTE:  that should be <libusb.h> and it should include
diff --git a/sys-apps/usbutils/usbutils-0.73.ebuild b/sys-apps/usbutils/usbutils-0.73.ebuild
index daeb13aa4c1c..ad47b551ef7e 100644
--- a/sys-apps/usbutils/usbutils-0.73.ebuild
+++ b/sys-apps/usbutils/usbutils-0.73.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.73.ebuild,v 1.1 2007/10/29 22:47:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.73.ebuild,v 1.2 2007/11/14 16:46:21 lavajoe Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="USB enumeration utilities"
 HOMEPAGE="http://linux-usb.sourceforge.net/"
@@ -21,6 +21,7 @@ src_unpack() {
 	cd "${S}"
 	cp update-usbids.sh update-usbids.sh.orig
 	epatch "${FILESDIR}"/${PN}-0.72-update-usbids.patch
+	epatch "${FILESDIR}"/${P}-byteorder.patch
 
 	# put usb.ids in same place as pci.ids (/usr/share/misc)
 	sed -i \
@@ -28,6 +29,8 @@ src_unpack() {
 		lsusb.8 || die "sed lsusb.8"
 	sed -e '/^DEST=/s:=usb.ids:=/usr/share/misc/usb.ids:' \
 		update-usbids.sh > update-usbids
+
+	eautoreconf
 }
 
 src_compile() {