From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 22 18:50:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B1411065674 for ; Thu, 22 Jan 2009 18:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1BB8E8FC20 for ; Thu, 22 Jan 2009 18:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MIo1CI018965 for ; Thu, 22 Jan 2009 18:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n0MIo1KX018964; Thu, 22 Jan 2009 18:50:01 GMT (envelope-from gnats) Resent-Date: Thu, 22 Jan 2009 18:50:01 GMT Resent-Message-Id: <200901221850.n0MIo1KX018964@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, Morgan Wesström Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5984106566B for ; 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 ; 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 ; 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 Wesström To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/130898: www/mediawiki fails to identify diff3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jan 2009 18:50:03 -0000 >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@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: