Changeset 32448


Ignore:
Timestamp:
Jan 2, 2008, 3:08:59 PM (10 years ago)
Author:
jochen@…
Message:

Provide variants to allow for builds against Qt4 and Qt3, patch
provided by mdickens@…
This closesTicket #13715

Location:
trunk/dports/graphics/qwt
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/graphics/qwt/Portfile

    r30076 r32448  
    2121platforms           darwin
    2222
    23 patchfiles          patch-qwtconfig.pri.diff
     23patchfiles          patch-qwtconfig.pri.diff \
     24                    patch-designer-designer.pro.diff
    2425
    2526depends_lib         port:qt4-mac
    2627
    2728configure.cmd       qmake
     29configure.env       INSTALLBASE="${prefix}" QTDIR="${prefix}"
    2830configure.pre_args
    29 configure.args      -macx INSTALLBASE="${prefix}"
     31configure.args      -macx
    3032
    31 destroot.destdir    INSTALL_ROOT="${destroot}"
     33build.env           QTDIR="${prefix}"
     34
     35destroot.destdir    INSTALL_ROOT="${destroot}${prefix}"
     36destroot.env        QTDIR="${prefix}"
     37
     38variant qt3 conflicts qt4 description "Use qt3-mac" {
     39    depends_lib-append  port:qt3-mac
     40}
     41
     42variant qt4 conflicts qt3 description "Use qt4-mac" {
     43    depends_lib-append  port:qt4-mac
     44}
     45
     46if { ![variant_isset qt3] && ![variant_isset qt4] } {
     47    default_variants    +qt4
     48}
  • trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.diff

    r26063 r32448  
    1 --- qwtconfig.pri-orig  2007-05-11 00:11:00.000000000 +0200
    2 +++ qwtconfig.pri       2007-05-11 00:11:39.000000000 +0200
    3 @@ -2,10 +2,6 @@
     1--- qwtconfig.pri~      2007-06-11 01:41:29.000000000 -0400
     2+++ qwtconfig.pri       2007-12-24 13:56:46.000000000 -0500
     3@@ -2,17 +2,13 @@
    44 # Install paths
    55 ######################################################################
     
    1010-
    1111 win32 {
    12      INSTALLBASE    = C:/Qwt
     12     INSTALLBASE    = C:/Qwt-5.0.2
    1313 }
    14 
     14 
     15 target.path    = $$INSTALLBASE/lib
     16 headers.path   = $$INSTALLBASE/include
     17-doc.path       = $$INSTALLBASE/doc
     18+doc.path       = $$INSTALLBASE/share/qwt/doc
     19 
     20 ######################################################################
     21 # qmake internal options
Note: See TracChangeset for help on using the changeset viewer.