aboutsummaryrefslogtreecommitdiff
path: root/www/mediawiki112/files
diff options
context:
space:
mode:
authorCheng-Lung Sung <clsung@FreeBSD.org>2006-07-01 17:34:39 +0000
committerCheng-Lung Sung <clsung@FreeBSD.org>2006-07-01 17:34:39 +0000
commitc4d3b405294d22b82f280b507bcab6fbd25f0ead (patch)
tree97a84a3f7ddcc744f790e641137c3d3f421c1720 /www/mediawiki112/files
parente63f046eff355f87895b565f8a7272bec4ef4371 (diff)
- Update the MediaWiki 1.6 port to locate the diff3 util on
FreeBSD correctly. - bump PORTREVISION Thanks to Mikhail Teterin for this patch. PR: ports/99685 Submitted by: maintainer (Gerrit Beine)
Notes
Notes: svn path=/head/; revision=166732
Diffstat (limited to 'www/mediawiki112/files')
-rw-r--r--www/mediawiki112/files/patch-index.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/www/mediawiki112/files/patch-index.php b/www/mediawiki112/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki112/files/patch-index.php
@@ -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) {