[98183] trunk/dports/devel/kdiff3

[michaelld at macports.org]

Revision: 98183
          http://trac.macports.org//changeset/98183
Author:   michaelld at macports.org
Date:     2012-09-27 12:48:17 -0700 (Thu, 27 Sep 2012)
Log Message:
-----------
kdiff3 : use qt4 portgroup and standard qmake configure command; add debug and universal variants; addresses ticket #36356.

Modified Paths:
--------------
    trunk/dports/devel/kdiff3/Portfile
    trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff

Modified: trunk/dports/devel/kdiff3/Portfile
===================================================================
--- trunk/dports/devel/kdiff3/Portfile	2012-09-27 19:22:00 UTC (rev 98182)
+++ trunk/dports/devel/kdiff3/Portfile	2012-09-27 19:48:17 UTC (rev 98183)
@@ -1,3 +1,4 @@
+# -*- 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
 # $Id$
 
 PortSystem          1.0
@@ -2,2 +3,3 @@
 PortGroup           xcodeversion 1.0
+PortGroup           qt4 1.0
 
@@ -20,19 +22,38 @@
 homepage            http://kdiff3.sourceforge.net/
 master_sites        sourceforge:project/kdiff3/kdiff3/${version}
 
-checksums           rmd160  cbbac8e0ad39fa3a2403199ceaac6239de94b83e \
-                    sha256  e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
+checksums           rmd160 cbbac8e0ad39fa3a2403199ceaac6239de94b83e \
+                    sha256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
 
-depends_lib       port:qt4-mac
-set worksrcpath   ${worksrcpath}/src-QT4
+set worksrcpath     ${worksrcpath}/src-QT4
 
+minimum_xcodeversions {9 3.1}
+
 patchfiles patch-src-QT4-kdiff3.pro.diff
 
-configure {
-  exec qmake ${worksrcpath}/kdiff3.pro -o ${worksrcpath}/Makefile DESTDIR=${destroot}/${prefix}/bin
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/kdiff3.pro
 }
 
-minimum_xcodeversions {9 3.1}
+# --disable-dependency-tracking is not recognized.
+configure.universal_args-delete --disable-dependency-tracking
 
+pre-configure {
+    configure.args-append CONFIG+=\"${qt_arch_types}\"
+}
+
+configure.cmd       ${qt_qmake_cmd}
+configure.pre_args   
+configure.post_args
+
+variant debug description \
+{Build both release and debug library} {}
+
+if {[variant_isset debug]} {
+    configure.args-append CONFIG+=\"debug_and_release build_all\"
+} else {
+    configure.args-append CONFIG+=\"release\"
+}
+
 livecheck.type      regex
 livecheck.regex     "Current version: (\\d+(?:\\.\\d+)*)"

Modified: trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff
===================================================================
--- trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff	2012-09-27 19:22:00 UTC (rev 98182)
+++ trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff	2012-09-27 19:48:17 UTC (rev 98183)
@@ -1,19 +1,30 @@
---- kdiff3.pro.orig	2012-07-14 05:27:14.000000000 -0500
-+++ kdiff3.pro	2012-09-27 11:43:59.000000000 -0500
-@@ -64,11 +64,13 @@
+--- kdiff3.pro.orig	2012-09-27 14:41:55.000000000 -0400
++++ kdiff3.pro	2012-09-27 14:42:25.000000000 -0400
+@@ -1,7 +1,7 @@
+ TEMPLATE = app
+ # When unresolved items remain during linking: Try adding "shared" in the CONFIG.
+-CONFIG  += qt warn_on thread precompile_header
+-!os2:PRECOMPILED_HEADER = stable.h
++CONFIG  += qt warn_on thread
++
+ HEADERS  = version.h                     \
+            diff.h                        \
+            difftextwindow.h              \
+@@ -64,11 +64,15 @@
  }
  
  unix {
 -  documentation.path = /usr/local/share/doc/kdiff3
-+  documentation.path = $$DESTDIR/../share/doc/kdiff3
++  documentation.path = @PREFIX@/share/doc/kdiff3
    documentation.files = ../doc/*
  
    INSTALLS += documentation
  
 -  target.path = /usr/local/bin
--  INSTALLS += target
-+}
++  target.path = @PREFIX@/bin
+   INSTALLS += target
+ }
 +
 +mac {
 +  CONFIG -= app_bundle
- }
++}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120927/c9fe0e51/attachment.html>