[91081] trunk/dports/devel/kdiff3

[macsforever2000 at macports.org]

Revision: 91081
          https://trac.macports.org/changeset/91081
Author:   macsforever2000 at macports.org
Date:     2012-03-23 09:38:40 -0700 (Fri, 23 Mar 2012)
Log Message:
-----------
kdiff3: Update to version 0.9.96. Use qt4. (#33738)

Modified Paths:
--------------
    trunk/dports/devel/kdiff3/Portfile

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

Modified: trunk/dports/devel/kdiff3/Portfile
===================================================================
--- trunk/dports/devel/kdiff3/Portfile	2012-03-23 16:36:29 UTC (rev 91080)
+++ trunk/dports/devel/kdiff3/Portfile	2012-03-23 16:38:40 UTC (rev 91081)
@@ -4,7 +4,7 @@
 PortGroup           xcodeversion 1.0
 
 name                kdiff3
-version             0.9.92
+version             0.9.96
 categories          devel
 platforms           darwin
 maintainers         nomaintainer
@@ -19,24 +19,19 @@
 homepage            http://kdiff3.sourceforge.net/
 master_sites        sourceforge
 
-checksums           md5 c7b52bfee6a085393de0c4f83732e8f0 \
-                    sha1 c97b98150a1f5de16736a399affe1b4243d1e6c2 \
-                    rmd160 3757fe678e944755164cdc62bfca9f0214acdbb8
+checksums           md5 46b96befddf3448a3cb673f018c6f6f9 \
+                    sha1 d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5 \
+                    rmd160 c0cfd2e7e30f58c9d6d058c2d8168ef97f1a33b7
 
-depends_lib         port:kdelibs3
+depends_lib       port:qt4-mac
+set worksrcpath   ${worksrcpath}/src-QT4
 
-configure.env       HOME=${workpath}
-configure.args      --with-qt-dir=${prefix}/lib/qt3 \
-                    --without-arts \
-                    --with-extra-includes=${prefix}/include \
-                    --with-extra-libs=${prefix}/lib
+patchfiles patch-src-QT4-kdiff3.pro.diff
 
-pre-configure {
-  reinplace "s|doc/HTML|doc/kde|" ${worksrcpath}/configure
+configure {
+  exec qmake ${worksrcpath}/kdiff3.pro -o ${worksrcpath}/Makefile DESTDIR=${destroot}/${prefix}/bin
 }
 
-build.env           ${configure.env}
-
 minimum_xcodeversions {9 3.1}
 
 livecheck.type      regex

Added: trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff
===================================================================
--- trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff	                        (rev 0)
+++ trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff	2012-03-23 16:38:40 UTC (rev 91081)
@@ -0,0 +1,20 @@
+--- kdiff3.pro.orig	2012-03-23 14:31:14.000000000 +0000
++++ kdiff3.pro	2012-03-23 14:24:05.000000000 +0000
+@@ -61,11 +61,13 @@
+ }
+ 
+ unix {
+-  documentation.path = /usr/local/share/doc/kdiff3
++  documentation.path = $$DESTDIR/../share/doc/kdiff3
+   documentation.files = ../doc/*
+ 
+   INSTALLS += documentation
+ 
+-  target.path = /usr/local/bin
+-  INSTALLS += target
+ }
++
++mac {
++  CONFIG -= app_bundle
++}
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120323/09608df7/attachment.html>