Revision: 72688 http://trac.macports.org/changeset/72688 Author: michaelld@macports.org Date: 2010-10-23 17:40:06 -0700 (Sat, 23 Oct 2010) Log Message: ----------- qscintilla: Trial fix for ticket #26958. Patch to fix #include "Platform.h" to not conflict with that installed by the port 'tidy' on case-insensitive file systems. Also, fix self-id of both the installed library and plugin, generically. Modified Paths: -------------- trunk/dports/devel/qscintilla/Portfile Modified: trunk/dports/devel/qscintilla/Portfile =================================================================== --- trunk/dports/devel/qscintilla/Portfile 2010-10-23 23:55:07 UTC (rev 72687) +++ trunk/dports/devel/qscintilla/Portfile 2010-10-24 00:40:06 UTC (rev 72688) @@ -41,6 +41,16 @@ universal_variant no +post-patch { + # fix up 'Platform.h's, to avoid a conflict with the port 'tidy's + # 'platform.h'. + reinplace "/INCLUDEPATH/s@ \\. @ . .. @" \ + ${worksrcpath}/Qt4/qscintilla.pro + foreach fixfile [exec grep -lr \"Platform\.h\" ${worksrcpath}] { + reinplace "s@\"Platform\.h\"@\"include/Platform\.h\"@g" ${fixfile} + } +} + configure.cmd "cd ${worksrcpath}/Qt4; ${qt_qmake_cmd} qscintilla.pro; \ cd ${worksrcpath}/designer-Qt4; ${qt_qmake_cmd} designer.pro; \ echo" @@ -50,10 +60,13 @@ destroot.cmd "cd ${worksrcpath}/Qt4; make install; cd ${worksrcpath}/designer-Qt4; make install; echo" -post-build { - system "install_name_tool -id \ - ${qt_dir}/lib/libqscintilla2.5.dylib \ - ${worksrcpath}/Qt4/libqscintilla2.5.dylib" +post-destroot { + # Fix import and plugin library ID (self name) + foreach fixfile [exec find ${destroot}${prefix}/share/${qt_name} \ + -name "*.dylib" -type f | \ + sed -e "s@${destroot}@@g" ] { + system "install_name_tool -id ${fixfile} ${destroot}${fixfile}" + } } livecheck.type regex