From 8b865b46b8455412331a516c6803fd664e32e3f1 Mon Sep 17 00:00:00 2001
From: clsung <clsung@FreeBSD.org>
Date: Sat, 1 Jul 2006 17:34:39 +0000
Subject: - 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)
---
 www/mediawiki12/Makefile              |  2 +-
 www/mediawiki12/files/patch-index.php | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 www/mediawiki12/files/patch-index.php

(limited to 'www/mediawiki12')

diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index 1b1e29b..287230d 100644
--- a/www/mediawiki12/Makefile
+++ b/www/mediawiki12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mediawiki
 PORTVERSION=	1.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wikipedia
diff --git a/www/mediawiki12/files/patch-index.php b/www/mediawiki12/files/patch-index.php
new file mode 100644
index 0000000..13c2cb71
--- /dev/null
+++ b/www/mediawiki12/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) {
-- 
cgit v1.1