Update to 0.9.70

PR:		57542
Submitted by:	Heiner Eichmann <h.eichmann@gmx.de>
This commit is contained in:
Tilman Keskinoz 2003-10-05 10:33:29 +00:00
parent 91753fc068
commit 3ae58c6623
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=90304
5 changed files with 36 additions and 33 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= kdiff3
PORTVERSION= 0.9.61
PORTVERSION= 0.9.70
CATEGORIES= textproc kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -19,9 +19,4 @@ CONFIGURE_ARGS+= --program-transform-name=s,^,,
USE_KDELIBS_VER= 3
GNU_CONFIGURE= yes
pre-configure:
.for i in config.h.in Makefile.in configure
${TOUCH} ${WRKSRC}/${i}
.endfor
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (kdiff3-0.9.61.tar.gz) = b776900e16ce501257e5bce416489c9e
MD5 (kdiff3-0.9.70.tar.gz) = 17dba67818b61c5c51dfe6163c2d44d2

View File

@ -1,10 +0,0 @@
--- src/pdiff.cpp.orig Mon Apr 7 21:12:32 2003
+++ src/pdiff.cpp Mon Apr 7 21:13:01 2003
@@ -55,6 +55,7 @@
#else
#include <unistd.h>
#endif
+#include <ctype.h>
using namespace std;

View File

@ -0,0 +1,11 @@
--- 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)

View File

@ -1,23 +1,30 @@
bin/kdiff3
share/doc/HTML/en/kdiff3/index.html
share/doc/HTML/en/kdiff3/triple_diff.png
lib/kde3/libkdiff3part.la
lib/kde3/libkdiff3part.so
share/applnk/Development/kdiff3.desktop
share/apps/kdiff3/kdiff3_shell.rc
share/apps/kdiff3part/kdiff3_part.rc
share/doc/HTML/en/kdiff3/common
share/doc/HTML/en/kdiff3/dirbrowser.png
share/doc/HTML/en/kdiff3/dirmergebig.png
share/doc/HTML/en/kdiff3/index.cache.bz2
share/doc/HTML/en/kdiff3/index.docbook
share/doc/HTML/en/kdiff3/iteminfo.png
share/doc/HTML/en/kdiff3/letter_by_letter.png
share/doc/HTML/en/kdiff3/merge_current.png
share/doc/HTML/en/kdiff3/new.png
share/doc/HTML/en/kdiff3/open_dialog.png
share/doc/HTML/en/kdiff3/screenshot_diff.png
share/doc/HTML/en/kdiff3/screenshot_merge.png
share/doc/HTML/en/kdiff3/triple_diff.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/Utilities/kdiff3.desktop
share/icons/locolor/32x32/apps/kdiff3.png
share/icons/locolor/16x16/apps/kdiff3.png
share/icons/hicolor/32x32/apps/kdiff3.png
share/icons/hicolor/16x16/apps/kdiff3.png
share/apps/kdiff3/kdiff3ui.rc
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/services/kdiff3part.desktop
@dirrm share/doc/HTML/en/kdiff3
@dirrm share/apps/kdiff3part
@dirrm share/apps/kdiff3