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 /x11 | |
| 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 'x11')
| -rw-r--r-- | x11/kde4-workspace/Makefile | 11 | ||||
| -rw-r--r-- | x11/kdebase3/Makefile | 7 | ||||
| -rw-r--r-- | x11/kdebase4-workspace/Makefile | 11 |
3 files changed, 21 insertions, 8 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 9380d226f5fb..84a6296334cc 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -16,8 +16,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system -LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz\ +LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz\ dbus-1.3:${PORTSDIR}/devel/dbus \ hal.1:${PORTSDIR}/sysutils/hal \ xklavier.12:${PORTSDIR}/x11/libxklavier @@ -52,6 +51,12 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ #Xmms and Googlegadgets could be enabled, #QEdje has not been ported yet. +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 800069 +LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb +.endif + post-extract: ${MKDIR} ${WRKSRC} @@ -74,4 +79,4 @@ post-install: @${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index eb8b7f5785f8..7bf87dee6da4 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -23,8 +23,7 @@ BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake \ bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - smbclient:${PORTSDIR}/net/samba-libsmbclient \ - usb-0.1:${PORTSDIR}/devel/libusb + smbclient:${PORTSDIR}/net/samba-libsmbclient CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-4]* kdeutils-3.[0-2]* @@ -59,6 +58,10 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +.if ${OSVERSION} < 800069 +LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb +.endif + .if !defined(WITHOUT_ARTSWRAPPER) RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 9380d226f5fb..84a6296334cc 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -16,8 +16,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system -LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb \ - qimageblitz.4:${PORTSDIR}/x11/qimageblitz\ +LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz\ dbus-1.3:${PORTSDIR}/devel/dbus \ hal.1:${PORTSDIR}/sysutils/hal \ xklavier.12:${PORTSDIR}/x11/libxklavier @@ -52,6 +51,12 @@ CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ #Xmms and Googlegadgets could be enabled, #QEdje has not been ported yet. +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 800069 +LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb +.endif + post-extract: ${MKDIR} ${WRKSRC} @@ -74,4 +79,4 @@ post-install: @${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.post.mk> |