summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2005-11-03 21:36:42 +0000
committerAlastair Tse <liquidx@gentoo.org>2005-11-03 21:36:42 +0000
commit12dee4e6f824bbb232df1780dd7dd0a9c0c4afa6 (patch)
tree266691950c255e061af80cb35e3a69aeb588e466 /dev-libs/libusb
parentinitial import wrt bug#107220 (diff)
downloadgentoo-2-12dee4e6f824bbb232df1780dd7dd0a9c0c4afa6.tar.gz
gentoo-2-12dee4e6f824bbb232df1780dd7dd0a9c0c4afa6.tar.bz2
gentoo-2-12dee4e6f824bbb232df1780dd7dd0a9c0c4afa6.zip
added freebsd patch (#100881)
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'dev-libs/libusb')
-rw-r--r--dev-libs/libusb/ChangeLog6
-rw-r--r--dev-libs/libusb/files/0.1.10a-fbsd.patch17
-rw-r--r--dev-libs/libusb/libusb-0.1.10a.ebuild35
3 files changed, 33 insertions, 25 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/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() {