From owner-freebsd-current@FreeBSD.ORG Fri Apr 17 16:28:51 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DE101065675 for ; Fri, 17 Apr 2009 16:28:51 +0000 (UTC) (envelope-from mel.flynn+fbsd.current@mailing.thruhere.net) Received: from mailhub.rachie.is-a-geek.net (rachie.is-a-geek.net [66.230.99.27]) by mx1.freebsd.org (Postfix) with ESMTP id 1009B8FC26 for ; Fri, 17 Apr 2009 16:28:50 +0000 (UTC) (envelope-from mel.flynn+fbsd.current@mailing.thruhere.net) Received: from sarevok.dnr.servegame.org (gate.lan.rachie.is-a-geek.net [192.168.2.10]) by mailhub.rachie.is-a-geek.net (Postfix) with ESMTP id 0326A7E821; Fri, 17 Apr 2009 08:28:49 -0800 (AKDT) From: Mel Flynn To: freebsd-current@freebsd.org Date: Fri, 17 Apr 2009 18:28:45 +0200 User-Agent: KMail/1.11.0 (FreeBSD/8.0-CURRENT; KDE/4.2.2; i386; ; ) References: <200904170836.36239.mel.flynn+fbsd.current@mailing.thruhere.net> <542798610904170031w44e51957gd342eadf747a4e97@mail.gmail.com> <200904171035.39259.mel.flynn+fbsd.current@mailing.thruhere.net> In-Reply-To: <200904171035.39259.mel.flynn+fbsd.current@mailing.thruhere.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200904171828.46222.mel.flynn+fbsd.current@mailing.thruhere.net> Cc: kde@freebsd.org, Johannes Dieterich Subject: Re: Proper procedure to update hal on -current X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2009 16:28:51 -0000 On Friday 17 April 2009 10:35:39 Mel Flynn wrote: > Hi Johannes, > > On Friday 17 April 2009 09:31:46 Johannes Dieterich wrote: > > > Do I need to temporarily uninstall devel/libusb (it doesn't build now > > > anyway, > > > but maybe upgrading to today's current will fix that) then reinstall > > > it? > > > > My procedure was to deinstall devel/libusb, then I also encountered the > > same kind of mising dependencies as you do but for me a pkgdb -F > > afterwards would fix them. Then hal would also build for me. :-) > > Ah, this relies on ldconfig -r finding /usr/lib/libusb and thus not > installing devel/libusb. Gotcha. Actually, it don't :( and libusb marked as IGNORE, portmaster complaints and downhill there. Hence the patch below. Whether this patch disables usb features, I don't know. Will have to dig into cmake and find out where it stores "what is enabled/disabled". Index: x11/kdebase4-workspace/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/kdebase4-workspace/Makefile,v retrieving revision 1.220 diff -u -r1.220 Makefile --- x11/kdebase4-workspace/Makefile 16 Apr 2009 05:05:56 -0000 1.220 +++ x11/kdebase4-workspace/Makefile 17 Apr 2009 16:22:14 -0000 @@ -17,8 +17,7 @@ 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 @@ -55,6 +54,11 @@ #Xmms and Googlegadgets could be enabled, #QEdje has not been ported yet. +.include +.if ${OSVERSION} < 800069 +LIB_DEPENDS+=usb-0.1.8:${PORTSDIR}/devel/libusb +.endif + post-extract: ${MKDIR} ${WRKSRC} @@ -77,4 +81,4 @@ @${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet ${PREFIX}/lib/kde4/libexec/kdm-bin_greet @${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin -.include +.include -- Mel