Date: Fri, 17 Apr 2009 18:28:45 +0200 From: Mel Flynn <mel.flynn+fbsd.current@mailing.thruhere.net> To: freebsd-current@freebsd.org Cc: kde@freebsd.org, Johannes Dieterich <dieterich.joh@googlemail.com> Subject: Re: Proper procedure to update hal on -current Message-ID: <200904171828.46222.mel.flynn%2Bfbsd.current@mailing.thruhere.net> In-Reply-To: <200904171035.39259.mel.flynn%2Bfbsd.current@mailing.thruhere.net> References: <200904170836.36239.mel.flynn%2Bfbsd.current@mailing.thruhere.net> <542798610904170031w44e51957gd342eadf747a4e97@mail.gmail.com> <200904171035.39259.mel.flynn%2Bfbsd.current@mailing.thruhere.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
--
Mel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904171828.46222.mel.flynn%2Bfbsd.current>