Re: Proper procedure to update hal on -current

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
_at__at_ -17,8 +17,7 _at__at_
 MAINTAINER=    kde_at_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
_at__at_ -55,6 +54,11 _at__at_
 #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}

_at__at_ -77,4 +81,4 _at__at_
        _at_${MV} ${PREFIX}/lib/kde4/libexec/kdm_greet 
${PREFIX}/lib/kde4/libexec/kdm-bin_greet
        _at_${INSTALL_SCRIPT} ${WRKDIR}/kdm ${PREFIX}/bin

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

-- 
Mel