diff options
author | Tilman Keskinoz <arved@FreeBSD.org> | 2003-10-05 10:33:29 +0000 |
---|---|---|
committer | Tilman Keskinoz <arved@FreeBSD.org> | 2003-10-05 10:33:29 +0000 |
commit | 3ae58c662395916799b76fb6ea12d10112a6b7ce (patch) | |
tree | e07d6ab0cd55e4443c8f5d5b80579f072c79d92b /textproc/kdiff3 | |
parent | The new ymessenger is still broken. A quick google suggests that Y! (diff) |
Update to 0.9.70
PR: 57542
Submitted by: Heiner Eichmann <h.eichmann@gmx.de>
Notes
Notes:
svn path=/head/; revision=90304
Diffstat (limited to 'textproc/kdiff3')
-rw-r--r-- | textproc/kdiff3/Makefile | 7 | ||||
-rw-r--r-- | textproc/kdiff3/distinfo | 2 | ||||
-rw-r--r-- | textproc/kdiff3/files/patch-pdiff.cpp | 10 | ||||
-rw-r--r-- | textproc/kdiff3/files/patch-src-directorymergewindow.cpp | 11 | ||||
-rw-r--r-- | textproc/kdiff3/pkg-plist | 39 |
5 files changed, 36 insertions, 33 deletions
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index bf75d77734ca..0286916c2914 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -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> diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo index f5f9e4c2173a..874e7b36f5ea 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1 +1 @@ -MD5 (kdiff3-0.9.61.tar.gz) = b776900e16ce501257e5bce416489c9e +MD5 (kdiff3-0.9.70.tar.gz) = 17dba67818b61c5c51dfe6163c2d44d2 diff --git a/textproc/kdiff3/files/patch-pdiff.cpp b/textproc/kdiff3/files/patch-pdiff.cpp deleted file mode 100644 index 8d9f0d6f21ec..000000000000 --- a/textproc/kdiff3/files/patch-pdiff.cpp +++ /dev/null @@ -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; - diff --git a/textproc/kdiff3/files/patch-src-directorymergewindow.cpp b/textproc/kdiff3/files/patch-src-directorymergewindow.cpp new file mode 100644 index 000000000000..d2be5585f4bc --- /dev/null +++ b/textproc/kdiff3/files/patch-src-directorymergewindow.cpp @@ -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) diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist index 3d6386936828..eec46f6bb271 100644 --- a/textproc/kdiff3/pkg-plist +++ b/textproc/kdiff3/pkg-plist @@ -1,23 +1,30 @@ bin/kdiff3 -share/doc/HTML/en/kdiff3/index.html -share/doc/HTML/en/kdiff3/triple_diff.png -share/doc/HTML/en/kdiff3/screenshot_diff.png -share/doc/HTML/en/kdiff3/screenshot_merge.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 +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/new.png +share/doc/HTML/en/kdiff3/letter_by_letter.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/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/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 |