This diff updates kdiff3 from 0.9.96 to 0.9.97, plus these changes:
* Fix WANTLIB
* Fix CXXFLAGS
* Update my email address
A few highlights of kdiff3 0.9.97:
* Memory usage optimized for comparison of large directories.
* In overview for two way diff show if only one side contains text.
* If text is selected in either input or output window use that in
Find dialog.
* Command line option --cs doesn't change the config value permanently
anymore.
Full release notes:
http://sourceforge.net/mailarchive/message.php?msg_id=29665062
Tested on amd64 and i386.
Looking for OKs to commit.
Lawrence
Index: Makefile
===================================================================
RCS file: /home/lteo/cvsync/cvs/ports/devel/kdiff3/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 29 Mar 2012 13:38:30 -0000 1.5
+++ Makefile 27 Sep 2012 04:47:23 -0000
@@ -2,14 +2,13 @@
COMMENT = compares and merges multiple files or directories
-DISTNAME = kdiff3-0.9.96
-REVISION = 1
+DISTNAME = kdiff3-0.9.97
CATEGORIES = devel x11/kde
HOMEPAGE = http://kdiff3.sourceforge.net/
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=kdiff3/}
-MAINTAINER = Lawrence Teo <l...@devio.us>
+MAINTAINER = Lawrence Teo <l...@openbsd.org>
# GPLv2
PERMIT_DISTFILES_CDROM =Yes
@@ -17,13 +16,14 @@ PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = QtGui c m pthread stdc++
+WANTLIB = ICE QtGui SM X11 Xext Xi Xinerama Xrender
+WANTLIB += c fontconfig freetype m pthread stdc++
MODULES = x11/qt4
SEPARATE_BUILD = Yes
-MAKE_FLAGS = CXX="${CXX}" CXXFLAGS='${CXXFLAGS} -fno-wrapv -pthread -Wall -W
$$(DEFINES)' \
+MAKE_FLAGS = CXX="${CXX}" CXXFLAGS='${CXXFLAGS} -Wall -W $$(DEFINES)' \
LINK="${CXX}"
DESTDIRNAME = INSTALL_ROOT
Index: distinfo
===================================================================
RCS file: /home/lteo/cvsync/cvs/ports/devel/kdiff3/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 6 Sep 2011 20:03:52 -0000 1.2
+++ distinfo 27 Sep 2012 04:20:47 -0000
@@ -1,5 +1,2 @@
-MD5 (kdiff3-0.9.96.tar.gz) = Rrlr793zRIo8tnPwGMb2+Q==
-RMD160 (kdiff3-0.9.96.tar.gz) = wM/S5+MPWMnW0FjC2BaO+X8aM7c=
-SHA1 (kdiff3-0.9.96.tar.gz) = 1+/azf1+o8fsn33uMqulliwXCaU=
-SHA256 (kdiff3-0.9.96.tar.gz) = EOdOxH1XzK4T9x+Db9W6uF20akB2I5jKOlFbVS511pE=
-SIZE (kdiff3-0.9.96.tar.gz) = 1796595
+SHA256 (kdiff3-0.9.97.tar.gz) = 47cWu0ScgU2MMIF+wcoj+6Dtnu5aY152bB8rkN23Wio=
+SIZE (kdiff3-0.9.97.tar.gz) = 1803769
Index: patches/patch-src-QT4_kdiff3_pro
===================================================================
RCS file:
/home/lteo/cvsync/cvs/ports/devel/kdiff3/patches/patch-src-QT4_kdiff3_pro,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src-QT4_kdiff3_pro
--- patches/patch-src-QT4_kdiff3_pro 21 Sep 2011 08:08:18 -0000 1.1
+++ patches/patch-src-QT4_kdiff3_pro 27 Sep 2012 04:30:03 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src-QT4_kdiff3_pro,v 1.1 2011/09/21 08:08:18 ajacoutot Exp $
---- src-QT4/kdiff3.pro.orig Thu Sep 1 20:40:51 2011
-+++ src-QT4/kdiff3.pro Thu Sep 1 20:41:55 2011
-@@ -56,11 +56,11 @@ win32 {
-
+--- src-QT4/kdiff3.pro.orig Sat Jul 14 06:27:14 2012
++++ src-QT4/kdiff3.pro Thu Sep 27 00:29:53 2012
+@@ -64,11 +64,11 @@ os2 {
+ }
unix {
- documentation.path = /usr/local/share/doc/kdiff3
