[102939] trunk/dports/graphics
michaelld at macports.org
michaelld at macports.org
Sun Feb 10 18:44:55 PST 2013
Revision: 102939
https://trac.macports.org/changeset/102939
Author: michaelld at macports.org
Date: 2013-02-10 18:44:55 -0800 (Sun, 10 Feb 2013)
Log Message:
-----------
qwt*:
+ Combine into 1 portfile with subports;
+ rename qwt-60 to qwt60 following use by other ports;
+ bump to latest version of each, with corrected patchfiles;
+ fix livecheck for each, since some recent changes have been backported to earlier versions;
+ when installed as a framework, relink as library and headers too;
+ addresses ticket #35975.
Modified Paths:
--------------
trunk/dports/graphics/qwt/Portfile
Added Paths:
-----------
trunk/dports/graphics/qwt/files/patch-designer_designer.pro.60.diff
trunk/dports/graphics/qwt/files/patch-designer_designer.pro.610rc3.diff
trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.60.diff
trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.610rc3.diff
trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.51.diff
trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.52.diff
trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.60.diff
trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.610rc3.diff
trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.60.diff
trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.610rc3.diff
Removed Paths:
-------------
trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff
trunk/dports/graphics/qwt-60/
trunk/dports/graphics/qwt-devel/
trunk/dports/graphics/qwt52/
Modified: trunk/dports/graphics/qwt/Portfile
===================================================================
--- trunk/dports/graphics/qwt/Portfile 2013-02-11 02:33:32 UTC (rev 102938)
+++ trunk/dports/graphics/qwt/Portfile 2013-02-11 02:44:55 UTC (rev 102939)
@@ -4,71 +4,186 @@
PortSystem 1.0
name qwt
-version 5.1.2
-revision 2
-conflicts qwt52 qwt-60 qwt-devel
categories graphics science
# actually a little more permissive than the standard LGPL, but the
# distinction doesn't matter to us.
license LGPL-2.1
-maintainers michaelld openmaintainer
-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.
+maintainers michaelld phw openmaintainer
homepage http://qwt.sourceforge.net
-master_sites sourceforge:qwt
-distname qwt-${version}
+
+master_sites sourceforge:qwt sourceforge:qwt-beta
use_bzip2 yes
use_parallel_build no
-checksums md5 cb26a36f020d7c038e207b03b7d79bc5 \
- sha1 2fc04b78c438635a78e41a22fea6f9e016f7ca17 \
- rmd160 a5a94aa3870a631f9605e6370c4d04fb1c79347e
+dist_subdir qwt
+
platforms darwin
+universal_variant yes
-patchfiles patch-qwtconfig.pri.diff
+if {${subport} == ${name}} {
+ version 5.1.2
+ distname qwt-${version}
+ revision 2
+ conflicts qwt52 qwt60 qwt-60 qwt-devel
+ checksums sha1 2fc04b78c438635a78e41a22fea6f9e016f7ca17 \
+ rmd160 a5a94aa3870a631f9605e6370c4d04fb1c79347e
+ patchfiles patch-qwtconfig.pri.51.diff
+ livecheck.url http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss
+ livecheck.regex \\/qwt\\/(5\\.1\\.\\d+)\\/
+
+}
+
+subport qwt52 {
+
+ version 5.2.3
+ distname qwt-${version}
+ conflicts qwt qwt60 qwt-60 qwt-devel
+ checksums sha1 ff81595a1641a8b431f98d6091bb134bc94e0003 \
+ rmd160 9b2128ad2b53a65678f9ea57d34cdc73a3674d21
+ patchfiles patch-qwtconfig.pri.52.diff
+ livecheck.url http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss
+ livecheck.regex \\/qwt\\/(5\\.2\\.\\d+)\\/
+
+}
+
+subport qwt-60 {
+
+ # disable this port; use qwt60 instead
+
+ version 6.0.2
+
+ replaced_by qwt60
+
+ livecheck.type none
+
+ pre-configure {
+ ui_error "This port has been replaced by 'qwt60'; please install that port instead."
+ return -code error
+ }
+
+ distfiles
+
+}
+
+subport qwt60 {
+
+ version 6.0.2
+ distname qwt-${version}
+ conflicts qwt qwt52 qwt-devel
+ checksums sha1 cbdd00b29521987c9e7bc6aa51092f0474b9428d \
+ rmd160 c9d31f40b6001f09c59dbf4c0628ddd860474821
+ patchfiles patch-qwtconfig.pri.60.diff \
+ patch-qwtbuild.pri.60.diff \
+ patch-qwtfunctions.pri.60.diff \
+ patch-designer_designer.pro.60.diff
+ livecheck.url http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss
+ livecheck.regex \\/qwt\\/(6\\.0\\.\\d+)\\/
+
+}
+
+subport qwt-devel {
+
+ version 6.1.0-rc3
+ distname qwt-6.1-rc3
+ conflicts qwt qwt52 qwt60 qwt-60
+ checksums sha1 0ee2e80fd9a5d5cc1efc2e09783d20fc4f76aa13 \
+ rmd160 560fb2e91eb3a825bcc93fc970ab574b85f3390d
+ patchfiles patch-qwtconfig.pri.610rc3.diff \
+ patch-qwtbuild.pri.610rc3.diff \
+ patch-qwtfunctions.pri.610rc3.diff \
+ patch-designer_designer.pro.610rc3.diff
+ livecheck.url http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss
+ livecheck.regex \\/(6\\.1\\.\\d-rc\\d)\\/
+
+}
+
+# get qwt's version numbers
+
+global qwt_major, qwt_minor, qwt_patch
+set qwt_vers [split ${version} "."]
+set qwt_major [lindex ${qwt_vers} 0]
+set qwt_minor [lindex ${qwt_vers} 1]
+set qwt_patch [lindex ${qwt_vers} 2]
+set qwt_maj_min ${qwt_major}.${qwt_minor}
+
+description QWT: Qt Widgets for Technical Applications, \
+ Version ${qwt_maj_min}
+
+long_description ${description}\nThe 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. QWT version ${qwt_maj_min} contains source incompatible \
+ changes versus other versions of QWT.
+
post-patch {
+
# setup for debug, if selected
+
if {[variant_isset debug]} {
- reinplace "/CONFIG/s at release@debug_and_release build_all@" \
+ if {${qwt_major} == 5} {
+ reinplace "/CONFIG/s at release@debug_and_release build_all@" \
+ ${worksrcpath}/qwtconfig.pri
+ } else {
+ reinplace "/CONFIG/s at release@debug_and_release build_all@" \
+ ${worksrcpath}/qwtbuild.pri
+ }
+ }
+
+ # set arch type(s)
+
+ if {${qwt_major} == 5} {
+ reinplace "s/@ARCHES@/${qt_arch_types}/" \
${worksrcpath}/qwtconfig.pri
+ } else {
+ reinplace "s/@ARCHES@/${qt_arch_types}/" \
+ ${worksrcpath}/qwtbuild.pri
}
- # set arch type
- reinplace "s/@ARCHES@/${qt_arch_types}/" \
- ${worksrcpath}/qwtconfig.pri
+ # setup for examples, if selected
- # setup for examples, if selected
if {![variant_isset examples]} {
reinplace "s at QwtExamples@@" \
${worksrcpath}/qwtconfig.pri
}
}
-variant qt3 conflicts qt4 description {Use qt3-mac} {}
+if {${qwt_major} < 6} {
-variant qt4 conflicts qt3 description {Use qt4-mac} {}
+ # QWT version 5 can work with Qt3 or Qt4
-# move setting of 'qt_qmake_cmd' outside variants, since 'if'
-# statements are processed in-order while variants are processed after
-# everything else.
-set qt_qmake_cmd ""
-if {[variant_isset qt3]} {
- depends_lib-append port:qt3-mac
- set qt_qmake_cmd ${prefix}/libexec/qt3-mac/bin/qmake
+ variant qt3 conflicts qt4 description {Use qt3-mac} {}
+
+ variant qt4 conflicts qt3 description {Use qt4-mac} {}
+
+ # move setting of 'qt_qmake_cmd' outside variants, since 'if'
+ # statements are processed in-order while variants are processed after
+ # everything else.
+
+ set qt_qmake_cmd ""
+
+ if {[variant_isset qt3]} {
+
+ depends_lib-append port:qt3-mac
+ set qt_qmake_cmd ${prefix}/libexec/qt3-mac/bin/qmake
+
+ } else {
+
+ # when variant 'qt3' is not set, use qt4 whether by default or via
+ # the user's variant choice
+
+ if {![variant_isset qt4]} {
+ default_variants +qt4
+ }
+ PortGroup qt4 1.0
+
+ }
} else {
- # when variant 'qt3' is not set, use qt4 whether by default or via
- # the user's variant choice
- if {![variant_isset qt4]} {
- default_variants +qt4
- }
- PortGroup qt4 1.0
+
+ # QWT 6+ uses Qt4+ only
+ PortGroup qt4 1.0
+
}
configure.cmd ${qt_qmake_cmd}
@@ -85,8 +200,61 @@
}
}
-universal_variant yes
+post-destroot {
+ # if qwt is installed as a framework,
+ # link in as libraries and headers too
+
+ if {[file exists ${destroot}${qt_frameworks_dir}/qwt.framework/qwt]} {
+
+ global qwt_major, qwt_minor, qwt_patch
+ foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
+ -name "*.framework" | \
+ sed -e "s@${destroot}@@g"] {
+
+ set tf_full [strsed ${fixfile} {s@\\.framework@@}]
+ set tf [strsed ${tf_full} {g at .*\/@@}]
+
+ # link headers into ${qt_includes_dir}, removing
+ # directories if they are already there first
+
+ set inc_file ${destroot}${qt_includes_dir}/${tf}
+ if {[file exists ${inc_file}]} {
+ file delete -force ${inc_file}
+ }
+ ln -s ${tf_full}.framework/Headers ${inc_file}
+
+ # link libraries into ${qt_libs_dir}
+
+ set libs_dir ${destroot}${qt_libs_dir}
+
+ ln -s ${tf_full}.framework/${tf} \
+ ${libs_dir}/lib${tf}.dylib
+ ln -s ${tf_full}.framework/${tf} \
+ ${libs_dir}/lib${tf}.${qwt_major}.dylib
+ ln -s ${tf_full}.framework/${tf} \
+ ${libs_dir}/lib${tf}.${qwt_major}.${qwt_minor}.dylib
+ ln -s ${tf_full}.framework/${tf} \
+ ${libs_dir}/lib${tf}.${qwt_major}.${qwt_minor}.${qwt_patch}.dylib
+
+ if {[variant_isset debug]} {
+
+ # link debug libraries into ${qt_libs_dir}
+
+ ln -s ${tf_full}.framework/${tf}_debug \
+ ${libs_dir}/lib${tf}_debug.dylib
+ ln -s ${tf_full}.framework/${tf}_debug \
+ ${libs_dir}/lib${tf}_debug.${qwt_major}.dylib
+ ln -s ${tf_full}.framework/${tf}_debug \
+ ${libs_dir}/lib${tf}_debug.${qwt_major}.${qwt_minor}.dylib
+ ln -s ${tf_full}.framework/${tf}_debug \
+ ${libs_dir}/lib${tf}_debug.${qwt_major}.${qwt_minor}.${qwt_patch}.dylib
+
+ }
+ }
+ }
+}
+
variant debug description "Build release and debug versions" {}
variant examples description "Build examples" {}
Added: trunk/dports/graphics/qwt/files/patch-designer_designer.pro.60.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-designer_designer.pro.60.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-designer_designer.pro.60.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,11 @@
+--- designer/designer.pro.orig 2013-02-07 14:40:16.000000000 -0500
++++ designer/designer.pro 2013-02-07 14:40:31.000000000 -0500
+@@ -19,7 +19,7 @@
+ CONFIG += warn_on
+
+ TEMPLATE = lib
+- TARGET = qwt_designer_plugin
++ TARGET = $$qwtLibraryTarget(qwt_designer_plugin)
+
+ DESTDIR = plugins/designer
+
Added: trunk/dports/graphics/qwt/files/patch-designer_designer.pro.610rc3.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-designer_designer.pro.610rc3.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-designer_designer.pro.610rc3.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,11 @@
+--- designer/designer.pro.orig 2013-01-25 19:21:02.000000000 -0500
++++ designer/designer.pro 2013-02-08 13:24:07.000000000 -0500
+@@ -29,7 +29,7 @@
+
+
+ TEMPLATE = lib
+- TARGET = qwt_designer_plugin
++ TARGET = $$qwtLibraryTarget(qwt_designer_plugin)
+
+ DESTDIR = plugins/designer
+
Copied: trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.60.diff (from rev 102705, trunk/dports/graphics/qwt-devel/files/patch-qwtbuild.pri.diff)
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.60.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.60.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,37 @@
+--- qwtbuild.pri.orig 2013-02-07 12:32:39.000000000 -0500
++++ qwtbuild.pri 2013-02-07 12:37:30.000000000 -0500
+@@ -14,7 +14,6 @@
+ CONFIG += qt
+ CONFIG += warn_on
+ CONFIG += no_keywords
+-CONFIG += silent
+
+ ######################################################################
+ # release/debug mode
+@@ -32,7 +31,7 @@
+ }
+ else {
+
+- CONFIG += release
++ CONFIG += @ARCHES@ release
+
+ VER_MAJ = $${QWT_VER_MAJ}
+ VER_MIN = $${QWT_VER_MIN}
+@@ -65,17 +64,3 @@
+ !debug_and_release {
+ OBJECTS_DIR = obj
+ }
+-
+-unix {
+-
+- exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
+-
+- # On some Linux distributions the Qwt libraries are installed
+- # in the same directory as the Qt libraries. Unfortunately
+- # qmake always adds QMAKE_LIBDIR_QT at the beginning of the
+- # linker path, so that the installed libraries will be
+- # used instead of the local ones.
+-
+- error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
+- }
+-}
Added: trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.610rc3.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.610rc3.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.610rc3.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,60 @@
+--- qwtbuild.pri.orig 2013-01-25 19:21:02.000000000 -0500
++++ qwtbuild.pri 2013-02-08 13:27:04.000000000 -0500
+@@ -14,7 +14,6 @@
+ CONFIG += qt
+ CONFIG += warn_on
+ CONFIG += no_keywords
+-CONFIG += silent
+
+ ######################################################################
+ # release/debug mode
+@@ -32,7 +31,7 @@
+ }
+ else {
+
+- CONFIG += release
++ CONFIG += @ARCHES@ release
+
+ VER_MAJ = $${QWT_VER_MAJ}
+ VER_MIN = $${QWT_VER_MIN}
+@@ -40,22 +39,6 @@
+ VERSION = $${QWT_VERSION}
+ }
+
+-linux-g++ {
+- #CONFIG += separate_debug_info
+- #QMAKE_CXXFLAGS *= -Wfloat-equal
+- #QMAKE_CXXFLAGS *= -Wshadow
+- #QMAKE_CXXFLAGS *= -Wpointer-arith
+- #QMAKE_CXXFLAGS *= -Wconversion
+- #QMAKE_CXXFLAGS *= -Wsign-compare
+- #QMAKE_CXXFLAGS *= -Wsign-conversion
+- #QMAKE_CXXFLAGS *= -Wlogical-op
+- #QMAKE_CXXFLAGS *= -Werror=format-security
+-
+- # when using the gold linker ( Qt < 4.8 ) - might be
+- # necessary on non linux systems too
+- #QMAKE_LFLAGS += -lrt
+-}
+-
+ ######################################################################
+ # paths for building qwt
+ ######################################################################
+@@ -65,17 +48,3 @@
+ !debug_and_release {
+ OBJECTS_DIR = obj
+ }
+-
+-unix {
+-
+- exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) {
+-
+- # On some Linux distributions the Qwt libraries are installed
+- # in the same directory as the Qt libraries. Unfortunately
+- # qmake always adds QMAKE_LIBDIR_QT at the beginning of the
+- # linker path, so that the installed libraries will be
+- # used instead of the local ones.
+-
+- error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
+- }
+-}
Copied: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.51.diff (from rev 102716, trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff)
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.51.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.51.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,67 @@
+--- qwtconfig.pri.orig 2010-11-02 15:09:08.000000000 -0400
++++ qwtconfig.pri 2010-11-02 15:10:35.000000000 -0400
+@@ -7,17 +7,9 @@
+ VER_PAT = 2
+ VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+
+-unix {
+- INSTALLBASE = /usr/local/qwt-5.1.2
+-}
+-
+-win32 {
+- INSTALLBASE = C:/Qwt-5.1.2
+-}
+-
+ target.path = $$INSTALLBASE/lib
+-headers.path = $$INSTALLBASE/include
+-doc.path = $$INSTALLBASE/doc
++headers.path = $$INSTALLBASE/include/qwt
++doc.path = $$INSTALLBASE/share/qwt/doc
+
+ ######################################################################
+ # qmake internal options
+@@ -33,36 +25,14 @@
+ # have to differ to avoid, that they overwrite each other.
+ ######################################################################
+
+-VVERSION = $$[QT_VERSION]
+-isEmpty(VVERSION) {
+-
+- # Qt 3
+- CONFIG += release # release/debug
+-}
+-else {
+- # Qt 4
+- win32 {
+- # On Windows you can't mix release and debug libraries.
+- # The designer is built in release mode. If you like to use it
+- # you need a release version. For your own application development you
+- # might need a debug version.
+- # Enable debug_and_release + build_all if you want to build both.
+-
+- CONFIG += release # release/debug/debug_and_release
+- #CONFIG += debug_and_release
+- #CONFIG += build_all
+- }
+- else {
+- CONFIG += release # release/debug
+- }
+-}
++CONFIG += @ARCHES@ release
+
+ ######################################################################
+ # If you want to have different names for the debug and release
+ # versions you can add a suffix rule below.
+ ######################################################################
+
+-DEBUG_SUFFIX =
++DEBUG_SUFFIX = _debug
+ RELEASE_SUFFIX =
+
+ win32 {
+@@ -121,4 +91,4 @@
+ # Otherwise you have to build them from the examples directory.
+ ######################################################################
+
+-#CONFIG += QwtExamples
++CONFIG += QwtExamples
Copied: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.52.diff (from rev 102705, trunk/dports/graphics/qwt52/files/patch-qwtconfig.pri.diff)
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.52.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.52.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,75 @@
+--- qwtconfig.pri.orig 2013-02-07 11:48:48.000000000 -0500
++++ qwtconfig.pri 2013-02-07 11:51:04.000000000 -0500
+@@ -7,17 +7,9 @@
+ VER_PAT = 3
+ VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+
+-unix {
+- INSTALLBASE = /usr/local/qwt-$$VERSION
+-}
+-
+-win32 {
+- INSTALLBASE = C:/Qwt-$$VERSION
+-}
+-
+ target.path = $$INSTALLBASE/lib
+-headers.path = $$INSTALLBASE/include
+-doc.path = $$INSTALLBASE/doc
++headers.path = $$INSTALLBASE/include/qwt
++doc.path = $$INSTALLBASE/share/qwt/doc
+
+ ######################################################################
+ # qmake internal options
+@@ -26,7 +18,6 @@
+ CONFIG += qt # Also for Qtopia Core!
+ CONFIG += warn_on
+ CONFIG += thread
+-CONFIG += silent
+
+ ######################################################################
+ # release/debug mode
+@@ -34,36 +25,14 @@
+ # have to differ to avoid, that they overwrite each other.
+ ######################################################################
+
+-VVERSION = $$[QT_VERSION]
+-isEmpty(VVERSION) {
+-
+- # Qt 3
+- CONFIG += release # release/debug
+-}
+-else {
+- # Qt 4
+- win32 {
+- # On Windows you can't mix release and debug libraries.
+- # The designer is built in release mode. If you like to use it
+- # you need a release version. For your own application development you
+- # might need a debug version.
+- # Enable debug_and_release + build_all if you want to build both.
+-
+- CONFIG += release # release/debug/debug_and_release
+- #CONFIG += debug_and_release
+- #CONFIG += build_all
+- }
+- else {
+- CONFIG += release # release/debug
+- }
+-}
++CONFIG += @ARCHES@ release
+
+ ######################################################################
+ # If you want to have different names for the debug and release
+ # versions you can add a suffix rule below.
+ ######################################################################
+
+-DEBUG_SUFFIX =
++DEBUG_SUFFIX = _debug
+ RELEASE_SUFFIX =
+
+ win32 {
+@@ -122,4 +91,4 @@
+ # Otherwise you have to build them from the examples directory.
+ ######################################################################
+
+-#CONFIG += QwtExamples
++CONFIG += QwtExamples
Copied: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.60.diff (from rev 102705, trunk/dports/graphics/qwt-devel/files/patch-qwtconfig.pri.diff)
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.60.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.60.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,63 @@
+--- qwtconfig.pri.orig 2013-02-07 12:32:34.000000000 -0500
++++ qwtconfig.pri 2013-02-07 12:39:46.000000000 -0500
+@@ -16,26 +16,16 @@
+ # Install paths
+ ######################################################################
+
+-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
++QWT_INSTALL_PREFIX = $$INSTALLBASE
+
+-unix {
+- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
+-}
+-
+-win32 {
+- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
+-}
+-
+-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
+-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
++QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/qwt/doc
++QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
+
+ ######################################################################
+ # Designer plugin
+ ######################################################################
+
+-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
+-# QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer
++QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
+
+ ######################################################################
+ # Features
+@@ -49,8 +39,7 @@
+ # with every Qt upgrade.
+ ######################################################################
+
+-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features
++QWT_INSTALL_FEATURES = $$[QT_INSTALL_DATA]/mkspecs/features
+
+ ######################################################################
+ # Build the static/shared libraries.
+@@ -105,7 +94,7 @@
+ # Otherwise you have to build them from the examples directory.
+ ######################################################################
+
+-# QWT_CONFIG += QwtExamples
++QWT_CONFIG += QwtExamples
+
+ ######################################################################
+ # When Qt has been built as framework qmake ( qtAddLibrary ) wants
+@@ -113,6 +102,8 @@
+ ######################################################################
+
+ macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
+-
+ QWT_CONFIG += QwtFramework
+-}
++ QWT_INSTALL_LIBS = $$[QT_INSTALL_FRAMEWORKS]
++} else {
++ QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
++}
Added: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.610rc3.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.610rc3.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.610rc3.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,64 @@
+--- qwtconfig.pri.orig 2013-01-25 19:21:02.000000000 -0500
++++ qwtconfig.pri 2013-02-08 13:30:10.000000000 -0500
+@@ -16,26 +16,16 @@
+ # Install paths
+ ######################################################################
+
+-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
++QWT_INSTALL_PREFIX = $$INSTALLBASE
+
+-unix {
+- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-rc3
+-}
+-
+-win32 {
+- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-rc3
+-}
+-
+-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
+-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
++QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/qwt/doc
++QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
+
+ ######################################################################
+ # Designer plugin
+ ######################################################################
+
+-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
+-# QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer
++QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
+
+ ######################################################################
+ # Features
+@@ -49,8 +39,7 @@
+ # with every Qt upgrade.
+ ######################################################################
+
+-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features
++QWT_INSTALL_FEATURES = $$[QT_INSTALL_DATA]/mkspecs/features
+
+ ######################################################################
+ # Build the static/shared libraries.
+@@ -96,7 +85,7 @@
+ # to your qmake project file.
+ ######################################################################
+
+-#QWT_CONFIG += QwtMathML
++QWT_CONFIG += QwtMathML
+
+ ######################################################################
+ # If you want to build the Qwt designer plugin,
+@@ -130,6 +119,8 @@
+ ######################################################################
+
+ macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
+-
+- QWT_CONFIG += QwtFramework
+-}
++ QWT_CONFIG += QwtFramework
++ QWT_INSTALL_LIBS = $$[QT_INSTALL_FRAMEWORKS]
++} else {
++ QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
++}
Deleted: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff 2013-02-11 02:33:32 UTC (rev 102938)
+++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -1,67 +0,0 @@
---- qwtconfig.pri.orig 2010-11-02 15:09:08.000000000 -0400
-+++ qwtconfig.pri 2010-11-02 15:10:35.000000000 -0400
-@@ -7,17 +7,9 @@
- VER_PAT = 2
- VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
-
--unix {
-- INSTALLBASE = /usr/local/qwt-5.1.2
--}
--
--win32 {
-- INSTALLBASE = C:/Qwt-5.1.2
--}
--
- target.path = $$INSTALLBASE/lib
--headers.path = $$INSTALLBASE/include
--doc.path = $$INSTALLBASE/doc
-+headers.path = $$INSTALLBASE/include/qwt
-+doc.path = $$INSTALLBASE/share/qwt/doc
-
- ######################################################################
- # qmake internal options
-@@ -33,36 +25,14 @@
- # have to differ to avoid, that they overwrite each other.
- ######################################################################
-
--VVERSION = $$[QT_VERSION]
--isEmpty(VVERSION) {
--
-- # Qt 3
-- CONFIG += release # release/debug
--}
--else {
-- # Qt 4
-- win32 {
-- # On Windows you can't mix release and debug libraries.
-- # The designer is built in release mode. If you like to use it
-- # you need a release version. For your own application development you
-- # might need a debug version.
-- # Enable debug_and_release + build_all if you want to build both.
--
-- CONFIG += release # release/debug/debug_and_release
-- #CONFIG += debug_and_release
-- #CONFIG += build_all
-- }
-- else {
-- CONFIG += release # release/debug
-- }
--}
-+CONFIG += @ARCHES@ release
-
- ######################################################################
- # If you want to have different names for the debug and release
- # versions you can add a suffix rule below.
- ######################################################################
-
--DEBUG_SUFFIX =
-+DEBUG_SUFFIX = _debug
- RELEASE_SUFFIX =
-
- win32 {
-@@ -121,4 +91,4 @@
- # Otherwise you have to build them from the examples directory.
- ######################################################################
-
--#CONFIG += QwtExamples
-+CONFIG += QwtExamples
Added: trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.60.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.60.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.60.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,38 @@
+--- qwtfunctions.pri.orig 2013-02-07 15:16:13.000000000 -0500
++++ qwtfunctions.pri 2013-02-08 13:18:24.000000000 -0500
+@@ -14,7 +14,7 @@
+ unset(LIBRARY_NAME)
+ LIBRARY_NAME = $$1
+
+- mac:!static:contains(QT_CONFIG, qt_framework) {
++ mac:!static:contains(QWT_CONFIG, QwtFramework) {
+ QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME
+ export(QMAKE_FRAMEWORK_BUNDLE_NAME)
+ }
+@@ -31,25 +31,5 @@
+ }
+
+ defineTest(qwtAddLibrary) {
+-
+- LIB_NAME = $$1
+-
+- unset(LINKAGE)
+-
+- if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+- win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
+- mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
+- }
+-
+- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
+-
+- !isEmpty(QMAKE_LSB) {
+- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
+- }
+-
+- LIBS += $$LINKAGE
+- export(LIBS)
+- export(QMAKE_LFLAGS)
+-
+- return(true)
++ qtAddLibrary($$1)
+ }
Added: trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.610rc3.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.610rc3.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtfunctions.pri.610rc3.diff 2013-02-11 02:44:55 UTC (rev 102939)
@@ -0,0 +1,38 @@
+--- qwtfunctions.pri.orig 2013-02-07 15:16:13.000000000 -0500
++++ qwtfunctions.pri 2013-02-08 13:18:24.000000000 -0500
+@@ -14,7 +14,7 @@
+ unset(LIBRARY_NAME)
+ LIBRARY_NAME = $$1
+
+- mac:!static:contains(QT_CONFIG, qt_framework) {
++ mac:!static:contains(QWT_CONFIG, QwtFramework) {
+ QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME
+ export(QMAKE_FRAMEWORK_BUNDLE_NAME)
+ }
+@@ -31,25 +31,5 @@
+ }
+
+ defineTest(qwtAddLibrary) {
+-
+- LIB_NAME = $$1
+-
+- unset(LINKAGE)
+-
+- if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+- win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
+- mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
+- }
+-
+- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
+-
+- !isEmpty(QMAKE_LSB) {
+- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
+- }
+-
+- LIBS += $$LINKAGE
+- export(LIBS)
+- export(QMAKE_LFLAGS)
+-
+- return(true)
++ qtAddLibrary($$1)
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130210/5e40c809/attachment-0001.html>
More information about the macports-changes
mailing list