From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 6 03:50:11 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C7FA37B401 for ; Fri, 6 Jun 2003 03:50:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EF7343FAF for ; Fri, 6 Jun 2003 03:50:10 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h56AoAUp068885 for ; Fri, 6 Jun 2003 03:50:10 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h56AoAaC068884; Fri, 6 Jun 2003 03:50:10 -0700 (PDT) Resent-Date: Fri, 6 Jun 2003 03:50:10 -0700 (PDT) Resent-Message-Id: <200306061050.h56AoAaC068884@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Heiner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0274337B401 for ; Fri, 6 Jun 2003 03:48:13 -0700 (PDT) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.FreeBSD.org (Postfix) with SMTP id C073643F85 for ; Fri, 6 Jun 2003 03:48:11 -0700 (PDT) (envelope-from h.eichmann@gmx.de) Received: (qmail 13583 invoked by uid 65534); 6 Jun 2003 10:48:10 -0000 Received: from pD9EC3261.dip.t-dialin.net (EHLO 192.168.254.43) (217.236.50.97) by mail.gmx.net (mp014) with SMTP; 06 Jun 2003 12:48:10 +0200 Message-Id: <200306061201.04416.h.eichmann@gmx.de> Date: Fri, 6 Jun 2003 11:01:03 +0100 From: Heiner To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/52986: Port upgrade: kdiff3 to 0.9.60 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2003 10:50:11 -0000 >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 >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 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 #endif -+#include ++#include 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: