added freebsd patch (#100881)

Package-Manager: portage-2.0.53_rc7

4 files changed, 44 insertions, 35 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index ae52c7f5f838..31ca7c942876 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libusb
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.38 2005/07/02 20:31:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.39 2005/11/03 21:36:42 liquidx Exp $
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> +files/0.1.10a-fbsd.patch,
+  libusb-0.1.10a.ebuild:
+  added freebsd patch (#100881)
 
   02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> libusb-0.1.10a.ebuild:
   Stable on alpha.
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index ec37789a29ef..b95bdc4ab298 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 67bd4c482479738a34057710a43b70de libusb-0.1.7-r1.ebuild 917
-MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 ecc4ed6c771b98aea70ec6f3955f569f libusb-0.1.8.ebuild 1361
-MD5 8d36e3a4a1028a9f2c272233b3a7ed27 ChangeLog 4540
-MD5 6276b178ab4ea6603bcff9b7db20845b libusb-0.1.10a.ebuild 1278
+MD5 2110573d82885a9618824d4b57949999 ChangeLog 4675
+MD5 c819378823e7b8610d4e164757dc25be files/0.1.10a-fbsd.patch 734
 MD5 9b71253641038ba3d13b833a85cdcf76 files/digest-libusb-0.1.10a 66
 MD5 9cb49945879f78000d198c898d197e54 files/digest-libusb-0.1.7-r1 64
-MD5 13b0f271f94755b89f904270daa0659d files/libusb-0.1.8-amd64-fPIC.patch 268
 MD5 edf695ba0c7ee442c501401384faaa94 files/digest-libusb-0.1.8 64
+MD5 13b0f271f94755b89f904270daa0659d files/libusb-0.1.8-amd64-fPIC.patch 268
+MD5 b9610d03edbab0b827b861f1f2dd85c2 libusb-0.1.10a.ebuild 1034
+MD5 67bd4c482479738a34057710a43b70de libusb-0.1.7-r1.ebuild 917
+MD5 ecc4ed6c771b98aea70ec6f3955f569f libusb-0.1.8.ebuild 1361
+MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCzHe2gIKl8Uu19MoRAjzqAJ0WYNG9mEtCEi6HViv1tRnikpMsAwCcC2gq
-OgLRUntK1jZh8VqpU/+tcLQ=
-=OfV+
+iD8DBQFDaoL79ZFPrqoILX8RAnBuAJ9fu981ImpLcAn7gnljtQmXnl4CGQCeOglR
++4zza0zT3oedEtr86UfX/lU=
+=VpMi
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libusb/files/0.1.10a-fbsd.patch b/dev-libs/libusb/files/0.1.10a-fbsd.patch
new file mode 100644
index 000000000000..227b59a877aa
--- /dev/null
+++ b/dev-libs/libusb/files/0.1.10a-fbsd.patch
@@ -0,0 +1,17 @@
+diff -ur libusb-0.1.10a/configure.in libusb-0.1.10a-fbsd/configure.in
+--- libusb-0.1.10a/configure.in	2005-02-14 21:22:08.000000000 +0100
++++ libusb-0.1.10a-fbsd/configure.in	2005-07-31 13:29:04.219598632 +0200
+@@ -191,11 +191,9 @@
+ 
+ if test "$os_support" = "bsd"; then
+   AC_MSG_CHECKING(if dev/usb/usb.h uses new naming convention)
+-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]], [[int main(void)
+-     {
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dev/usb/usb.h>]], [[
+        int a = ((struct usb_ctl_request *)0L)->ucr_addr;
+-       return 0;
+-     }]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++     ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+     AC_DEFINE_UNQUOTED(HAVE_OLD_DEV_USB_USB_H)])
+ fi
+ 
diff --git a/dev-libs/libusb/libusb-0.1.10a.ebuild b/dev-libs/libusb/libusb-0.1.10a.ebuild
index 832085767a14..af3878be97b9 100644
--- a/dev-libs/libusb/libusb-0.1.10a.ebuild
+++ b/dev-libs/libusb/libusb-0.1.10a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.10a.ebuild,v 1.13 2005/07/07 00:29:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.10a.ebuild,v 1.14 2005/11/03 21:36:42 liquidx Exp $
 
-inherit eutils libtool
+inherit eutils libtool autotools
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -21,32 +21,19 @@ DEPEND="sys-devel/libtool
 
 src_unpack(){
 	unpack ${A}
+	cd ${S}
 
-	if use ppc-macos ; then
-		aclocal || die
-		autoconf || die
-		automake --add-missing || die
-	fi
+	epatch ${FILESDIR}/${PV}-fbsd.patch
+	eautoreconf
+	elibtoolize
 }
 
 src_compile() {
-	local myconf
-
-	# keep this otherwise libraries will not have .so extensions
-	use ppc-macos \
-	  && glibtoolize --force \
-	  || elibtoolize
-
-	use doc \
-		&& myconf="--enable-build-docs" \
-		|| myconf="--disable-build-docs"
-
-	use debug \
-		&& myconf="${myconf} --enable-debug=all" \
-		|| myconf="${myconf} --disable-debug"
-
-	econf ${myconf} || die
-	make || die
+	econf \
+		$(use_enable debug debug all) \
+		$(use_enable doc build-docs) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {