Date: Sat, 1 Jul 2006 11:46:31 GMT From: Gerrit Beine <gerrit.beine@gmx.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/99685: Update port: www/mediawiki Message-ID: <200607011146.k61BkV1O065030@www.freebsd.org> Resent-Message-ID: <200607011150.k61BoJQX087395@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99685 >Category: ports >Synopsis: Update port: www/mediawiki >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jul 01 11:50:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Gerrit Beine >Release: FreeBSD 6.1-RELEASE >Organization: >Environment: FreeBSD freebsd61.vmware 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update the MediaWiki 1.6 port to locate the diff3 util on FreeBSD correctly. Thanks to Mikhail Teterin for this patch. >How-To-Repeat: >Fix: diff -Nur /usr/ports/www/mediawiki/files/patch-index.php mediawiki/files/patch-index.php --- /usr/ports/www/mediawiki/files/patch-index.php Thu Jan 1 01:00:00 1970 +++ mediawiki/files/patch-index.php Sat Jul 1 13:29:45 2006 @@ -0,0 +1,11 @@ +--- config/index.php.orig Tue Jun 6 11:04:04 2006 ++++ config/index.php Sat Jul 1 13:27:04 2006 +@@ -340,7 +340,7 @@ + $diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607011146.k61BkV1O065030>