Revision: 141232 https://trac.macports.org/changeset/141232 Author: ryandesign@macports.org Date: 2015-10-12 23:46:32 -0700 (Mon, 12 Oct 2015) Log Message: ----------- qt3: fix build with freetype 2.6.1 (#49209); enable verbose configuration output Modified Paths: -------------- trunk/dports/x11/qt3/Portfile Removed Paths: ------------- trunk/dports/x11/qt3/files/patch-freetype-2.5.1.diff Modified: trunk/dports/x11/qt3/Portfile =================================================================== --- trunk/dports/x11/qt3/Portfile 2015-10-13 06:42:15 UTC (rev 141231) +++ trunk/dports/x11/qt3/Portfile 2015-10-13 06:46:32 UTC (rev 141232) @@ -42,7 +42,7 @@ } patchfiles qt3-tiger.patch dp01.patch macports-x11.patch \ - patch-src_kernel_qpngio.cpp.diff patch-freetype-2.5.1.diff + patch-src_kernel_qpngio.cpp.diff patch { foreach p ${patchfiles} { @@ -123,7 +123,7 @@ conflicts_build qt3-mac -configure.args -buildkey qt3-jaguar \ +configure.args -v -buildkey qt3-jaguar \ -platform darwin-g++ -xplatform darwin-g++ \ -prefix '${prefix}/lib/qt3' -docdir '${prefix}/share/doc/qt3' \ -headerdir '${prefix}/include/qt3' -libdir '${prefix}/lib' \ Deleted: trunk/dports/x11/qt3/files/patch-freetype-2.5.1.diff =================================================================== --- trunk/dports/x11/qt3/files/patch-freetype-2.5.1.diff 2015-10-13 06:42:15 UTC (rev 141231) +++ trunk/dports/x11/qt3/files/patch-freetype-2.5.1.diff 2015-10-13 06:46:32 UTC (rev 141232) @@ -1,11 +0,0 @@ ---- a/config.tests/x11/xfreetype.test 2004-08-09 15:16:57.000000000 -0500 -+++ b/config.tests/x11/xfreetype.test 2014-01-06 11:57:29.000000000 -0600 -@@ -116,7 +116,7 @@ - # check for freetype2 headers - FREETYPE2_INCDIR= - if [ "$XFT" = "yes" ]; then -- INC="freetype2/freetype/freetype.h" -+ INC="freetype2/freetype.h" - XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"