From 1b3db94b73dc4610e034d57a9db3cce5ebcac759 Mon Sep 17 00:00:00 2001
From: "Michael S. Scaramella, Esq" <36650381+MSSEsq@users.noreply.github.com>
Date: Tue, 9 May 2023 19:00:57 -0400
Subject: [PATCH 1/5] Rename config-freebsd-8.0-ALL to config-freebsd-8.0-10.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This configuration file must be renamed to include a FreeBSD version range to accommodate a new configuration file named “config-freebsd-11.0-ALL” that supports Apache HTTP Server V. 2.4 on FreeBSD versions 11.0 and later.
---
 apache/{config-freebsd-8.0-ALL => config-freebsd-8.0-10.4} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apache/{config-freebsd-8.0-ALL => config-freebsd-8.0-10.4} (100%)

diff --git a/apache/config-freebsd-8.0-ALL b/apache/config-freebsd-8.0-10.4
similarity index 100%
rename from apache/config-freebsd-8.0-ALL
rename to apache/config-freebsd-8.0-10.4

From 913e326a716bccc2606ae16f7b6be23eeb74b810 Mon Sep 17 00:00:00 2001
From: "Michael S. Scaramella, Esq" <36650381+MSSEsq@users.noreply.github.com>
Date: Tue, 9 May 2023 19:04:39 -0400
Subject: [PATCH 2/5] Create config-freebsd-11.0-ALL

This new configuration file adds support for Apache HTTP Server 2.4 on FreeBSD 11.0 and later.
---
 apache/config-freebsd-11.0-ALL | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 apache/config-freebsd-11.0-ALL

diff --git a/apache/config-freebsd-11.0-ALL b/apache/config-freebsd-11.0-ALL
new file mode 100644
index 000000000..bccb0d9bf
--- /dev/null
+++ b/apache/config-freebsd-11.0-ALL
@@ -0,0 +1,19 @@
+show_list=0
+httpd_dir=/usr/local
+httpd_path=/usr/local/sbin/httpd
+apachectl_path=/usr/local/sbin/apachectl
+httpd_conf=/usr/local/etc/apache24/httpd.conf
+mime_types=/usr/local/etc/apache24/mime.types
+srm_conf=/usr/local/etc/apache24/srm.conf
+access_conf=/usr/local/etc/apache24/access.conf
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+auto_mods=1
+pid_file=/var/run/httpd.pid
+show_names=0
+allow_virtualmin=0
+format_config=1

From 9a1da695cdf75368235790f1ac460ab4a8271f39 Mon Sep 17 00:00:00 2001
From: "Michael S. Scaramella, Esq" <36650381+MSSEsq@users.noreply.github.com>
Date: Tue, 9 May 2023 19:39:28 -0400
Subject: [PATCH 3/5] Update pkg-lib.pl

The edits update the Apache package names to versions 2.4. Versions 2.2 expired on 2017-07-01.
---
 software/pkg-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/pkg-lib.pl b/software/pkg-lib.pl
index 4a14c4d5d..e20afbb36 100644
--- a/software/pkg-lib.pl
+++ b/software/pkg-lib.pl
@@ -92,7 +92,7 @@ return @rv;
 sub update_system_resolve
 {
 local ($name) = @_;
-return $name eq "apache" ? "apache22 ap22-mod_.*" :
+return $name eq "apache" ? "apache24 ap24-mod_.*" :
        $name eq "dhcpd" ? "isc-dhcp42-server" :
        $name eq "mysql" ? "mysql-server" :
        $name eq "openssh" ? "openssh-portable" :

From 9d081e49d9e33108e04547c12c1a3f4fc03a8217 Mon Sep 17 00:00:00 2001
From: "Michael S. Scaramella, Esq" <36650381+MSSEsq@users.noreply.github.com>
Date: Tue, 9 May 2023 19:47:07 -0400
Subject: [PATCH 4/5] Update ports-lib.pl

The edits update the Apache package names to versions 2.4. Versions 2.2 expired on 2017-07-01.
---
 software/ports-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/ports-lib.pl b/software/ports-lib.pl
index 4cd4bc5de..199070bf0 100644
--- a/software/ports-lib.pl
+++ b/software/ports-lib.pl
@@ -99,7 +99,7 @@ return @rv;
 sub update_system_resolve
 {
 local ($name) = @_;
-return $name eq "apache" ? "apache22 ap22-mod_.*" :
+return $name eq "apache" ? "apache24 ap24-mod_.*" :
        $name eq "dhcpd" ? "isc-dhcp42-server" :
        $name eq "mysql" ? "mysql-server" :
        $name eq "openssh" ? "openssh-portable" :

From a698576f59f3bbbf2f1fb892268b4e6ba12c6c70 Mon Sep 17 00:00:00 2001
From: "Michael S. Scaramella, Esq" <36650381+MSSEsq@users.noreply.github.com>
Date: Tue, 9 May 2023 19:59:27 -0400
Subject: [PATCH 5/5] Update config-solaris-11-ALL

The apparent need to edit this file to support the Apache HTTP Server 2.4 on Solaris was noticed when performing Spotlight searches on download code. We do not run Solaris, so cannot test these edits, yet they seem quite likely to be correct. Any needed corrections made by anyone running Solaris are welcome.
---
 apache/config-solaris-11-ALL | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apache/config-solaris-11-ALL b/apache/config-solaris-11-ALL
index 950e80a4d..aa568090a 100644
--- a/apache/config-solaris-11-ALL
+++ b/apache/config-solaris-11-ALL
@@ -1,11 +1,11 @@
 show_list=0
-httpd_dir=/usr/apache2/2.2
-httpd_conf=/etc/apache2/2.2/httpd.conf
-httpd_path=/usr/apache2/2.2/bin/httpd
-apachectl_path=/usr/apache2/2.2/bin/apachectl
-pid_file=/var/run/apache2/2.2/httpd.pid
-start_cmd=svcadm enable svc:/network/http:apache22
-stop_cmd=svcadm disable svc:/network/http:apache22
+httpd_dir=/usr/apache2/2.4
+httpd_conf=/etc/apache2/2.4/httpd.conf
+httpd_path=/usr/apache2/2.4/bin/httpd
+apachectl_path=/usr/apache2/2.4/bin/apachectl
+pid_file=/var/run/apache2/2.4/httpd.pid
+start_cmd=svcadm enable svc:/network/http:apache24
+stop_cmd=svcadm disable svc:/network/http:apache24
 mime_types=
 srm_conf=
 access_conf=