[kde-freebsd] qt upgrade strangeness

[Michael Nottebrock]

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?

-- 
   ,_,   | Michael Nottebrock               | lofi at freebsd.org
 (/^ ^\) | FreeBSD - The Power to Serve     | http://www.freebsd.org
   \u/   | K Desktop Environment on FreeBSD | http://freebsd.kde.org
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/kde-freebsd/area51/x11-toolkits/qt33/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- 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
-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${GREP} --mmap -F -l -- \
-		"${PLATFORM}" | ${XARGS} ${REINPLACE_CMD} -e "s,${PLATFORM}/qmake.conf,," \
-		-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
 
 # Work around qmake generated dependencies
 pre-su-install:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kde-freebsd/attachments/20070418/00d804f3/attachment.pgp