5 files changed, 115 insertions, 17 deletions

diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 2b2b57272b94..60530a9aac13 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdiff3
-PORTVERSION=	0.9.70
-PORTREVISION=	1
+PORTVERSION=	0.9.83
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,6 +18,14 @@ CONFIGURE_ARGS+=	--program-transform-name=s,^,,
 
 USE_KDELIBS_VER=	3
 GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	13
+
+MAN1=	kdiff3.1
+
+pre-configure:
+.for i in config.h.in Makefile.in
+	${TOUCH} ${WRKSRC}/${i}
+.endfor
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/x11/kde3/Makefile.kde"
diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo
index 874e7b36f5ea..aa4239fd5fe8 100644
--- a/textproc/kdiff3/distinfo
+++ b/textproc/kdiff3/distinfo
@@ -1 +1 @@
-MD5 (kdiff3-0.9.70.tar.gz) = 17dba67818b61c5c51dfe6163c2d44d2
+MD5 (kdiff3-0.9.83.tar.gz) = 075a9555bada43f06a483f973928a5f5
diff --git a/textproc/kdiff3/files/patch-src-directorymergewindow.cpp b/textproc/kdiff3/files/patch-src-directorymergewindow.cpp
deleted file mode 100644
index d2be5585f4bc..000000000000
--- a/textproc/kdiff3/files/patch-src-directorymergewindow.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/directorymergewindow.cpp.orig	Fri Oct  3 18:32:57 2003
-+++ src/directorymergewindow.cpp	Fri Oct  3 18:33:00 2003
-@@ -863,7 +863,7 @@
- 
-       mfi.m_subPath = mfi.m_fileInfoA.exists() ? mfi.m_fileInfoA.filePath() :
-                       mfi.m_fileInfoB.exists() ? mfi.m_fileInfoB.filePath() :
--                      mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : "";
-+                      mfi.m_fileInfoC.exists() ? mfi.m_fileInfoC.filePath() : QString("");
- 
-       g_pProgressDialog->setInformation(
-          "Processing " + QString::number(currentIdx) +" / "+ QString::number(nrOfFiles)
diff --git a/textproc/kdiff3/pkg-descr b/textproc/kdiff3/pkg-descr
index 8b9836a82fd2..1cacfe4b81d5 100644
--- a/textproc/kdiff3/pkg-descr
+++ b/textproc/kdiff3/pkg-descr
@@ -3,7 +3,8 @@ KDiff3 is a program that:
     * compares two or three text input files,
     * 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
+    * an integrated editor for comfortable solving of merge-conflicts,
+    * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
     * and has an intuitive graphical user interface,
     * and it can also compare and merge directories!
 
diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist
index eec46f6bb271..b7cacb326a70 100644
--- a/textproc/kdiff3/pkg-plist
+++ b/textproc/kdiff3/pkg-plist
@@ -4,27 +4,128 @@ lib/kde3/libkdiff3part.so
 share/applnk/Development/kdiff3.desktop
 share/apps/kdiff3/kdiff3_shell.rc
 share/apps/kdiff3part/kdiff3_part.rc
+share/doc/HTML/da/kdiff3/common
+share/doc/HTML/da/kdiff3/dirbrowser.png
+share/doc/HTML/da/kdiff3/dirmergebig.png
+share/doc/HTML/da/kdiff3/index.cache.bz2
+share/doc/HTML/da/kdiff3/index.docbook
+share/doc/HTML/da/kdiff3/iteminfo.png
+share/doc/HTML/da/kdiff3/letter_by_letter.png
+share/doc/HTML/da/kdiff3/merge_current.png
+share/doc/HTML/da/kdiff3/new.png
+share/doc/HTML/da/kdiff3/open_dialog.png
+share/doc/HTML/da/kdiff3/screenshot_diff.png
+share/doc/HTML/da/kdiff3/screenshot_merge.png
+share/doc/HTML/da/kdiff3/triple_diff.png
+share/doc/HTML/da/kdiff3/white_space.png
 share/doc/HTML/en/kdiff3/common
+share/doc/HTML/en/kdiff3/compilation.html
+share/doc/HTML/en/kdiff3/credits.html
 share/doc/HTML/en/kdiff3/dirbrowser.png
+share/doc/HTML/en/kdiff3/dirmerge.html
 share/doc/HTML/en/kdiff3/dirmergebig.png
+share/doc/HTML/en/kdiff3/dirmergeoptions.html
+share/doc/HTML/en/kdiff3/dirmergevisible.html
+share/doc/HTML/en/kdiff3/documentation.html
+share/doc/HTML/en/kdiff3/dothemerge.html
+share/doc/HTML/en/kdiff3/faq.html
+share/doc/HTML/en/kdiff3/features.html
+share/doc/HTML/en/kdiff3/find.html
 share/doc/HTML/en/kdiff3/index.cache.bz2
 share/doc/HTML/en/kdiff3/index.docbook
+share/doc/HTML/en/kdiff3/index.html
+share/doc/HTML/en/kdiff3/installation.html
+share/doc/HTML/en/kdiff3/interpretinginformation.html
+share/doc/HTML/en/kdiff3/introduction.html
 share/doc/HTML/en/kdiff3/iteminfo.png
+share/doc/HTML/en/kdiff3/kdiff3.1
+share/doc/HTML/en/kdiff3/kpart.html
 share/doc/HTML/en/kdiff3/letter_by_letter.png
 share/doc/HTML/en/kdiff3/merge_current.png
+share/doc/HTML/en/kdiff3/merging.html
+share/doc/HTML/en/kdiff3/misc.html
+share/doc/HTML/en/kdiff3/navigation.html
 share/doc/HTML/en/kdiff3/new.png
 share/doc/HTML/en/kdiff3/open_dialog.png
+share/doc/HTML/en/kdiff3/opendialog.html
+share/doc/HTML/en/kdiff3/options.html
+share/doc/HTML/en/kdiff3/other.html
+share/doc/HTML/en/kdiff3/pasteinput.html
+share/doc/HTML/en/kdiff3/requirements.html
+share/doc/HTML/en/kdiff3/saving.html
 share/doc/HTML/en/kdiff3/screenshot_diff.png
 share/doc/HTML/en/kdiff3/screenshot_merge.png
+share/doc/HTML/en/kdiff3/screenshots.html
+share/doc/HTML/en/kdiff3/selections.html
+share/doc/HTML/en/kdiff3/startingdirmerge.html
 share/doc/HTML/en/kdiff3/triple_diff.png
 share/doc/HTML/en/kdiff3/white_space.png
+share/doc/HTML/et/kdiff3/common
+share/doc/HTML/et/kdiff3/dirbrowser.png
+share/doc/HTML/et/kdiff3/dirmergebig.png
+share/doc/HTML/et/kdiff3/index.cache.bz2
+share/doc/HTML/et/kdiff3/index.docbook
+share/doc/HTML/et/kdiff3/iteminfo.png
+share/doc/HTML/et/kdiff3/letter_by_letter.png
+share/doc/HTML/et/kdiff3/merge_current.png
+share/doc/HTML/et/kdiff3/new.png
+share/doc/HTML/et/kdiff3/open_dialog.png
+share/doc/HTML/et/kdiff3/screenshot_diff.png
+share/doc/HTML/et/kdiff3/screenshot_merge.png
+share/doc/HTML/et/kdiff3/triple_diff.png
+share/doc/HTML/et/kdiff3/white_space.png
+share/doc/HTML/it/kdiff3/common
+share/doc/HTML/it/kdiff3/dirbrowser.png
+share/doc/HTML/it/kdiff3/dirmergebig.png
+share/doc/HTML/it/kdiff3/index.cache.bz2
+share/doc/HTML/it/kdiff3/index.docbook
+share/doc/HTML/it/kdiff3/iteminfo.png
+share/doc/HTML/it/kdiff3/letter_by_letter.png
+share/doc/HTML/it/kdiff3/merge_current.png
+share/doc/HTML/it/kdiff3/new.png
+share/doc/HTML/it/kdiff3/open_dialog.png
+share/doc/HTML/it/kdiff3/screenshot_diff.png
+share/doc/HTML/it/kdiff3/screenshot_merge.png
+share/doc/HTML/it/kdiff3/triple_diff.png
+share/doc/HTML/it/kdiff3/white_space.png
+share/doc/HTML/kdiff3/README
+share/doc/HTML/sv/kdiff3/common
+share/doc/HTML/sv/kdiff3/dirbrowser.png
+share/doc/HTML/sv/kdiff3/dirmergebig.png
+share/doc/HTML/sv/kdiff3/index.cache.bz2
+share/doc/HTML/sv/kdiff3/index.docbook
+share/doc/HTML/sv/kdiff3/iteminfo.png
+share/doc/HTML/sv/kdiff3/letter_by_letter.png
+share/doc/HTML/sv/kdiff3/merge_current.png
+share/doc/HTML/sv/kdiff3/new.png
+share/doc/HTML/sv/kdiff3/open_dialog.png
+share/doc/HTML/sv/kdiff3/screenshot_diff.png
+share/doc/HTML/sv/kdiff3/screenshot_merge.png
+share/doc/HTML/sv/kdiff3/triple_diff.png
+share/doc/HTML/sv/kdiff3/white_space.png
 share/icons/hicolor/16x16/apps/kdiff3.png
 share/icons/hicolor/32x32/apps/kdiff3.png
 share/icons/locolor/16x16/apps/kdiff3.png
 share/icons/locolor/32x32/apps/kdiff3.png
-share/nls/POSIX
-share/nls/en_US.US-ASCII
+share/locale/da/LC_MESSAGES/kdiff3.mo
+share/locale/de/LC_MESSAGES/kdiff3.mo
+share/locale/en_GB/LC_MESSAGES/kdiff3.mo
+share/locale/es/LC_MESSAGES/kdiff3.mo
+share/locale/et/LC_MESSAGES/kdiff3.mo
+share/locale/fr/LC_MESSAGES/kdiff3.mo
+share/locale/hu/LC_MESSAGES/kdiff3.mo
+share/locale/it/LC_MESSAGES/kdiff3.mo
+share/locale/pt/LC_MESSAGES/kdiff3.mo
+share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
+share/locale/ru/LC_MESSAGES/kdiff3.mo
+share/locale/sr/LC_MESSAGES/kdiff3.mo
+share/locale/sv/LC_MESSAGES/kdiff3.mo
 share/services/kdiff3part.desktop
+@dirrm share/doc/HTML/sv/kdiff3
+@dirrm share/doc/HTML/kdiff3
+@dirrm share/doc/HTML/it/kdiff3
+@dirrm share/doc/HTML/et/kdiff3
 @dirrm share/doc/HTML/en/kdiff3
+@dirrm share/doc/HTML/da/kdiff3
 @dirrm share/apps/kdiff3part
 @dirrm share/apps/kdiff3