Skip to content
Permalink
Browse files

apache24-devel: rename to apache2

fix libexecdir in patch-config.layout.diff
  • Loading branch information...
Schamschula committed Oct 15, 2017
1 parent adbd4e7 commit 12fedbd20c5bd98b3dc91437384886d24ede3f52
@@ -4,8 +4,7 @@ PortSystem 1.0
# Untested
PortGroup apache2 1.0

name apache24-devel
apache2.name apache2
name apache2
version 2.4.28
categories www
maintainers {ryandesign @ryandesign} mathiesen.info:macintosh pixilla openmaintainer
@@ -40,9 +39,9 @@ patchfiles patch-build-rules.mk.in.diff \
patch-support-apxs.in.diff

post-patch {
reinplace "s,@MANDIR@,\${prefix}/share/${apache2.name},g" \
reinplace "s,@MANDIR@,\${prefix}/share/${name},g" \
${worksrcpath}/config.layout
reinplace "s,@APACHE_NAME@,${apache2.name},g" \
reinplace "s,@APACHE_NAME@,${name},g" \
${worksrcpath}/config.layout
}

@@ -107,10 +106,6 @@ post-destroot {
${destroot}${apache2.runtimedir} \
${destroot}${apache2.logfiledir}

# fix libtool path
reinplace "s|/build/libtool|/share/apr-1/build/libtool|g" \
${destroot}${apache2.installbuilddir}/config_vars.mk

xinstall -d ${destroot}${apache2.docdir}
xinstall -m 0644 -W ${worksrcpath} ABOUT_APACHE CHANGES LICENSE NOTICE README \
README.platforms ROADMAP VERSIONING ${destroot}${apache2.docdir}
@@ -133,7 +128,7 @@ pre-activate {
}

post-activate {
set confDir ${prefix}/etc/${apache2.name}
set confDir ${prefix}/etc/${name}
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" \
@@ -199,7 +194,7 @@ startupitem.create yes
startupitem.start \
"\[ -x ${prefix}/sbin/apachectl \] && ${prefix}/sbin/apachectl start > /dev/null"
startupitem.stop \
"\[ -r ${prefix}/var/run/${apache2.name}/httpd.pid \] && ${prefix}/sbin/apachectl stop > /dev/null"
"\[ -r ${prefix}/var/run/${name}/httpd.pid \] && ${prefix}/sbin/apachectl stop > /dev/null"
startupitem.restart \
"${prefix}/sbin/apachectl graceful > /dev/null"

@@ -11,7 +11,7 @@
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib/@APACHE_NAME@
+ libexecdir: ${libdir}/modules
+ libexecdir: ${exec_prefix}/lib/@APACHE_NAME@/modules
+ mandir: @MANDIR@
+ sysconfdir: ${prefix}/etc/@APACHE_NAME@
+ datadir: ${prefix}/www/@APACHE_NAME@

0 comments on commit 12fedbd

Please sign in to comment.
You can’t perform that action at this time.