cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update the MediaWiki 1.6 port to locate the diff3 util on

Browse Source 
FreeBSD correctly.
- bump PORTREVISION

Thanks to Mikhail Teterin for this patch.

PR:		ports/99685
Submitted by:	maintainer (Gerrit Beine)
This commit is contained in:
Cheng-Lung Sung 2006-07-01 17:34:39 +00:00
parent e63f046eff
commit c4d3b40529
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=166732
28 changed files with 168 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/mediawiki/Makefile
View File

@ -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

11
www/mediawiki/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki110/Makefile
View File

@ -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

11
www/mediawiki110/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki111/Makefile
View File

@ -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

11
www/mediawiki111/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki112/Makefile
View File

@ -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

11
www/mediawiki112/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki113/Makefile
View File

@ -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

11
www/mediawiki113/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki114/Makefile
View File

@ -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

11
www/mediawiki114/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki115/Makefile
View File

@ -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

11
www/mediawiki115/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki116/Makefile
View File

@ -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

11
www/mediawiki116/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki118/Makefile
View File

@ -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

11
www/mediawiki118/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki12/Makefile
View File

@ -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

11
www/mediawiki12/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki16/Makefile
View File

@ -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

11
www/mediawiki16/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki17/Makefile
View File

@ -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

11
www/mediawiki17/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki18/Makefile
View File

@ -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

11
www/mediawiki18/files/patch-index.php Normal file
View File

@ -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) {

2
www/mediawiki19/Makefile
View File

@ -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

11
www/mediawiki19/files/patch-index.php Normal file
View File

@ -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) {