From 910beac0047bb267c7ee8858de5c4f5fd33c18b6 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sun, 25 Apr 2010 18:02:09 +0000 Subject: [PATCH] Fix build on FreeBSD, bug #316671, by Toffanin [Gentoo/FreeBSD AT] Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-apps/usbutils/ChangeLog | 7 ++++- sys-apps/usbutils/Manifest | 15 ++++++----- .../usbutils/files/usbutils-0.87-fbsd.patch | 27 +++++++++++++++++++ sys-apps/usbutils/usbutils-0.87.ebuild | 9 ++++--- 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 sys-apps/usbutils/files/usbutils-0.87-fbsd.patch diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog index 800469a2669e..e66c4d03b15f 100644 --- a/sys-apps/usbutils/ChangeLog +++ b/sys-apps/usbutils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/usbutils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.98 2010/03/21 18:04:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.99 2010/04/25 18:02:09 aballier Exp $ + + 25 Apr 2010; Alexis Ballier usbutils-0.87.ebuild, + +files/usbutils-0.87-fbsd.patch: + Fix build on FreeBSD, bug #316671, by Toffanin [Gentoo/FreeBSD AT] + *usbutils-0.87 (21 Mar 2010) diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest index fc52aae798b9..50005083893c 100644 --- a/sys-apps/usbutils/Manifest +++ b/sys-apps/usbutils/Manifest @@ -1,19 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX usbmodules.sh 989 RMD160 6d5930b97b1ae2f87fe14c10ea72ab01625ab908 SHA1 19e08e37270a92650e2e7abf780239ae9a7b6908 SHA256 096271d45255f27836274ce92e89456644b6fc68e3a784b9dd251d28a407c630 AUX usbutils-0.82-fbsd.patch 254 RMD160 bc82734b6630170a746fb06c3482fa2d9b0bcc66 SHA1 8163571295867b995db44bc69d36d0725fd7d0c2 SHA256 7654349d6150841a141211a74b5252c615225805ff466364ac67d76fbeef3316 +AUX usbutils-0.87-fbsd.patch 453 RMD160 2fe50ee1a872606a1caadfccee24f2fcc6728c31 SHA1 549d2e47709f648246695d6f607b15aed028e76e SHA256 41745f459d0beb27fa4c875b9ce58104e04bdf4c9b44f50797b42612627e8bf5 AUX usbutils.cron 42 RMD160 463be9cd3993b1abfc05be0d3f8f8deed30e83bd SHA1 d7c11c3f387f1faf9941b9e77f936558c447a6d5 SHA256 4e53150761fc4a00b2a3593edd72e61c8710d619b96f0ae88b3c73360fac15d2 DIST usbutils-0.86.tar.gz 246623 RMD160 5f1152260190fac63960e0d4e9aa91b4fb67f38b SHA1 8789fe562a0c791cc1cdffd30af5908876efb6da SHA256 b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4 DIST usbutils-0.87.tar.gz 251859 RMD160 00ab599269814ea4404f9174be7af468f5124a27 SHA1 d5efe8101118932f8cfdd8922b0bb75de03cf154 SHA256 76d62db57e36e0c2d8e2c5cfdcdf5bc615b7b9e95f42d0560a19729fe7b3c550 EBUILD usbutils-0.86-r1.ebuild 1194 RMD160 c80c5dfd768d2fa4368ef6c21157f53085cb1c50 SHA1 78d6828d5820ad8b831ab600c85168f4c840572f SHA256 d0ab3e672aef4dccd41cc5dc20e3115ef6dde8bd543c1403197a8a2038b7e2db -EBUILD usbutils-0.87.ebuild 1211 RMD160 946612c8a2f90421836a4a863f3de2583fa2c785 SHA1 04b07194d7735d2d9310d22f67b191ba20f7a1bd SHA256 12b0a80a849e4cbc53796919cba9b69d9e3b74e7978a799c81866fb736f366c4 -MISC ChangeLog 12768 RMD160 6ff60640393a074f17270646e9061dff2d188e5f SHA1 5c740e0d34804cbe6b0a939e8d6755947d3cfe19 SHA256 955c96b82231b1e4a642ca1becf644cddd095cf893f08842436e021571769a98 +EBUILD usbutils-0.87.ebuild 1244 RMD160 3b5b90e8fb02dcfba0b079c93ab449eb76229147 SHA1 12ff33c0f3cabfabcb500d42069d58e4c257fa1e SHA256 4988ecd8357dbb409304a42ab39534cb4a4bdff2dea55aa758012767c9cb4dfb +MISC ChangeLog 12978 RMD160 20ce2835534441ab621e1ef50d152a2cae57bf5a SHA1 0cd8e6c7c30aba80b677dba0974b80b395c49af0 SHA256 1898e0fe74ad83e5dd7fe197346a27de3b8df3112bbb5ddc4c28885b063f4ef5 MISC metadata.xml 252 RMD160 cf5c2f72c68d4127a9eaa80c8c8a670dc5c141e6 SHA1 7289fac4ca3f1c6928224df39540dff5c8f0ddf4 SHA256 73bd60d4faf2d4cf923e02b80d531ced8e01c581fc8ae3d7271ae5abd6b14b91 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkumX5QACgkQTwhj9JtAlp7a/gEAh335aPio+7EAFV+aMSQfEdEp -LNbURcPsoS4ERfGVkOwBALlftx8K0SBUxZUyWuxvCRHOmCW/EpA4kxAc3fu44RMh -=6HLQ +iEYEARECAAYFAkvUg6cACgkQvFcC4BYPU0pACgCgptFuHfoT+tYItuaJBnL1BUKJ +WC0AoIi7wj+Cvp3klCEMISDhV6BZ9xjN +=zRZz -----END PGP SIGNATURE----- diff --git a/sys-apps/usbutils/files/usbutils-0.87-fbsd.patch b/sys-apps/usbutils/files/usbutils-0.87-fbsd.patch new file mode 100644 index 000000000000..7ec550d1438f --- /dev/null +++ b/sys-apps/usbutils/files/usbutils-0.87-fbsd.patch @@ -0,0 +1,27 @@ +--- usbutils-0.87/configure.ac ++++ usbutils-0.87/configure.ac +@@ -34,6 +34,8 @@ + Makefile + ]) + ++AC_CHECK_HEADERS([byteswap.h]) ++ + AC_OUTPUT + AC_MSG_RESULT([ + usbutils $VERSION +--- usbutils-0.87/lsusb.c ++++ usbutils-0.87/lsusb.c +@@ -32,8 +32,13 @@ + #include + #include + #include ++ ++#ifdef HAVE_BYTESWAP_H + #include ++#endif ++ + #include ++#include + + #include "names.h" + #include "devtree.h" diff --git a/sys-apps/usbutils/usbutils-0.87.ebuild b/sys-apps/usbutils/usbutils-0.87.ebuild index 1e3785a26696..79ace25ba7fc 100644 --- a/sys-apps/usbutils/usbutils-0.87.ebuild +++ b/sys-apps/usbutils/usbutils-0.87.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.87.ebuild,v 1.1 2010/03/21 18:04:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.87.ebuild,v 1.2 2010/04/25 18:02:09 aballier Exp $ EAPI="2" -inherit eutils +inherit eutils autotools DESCRIPTION="USB enumeration utilities" HOMEPAGE="http://linux-usb.sourceforge.net/" @@ -21,8 +21,9 @@ DEPEND="${DEPEND} dev-util/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/${PN}-0.82-fbsd.patch #275052 - sed -i '/^pkgconfigdir/s:datadir:datarootdir:' Makefile.in #287206 + epatch "${FILESDIR}"/${PN}-0.87-fbsd.patch #275052 #316671 + sed -i '/^pkgconfigdir/s:datadir:datarootdir:' Makefile.am #287206 + eautoreconf } src_configure() { -- 2.26.2