[69270] trunk/dports/science/root

[Ryan Schmidt]

On Jun 29, 2010, at 02:18, michaelld at macports.org wrote:

> Revision: 69270
>          http://trac.macports.org/changeset/69270
> Author:   michaelld at macports.org
> Date:     2010-06-29 00:18:52 -0700 (Tue, 29 Jun 2010)
> Log Message:
> -----------
> Bump to 5.26.00b .
> Add variants for qt4-mac and qt4-x11 (fixes ticket #23748).
> Corrected use of qt4-* dependency.
> Explicit compilation as 32-bit or 64-bit.
> Hack to get around issues finding Qt libraries.


> Added: trunk/dports/science/root/files/patch-config-Makefile.config.diff
> ===================================================================
> --- trunk/dports/science/root/files/patch-config-Makefile.config.diff	                        (rev 0)
> +++ trunk/dports/science/root/files/patch-config-Makefile.config.diff	2010-06-29 07:18:52 UTC (rev 69270)
> @@ -0,0 +1,11 @@
> +--- config/Makefile.config_orig	2010-06-25 21:17:25.000000000 -0600
> ++++ config/Makefile.config	2010-06-25 21:18:05.000000000 -0600
> +@@ -96,7 +96,7 @@
> + BUILDQT        := yes
> + BUILDQTGSI     := yes
> + QTLIBDIR       := -L/opt/local/libexec/qt4-mac/lib
> +-QTLIB          := QtCore.la QtGui.la Qt3Support.la QtOpenGL.la QtSvg.la QtXml.la QtWebKit.la QtNetwork.la
> ++QTLIB          := -F/opt/local/libexec/qt4-mac/lib -framework QtCore -framework QtGui -framework Qt3Support -framework QtOpenGL -framework QtSvg -framework QtXml -framework QtWebKit -framework QtNetwork -framework ApplicationServices -framework Carbon -framework AppKit -L/opt/local/libexec/qt4-mac/lib -lpng -lz -lm
> + QTINCDIR       := $(filter-out /usr/include, /opt/local/libexec/qt4-mac/include/ /opt/local/libexec/qt4-mac/include//Qt /opt/local/libexec/qt4-mac/include//Qt3Support /opt/local/libexec/qt4-mac/include//QtAssistant /opt/local/libexec/qt4-mac/include//QtCore /opt/local/libexec/qt4-mac/include//QtDBus /opt/local/libexec/qt4-mac/include//QtDesigner /opt/local/libexec/qt4-mac/include//QtGui /opt/local/libexec/qt4-mac/include//QtHelp /opt/local/libexec/qt4-mac/include//QtMultimedia /opt/local/libexec/qt4-mac/include//QtNetwork /opt/local/libexec/qt4-mac/include//QtOpenGL /opt/local/libexec/qt4-mac/include//QtScript /opt/local/libexec/qt4-mac/include//QtScriptTools /opt/local/libexec/qt4-mac/include//QtSql /opt/local/libexec/qt4-mac/include//QtSvg /opt/local/libexec/qt4-mac/include//QtTest /opt/local/libexec/qt4-mac/include//QtUiTools /opt/local/libexec/qt4-mac/include//QtWebKit /opt/local/libexec/qt4-mac/include//QtXml /opt/local/libexec/qt4-mac/include//QtXmlPatterns)
> + QTVERS	       := 4
> + QTMOCEXE       := /opt/local/bin/moc

You mustn't hardcode /opt/local here; you must arrange for the current value of ${prefix} to be used.