aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorclsung <clsung@FreeBSD.org>2006-07-02 01:34:39 +0800
committerclsung <clsung@FreeBSD.org>2006-07-02 01:34:39 +0800
commit8b865b46b8455412331a516c6803fd664e32e3f1 (patch)
tree425d5b590e408a99105ef4c6ccb5c5560172a1c6 /www
parentdedb7cf08bc8b9485f58db5f17f5286d7441ca05 (diff)
downloadfreebsd-ports-gnome-8b865b46b8455412331a516c6803fd664e32e3f1.tar.gz
freebsd-ports-gnome-8b865b46b8455412331a516c6803fd664e32e3f1.tar.zst
freebsd-ports-gnome-8b865b46b8455412331a516c6803fd664e32e3f1.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)
Diffstat (limited to 'www')
-rw-r--r--www/mediawiki/Makefile2
-rw-r--r--www/mediawiki/files/patch-index.php11
-rw-r--r--www/mediawiki110/Makefile2
-rw-r--r--www/mediawiki110/files/patch-index.php11
-rw-r--r--www/mediawiki111/Makefile2
-rw-r--r--www/mediawiki111/files/patch-index.php11
-rw-r--r--www/mediawiki112/Makefile2
-rw-r--r--www/mediawiki112/files/patch-index.php11
-rw-r--r--www/mediawiki113/Makefile2
-rw-r--r--www/mediawiki113/files/patch-index.php11
-rw-r--r--www/mediawiki114/Makefile2
-rw-r--r--www/mediawiki114/files/patch-index.php11
-rw-r--r--www/mediawiki115/Makefile2
-rw-r--r--www/mediawiki115/files/patch-index.php11
-rw-r--r--www/mediawiki116/Makefile2
-rw-r--r--www/mediawiki116/files/patch-index.php11
-rw-r--r--www/mediawiki118/Makefile2
-rw-r--r--www/mediawiki118/files/patch-index.php11
-rw-r--r--www/mediawiki12/Makefile2
-rw-r--r--www/mediawiki12/files/patch-index.php11
-rw-r--r--www/mediawiki16/Makefile2
-rw-r--r--www/mediawiki16/files/patch-index.php11
-rw-r--r--www/mediawiki17/Makefile2
-rw-r--r--www/mediawiki17/files/patch-index.php11
-rw-r--r--www/mediawiki18/Makefile2
-rw-r--r--www/mediawiki18/files/patch-index.php11
-rw-r--r--www/mediawiki19/Makefile2
-rw-r--r--www/mediawiki19/files/patch-index.php11
28 files changed, 168 insertions, 14 deletions
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/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/mediawiki/files/patch-index.php b/www/mediawiki/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki/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) {
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) {
diff --git a/www/mediawiki111/Makefile b/www/mediawiki111/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki111/Makefile
+++ b/www/mediawiki111/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/mediawiki111/files/patch-index.php b/www/mediawiki111/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki111/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) {
diff --git a/www/mediawiki112/Makefile b/www/mediawiki112/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki112/Makefile
+++ b/www/mediawiki112/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/mediawiki112/files/patch-index.php b/www/mediawiki112/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki112/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) {
diff --git a/www/mediawiki113/Makefile b/www/mediawiki113/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki113/Makefile
+++ b/www/mediawiki113/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/mediawiki113/files/patch-index.php b/www/mediawiki113/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki113/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) {
diff --git a/www/mediawiki114/Makefile b/www/mediawiki114/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki114/Makefile
+++ b/www/mediawiki114/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/mediawiki114/files/patch-index.php b/www/mediawiki114/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki114/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) {
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/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/mediawiki115/files/patch-index.php b/www/mediawiki115/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki115/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) {
diff --git a/www/mediawiki116/Makefile b/www/mediawiki116/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki116/Makefile
+++ b/www/mediawiki116/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/mediawiki116/files/patch-index.php b/www/mediawiki116/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki116/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) {
diff --git a/www/mediawiki118/Makefile b/www/mediawiki118/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki118/Makefile
+++ b/www/mediawiki118/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/mediawiki118/files/patch-index.php b/www/mediawiki118/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki118/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) {
diff --git a/www/mediawiki12/Makefile b/www/mediawiki12/Makefile
index 1b1e29beaaf3..287230dc6875 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 000000000000..13c2cb716361
--- /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) {
diff --git a/www/mediawiki16/Makefile b/www/mediawiki16/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki16/Makefile
+++ b/www/mediawiki16/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/mediawiki16/files/patch-index.php b/www/mediawiki16/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki16/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) {
diff --git a/www/mediawiki17/Makefile b/www/mediawiki17/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki17/Makefile
+++ b/www/mediawiki17/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/mediawiki17/files/patch-index.php b/www/mediawiki17/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki17/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) {
diff --git a/www/mediawiki18/Makefile b/www/mediawiki18/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki18/Makefile
+++ b/www/mediawiki18/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/mediawiki18/files/patch-index.php b/www/mediawiki18/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki18/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) {
diff --git a/www/mediawiki19/Makefile b/www/mediawiki19/Makefile
index 1b1e29beaaf3..287230dc6875 100644
--- a/www/mediawiki19/Makefile
+++ b/www/mediawiki19/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/mediawiki19/files/patch-index.php b/www/mediawiki19/files/patch-index.php
new file mode 100644
index 000000000000..13c2cb716361
--- /dev/null
+++ b/www/mediawiki19/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) {
generated by cgit (git 2.34.1) at 2025-02-20 17:03:29 +0800