aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-06-14 21:14:56 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-06-14 21:14:56 +0000
commitae7796bd82baa44c460383c201114501e90a8dbe (patch)
tree7aeccd3b12cd57b3880623dc3ba9f6b3d0837ef3 /www
parent09d3ef7b9167c2ac97206a7d3e4441c6a83fe071 (diff)
downloadports-ae7796bd82baa44c460383c201114501e90a8dbe.tar.gz
ports-ae7796bd82baa44c460383c201114501e90a8dbe.zip
Notes
Diffstat (limited to 'www')
-rw-r--r--www/Makefile1
-rw-r--r--www/mediawiki19/Makefile5
-rw-r--r--www/mediawiki19/files/patch-index.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/www/Makefile b/www/Makefile
index 6bb2b38bc742..eb5d01efa08a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -289,6 +289,7 @@
SUBDIR += mediawiki16
SUBDIR += mediawiki17
SUBDIR += mediawiki18
+ SUBDIR += mediawiki19
SUBDIR += mergelog
SUBDIR += mgstat
SUBDIR += mhonarc
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index 1bacdb0f48d4..5135bf1fac54 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/Makefile
@@ -8,13 +8,12 @@
PORTNAME= mediawiki
PORTVERSION= 1.9.3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= wikipedia
+MASTER_SITES= http://download.wikimedia.org/mediawiki/1.9/
MAINTAINER= gerrit.beine@gmx.de
COMMENT= The wiki engine used by Wikipedia
-CONFLICTS= mediawiki-1.[0-79].*
+CONFLICTS= mediawiki-1.[0-8].* mediawiki-1.1[0-9].*
NO_BUILD= yes
USE_MYSQL= yes
diff --git a/www/mediawiki19/files/patch-index.php b/www/mediawiki19/files/patch-index.php
index b1d9e238d4d9..5720cace8303 100644
--- a/www/mediawiki19/files/patch-index.php
+++ b/www/mediawiki19/files/patch-index.php
@@ -3,7 +3,7 @@
@@ -434,7 +434,7 @@
$diff3locations = array( "/usr/bin", "/usr/local/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) {