Changeset 98183


Ignore:
Timestamp:
Sep 27, 2012, 7:48:17 PM (12 years ago)
Author:
michaelld@…
Message:

kdiff3 : use qt4 portgroup and standard qmake configure command; add debug and universal variants; addresses ticket #36356.

Location:
trunk/dports/devel/kdiff3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/devel/kdiff3/Portfile

    r98177 r98183  
     1# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    12# $Id$
    23
    34PortSystem          1.0
    45PortGroup           xcodeversion 1.0
     6PortGroup           qt4 1.0
    57
    68name                kdiff3
    … …  
    2123master_sites        sourceforge:project/kdiff3/kdiff3/${version}
    2224
    23 checksums           rmd160  cbbac8e0ad39fa3a2403199ceaac6239de94b83e \
    24                     sha256  e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
     25checksums           rmd160 cbbac8e0ad39fa3a2403199ceaac6239de94b83e \
     26                    sha256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
    2527
    26 depends_lib       port:qt4-mac
    27 set worksrcpath   ${worksrcpath}/src-QT4
     28set worksrcpath     ${worksrcpath}/src-QT4
     29
     30minimum_xcodeversions {9 3.1}
    2831
    2932patchfiles patch-src-QT4-kdiff3.pro.diff
    3033
    31 configure {
    32   exec qmake ${worksrcpath}/kdiff3.pro -o ${worksrcpath}/Makefile DESTDIR=${destroot}/${prefix}/bin
     34post-patch {
     35    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/kdiff3.pro
    3336}
    3437
    35 minimum_xcodeversions {9 3.1}
     38# --disable-dependency-tracking is not recognized.
     39configure.universal_args-delete --disable-dependency-tracking
     40
     41pre-configure {
     42    configure.args-append CONFIG+=\"${qt_arch_types}\"
     43}
     44
     45configure.cmd       ${qt_qmake_cmd}
     46configure.pre_args   
     47configure.post_args
     48
     49variant debug description \
     50{Build both release and debug library} {}
     51
     52if {[variant_isset debug]} {
     53    configure.args-append CONFIG+=\"debug_and_release build_all\"
     54} else {
     55    configure.args-append CONFIG+=\"release\"
     56}
    3657
    3758livecheck.type      regex

  • trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff

    r98177 r98183  
    1 --- kdiff3.pro.orig     2012-07-14 05:27:14.000000000 -0500
    2 +++ kdiff3.pro  2012-09-27 11:43:59.000000000 -0500
    3 @@ -64,11 +64,13 @@
     1--- kdiff3.pro.orig     2012-09-27 14:41:55.000000000 -0400
     2+++ kdiff3.pro  2012-09-27 14:42:25.000000000 -0400
     3@@ -1,7 +1,7 @@
     4 TEMPLATE = app
     5 # When unresolved items remain during linking: Try adding "shared" in the CONFIG.
     6-CONFIG  += qt warn_on thread precompile_header
     7-!os2:PRECOMPILED_HEADER = stable.h
     8+CONFIG  += qt warn_on thread
     9+
     10 HEADERS  = version.h                     \
     11            diff.h                        \
     12            difftextwindow.h              \
     13@@ -64,11 +64,15 @@
    414 }
    515 
    616 unix {
    717-  documentation.path = /usr/local/share/doc/kdiff3
    8 +  documentation.path = $$DESTDIR/../share/doc/kdiff3
     18+  documentation.path = @PREFIX@/share/doc/kdiff3
    919   documentation.files = ../doc/*
    1020 
    … …  
    1222 
    1323-  target.path = /usr/local/bin
    14 -  INSTALLS += target
    15 +}
     24+  target.path = @PREFIX@/bin
     25   INSTALLS += target
     26 }
    1627+
    1728+mac {
    1829+  CONFIG -= app_bundle
    19  }
     30+}
Note: See TracChangeset for help on using the changeset viewer.