diff options
| author | lwhsu <lwhsu@FreeBSD.org> | 2009-03-20 04:36:41 +0800 |
|---|---|---|
| committer | lwhsu <lwhsu@FreeBSD.org> | 2009-03-20 04:36:41 +0800 |
| commit | a45a0efb64cc18fef3ddabe4afc969113ebc2b07 (patch) | |
| tree | 5ff766281a08d6c6804e598fdd046a186feaef15 /graphics | |
| parent | b59acca4479ddd26d9a8229f4e3fff7d00c6cd22 (diff) | |
| download | freebsd-ports-gnome-a45a0efb64cc18fef3ddabe4afc969113ebc2b07.tar.gz freebsd-ports-gnome-a45a0efb64cc18fef3ddabe4afc969113ebc2b07.tar.zst freebsd-ports-gnome-a45a0efb64cc18fef3ddabe4afc969113ebc2b07.zip | |
- Unbreak on -CURRENT
Submitted by: thompsa
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/sane-backends/Makefile | 6 | ||||
| -rw-r--r-- | graphics/sane-backends/files/patch-sanei_sanei_usb.c | 19 |
2 files changed, 21 insertions, 4 deletions
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 992fa09418e3..43c3c551c164 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -41,15 +41,13 @@ USE_LDCONFIG= yes .include "Makefile.man" .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 800069 -BROKEN= does not compile due to changes in USB stack -.endif - .if defined(WITHOUT_USB) CONFIGURE_ARGS+= --disable-libusb .else +.if ${OSVERSION} < 800069 LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb .endif +.endif .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-translations diff --git a/graphics/sane-backends/files/patch-sanei_sanei_usb.c b/graphics/sane-backends/files/patch-sanei_sanei_usb.c new file mode 100644 index 000000000000..8c602a6cdaa4 --- /dev/null +++ b/graphics/sane-backends/files/patch-sanei_sanei_usb.c @@ -0,0 +1,19 @@ +--- 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 @@ + #endif /* HAVE_USBCALLS */ + + #if defined (__FreeBSD__) ++#include <sys/param.h> + #include <dev/usb/usb.h> + #endif /* __FreeBSD__ */ + #if defined (__DragonFly__) +@@ -252,7 +253,7 @@ + *vendorID = vendor; + *productID = product; + } +-#elif defined (__FreeBSD__) || defined (__DragonFly__) ++#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) || defined (__DragonFly__) + { + int controller; + int ctrl_fd; |