<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/12fedbd20c5bd98b3dc91437384886d24ede3f52">https://github.com/macports/macports-ports/commit/12fedbd20c5bd98b3dc91437384886d24ede3f52</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 12fedbd20c5bd98b3dc91437384886d24ede3f52
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Oct 15 12:40:08 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> apache24-devel: rename to apache2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix libexecdir in patch-config.layout.diff
</span>---
www/{apache24-devel => apache2}/Portfile | 15 +++++----------
.../files/patch-build-rules.mk.in.diff | 0
.../files/patch-config.layout.diff | 2 +-
.../files/patch-support-apachectl.in.diff | 0
.../files/patch-support-apxs.in.diff | 0
5 files changed, 6 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache24-devel/Portfile b/www/apache2/Portfile
</span>similarity index 93%
rename from www/apache24-devel/Portfile
rename to www/apache2/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 04ac5ac..2ac3f84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache24-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/apache2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> # Untested
PortGroup apache2 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name apache24-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-apache2.name apache2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name apache2
</span> version 2.4.28
categories www
maintainers {ryandesign @ryandesign} mathiesen.info:macintosh pixilla openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +39,9 @@ patchfiles patch-build-rules.mk.in.diff \
</span> patch-support-apxs.in.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@MANDIR@,\${prefix}/share/${apache2.name},g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@MANDIR@,\${prefix}/share/${name},g" \
</span> ${worksrcpath}/config.layout
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@APACHE_NAME@,${apache2.name},g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@APACHE_NAME@,${name},g" \
</span> ${worksrcpath}/config.layout
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,10 +106,6 @@ post-destroot {
</span> ${destroot}${apache2.runtimedir} \
${destroot}${apache2.logfiledir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix libtool path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/build/libtool|/share/apr-1/build/libtool|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${apache2.installbuilddir}/config_vars.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> xinstall -d ${destroot}${apache2.docdir}
xinstall -m 0644 -W ${worksrcpath} ABOUT_APACHE CHANGES LICENSE NOTICE README \
README.platforms ROADMAP VERSIONING ${destroot}${apache2.docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +128,7 @@ pre-activate {
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set confDir ${prefix}/etc/${apache2.name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confDir ${prefix}/etc/${name}
</span> if {![file exists ${confDir}/httpd.conf]} {
file copy ${confDir}/httpd.conf.orig ${confDir}/httpd.conf
reinplace "s|#LoadModule slotmem_shm_module|LoadModule slotmem_shm_module|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,7 +194,7 @@ startupitem.create yes
</span> startupitem.start \
"\[ -x ${prefix}/sbin/apachectl \] && ${prefix}/sbin/apachectl start > /dev/null"
startupitem.stop \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-"\[ -r ${prefix}/var/run/${apache2.name}/httpd.pid \] && ${prefix}/sbin/apachectl stop > /dev/null"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"\[ -r ${prefix}/var/run/${name}/httpd.pid \] && ${prefix}/sbin/apachectl stop > /dev/null"
</span> startupitem.restart \
"${prefix}/sbin/apachectl graceful > /dev/null"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache24-devel/files/patch-build-rules.mk.in.diff b/www/apache2/files/patch-build-rules.mk.in.diff
</span>similarity index 100%
rename from www/apache24-devel/files/patch-build-rules.mk.in.diff
rename to www/apache2/files/patch-build-rules.mk.in.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache24-devel/files/patch-config.layout.diff b/www/apache2/files/patch-config.layout.diff
</span>similarity index 94%
rename from www/apache24-devel/files/patch-config.layout.diff
rename to www/apache2/files/patch-config.layout.diff
<span style='display:block; white-space:pre;color:#808080;'>index fb9fced..64c8b76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache24-devel/files/patch-config.layout.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/apache2/files/patch-config.layout.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> + bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib/@APACHE_NAME@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libexecdir: ${libdir}/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libexecdir: ${exec_prefix}/lib/@APACHE_NAME@/modules
</span> + mandir: @MANDIR@
+ sysconfdir: ${prefix}/etc/@APACHE_NAME@
+ datadir: ${prefix}/www/@APACHE_NAME@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache24-devel/files/patch-support-apachectl.in.diff b/www/apache2/files/patch-support-apachectl.in.diff
</span>similarity index 100%
rename from www/apache24-devel/files/patch-support-apachectl.in.diff
rename to www/apache2/files/patch-support-apachectl.in.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache24-devel/files/patch-support-apxs.in.diff b/www/apache2/files/patch-support-apxs.in.diff
</span>similarity index 100%
rename from www/apache24-devel/files/patch-support-apxs.in.diff
rename to www/apache2/files/patch-support-apxs.in.diff
</pre><pre style='margin:0'>
</pre>