Version 0.9.84 New Features: - Word Wrap for DiffTextWindow - Directory-Comparison: Option "Full Analysis" allows to show the number= of=20 solved vs. unsolved conflicts or deltas vs. whitespace-changes in the directory tree. - Should now also work on 64-bit systems. - Docs now contain a new chapter for uses of preprocessor and=20 line-matching-preprocessor. - Added several credits which now are also visible in the Qt-only versio= n. - The Qt-only version now also shows all command-line options. Under=20 windows a dialog shows them. - Command line options -u and -L for Subversion-support. - Command line options --L1/2/3 for specifying alias names. - In the Qt-only-version the user-interface-language can be set via the= =20 regional-settings (only effective after a restart). - Overview now allows to show the delta between two other files in=20 triplediff-mode. - Option to ignore case which treats case-changes like white space (inst= ead=20 of conversion to upcase). - Bugfixes Also the Makefile.kde include issue is resolved.=20 Heiner Fix: See attached diff Heiner --Boundary-00=_NkMwADBrrOAb65Q Content-Type: text/x-diff; charset="iso-8859-1"; name="diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="diff" --Boundary-00=_NkMwADBrrOAb65Q----DoLQNistfnszHpAnfrbL5OmTfti7g3G1vC1tGFBIMMBykA0K Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" diff -urN ../../textproc/kdiff3/Makefile ./Makefile --- ../../textproc/kdiff3/Makefile Sun May 23 18:37:11 2004 +++ ./Makefile Fri Jun 4 21:00:24 2004 @@ -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,8 +14,6 @@ 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 @@ -28,6 +25,4 @@ ${TOUCH} ${WRKSRC}/${i} .endfor -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN ../../textproc/kdiff3/distinfo ./distinfo --- ../../textproc/kdiff3/distinfo Thu Apr 29 20:39:22 2004 +++ ./distinfo Mon May 31 10:51:19 2004 @@ -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 -urN ../../textproc/kdiff3/files/patch-src-pdiff.cpp ./files/patch-src-pdiff.cpp --- ../../textproc/kdiff3/files/patch-src-pdiff.cpp Thu Jan 1 01:00:00 1970 +++ ./files/patch-src-pdiff.cpp Mon May 31 11:02:52 2004 @@ -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 -urN ../../textproc/kdiff3/pkg-descr ./pkg-descr --- ../../textproc/kdiff3/pkg-descr Mon May 31 10:55:56 2004 +++ ./pkg-descr Thu Apr 29 20:39:22 2004 @@ -1,11 +1,12 @@ KDiff3 is a program that: - * compares or merges two or three text input files or directories, + * 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, * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), - * 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 ../../textproc/kdiff3/pkg-plist ./pkg-plist --- ../../textproc/kdiff3/pkg-plist Thu Apr 29 20:39:22 2004 +++ ./pkg-plist Mon May 31 11:07:05 2004 @@ -51,6 +51,7 @@ 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/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/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
State Changed From-To: open->closed Committed, thanks! One note: I have changed the Makefile to respect CFLAGS and PTHREAD_LIBS (the latter being taken care of in Makefile.kde before)