ports/50697: Port upgrade: kdiff3 to 0.9.50

[Heiner]

>Number:         50697
>Category:       ports
>Synopsis:       Port upgrade: kdiff3 to 0.9.50
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 07 15:00:25 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Heiner Eichmann <h.eichmann at gmx.de>
>Release:        FreeBSD 4.8-RC2
>Organization:
Sirius Cybernetics Corp.
>Environment:
System: FreeBSD 4.8-RC #2: Thu Apr  3 11:05:05 CEST 2003
    root at 7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL i386
>Description:
See fix

Heiner
>How-To-Repeat:
>Fix:
diff -urN kdiff3.orig/Makefile kdiff3/Makefile
--- kdiff3.orig/Makefile        Sun Feb 23 10:33:04 2003
+++ kdiff3/Makefile     Mon Apr  7 23:12:32 2003
@@ -6,7 +6,7 @@
 #

 PORTNAME=      kdiff3
-PORTVERSION=   0.92
+PORTVERSION=   0.9.50
 CATEGORIES=    textproc kde
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    ${PORTNAME}
diff -urN kdiff3.orig/distinfo kdiff3/distinfo
--- kdiff3.orig/distinfo        Fri Jan 10 07:22:51 2003
+++ kdiff3/distinfo     Mon Apr  7 23:32:35 2003
@@ -1 +1 @@
-MD5 (kdiff3-0.92.tar.gz) = 2dfa39aecd7c801496eea5e4b315121b
+MD5 (kdiff3-0.9.50.tar.gz) = 2aa73b3c76213bdc69184d7806897a0e
diff -urN kdiff3.orig/files/patch-pdiff.cpp kdiff3/files/patch-pdiff.cpp
--- kdiff3.orig/files/patch-pdiff.cpp   Thu Jan  1 01:00:00 1970
+++ kdiff3/files/patch-pdiff.cpp        Mon Apr  7 21:13:48 2003
@@ -0,0 +1,10 @@
+--- kdiff3/pdiff.cpp.orig      Mon Apr  7 21:12:32 2003
++++ kdiff3/pdiff.cpp   Mon Apr  7 21:13:01 2003
+@@ -53,6 +53,7 @@
+ #else
+ #include <unistd.h>
+ #endif
++#include <errno.h>
+
+ using namespace std;
+
diff -urN kdiff3.orig/pkg-descr kdiff3/pkg-descr
--- kdiff3.orig/pkg-descr       Fri Jan 10 07:22:51 2003
+++ kdiff3/pkg-descr    Mon Apr  7 23:15:20 2003
@@ -4,7 +4,8 @@
     * shows the differences line by line and character by character (!),
     * provides an automatic merge-facility and
     * an integrated editor for comfortable solving of merge-conflicts
-    * and has an intuitive graphical user interface.
+    * and has an intuitive graphical user interface,
+    * and it can also compare and merge directories!

 WWW: http://kdiff3.sourceforge.net/

diff -urN kdiff3.orig/pkg-plist kdiff3/pkg-plist
--- kdiff3.orig/pkg-plist       Fri Jan 10 07:22:51 2003
+++ kdiff3/pkg-plist    Mon Apr  7 23:32:06 2003
@@ -3,10 +3,16 @@
 share/doc/HTML/en/kdiff3/triple_diff.png
 share/doc/HTML/en/kdiff3/screenshot_diff.png
 share/doc/HTML/en/kdiff3/screenshot_merge.png
-share/doc/HTML/en/kdiff3/background.png
 share/doc/HTML/en/kdiff3/white_space.png
 share/doc/HTML/en/kdiff3/letter_by_letter.png
 share/doc/HTML/en/kdiff3/open_dialog.png
+share/doc/HTML/en/kdiff3/dirmergebig.png
+share/doc/HTML/en/kdiff3/dirmergedocs.html
+share/doc/HTML/en/kdiff3/bigscreenshot.html
+share/doc/HTML/en/kdiff3/dirbrowser.png
+share/doc/HTML/en/kdiff3/iteminfo.png
+share/doc/HTML/en/kdiff3/new.png
+share/doc/HTML/en/kdiff3/merge_current.png
 share/applnk/Applications/kdiff3.desktop
 share/icons/locolor/32x32/apps/kdiff3.png
 share/icons/locolor/16x16/apps/kdiff3.png

>Release-Note:
>Audit-Trail:
>Unformatted: