ports/130898: www/mediawiki fails to identify diff3

[Morgan Wesström]

>Number:         130898
>Category:       ports
>Synopsis:       www/mediawiki fails to identify diff3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 22 18:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Morgan Wesström
>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 at 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:
>Unformatted: