Revision: 69257 http://trac.macports.org/changeset/69257 Author: michaelld@macports.org Date: 2010-06-28 23:55:03 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Tweaked install location of headers to ${prefix}/include/qwt . Corrected variants for qt3 and qt4. Corrected use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/graphics/qwt/Portfile trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff Modified: trunk/dports/graphics/qwt/Portfile =================================================================== --- trunk/dports/graphics/qwt/Portfile 2010-06-29 06:53:07 UTC (rev 69256) +++ trunk/dports/graphics/qwt/Portfile 2010-06-29 06:55:03 UTC (rev 69257) @@ -5,14 +5,19 @@ name qwt version 5.1.2 +revision 1 +conflicts qwt52 categories graphics science -maintainers nomaintainer -description Qt Widgets for Technical Applications -long_description The Qwt library contains GUI Components and utility classes \ - which are primarily useful for programs with a technical \ - background. Beside a 2D plot widget it provides scales, sliders, \ - dials, compasses, thermometers, wheels and knobs to control \ - or display values, arrays, or ranges of type double. +maintainers michaelld +description Qt Widgets for Technical Applications, version 5.1 +long_description \ + The Qwt 5.1 library contains GUI Components and utility classes \ + which are primarily useful for programs with a technical \ + background. Beside a 2D plot widget it provides scales, sliders, \ + dials, compasses, thermometers, wheels and knobs to control \ + or display values, arrays, or ranges of type double. \ + Version 5.1 contains source incompatible changes versus 5.2. \ + See qwt52 for that port. homepage http://qwt.sourceforge.net master_sites sourceforge:qwt distname qwt-${version} @@ -24,27 +29,32 @@ patchfiles patch-qwtconfig.pri.diff -set qt_dir ${prefix}/libexec/qt4-mac +# set the qt_dir variable to nothing; makes 'port' happy +set qt_dir "" +variant qt3 conflicts qt4 description {Use qt3-mac} { + depends_lib-append port:qt3-mac + set qt_dir ${prefix}/libexec/qt3-mac +} + +variant qt4 conflicts qt3 description {Use qt4-mac} { + depends_lib-append port:qt4-mac + set qt_dir ${prefix}/libexec/qt4-mac +} + +if {![variant_isset qt3] && ![variant_isset qt4]} { + default_variants +qt4 + set qt_dir ${prefix}/libexec/qt4-mac +} + configure.cmd ${qt_dir}/bin/qmake configure.pre_args INSTALLBASE="${prefix}" +configure.universal_args-delete --disable-dependency-tracking destroot.destdir INSTALL_ROOT="${destroot}" post-destroot { # fix install-name of dynamic library system "install_name_tool -id ${prefix}/lib/libqwt.${version}.dylib ${destroot}${prefix}/lib/libqwt.${version}.dylib" - system "install_name_tool -change libqwt.5.dylib ${prefix}/lib/libqwt.5.dylib ${destroot}${qt_dir}/plugins/designer/libqwt_designer_plugin.bundle" + system "install_name_tool -change libqwt.5.dylib ${prefix}/lib/libqwt.5.dylib ${destroot}${qt_dir}/plugins/designer/libqwt_designer_plugin.dylib" } - -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 path:bin/qmake-mac:qt4-mac -} - -if { ![variant_isset qt3] && ![variant_isset qt4] } { - default_variants +qt4 -} Modified: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff =================================================================== --- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff 2010-06-29 06:53:07 UTC (rev 69256) +++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff 2010-06-29 06:55:03 UTC (rev 69257) @@ -1,7 +1,7 @@ ---- work/qwt-5.1.0/qwtconfig.pri 2008-05-02 11:08:06.000000000 -0700 +--- qwtconfig.pri.orig 2008-05-02 11:08:06.000000000 -0700 +++ qwtconfig.pri 2008-05-02 11:10:49.000000000 -0700 @@ -7,17 +7,13 @@ - VER_PAT = 0 + VER_PAT = 2 VERSION = $$VER_MAJ.$$VER_MIN.$$VER_PAT -unix { @@ -13,7 +13,8 @@ } target.path = $$INSTALLBASE/lib - headers.path = $$INSTALLBASE/include +-headers.path = $$INSTALLBASE/include ++headers.path = $$INSTALLBASE/include/qwt -doc.path = $$INSTALLBASE/doc +doc.path = $$INSTALLBASE/share/qwt/doc