[127111] trunk/dports/devel/kdiff3

[khindenburg at macports.org]

Revision: 127111
          https://trac.macports.org/changeset/127111
Author:   khindenburg at macports.org
Date:     2014-10-21 06:36:02 -0700 (Tue, 21 Oct 2014)
Log Message:
-----------
kdiff3: update to 0.9.98; add +kde; add maintainer #45420

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	2014-10-21 09:49:39 UTC (rev 127110)
+++ trunk/dports/devel/kdiff3/Portfile	2014-10-21 13:36:02 UTC (rev 127111)
@@ -6,10 +6,10 @@
 PortGroup           qt4 1.0
 
 name                kdiff3
-version             0.9.97
+version             0.9.98
 categories          devel
 platforms           darwin
-maintainers         nomaintainer
+maintainers         khindenburg openmaintainer
 license             GPL-2
 description         kdiff3 is a file comparing and merging tool.
 long_description    kdiff3 compares two or three input files and shows the \
@@ -22,37 +22,45 @@
 homepage            http://kdiff3.sourceforge.net/
 master_sites        sourceforge:project/kdiff3/kdiff3/${version}
 
-checksums           rmd160 cbbac8e0ad39fa3a2403199ceaac6239de94b83e \
-                    sha256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
+checksums           rmd160 17fc05df3fd8f052e2010834ba8efe2481e4f434 \
+                    sha256 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
 
-set worksrcpath     ${worksrcpath}/src-QT4
 
-minimum_xcodeversions {9 3.1}
+variant kde description {Build the KDE version} {}
 
-patchfiles patch-src-QT4-kdiff3.pro.diff
+if {[variant_isset kde]} {
+    PortGroup kde4 1.1
+    depends_lib-append  port:kdelibs4
+    post-destroot {
+        ln -s ${applications_dir}/KDE4/${name}.app/Contents/MacOS/kdiff3 ${destroot}${prefix}/bin
+    }
+} else {
+    set worksrcpath     ${worksrcpath}/src-QT4
+    minimum_xcodeversions {9 3.1}
+    patchfiles patch-src-QT4-kdiff3.pro.diff
+    post-patch {
+        reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/kdiff3.pro
+    }
 
-post-patch {
-    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/kdiff3.pro
-}
+#    --disable-dependency-tracking is not recognized.
+    configure.universal_args-delete --disable-dependency-tracking
 
-# --disable-dependency-tracking is not recognized.
-configure.universal_args-delete --disable-dependency-tracking
+    pre-configure {
+        configure.args-append CONFIG+=\"${qt_arch_types}\"
+    }
 
-pre-configure {
-    configure.args-append CONFIG+=\"${qt_arch_types}\"
-}
+    configure.cmd       ${qt_qmake_cmd}
+    configure.pre_args
+    configure.post_args
 
-configure.cmd       ${qt_qmake_cmd}
-configure.pre_args   
-configure.post_args
+    variant debug description \
+    {Build both release and debug library} {}
 
-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\"
+    if {[variant_isset debug]} {
+        configure.args-append CONFIG+=\"debug_and_release build_all\"
+    } else {
+        configure.args-append CONFIG+=\"release\"
+    }
 }
 
 livecheck.type      regex

Modified: trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff
===================================================================
--- trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff	2014-10-21 09:49:39 UTC (rev 127110)
+++ trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff	2014-10-21 13:36:02 UTC (rev 127111)
@@ -1,16 +1,17 @@
---- 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 @@
+--- orig.kdiff3.pro	2014-07-03 13:37:37.000000000 +0200
++++ kdiff3.pro	2014-10-17 18:20:22.000000000 +0200
+@@ -1,8 +1,8 @@
  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
+ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
+-#!os2:PRECOMPILED_HEADER = stable.h
 +
  HEADERS  = version.h                     \
+            common.h                      \
             diff.h                        \
-            difftextwindow.h              \
-@@ -64,11 +64,15 @@
+@@ -66,12 +66,16 @@
  }
  
  unix {
@@ -24,7 +25,8 @@
 +  target.path = @PREFIX@/bin
    INSTALLS += target
  }
-+
+ 
 +mac {
-+  CONFIG -= app_bundle
++	CONFIG -= app_bundle
 +}
++
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141021/cdbc8823/attachment.html>