diff options
| author | Cheng-Lung Sung <clsung@FreeBSD.org> | 2006-07-01 17:37:54 +0000 |
|---|---|---|
| committer | Cheng-Lung Sung <clsung@FreeBSD.org> | 2006-07-01 17:37:54 +0000 |
| commit | 66ef09855214b5fac434aca36fcdfe38724e52b7 (patch) | |
| tree | 232ccc2eb202444a9a5eabbfe841d4d8a92882c6 | |
| parent | c4d3b405294d22b82f280b507bcab6fbd25f0ead (diff) | |
| download | ports-66ef09855214b5fac434aca36fcdfe38724e52b7.tar.gz ports-66ef09855214b5fac434aca36fcdfe38724e52b7.zip | |
- Update the MediaWiki 1.5 port to locate the diff3 util on
FreeBSD correctly.
- bump PORTREVISION
Thanks to Mikhail Teterin for this patch.
PR: ports/99684
Submitted by: maintainer (Gerrit Beine)
Notes
Notes:
svn path=/head/; revision=166733
| -rw-r--r-- | www/mediawiki15/Makefile | 1 | ||||
| -rw-r--r-- | www/mediawiki15/files/patch-index.php | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/www/mediawiki15/Makefile b/www/mediawiki15/Makefile index e85572115aa1..2391c15af12e 100644 --- a/www/mediawiki15/Makefile +++ b/www/mediawiki15/Makefile @@ -7,6 +7,7 @@ PORTNAME= mediawiki PORTVERSION= 1.5.8 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wikipedia diff --git a/www/mediawiki15/files/patch-index.php b/www/mediawiki15/files/patch-index.php new file mode 100644 index 000000000000..870879d1214d --- /dev/null +++ b/www/mediawiki15/files/patch-index.php @@ -0,0 +1,11 @@ +--- config/index.php.orig Thu Mar 2 03:55:15 2006 ++++ config/index.php Sat Jul 1 13:32:47 2006 +@@ -321,7 +321,7 @@ + $diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode(":", getenv("PATH")); + $diff3names = array("gdiff3", "diff3"); + +-$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) { |