Date: Wed, 18 Apr 2007 18:02:30 +0200 From: Michael Nottebrock <lofi@freebsd.org> To: kde@freebsd.org Cc: x11@freebsd.org, Andy Fawcett <andy@athame.co.uk> Subject: Re: [kde-freebsd] qt upgrade strangeness Message-ID: <200704181802.31789.lofi@freebsd.org> In-Reply-To: <00d201c78052$6b2af740$0d0aa8c0@dorfl> References: <200704051229.27994.lists@jnielsen.net> <200704051231.45103.lists@jnielsen.net> <00d201c78052$6b2af740$0d0aa8c0@dorfl>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart20745322.P7gT6J618O Content-Type: multipart/mixed; boundary="Boundary-01=_XEkJGGH7rHbIEwf" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_XEkJGGH7rHbIEwf Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Monday, 16. April 2007, Andy Fawcett wrote: > > On Thursday 05 April 2007 12:29:27 pm John Nielsen wrote: > > [...] > > > In short, qt will install happily the first time but not the second. > > [...] > > Originally I reported that I wasn't seeing this. > > Now, I've just updated to the very latest git X11 ports, with X11BASE > migrated to LOCALBASE, and get this problem. > > cd src/moc && make > cd src/moc && make install > cp -f "../../bin/moc" "/usr/local/bin/moc" > cd src && make > make: don't know how to make /usr/local/include/qconfig.h. Stop > *** Error code 2 John, Andy, can you both try the attached patch? =2D-=20 ,_, | Michael Nottebrock | lofi@freebsd.org (/^ ^\) | FreeBSD - The Power to Serve | http://www.freebsd.org \u/ | K Desktop Environment on FreeBSD | http://freebsd.kde.org --Boundary-01=_XEkJGGH7rHbIEwf Content-Type: text/plain; charset="iso-8859-1"; name="qt33.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="qt33.diff" Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/kde-freebsd/area51/x11-toolkits/qt33/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile =2D-- Makefile 12 Apr 2007 16:27:19 -0000 1.48 +++ Makefile 18 Apr 2007 15:41:00 -0000 @@ -186,10 +186,10 @@ .for tool in makeqpf mergetr msg2qm qembed qvfb @cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE} .endfor =2D @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${GREP} --mmap -F -l -- \ =2D "${PLATFORM}" | ${XARGS} ${REINPLACE_CMD} -e "s,${PLATFORM}/qmake.conf= ,," \ =2D -e "s,${PLATFORM},," @${RM} -f ${WRKSRC}/doc/html/qmake* + ${REINPLACE_CMD} -e 's|${PREFIX}/include/q.*h||g' \ + -e 's|${PREFIX}/include/private/q.*h||g' \ + ${WRKSRC}/src/Makefile =20 # Work around qmake generated dependencies pre-su-install: --Boundary-01=_XEkJGGH7rHbIEwf-- --nextPart20745322.P7gT6J618O Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQBGJkEXXhc68WspdLARAkN/AJsEPYTIzjeoyDniYJx1rFWYoouyggCcDaHp Ujz/ffO6G1Vz3ccW4Mw0m10= =ik/c -----END PGP SIGNATURE----- --nextPart20745322.P7gT6J618O--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704181802.31789.lofi>