From nobody@FreeBSD.org  Thu Jan 22 18:40:50 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D5984106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Jan 2009 18:40:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id C4BC58FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Jan 2009 18:40:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MIeoKx064420
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Jan 2009 18:40:50 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n0MIeocv064419;
	Thu, 22 Jan 2009 18:40:50 GMT
	(envelope-from nobody)
Message-Id: <200901221840.n0MIeocv064419@www.freebsd.org>
Date: Thu, 22 Jan 2009 18:40:50 GMT
From: Morgan Wesstrm <freebsd-ports-bugs@pp.dyndns.biz>
To: freebsd-gnats-submit@FreeBSD.org
Subject: www/mediawiki fails to identify diff3
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: gerrit.beine@gmx.de

>Number:         130898
>Category:       ports
>Synopsis:       www/mediawiki fails to identify diff3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    stefan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 22 18:50:01 UTC 2009
>Closed-Date:    Thu Feb 05 10:06:02 UTC 2009
>Last-Modified:  Thu Feb  5 10:10:01 UTC 2009
>Originator:     Morgan Wesstrm
>Release:        7.0-RELEASE
>Organization:
>Environment:
FreeBSD gatekeeper.pp.dyndns.biz 7.0-RELEASE-p5 FreeBSD 7.0-RELEASE-p5 #1: Fri Oct 24 01:34:45 CEST 2008     pp@gatekeeper.pp.dyndns.biz:/usr/obj/usr/src/sys/MYKERNEL  amd64

>Description:
During setup of www/mediawiki the script looks for diff3 but can't find FreeBSD's version because it has the wrong version string info to compare to.
>How-To-Repeat:
Install www/mediawiki from Ports and run the setup-script http://yourdomain/mediawiki/config/index.php
In the top section "Checking environment" you will find a line saying "GNU diff3 not found".
>Fix:
The following simple diff will correct the version string info.



--- /usr/local/www/mediawiki/config/index.php	2009-01-15 16:50:26.000000000 +0100
+++ index.php	2008-12-27 04:59:22.000000000 +0100
@@ -512,7 +512,7 @@
 	explode( PATH_SEPARATOR, getenv( "PATH" ) ) );
 $diff3names = array( "gdiff3", "diff3", "diff3.exe" );
 
-$diff3versioninfo = array('$1 --version 2>&1', 'diff3 - GNU diffutils');
+$diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)');
 foreach ($diff3locations as $loc) {
 	$exe = locate_executable($loc, $diff3names, $diff3versioninfo);
 	if ($exe !== false) {



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Jan 22 18:50:13 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: gerrit.beine@gmx.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/130898: www/mediawiki fails to identify diff3
Date: Thu, 22 Jan 2009 18:50:11 UT

 Maintainer of www/mediawiki,
 
 Please note that PR ports/130898 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/130898
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Gerrit Beine <gerrit.beine@gmx.de>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/130898: www/mediawiki fails to identify diff3
Date: Sun, 1 Feb 2009 18:45:58 +0100

 Am Donnerstag, 22. Januar 2009 19:50:11 schrieb Edwin Groothuis:
 > Maintainer of www/mediawiki,
 >
 > Please note that PR ports/130898 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/130898
 
 
 This means that we can remove patch-index.php from www/mediawiki :-)
 
 How can we handle this? Should I create a separate PR containing a 
 maintainer-update?
 
 So long....
 
 Gerrit

From: linimon@lonesome.com (Mark Linimon)
To: Gerrit Beine <gerrit.beine@gmx.de>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/130898: www/mediawiki fails to identify diff3
Date: Tue, 3 Feb 2009 03:24:43 -0600

 On Sun, Feb 01, 2009 at 05:50:05PM +0000, Gerrit Beine wrote:
 >  This means that we can remove patch-index.php from www/mediawiki :-)
 >  
 >  How can we handle this? Should I create a separate PR containing a 
 >  maintainer-update?
 
 not really necessary, just the followup is ok if it makes it into GNATS.
 
 mcl
Responsible-Changed-From-To: freebsd-ports-bugs->stefan 
Responsible-Changed-By: stefan 
Responsible-Changed-When: Thu Feb 5 09:05:16 UTC 2009 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130898 
State-Changed-From-To: feedback->closed 
State-Changed-By: stefan 
State-Changed-When: Thu Feb 5 10:05:46 UTC 2009 
State-Changed-Why:  
Fix committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/130898: commit references a PR
Date: Thu,  5 Feb 2009 10:05:38 +0000 (UTC)

 stefan      2009-02-05 10:05:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/mediawiki        Makefile 
   Removed files:
     www/mediawiki/files  patch-index.php 
   Log:
   - Fix detection of diff3 by removing files/patch-index.php.
   - Bump PORTREVISION.
   
   PR:             130898
   Submitted by:   Morgan Wesstrm <freebsd-ports-bugs@pp.dyndns.biz>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.50      +1 -0      ports/www/mediawiki/Makefile
   1.3       +0 -11     ports/www/mediawiki/files/patch-index.php (dead)
 _______________________________________________
 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:
