On Mon, Aug 09, 2010 at 10:36:48AM +0200, Marc Espie wrote: > On Sun, Jul 18, 2010 at 10:57:28PM +0200, viq wrote: > > I am having a go at updating net/psi port, and it caused me some > > problems, it tried to build qca2 and qt4 as a process of building psi > > itself. I narrowed it down to the .prl files that are part of > > security/qca2 and x11/qt4 that include path to where the port was build. > > When I removed those lines (and in once case altered the library path to > > point to "real" location of libraries) psi built fine, using libraries > > present in the system. > > > > Here is a patch to x11/qt4 that fixes the above issue. Please review > > this and tell me whether it's a bad way to go about this. Also please > > test for any fallout, I didn't see any in a limited bulk build on amd64, > > but I would rather have other people test it too. > > > > Probably similiar fix will be needed for security/qca2 > > Sorry, got caught up in a lot of other more urgent things. > > I need a complete testcase to figure this out. This doesn't make > a lot of sense to me (the information stored in the PRL files appears to > be correct, and psi would not need to use those build dirs ?). > > So, if you can, prepare an update (along with patches you think are > necessary to qca2 and qt4), and I'll have a much closer look.
Sorry for the delay. My testcase is psi, port attached (needs a bit cleanup but compiles and works), and the patches to qt4 and qca2 that make psi compile. Without version bump as I haven't yet wrapped my head around that. -- viq
psi.tar.gz
Description: application/tar-gz
diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile
index fb08452..7a91e4c 100644
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@@ -291,6 +291,9 @@ pre-patch:
cd ${WRKDIST} && cp -R mkspecs/openbsd-g++ mkspecs/openbsd-g++4
post-install:
+ # remove extraneous paths
+ perl -pi -e "s,QMAKE_PRL_(BUILD|SOURCE)_DIR.*\n,,g"
${PREFIX}/lib/qt4/*.prl ${PREFIX}/lib/qt4/demos/shared/libdemo_shared.prl
+ perl -pi -e "s,${WRKBUILD}/lib,${LOCALBASE}/lib/qt4,g"
${PREFIX}/lib/qt4/*.prl ${PREFIX}/lib/qt4/demos/shared/libdemo_shared.prl
# extra doc
cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${QT_DOC}
# programs
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/qca2/Makefile,v
retrieving revision 1.4
diff -u -d -r1.4 Makefile
--- Makefile 22 Jun 2010 00:35:42 -0000 1.4
+++ Makefile 19 Aug 2010 21:15:28 -0000
@@ -29,5 +29,8 @@
WANTLIB += c m
WANTLIB += pthread stdc++
+
+post-install:
+ perl -pi -e "s,^QMAKE_PRL_BUILD_DIR.*\n,,g" ${PREFIX}/lib/*.prl
.include <bsd.port.mk>
pgpM9mZcD5EDB.pgp
Description: PGP signature
