diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2009-03-09 17:15:43 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2009-03-09 17:15:43 +0000 |
| commit | f5d05ea54d1f80ecd08c5809a3ce5e1594e34eaa (patch) | |
| tree | 343e91600b9cf81ffb94bf71017b43a88bfcbf45 /palm | |
| parent | - Update to 1.4.20 (diff) | |
- Chase libusb20 rename in r189585.
- Mark sane-backends broken on current due to changes
in USB stack.
Reviewed by: thompsa (old version), miwi
Tested by: miwi
Notes
Notes:
svn path=/head/; revision=229765
Diffstat (limited to 'palm')
| -rw-r--r-- | palm/barry/Makefile | 7 | ||||
| -rw-r--r-- | palm/pilot-link/Makefile | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/palm/barry/Makefile b/palm/barry/Makefile index f663116bc4be..66a2727f4619 100644 --- a/palm/barry/Makefile +++ b/palm/barry/Makefile @@ -13,8 +13,7 @@ MASTER_SITES= SF MAINTAINER= meitolake@gmail.com COMMENT= C++ library for interfacing with the BlackBerry Handheld -LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb \ - boost_thread.4:${PORTSDIR}/devel/boost +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost USE_BZIP2= yes USE_LDCONFIG= yes @@ -31,6 +30,10 @@ OPTIONS= GUI "Build the GUI" On \ .include <bsd.port.pre.mk> +.if ${OSVERSION} < 800069 +LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb +.endif + .if defined(WITH_GUI) LIB_DEPENDS+= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \ tar.0:${PORTSDIR}/devel/libtar diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index 7677efae87cc..68b306f2f799 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -39,7 +39,9 @@ CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS .endif .if defined(WITH_USB) +. if ${OSVERSION} < 800069 LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb +. endif CONFIGURE_ARGS+=--enable-libusb CONFIGURE_ENV+=LDFLAGS="${LDFLAGS} -L${PREFIX}/lib -lusb" |