[84580] trunk/dports/www/apache2/Portfile
snc at macports.org
snc at macports.org
Wed Sep 28 08:25:59 PDT 2011
Revision: 84580
http://trac.macports.org/changeset/84580
Author: snc at macports.org
Date: 2011-09-28 08:25:56 -0700 (Wed, 28 Sep 2011)
Log Message:
-----------
apache2: whitespace
Modified Paths:
--------------
trunk/dports/www/apache2/Portfile
Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- trunk/dports/www/apache2/Portfile 2011-09-28 15:19:23 UTC (rev 84579)
+++ trunk/dports/www/apache2/Portfile 2011-09-28 15:25:56 UTC (rev 84580)
@@ -1,42 +1,42 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
-name apache2
-version 2.2.21
-categories www
-maintainers ryandesign openmaintainer
+name apache2
+version 2.2.21
+categories www
+maintainers ryandesign openmaintainer
license Apache-2
-description The extremely popular second version of the Apache http server
+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.
-homepage http://httpd.apache.org/
-platforms darwin freebsd openbsd
+ 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
-master_sites apache:httpd
-distname httpd-${version}
-use_bzip2 yes
+master_sites apache:httpd
+distname httpd-${version}
+use_bzip2 yes
use_parallel_build yes
-checksums rmd160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 \
- sha256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
+checksums rmd160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 \
+ sha256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
-depends_lib port:apr \
- port:apr-util \
- port:expat \
- port:openssl \
- port:pcre \
- port:perl5
+depends_lib port:apr \
+ port:apr-util \
+ port:expat \
+ port:openssl \
+ port:pcre \
+ port:perl5
# Both apache and apache2 want to install dbmmanage.1 and other manpages.
-conflicts apache
+conflicts apache
-patchfiles patch-docs-cgi-examples-printenv.diff
+patchfiles patch-docs-cgi-examples-printenv.diff
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/docs/cgi-examples/printenv
@@ -44,21 +44,21 @@
}
platform darwin {
- post-patch {
- # Customize userdir naming to match darwin
- reinplace "s|/home/|/Users/|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
- reinplace "s|public_html|Sites|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
- }
+ post-patch {
+ # Customize userdir naming to match darwin
+ reinplace "s|/home/|/Users/|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
+ reinplace "s|public_html|Sites|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
+ }
- # HFS can be case insensitive, so protect for this as in
- # http://docs.info.apple.com/article.html?artnum=300422
- patchfiles-append patch-httpd.conf.in-sensitive-files.diff
+ # HFS can be case insensitive, so protect for this as in
+ # http://docs.info.apple.com/article.html?artnum=300422
+ patchfiles-append patch-httpd.conf.in-sensitive-files.diff
}
platform darwin 9 {
- post-extract {
- reinplace "s|-export-symbols-regex ssl_module||g" ${worksrcpath}/configure
- }
+ post-extract {
+ reinplace "s|-export-symbols-regex ssl_module||g" ${worksrcpath}/configure
+ }
}
configure.pre_args --prefix=${prefix}/${name}
@@ -84,24 +84,24 @@
configure.ccache no
post-configure {
- # Setting DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
- # avoids issues with library collisions (bug #3013)
- reinplace "s|DYLD_LIBRARY_PATH|DYLD_FALLBACK_LIBRARY_PATH|g" \
- ${worksrcpath}/support/envvars-std
+ # Setting DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
+ # avoids issues with library collisions (bug #3013)
+ reinplace "s|DYLD_LIBRARY_PATH|DYLD_FALLBACK_LIBRARY_PATH|g" \
+ ${worksrcpath}/support/envvars-std
}
destroot.violate_mtree yes
post-destroot {
- set confDir ${destroot}${prefix}/apache2/conf
+ set confDir ${destroot}${prefix}/apache2/conf
eval delete ${confDir}/httpd.conf [glob -directory ${confDir}/extra *.conf]
- destroot.keepdirs ${destroot}${prefix}/apache2/logs \
- ${confDir}/extra
+ destroot.keepdirs ${destroot}${prefix}/apache2/logs \
+ ${confDir}/extra
- # fix libtool path
+ # fix libtool path
reinplace "s|/apache2/build/libtool|/share/apr-1/build/libtool|g" \
- ${destroot}${prefix}/apache2/build/config_vars.mk
+ ${destroot}${prefix}/apache2/build/config_vars.mk
set docdir ${prefix}/share/doc/apache-${version}
xinstall -d ${destroot}${docdir}
@@ -125,50 +125,50 @@
}
platform openbsd {
- build.env-append "LD_LIBRARY_PATH=${prefix}/lib"
+ build.env-append "LD_LIBRARY_PATH=${prefix}/lib"
}
variant openldap description {Enable LDAP support through OpenLDAP} {
- configure.args-append --enable-ldap --enable-authnz-ldap
- depends_lib-append port:openldap
- pre-configure {
- if {-1 == [string first -lldap [exec ${prefix}/bin/apu-1-config --libs]]} {
- ui_error "To install ${name} with the +openldap variant, apr-util must be installed"
- ui_error "with the +openldap variant. Rebuild apr-util using:"
- ui_error
- ui_error " sudo port upgrade --enforce-variants apr-util +openldap"
- ui_error
- return -code error "incompatible apr-util installation"
- }
- }
+ configure.args-append --enable-ldap --enable-authnz-ldap
+ depends_lib-append port:openldap
+ pre-configure {
+ if {-1 == [string first -lldap [exec ${prefix}/bin/apu-1-config --libs]]} {
+ ui_error "To install ${name} with the +openldap variant, apr-util must be installed"
+ ui_error "with the +openldap variant. Rebuild apr-util using:"
+ ui_error
+ ui_error " sudo port upgrade --enforce-variants apr-util +openldap"
+ ui_error
+ return -code error "incompatible apr-util installation"
+ }
+ }
}
variant preforkmpm conflicts workermpm eventmpm description {Use prefork MPM} {
- configure.args-append --with-mpm=prefork
+ configure.args-append --with-mpm=prefork
}
variant workermpm conflicts preforkmpm eventmpm description {Use worker MPM} {
- configure.args-append --with-mpm=worker
+ configure.args-append --with-mpm=worker
}
variant eventmpm conflicts preforkmpm workermpm description {Use event MPM (experimental)} {
- configure.args-append --with-mpm=event
+ configure.args-append --with-mpm=event
}
if {![variant_isset workermpm] && ![variant_isset eventmpm]} {
- default_variants +preforkmpm
+ default_variants +preforkmpm
}
variant no_startupitem description {Do not create a startup item} {
- startupitem.create no
+ startupitem.create no
}
-startupitem.create yes
-startupitem.start \
+startupitem.create yes
+startupitem.start \
"\[ -x ${prefix}/apache2/bin/apachectl \] && ${prefix}/apache2/bin/apachectl start > /dev/null"
-startupitem.stop \
+startupitem.stop \
"\[ -r ${prefix}/apache2/logs/httpd.pid \] && ${prefix}/apache2/bin/apachectl stop > /dev/null"
-startupitem.restart \
+startupitem.restart \
"${prefix}/apache2/bin/apachectl restart > /dev/null"
livecheck.type regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110928/070de8c6/attachment-0001.html>
More information about the macports-changes
mailing list