diff options
| author | Cheng-Lung Sung <clsung@FreeBSD.org> | 2006-07-01 17:34:39 +0000 |
|---|---|---|
| committer | Cheng-Lung Sung <clsung@FreeBSD.org> | 2006-07-01 17:34:39 +0000 |
| commit | c4d3b405294d22b82f280b507bcab6fbd25f0ead (patch) | |
| tree | 97a84a3f7ddcc744f790e641137c3d3f421c1720 /www/mediawiki110 | |
| parent | e63f046eff355f87895b565f8a7272bec4ef4371 (diff) | |
| download | ports-c4d3b405294d22b82f280b507bcab6fbd25f0ead.tar.gz ports-c4d3b405294d22b82f280b507bcab6fbd25f0ead.zip | |
- 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/mediawiki110')
| -rw-r--r-- | www/mediawiki110/Makefile | 2 | ||||
| -rw-r--r-- | www/mediawiki110/files/patch-index.php | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/www/mediawiki110/Makefile b/www/mediawiki110/Makefile index 1b1e29beaaf3..287230dc6875 100644 --- a/www/mediawiki110/Makefile +++ b/www/mediawiki110/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/mediawiki110/files/patch-index.php b/www/mediawiki110/files/patch-index.php new file mode 100644 index 000000000000..13c2cb716361 --- /dev/null +++ b/www/mediawiki110/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) { |