summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2003-06-06 20:57:43 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2003-06-06 20:57:43 +0000
commit2cd36b7277a6125eca0d14f081f5b46ac192b695 (patch)
tree878937ac4a0a3f2368c4873af9f775d035b23b9c
parentAdd a new port OpenReg: an implementation of a domain registry, such (diff)
Update to 0.9.60.
PR: ports/52986 Submitted by: Heiner Eichmann <h.eichmann@gmx.de> (maintainer)
Notes
Notes: svn path=/head/; revision=82400
-rw-r--r--textproc/kdiff3/Makefile7
-rw-r--r--textproc/kdiff3/distinfo2
-rw-r--r--textproc/kdiff3/files/patch-pdiff.cpp8
-rw-r--r--textproc/kdiff3/pkg-plist2
4 files changed, 12 insertions, 7 deletions
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index dcbe54f11489..86a9ba37b01b 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kdiff3
-PORTVERSION= 0.9.51
+PORTVERSION= 0.9.60
CATEGORIES= textproc kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,4 +19,9 @@ 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 31e3eff1f349..979fcc4b22b6 100644
--- a/textproc/kdiff3/distinfo
+++ b/textproc/kdiff3/distinfo
@@ -1 +1 @@
-MD5 (kdiff3-0.9.51.tar.gz) = 7574a47b268ef31f3031d4145328f04f
+MD5 (kdiff3-0.9.60.tar.gz) = ab54ea2a6f547e4233293e81cd5afc0b
diff --git a/textproc/kdiff3/files/patch-pdiff.cpp b/textproc/kdiff3/files/patch-pdiff.cpp
index 08fcd1eae193..8d9f0d6f21ec 100644
--- a/textproc/kdiff3/files/patch-pdiff.cpp
+++ b/textproc/kdiff3/files/patch-pdiff.cpp
@@ -1,10 +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 @@
+--- 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 <errno.h>
++#include <ctype.h>
using namespace std;
diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist
index df97bbe86a62..3d6386936828 100644
--- a/textproc/kdiff3/pkg-plist
+++ b/textproc/kdiff3/pkg-plist
@@ -13,7 +13,7 @@ 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/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