Revision: 32448 http://trac.macosforge.org/projects/macports/changeset/32448 Author: jochen@macports.org Date: 2008-01-02 07:08:59 -0800 (Wed, 02 Jan 2008) Log Message: ----------- Provide variants to allow for builds against Qt4 and Qt3, patch provided by mdickens@nd.edu This closesTicket #13715 Modified Paths: -------------- trunk/dports/graphics/qwt/Portfile trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff Added Paths: ----------- trunk/dports/graphics/qwt/files/patch-designer-designer.pro.diff Modified: trunk/dports/graphics/qwt/Portfile =================================================================== --- trunk/dports/graphics/qwt/Portfile 2008-01-02 10:56:37 UTC (rev 32447) +++ trunk/dports/graphics/qwt/Portfile 2008-01-02 15:08:59 UTC (rev 32448) @@ -20,12 +20,29 @@ checksums md5 53adbb313c478dd4aae4f1c864a2037e platforms darwin -patchfiles patch-qwtconfig.pri.diff +patchfiles patch-qwtconfig.pri.diff \ + patch-designer-designer.pro.diff depends_lib port:qt4-mac configure.cmd qmake +configure.env INSTALLBASE="${prefix}" QTDIR="${prefix}" configure.pre_args -configure.args -macx INSTALLBASE="${prefix}" +configure.args -macx -destroot.destdir INSTALL_ROOT="${destroot}" +build.env QTDIR="${prefix}" + +destroot.destdir INSTALL_ROOT="${destroot}${prefix}" +destroot.env QTDIR="${prefix}" + +variant qt3 conflicts qt4 description "Use qt3-mac" { + depends_lib-append port:qt3-mac +} + +variant qt4 conflicts qt3 description "Use qt4-mac" { + depends_lib-append port:qt4-mac +} + +if { ![variant_isset qt3] && ![variant_isset qt4] } { + default_variants +qt4 +} Added: trunk/dports/graphics/qwt/files/patch-designer-designer.pro.diff =================================================================== --- trunk/dports/graphics/qwt/files/patch-designer-designer.pro.diff (rev 0) +++ trunk/dports/graphics/qwt/files/patch-designer-designer.pro.diff 2008-01-02 15:08:59 UTC (rev 32448) @@ -0,0 +1,20 @@ +--- designer/designer.pro~ 2007-06-11 01:41:29.000000000 -0400 ++++ designer/designer.pro 2007-12-25 16:05:01.000000000 -0500 +@@ -49,7 +49,7 @@ + HEADERS += qwtplugin.h + SOURCES += qwtplugin.cpp + +- target.path = $(QTDIR)/plugins/designer ++ target.path = /share/qwt/plugins/designer + INSTALLS += target + + IMAGES += \ +@@ -92,7 +92,7 @@ + RESOURCES += \ + qwt_designer_plugin.qrc + +- target.path = $$[QT_INSTALL_PLUGINS]/designer ++ target.path = /share/qwt/plugins/designer + INSTALLS += target + } + Modified: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff =================================================================== --- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff 2008-01-02 10:56:37 UTC (rev 32447) +++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff 2008-01-02 15:08:59 UTC (rev 32448) @@ -1,6 +1,6 @@ ---- qwtconfig.pri-orig 2007-05-11 00:11:00.000000000 +0200 -+++ qwtconfig.pri 2007-05-11 00:11:39.000000000 +0200 -@@ -2,10 +2,6 @@ +--- qwtconfig.pri~ 2007-06-11 01:41:29.000000000 -0400 ++++ qwtconfig.pri 2007-12-24 13:56:46.000000000 -0500 +@@ -2,17 +2,13 @@ # Install paths ###################################################################### @@ -9,6 +9,13 @@ -} - win32 { - INSTALLBASE = C:/Qwt + INSTALLBASE = C:/Qwt-5.0.2 } - + + target.path = $$INSTALLBASE/lib + headers.path = $$INSTALLBASE/include +-doc.path = $$INSTALLBASE/doc ++doc.path = $$INSTALLBASE/share/qwt/doc + + ###################################################################### + # qmake internal options