- Update to version 0.9.84

- Don't use Makefile.kde anymore
- Respect CFLAGS

PR:		ports/67581
Submitted by:	Heiner Eichmann <h.eichmann@gmx.de>

5 files changed, 41 insertions, 11 deletions

diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index e99ce95800a3..d45292634590 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kdiff3
-PORTVERSION=	0.9.83
-PORTREVISION=	1
+PORTVERSION=	0.9.84
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,11 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A KDE3 graphical frontend for diff
 
-CONFIGURE_ARGS+=	--program-transform-name=s,^,,
-
 USE_KDELIBS_VER=	3
 GNU_CONFIGURE=	yes
 USE_LIBTOOL_VER=	13
+USE_REINPLACE=	yes
+
+CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 
 MAN1=	kdiff3.1
 
@@ -28,6 +28,8 @@ pre-configure:
 	${TOUCH} ${WRKSRC}/${i}
 .endfor
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O2 ||g; s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
+
+.include <bsd.port.mk>
diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo
index aa4239fd5fe8..88801da9f12d 100644
--- a/textproc/kdiff3/distinfo
+++ b/textproc/kdiff3/distinfo
@@ -1 +1,2 @@
-MD5 (kdiff3-0.9.83.tar.gz) = 075a9555bada43f06a483f973928a5f5
+MD5 (kdiff3-0.9.84.tar.gz) = 57e576a12a8e81c634cb6d4be4084903
+SIZE (kdiff3-0.9.84.tar.gz) = 1469216
diff --git a/textproc/kdiff3/files/patch-src-pdiff.cpp b/textproc/kdiff3/files/patch-src-pdiff.cpp
new file mode 100644
index 000000000000..c8f2c7d41e99
--- /dev/null
+++ b/textproc/kdiff3/files/patch-src-pdiff.cpp
@@ -0,0 +1,19 @@
+--- src/pdiff.cpp.orig	Sat May 29 22:22:15 2004
++++ src/pdiff.cpp	Mon May 31 10:59:57 2004
+@@ -462,12 +462,12 @@
+       // 2. If the files don't have the same name then show all names
+       if ( caption.isEmpty() && (!f1.isEmpty() || !f2.isEmpty() || !f3.isEmpty()) )
+       {
+-         caption = ( f1.isEmpty()? "" : ".../"+f1 );
+-         caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? "" : ".../"+f2 );
+-         caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? "" : ".../"+f3 ) ;
++         caption = ( f1.isEmpty()? QString("") : ".../"+f1 );
++         caption += QString(caption.isEmpty() || f2.isEmpty() ? "" : " <-> ") + ( f2.isEmpty()? QString("") : ".../"+f2 );
++         caption += QString(caption.isEmpty() || f3.isEmpty() ? "" : " <-> ") + ( f3.isEmpty()? QString("") : ".../"+f3 ) ;
+       }      
+       
+-      m_pKDiff3Shell->setCaption( caption.isEmpty() ? "KDiff3" : caption+" - KDiff3");
++      m_pKDiff3Shell->setCaption( caption.isEmpty() ? QString("KDiff3") : caption+" - KDiff3");
+    }
+    
+    
diff --git a/textproc/kdiff3/pkg-descr b/textproc/kdiff3/pkg-descr
index 1cacfe4b81d5..dec50936e414 100644
--- a/textproc/kdiff3/pkg-descr
+++ b/textproc/kdiff3/pkg-descr
@@ -1,12 +1,11 @@
 KDiff3 is a program that:
 
-    * compares two or three text input files,
+    * compares or merges two or three text input files or directories,
     * 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,
     * 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!
+    * and has an intuitive graphical user interface.
 
 WWW: http://kdiff3.sourceforge.net/
 
diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist
index b7cacb326a70..fee102bceb72 100644
--- a/textproc/kdiff3/pkg-plist
+++ b/textproc/kdiff3/pkg-plist
@@ -51,6 +51,7 @@ 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/preprocessors.html
 share/doc/HTML/en/kdiff3/requirements.html
 share/doc/HTML/en/kdiff3/saving.html
 share/doc/HTML/en/kdiff3/screenshot_diff.png
@@ -107,6 +108,8 @@ 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/locale/az/LC_MESSAGES/kdiff3.mo
+share/locale/ca/LC_MESSAGES/kdiff3.mo
 share/locale/da/LC_MESSAGES/kdiff3.mo
 share/locale/de/LC_MESSAGES/kdiff3.mo
 share/locale/en_GB/LC_MESSAGES/kdiff3.mo
@@ -115,11 +118,17 @@ 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/nl/LC_MESSAGES/kdiff3.mo
+share/locale/pl/LC_MESSAGES/kdiff3.mo
 share/locale/pt/LC_MESSAGES/kdiff3.mo
 share/locale/pt_BR/LC_MESSAGES/kdiff3.mo
+share/locale/ro/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/locale/ta/LC_MESSAGES/kdiff3.mo
+share/locale/tr/LC_MESSAGES/kdiff3.mo
+share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
 share/services/kdiff3part.desktop
 @dirrm share/doc/HTML/sv/kdiff3
 @dirrm share/doc/HTML/kdiff3