Date: Fri, 6 Jun 2003 11:01:03 +0100 From: Heiner <h.eichmann@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/52986: Port upgrade: kdiff3 to 0.9.60 Message-ID: <200306061201.04416.h.eichmann@gmx.de> Resent-Message-ID: <200306061050.h56AoAaC068884@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 52986
>Category: ports
>Synopsis: Port upgrade: kdiff3 to 0.9.60
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 06 03:50:09 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Heiner Eichmann <h.eichmann@gmx.de>
>Release: FreeBSD 4.8-RC2
>Organization:
Sirius Cybernetics Corp.
>Environment:
System: FreeBSD 4.8-RC #2: Thu Apr 3 11:05:05 CEST 2003 root@7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL i386
>Description:
See fix
Heiner
>How-To-Repeat:
>Fix:
diff -BurbN ../../textproc/kdiff3/Makefile ./Makefile
--- ../../textproc/kdiff3/Makefile Sun Jun 1 11:49:06 2003
+++ ./Makefile Fri Jun 6 00:07:46 2003
@@ -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}
@@ -18,5 +18,10 @@
USE_KDELIBS_VER= 3
GNU_CONFIGURE= yes
+
+pre-configure:
+ ${TOUCH} ${WRKSRC}/config.h.in
+ ${TOUCH} ${WRKSRC}/Makefile.in
+ ${TOUCH} ${WRKSRC}/configure
.include <bsd.port.mk>
diff -BurbN ../../textproc/kdiff3/distinfo ./distinfo
--- ../../textproc/kdiff3/distinfo Sun Jun 1 11:49:06 2003
+++ ./distinfo Thu Jun 5 23:08:06 2003
@@ -1 +1 @@
-MD5 (kdiff3-0.9.51.tar.gz) = 7574a47b268ef31f3031d4145328f04f
+MD5 (kdiff3-0.9.60.tar.gz) = ab54ea2a6f547e4233293e81cd5afc0b
diff -BurbN ../../textproc/kdiff3/files/patch-pdiff.cpp ./files/patch-pdiff.cpp
--- ../../textproc/kdiff3/files/patch-pdiff.cpp Tue Apr 8 07:53:56 2003
+++ ./files/patch-pdiff.cpp Fri Jun 6 09:26:23 2003
@@ -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 Fri Jun 6 09:23:54 2003
++++ src/pdiff.cpp Fri Jun 6 09:25:15 2003
+@@ -55,6 +55,7 @@
#else
#include <unistd.h>
#endif
-+#include <errno.h>
++#include <ctype.h>
using namespace std;
diff -BurbN ../../textproc/kdiff3/pkg-plist ./pkg-plist
--- ../../textproc/kdiff3/pkg-plist Tue Apr 8 07:53:56 2003
+++ ./pkg-plist Fri Jun 6 11:25:55 2003
@@ -13,7 +13,7 @@
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
7of9#
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306061201.04416.h.eichmann>