diff options
| author | kevlo <kevlo@FreeBSD.org> | 2003-04-08 13:53:56 +0800 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2003-04-08 13:53:56 +0800 |
| commit | 705e471c285f0012ab5b4ffc27c49bbb2f8d2e46 (patch) | |
| tree | 26a9ec8c2af87d67759858ea4b877fc197732925 /textproc | |
| parent | 9c74a7089514df296ff84eee6978d50e6db262f7 (diff) | |
| download | freebsd-ports-gnome-705e471c285f0012ab5b4ffc27c49bbb2f8d2e46.tar.gz freebsd-ports-gnome-705e471c285f0012ab5b4ffc27c49bbb2f8d2e46.tar.zst freebsd-ports-gnome-705e471c285f0012ab5b4ffc27c49bbb2f8d2e46.zip | |
Update to 0.9.50
PR: 50697
Submitted by: MAINTAINER
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/kdiff3/Makefile | 2 | ||||
| -rw-r--r-- | textproc/kdiff3/distinfo | 2 | ||||
| -rw-r--r-- | textproc/kdiff3/files/patch-pdiff.cpp | 10 | ||||
| -rw-r--r-- | textproc/kdiff3/pkg-descr | 3 | ||||
| -rw-r--r-- | textproc/kdiff3/pkg-plist | 8 |
5 files changed, 21 insertions, 4 deletions
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 3bb7fe2a5420..c714284c9f74 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdiff3 -PORTVERSION= 0.92 +PORTVERSION= 0.9.50 CATEGORIES= textproc kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo index abe8f483fc1b..2e9032fe8978 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1 +1 @@ -MD5 (kdiff3-0.92.tar.gz) = 2dfa39aecd7c801496eea5e4b315121b +MD5 (kdiff3-0.9.50.tar.gz) = 2aa73b3c76213bdc69184d7806897a0e diff --git a/textproc/kdiff3/files/patch-pdiff.cpp b/textproc/kdiff3/files/patch-pdiff.cpp new file mode 100644 index 000000000000..08fcd1eae193 --- /dev/null +++ b/textproc/kdiff3/files/patch-pdiff.cpp @@ -0,0 +1,10 @@ +--- kdiff3/pdiff.cpp.orig Mon Apr 7 21:12:32 2003 ++++ kdiff3/pdiff.cpp Mon Apr 7 21:13:01 2003 +@@ -53,6 +53,7 @@ + #else + #include <unistd.h> + #endif ++#include <errno.h> + + using namespace std; + diff --git a/textproc/kdiff3/pkg-descr b/textproc/kdiff3/pkg-descr index 6f133bf998be..8b9836a82fd2 100644 --- a/textproc/kdiff3/pkg-descr +++ b/textproc/kdiff3/pkg-descr @@ -4,7 +4,8 @@ KDiff3 is a program that: * 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 - * 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 --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist index 7dbb4198d0ea..df97bbe86a62 100644 --- a/textproc/kdiff3/pkg-plist +++ b/textproc/kdiff3/pkg-plist @@ -3,10 +3,16 @@ 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/background.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/Applications/kdiff3.desktop share/icons/locolor/32x32/apps/kdiff3.png share/icons/locolor/16x16/apps/kdiff3.png |