[69258] trunk/dports/graphics/qwt52

29 Jun 2010

Revision: 69258
          http://trac.macports.org/changeset/69258
Author:   michaelld@macports.org
Date:     2010-06-28 23:58:40 -0700 (Mon, 28 Jun 2010)
Log Message:
-----------
Bump version to 5.2.1.
Change header install location to ${prefix}/include/qwt .
Corrected variants qt4 and qt3.
Corrected use of qt4-mac dependency.
Fix bundle extension (per ticket #25319).

Modified Paths:
--------------
    trunk/dports/graphics/qwt52/Portfile
    trunk/dports/graphics/qwt52/files/patch-qwtconfig.pri.diff

Modified: trunk/dports/graphics/qwt52/Portfile
===================================================================

--- trunk/dports/graphics/qwt52/Portfile	2010-06-29 06:55:03 UTC (rev 69257)
+++ trunk/dports/graphics/qwt52/Portfile	2010-06-29 06:58:40 UTC (rev 69258)
@@ -4,33 +4,50 @@
 PortSystem          1.0
 
 name                qwt52
-version             5.2.0
-revision            2
+version             5.2.1
+conflicts           qwt
 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. \
-                    Version 5.2 contains source incompatible changes versus 5.1
+maintainers         michaelld
+description         Qt Widgets for Technical Applications, version 5.2
+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. \
+    Version 5.2 contains source incompatible changes versus 5.1. \
+    See qwt for that port.
 homepage            http://qwt.sourceforge.net
 master_sites        sourceforge:qwt
 distname            qwt-${version}
 use_bzip2           yes
 use_parallel_build  no
-checksums           md5     c60b4cfac271a41524402b3ae5197890 \
-                    sha1    8830498b87d99d4b7e95ee643f1f7ff178204ba9 \
-                    rmd160  061319c7b4821c366fd05b68bbc3e134351f9110
+checksums           md5     4a595b8db0ec3856b117836c1d60cb27 \
+                    sha1    89de7a90b7eddad2989470627baa19d59e348df1 \
+                    rmd160  28e07ea12323a5217118a38e1a7d730a8ce50fee
 
 platforms           darwin
 
 patchfiles          patch-qwtconfig.pri.diff
 
-set qt_dir          ${prefix}/libexec/qt4-mac
-set qt_plugin_dir   ${qt_dir}/plugins
+# 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
@@ -39,21 +56,8 @@
 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_plugin_dir}/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
-}
-
 livecheck.url           http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss?path=%...
 livecheck.regex         \\/qwt\\/(\\d+(\\.\\d+)+)\\/

Modified: trunk/dports/graphics/qwt52/files/patch-qwtconfig.pri.diff
===================================================================
--- trunk/dports/graphics/qwt52/files/patch-qwtconfig.pri.diff	2010-06-29 06:55:03 UTC (rev 69257)
+++ trunk/dports/graphics/qwt52/files/patch-qwtconfig.pri.diff	2010-06-29 06:58:40 UTC (rev 69258)
@@ -1,20 +1,21 @@
---- work/qwt-5.1.0/qwtconfig.pri	2008-05-02 11:08:06.000000000 -0700
-+++ qwtconfig.pri	2008-05-02 11:10:49.000000000 -0700
+--- qwtconfig.pri.orig	2010-06-28 10:39:44.000000000 -0600
++++ qwtconfig.pri	2010-06-28 10:40:28.000000000 -0600
 @@ -7,17 +7,13 @@
- VER_PAT      = 0
- VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
+ VER_PAT      = 1
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
 -unix {
--    INSTALLBASE    = /usr/local/qwt-5.2.0
+-    INSTALLBASE    = /usr/local/qwt-5.2.1
 -}
 -
  win32 {
-     INSTALLBASE    = C:/Qwt-5.2.0
+     INSTALLBASE    = C:/Qwt-5.2.1
  }
  
  target.path    = $$INSTALLBASE/lib
- headers.path   = $$INSTALLBASE/include
+-headers.path   = $$INSTALLBASE/include
 -doc.path       = $$INSTALLBASE/doc
++headers.path   = $$INSTALLBASE/include/qwt
 +doc.path       = $$INSTALLBASE/share/qwt/doc
  
  ######################################################################

    

[69258] trunk/dports/graphics/qwt52

michaelld＠macports.org