diff options
| author | Marc Fonvieille <blackend@FreeBSD.org> | 2009-07-26 20:13:38 +0000 |
|---|---|---|
| committer | Marc Fonvieille <blackend@FreeBSD.org> | 2009-07-26 20:13:38 +0000 |
| commit | bea94f499d8917183962d10f681a86049aa476d4 (patch) | |
| tree | 9a11ea6de2922b42bc6a667fb8b135c139d0a4ee /graphics | |
| parent | 34f8cc4b7cc96ffba6d880222930219942b23cf7 (diff) | |
| download | ports-bea94f499d8917183962d10f681a86049aa476d4.tar.gz ports-bea94f499d8917183962d10f681a86049aa476d4.zip | |
Unbreak for real the build with libusb support under 8.X. Now one can
use USB scanners under 8.X
Submitted by: Hans Petter Selasky <hselasky@c2i.net>
Reviewed by: rink
Approved by: miwi
Tested by: blackend (with some CanoScan LIDE scanners)
Notes
Notes:
svn path=/head/; revision=238398
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/sane-backends/Makefile | 4 | ||||
| -rw-r--r-- | graphics/sane-backends/files/patch-sanei_sanei_usb.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index b47e25ffb2f1..7f3d525b1a44 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -7,7 +7,7 @@ PORTNAME= sane-backends PORTVERSION= 1.0.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://alioth.debian.org/frs/download.php/3026/ \ ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \ @@ -45,7 +45,7 @@ USE_LDCONFIG= yes .include "Makefile.man" .include <bsd.port.pre.mk> -.if (defined(WITHOUT_USB) || ${OSVERSION} > 800000) +.if defined(WITHOUT_USB) CONFIGURE_ARGS+= --disable-libusb .else .if ${OSVERSION} < 800069 diff --git a/graphics/sane-backends/files/patch-sanei_sanei_usb.c b/graphics/sane-backends/files/patch-sanei_sanei_usb.c index 8c602a6cdaa4..79523f1866bf 100644 --- a/graphics/sane-backends/files/patch-sanei_sanei_usb.c +++ b/graphics/sane-backends/files/patch-sanei_sanei_usb.c @@ -1,14 +1,16 @@ ---- sanei/sanei_usb.c.orig 2009-03-18 17:05:03.000000000 -0700 -+++ sanei/sanei_usb.c 2009-03-18 17:05:06.000000000 -0700 -@@ -88,6 +88,7 @@ +--- sanei/sanei_usb.c.orig 2009-07-26 21:29:33.000000000 +0200 ++++ sanei/sanei_usb.c 2009-07-26 21:31:42.000000000 +0200 +@@ -96,7 +96,8 @@ + } #endif /* HAVE_USBCALLS */ - #if defined (__FreeBSD__) +-#if defined (__FreeBSD__) ++#if (defined (__FreeBSD__) && (__FreeBSD_version < 800064)) +#include <sys/param.h> #include <dev/usb/usb.h> #endif /* __FreeBSD__ */ #if defined (__DragonFly__) -@@ -252,7 +253,7 @@ +@@ -273,7 +274,7 @@ *vendorID = vendor; *productID = product; } |