From h.eichmann@gmx.de  Sat Nov  4 16:04:32 2006
Return-Path: <h.eichmann@gmx.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 993F916A6AB
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Nov 2006 16:04:32 +0000 (UTC)
	(envelope-from h.eichmann@gmx.de)
Received: from mail.gmx.net (mail.gmx.net [213.165.64.20])
	by mx1.FreeBSD.org (Postfix) with SMTP id DB73F43D55
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Nov 2006 16:04:31 +0000 (GMT)
	(envelope-from h.eichmann@gmx.de)
Received: (qmail invoked by alias); 04 Nov 2006 16:04:30 -0000
Received: from p54824BBC.dip.t-dialin.net (EHLO 7of9) [84.130.75.188]
  by mail.gmx.net (mp027) with SMTP; 04 Nov 2006 17:04:30 +0100
Message-Id: <200611041704.29593.h.eichmann@gmx.de>
Date: Sat, 4 Nov 2006 17:04:29 +0100
From: Heiner <h.eichmann@gmx.de>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Port upgrade: kdiff3 to 0.9.91

>Number:         105146
>Category:       ports
>Synopsis:       Port upgrade: kdiff3 to 0.9.91
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 04 17:53:37 GMT 2006
>Closed-Date:    Sun Nov 05 18:29:20 GMT 2006
>Last-Modified:  Sun Nov  5 18:30:23 GMT 2006
>Originator:     Heiner Eichmann <h.eichmann@gmx.de>
>Release:        FreeBSD 5.4-RELEASE
>Organization:
Sirius Cybernetics Corp.
>Environment:
FreeBSD 7of9.unimatrix-zero.borg 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #0: Sat 
Dec  3 13:30:24 CET 2005     
root@7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL  i386
>Description:

See Patch.

Heiner
>How-To-Repeat:
>Fix:


--Boundary-00=_NoLTFhBRmTnsnAm
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="kdiff3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="kdiff3.diff"

diff -urN ../../textproc/kdiff3/Makefile ./Makefile
--- ../../textproc/kdiff3/Makefile	Mon Jun  5 07:56:03 2006
+++ ./Makefile	Sat Nov  4 16:37:44 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdiff3
-PORTVERSION=	0.9.90
+PORTVERSION=	0.9.91
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,14 +21,5 @@
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
 
 MAN1=	kdiff3.1
-
-pre-configure:
-.for i in config.h.in Makefile.in
-	${TOUCH} ${WRKSRC}/${i}
-.endfor
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2 ||g; s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff -urN ../../textproc/kdiff3/distinfo ./distinfo
--- ../../textproc/kdiff3/distinfo	Mon Jun  5 07:56:03 2006
+++ ./distinfo	Sat Nov  4 16:33:45 2006
@@ -1,3 +1,3 @@
-MD5 (kdiff3-0.9.90.tar.gz) = 7224d636e1f1fa577abfbc17192e71bd
-SHA256 (kdiff3-0.9.90.tar.gz) = 39ce3880a4ff586a96460dac32a483cc081979ffcc82508ea39ace4f39ce6000
-SIZE (kdiff3-0.9.90.tar.gz) = 1846495
+MD5 (kdiff3-0.9.91.tar.gz) = e56613506475f23b8ab713f325dea6e3
+SHA256 (kdiff3-0.9.91.tar.gz) = b22deb1ed23049b303427d8ac81d1e6010166fd6d5eb1dbdd6a075ee770ad9d3
+SIZE (kdiff3-0.9.91.tar.gz) = 2173290
diff -urN ../../textproc/kdiff3/pkg-plist ./pkg-plist
--- ../../textproc/kdiff3/pkg-plist	Mon Jun  5 07:56:03 2006
+++ ./pkg-plist	Sat Nov  4 16:49:19 2006
@@ -219,15 +219,31 @@
 share/locale/zh_CN/LC_MESSAGES/kdiff3.mo
 share/services/kdiff3part.desktop
 @dirrm share/doc/HTML/sv/kdiff3
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/kdiff3
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/kdiff3
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/kdiff3
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/fr/kdiff3
+@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/et/kdiff3
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/es/kdiff3
+@dirrmtry share/doc/HTML/es
 @dirrm share/doc/HTML/en/kdiff3
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/kdiff3
+@dirrmtry share/doc/HTML/de
 @dirrm share/doc/HTML/da/kdiff3
+@dirrmtry share/doc/HTML/da
 @dirrm share/doc/HTML/kdiff3
+@dirrmtry share/doc/HTML
+@dirrmtry share/doc
 @dirrm share/apps/kdiff3part
 @dirrm share/apps/kdiff3
+@dirrmtry share/apps
+@dirrmtry share/applnk/Development
+@dirrmtry share/applnk
+@dirrmtry share

--Boundary-00=_NoLTFhBRmTnsnAm--
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Nov 4 18:31:38 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105146 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Sun Nov 5 12:20:22 UTC 2006 
State-Changed-Why:  
Ask for maintainer fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105146 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sun Nov 5 18:29:18 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105146 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/105146: commit references a PR
Date: Sun,  5 Nov 2006 18:29:13 +0000 (UTC)

 miwi        2006-11-05 18:29:07 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/kdiff3      Makefile distinfo pkg-plist 
   Added files:
     textproc/kdiff3/files patch-src-mergeresultwindow.cpp 
   Log:
   - Update to 0.9.91
   
   PR:             ports/105146
   Submitted by:   Heiner <h.eichmann@gmx.de> (maintainer)
   Sponsored by:   FreeBSD Bug-a-thon #2
   
   Revision  Changes    Path
   1.23      +1 -10     ports/textproc/kdiff3/Makefile
   1.13      +3 -3      ports/textproc/kdiff3/distinfo
   1.1       +11 -0     ports/textproc/kdiff3/files/patch-src-mergeresultwindow.cpp (new)
   1.11      +16 -0     ports/textproc/kdiff3/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
 --Boundary-00=_NoLTFhBRmTnsnAm
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
