[110959] trunk/dports
pixilla at macports.org
pixilla at macports.org
Wed Sep 11 08:59:19 PDT 2013
Revision: 110959
https://trac.macports.org/changeset/110959
Author: pixilla at macports.org
Date: 2013-09-11 08:59:19 -0700 (Wed, 11 Sep 2013)
Log Message:
-----------
_resources/port1.0/group:
- Match namespace to portgroup name.
www/apache24-devel:
- Update portgroup namespace and revbump.
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/apache2-1.0.tcl
trunk/dports/www/apache24-devel/Portfile
Modified: trunk/dports/_resources/port1.0/group/apache2-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/apache2-1.0.tcl 2013-09-11 15:09:37 UTC (rev 110958)
+++ trunk/dports/_resources/port1.0/group/apache2-1.0.tcl 2013-09-11 15:59:19 UTC (rev 110959)
@@ -6,106 +6,109 @@
#
# values to be used in eg configuration files
#
-options apache.prefix
-default apache.prefix {"${prefix}"}
-options apache.exec_prefix
-default apache.exec_prefix {"${apache.prefix}"}
-options apache.name
-default apache.name {"${name}"}
-options apache.exec_name
-default apache.exec_name {"httpd"}
-options apache.bindir
-default apache.bindir {"${apache.exec_prefix}/bin"}
-options apache.sbindir
-default apache.sbindir {"${apache.exec_prefix}/sbin"}
-options apache.libdir
-default apache.libdir {"${apache.exec_prefix}/lib/${apache.name}"}
-options apache.libexecdir
-default apache.libexecdir {"${apache.libdir}/modules"}
-options apache.mandir
-default apache.mandir {"${apache.prefix}/share/${apache.name}/man"}
-options apache.sysconfdir
-default apache.sysconfdir {"${apache.prefix}/etc/${apache.name}"}
-options apache.datadir
-default apache.datadir {"${apache.prefix}/www/${apache.name}"}
-options apache.installbuilddir
-default apache.installbuilddir {"${apache.datadir}/build"}
-options apache.errordir
-default apache.errordir {"${apache.datadir}/error"}
-options apache.iconsdir
-default apache.iconsdir {"${apache.datadir}/icons"}
-options apache.htdocsdir
-default apache.htdocsdir {"${apache.datadir}/html"}
-options apache.manualdir
-default apache.manualdir {"${apache.datadir}/manual"}
-options apache.cgidir
-default apache.cgidir {"${apache.datadir}/cgi-bin"}
-options apache.includedir
-default apache.includedir {"${apache.prefix}/include/${apache.name}"}
-options apache.localstatedir
-default apache.localstatedir {"${apache.prefix}/var"}
-options apache.runtimedir
-default apache.runtimedir {"${apache.localstatedir}/run/${apache.name}"}
-options apache.logfiledir
-default apache.logfiledir {"${apache.localstatedir}/log/${apache.name}"}
-options apache.proxycachedir
-default apache.proxycachedir {"${apache.localstatedir}/tmp/${apache.name}"}
+options apache2.prefix
+default apache2.prefix {"${prefix}"}
+options apache2.exec_prefix
+default apache2.exec_prefix {"${apache2.prefix}"}
+options apache2.name
+default apache2.name {"${name}"}
+options apache2.exec_name
+default apache2.exec_name {"httpd"}
+options apache2.bindir
+default apache2.bindir {"${apache2.exec_prefix}/bin"}
+options apache2.sbindir
+default apache2.sbindir {"${apache2.exec_prefix}/sbin"}
+options apache2.libdir
+default apache2.libdir {"${apache2.exec_prefix}/lib/${apache2.name}"}
+options apache2.libexecdir
+default apache2.libexecdir {"${apache2.libdir}/modules"}
+options apache2.mandir
+default apache2.mandir {"${apache2.prefix}/share/${apache2.name}/man"}
+options apache2.docdir
+default apache2.docdir {"${apache2.prefix}/share/doc/${apache2.name}"}
+options apache2.sysconfdir
+default apache2.sysconfdir {"${apache2.prefix}/etc/${apache2.name}"}
+options apache2.datadir
+default apache2.datadir {"${apache2.prefix}/www/${apache2.name}"}
+options apache2.installbuilddir
+default apache2.installbuilddir {"${apache2.datadir}/build"}
+options apache2.errordir
+default apache2.errordir {"${apache2.datadir}/error"}
+options apache2.iconsdir
+default apache2.iconsdir {"${apache2.datadir}/icons"}
+options apache2.htdocsdir
+default apache2.htdocsdir {"${apache2.datadir}/html"}
+options apache2.manualdir
+default apache2.manualdir {"${apache2.datadir}/manual"}
+options apache2.cgidir
+default apache2.cgidir {"${apache2.datadir}/cgi-bin"}
+options apache2.includedir
+default apache2.includedir {"${apache2.prefix}/include/${apache2.name}"}
+options apache2.localstatedir
+default apache2.localstatedir {"${apache2.prefix}/var"}
+options apache2.runtimedir
+default apache2.runtimedir {"${apache2.localstatedir}/run/${apache2.name}"}
+options apache2.logfiledir
+default apache2.logfiledir {"${apache2.localstatedir}/log/${apache2.name}"}
+options apache2.proxycachedir
+default apache2.proxycachedir {"${apache2.localstatedir}/tmp/${apache2.name}"}
-options apache.user
-default apache.user {"_www"}
-options apache.group
-default apache.group {"_www"}
+options apache2.user
+default apache2.user {"_www"}
+options apache2.group
+default apache2.group {"_www"}
# General settings
-options apache.listen_ports
-default apache.listen_ports {{80 443}}
-options apache.contact
-default apache.contact {"ops at example.com"}
-options apache.timeout
-default apache.timeout {300}
-options apache.keepalive
-default apache.keepalive {"On"}
-set apache(keepaliverequests) 100
-options apache.keepalivetimeout
-default apache.keepalivetimeout {5}
+options apache2.listen_ports
+default apache2.listen_ports {{80 443}}
+options apache2.contact
+default apache2.contact {"ops at example.com"}
+options apache2.timeout
+default apache2.timeout {300}
+options apache2.keepalive
+default apache2.keepalive {"On"}
+options apache2.keepaliverequests
+default apache2.keepaliverequests {100}
+options apache2.keepalivetimeout
+default apache2.keepalivetimeout {5}
# Security
-options apache.servertokens
-default apache.servertokens {"Prod"}
-options apache.serversignature
-default apache.serversignature {"On"}
-options apache.traceenable
-default apache.traceenable {"On"}
+options apache2.servertokens
+default apache2.servertokens {"Prod"}
+options apache2.serversignature
+default apache2.serversignature {"On"}
+options apache2.traceenable
+default apache2.traceenable {"On"}
# mod_auth_openids
-options apache.allowed_openids
-default apache.allowed_openids {""}
+options apache2.allowed_openids
+default apache2.allowed_openids {""}
# Prefork Attributes
-options apache.prefork.startservers
-default apache.prefork.startservers {16}
-options apache.prefork.minspareservers
-default apache.prefork.minspareservers {16}
-options apache.prefork.maxspareservers
-default apache.prefork.maxspareservers {32}
-options apache.prefork.serverlimit
-default apache.prefork.serverlimit {400}
-options apache.prefork.maxclients
-default apache.prefork.maxclients {400}
-options apache.prefork.threadsperchild
-default apache.prefork.threadsperchild {10000}
+options apache2.prefork.startservers
+default apache2.prefork.startservers {16}
+options apache2.prefork.minspareservers
+default apache2.prefork.minspareservers {16}
+options apache2.prefork.maxspareservers
+default apache2.prefork.maxspareservers {32}
+options apache2.prefork.serverlimit
+default apache2.prefork.serverlimit {400}
+options apache2.prefork.maxclients
+default apache2.prefork.maxclients {400}
+options apache2.prefork.threadsperchild
+default apache2.prefork.threadsperchild {10000}
# Worker Attributes
-options apache.worker.startservers
-default apache.worker.startservers {4}
-options apache.worker.maxclients
-default apache.worker.maxclients {1024}
-options apache.worker.minsparethreads
-default apache.worker.minsparethreads {64}
-options apache.worker.maxsparethreads
-default apache.worker.maxsparethreads {192}
-options apache.worker.threadsperchild
-default apache.worker.threadsperchild {64}
+options apache2.worker.startservers
+default apache2.worker.startservers {4}
+options apache2.worker.maxclients
+default apache2.worker.maxclients {1024}
+options apache2.worker.minsparethreads
+default apache2.worker.minsparethreads {64}
+options apache2.worker.maxsparethreads
+default apache2.worker.maxsparethreads {192}
+options apache2.worker.threadsperchild
+default apache2.worker.threadsperchild {64}
# Default modules to enable via include_recipe
@@ -121,16 +124,16 @@
# ++ optionally installs dylibs
#
proc apxsInstall { moduleName activate dylibs } {
- global apache destroot prefix
+ global apache2 destroot prefix
- xinstall -m 0755 -d -W ${destroot}${apache.sysconfdir} \
- mods-available mods-enabled
+ xinstall -m 0755 -d -W ${destroot}${apache2.sysconfdir} \
+ mods-available mods-enabled
# strip pre-/suffix from moduleName
set moduleName [regsub {_module} ${moduleName} "" ]
set moduleName [regsub {mod_} ${moduleName} "" ]
- set loadFileName ${apache.sysconfdir}/mods-available/${moduleName}.load
+ set loadFileName ${apache2.sysconfdir}/mods-available/${moduleName}.load
set loadFile [open ${loadFileName} w 644]
foreach libName ${dylibs} {
@@ -138,12 +141,11 @@
puts ${loadFile} "LoadFile ${dylibFile}"
}
- puts ${loadFile} "LoadModule ${moduleName}_module ${apache.libexecdir}/mod_${moduleName}.so"
+ puts ${loadFile} "LoadModule ${moduleName}_module ${apache2.libexecdir}/mod_${moduleName}.so"
close ${loadFile}
if { ${activate} == "yes" } {
- exec "${apache.sbindir}/a2enmod" ${moduleName}
+ exec "${apache2.sbindir}/a2enmod" ${moduleName}
}
-
}
Modified: trunk/dports/www/apache24-devel/Portfile
===================================================================
--- trunk/dports/www/apache24-devel/Portfile 2013-09-11 15:09:37 UTC (rev 110958)
+++ trunk/dports/www/apache24-devel/Portfile 2013-09-11 15:59:19 UTC (rev 110959)
@@ -6,19 +6,18 @@
PortGroup apache2 1.0
name apache24-devel
-apache.name apache2
+apache2.name apache2
# Both apache and apache2 want to install dbmmanage.1 and other manpages.
version 2.4.6
+revision 1
categories www
maintainers ryandesign mathiesen.info:macintosh pixilla openmaintainer
license Apache-2
description The extremely popular second version of the Apache http server
-long_description \
- Apache is an HTTP server designed as a plug-in replacement for \
- the NCSA server version 1.3 (or 1.4). It fixes numerous bugs in \
- the NCSA server and includes many frequently requested new \
- features, and has an API which allows it to be extended to meet \
- users' needs more easily.
+long_description Apache is an HTTP server designed as a plug-in replacement for the NCSA \
+ server version 1.3 (or 1.4). It fixes numerous bugs in the NCSA server \
+ and includes many frequently requested new features, and has an API \
+ which allows it to be extended to meet users' needs more easily.
homepage http://httpd.apache.org/
platforms darwin freebsd openbsd
@@ -43,9 +42,9 @@
patch-support-apxs.in.diff
post-patch {
- reinplace "s, at MANDIR@,\${prefix}/share/${apache.name},g" \
+ reinplace "s, at MANDIR@,\${prefix}/share/${apache2.name},g" \
${worksrcpath}/config.layout
- reinplace "s, at APACHE_NAME@,${apache.name},g" \
+ reinplace "s, at APACHE_NAME@,${apache2.name},g" \
${worksrcpath}/config.layout
}
@@ -95,24 +94,23 @@
post-destroot {
- move ${destroot}${apache.sysconfdir}/httpd.conf \
- ${destroot}${apache.sysconfdir}/httpd.conf.orig
+ move ${destroot}${apache2.sysconfdir}/httpd.conf \
+ ${destroot}${apache2.sysconfdir}/httpd.conf.orig
- xinstall -m 755 -d ${destroot}${apache.datadir}
- xinstall -m 755 -d ${destroot}${apache.runtimedir}
- xinstall -m 755 -d ${destroot}${apache.logfiledir}
- destroot.keepdirs ${apache.datadir} \
- ${apache.runtimedir} \
- ${apache.logfiledir}
+ xinstall -m 755 -d ${destroot}${apache2.datadir}
+ xinstall -m 755 -d ${destroot}${apache2.runtimedir}
+ xinstall -m 755 -d ${destroot}${apache2.logfiledir}
+ destroot.keepdirs ${apache2.datadir} \
+ ${apache2.runtimedir} \
+ ${apache2.logfiledir}
# fix libtool path
reinplace "s|/build/libtool|/share/apr-1/build/libtool|g" \
- ${destroot}${apache.installbuilddir}/config_vars.mk
+ ${destroot}${apache2.installbuilddir}/config_vars.mk
- set docdir ${prefix}/share/doc/apache-${version}
- xinstall -d ${destroot}${docdir}
+ xinstall -d ${destroot}${apache2.docdir}
xinstall -m 0644 -W ${worksrcpath} ABOUT_APACHE CHANGES LICENSE NOTICE README \
- README.platforms ROADMAP VERSIONING ${destroot}${docdir}
+ README.platforms ROADMAP VERSIONING ${destroot}${apache2.docdir}
# foreach {module args} [array get apache_default_modules] {
# apxsInstall ${module} "yes" {}
@@ -121,21 +119,21 @@
# post-activate {
#
-# if {![file exists ${apache.sbindir}/envvars]} {
-# xinstall -m 755 ${apache.sbindir}/envvars-std ${apache.sbindir}/envvars
+# if {![file exists ${apache2.sbindir}/envvars]} {
+# xinstall -m 755 ${apache2.sbindir}/envvars-std ${apache2.sbindir}/envvars
# }
#
# fileInstall "install" "${prefix}" "0644"
#
-# set listenFile [open "${apache.sysconfdir}/ports.conf" w 0644]
-# foreach listen_port ${apache.listen_ports} {
+# set listenFile [open "${apache2.sysconfdir}/ports.conf" w 0644]
+# foreach listen_port ${apache2.listen_ports} {
# puts ${listenFile} "Listen ${listen_port}"
# }
# close ${listenFile}
#
# foreach action {enmod dismod} {
-# foreach module ${apache.default_ ${action}} {
-# exec "${apache.sbindir}/a2${action}" ${module}
+# foreach module ${apache2.default_ ${action}} {
+# exec "${apache2.sbindir}/a2${action}" ${module}
# }
# }
# }
@@ -179,7 +177,7 @@
startupitem.start \
"\[ -x ${prefix}/sbin/apachectl \] && ${prefix}/sbin/apachectl start > /dev/null"
startupitem.stop \
-"\[ -r ${prefix}/var/run/${apache.name}/httpd.pid \] && ${prefix}/sbin/apachectl stop > /dev/null"
+"\[ -r ${prefix}/var/run/${apache2.name}/httpd.pid \] && ${prefix}/sbin/apachectl stop > /dev/null"
startupitem.restart \
"${prefix}/sbin/apachectl graceful > /dev/null"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130911/772b8b46/attachment-0001.html>
More information about the macports-changes
mailing list