[110953] trunk/dports/www
pixilla at macports.org
pixilla at macports.org
Tue Sep 10 21:04:08 PDT 2013
Revision: 110953
https://trac.macports.org/changeset/110953
Author: pixilla at macports.org
Date: 2013-09-10 21:04:08 -0700 (Tue, 10 Sep 2013)
Log Message:
-----------
www/apache24-devel:
- New devel port for apache 2.4.x. Unlike the current apache2 port this port conforms to porthier.
Maintainers of apache2 dependent ports are encouraged to provide feed back so we can eventually
update the apache2 port to version 2.4.x with these layout changes.
Added Paths:
-----------
trunk/dports/www/apache24-devel/
trunk/dports/www/apache24-devel/Portfile
trunk/dports/www/apache24-devel/files/
trunk/dports/www/apache24-devel/files/patch-build-rules.mk.in.diff
trunk/dports/www/apache24-devel/files/patch-config.layout.diff
trunk/dports/www/apache24-devel/files/patch-support-apxs.in.diff
Added: trunk/dports/www/apache24-devel/Portfile
===================================================================
--- trunk/dports/www/apache24-devel/Portfile (rev 0)
+++ trunk/dports/www/apache24-devel/Portfile 2013-09-11 04:04:08 UTC (rev 110953)
@@ -0,0 +1,188 @@
+# -*- 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
+# Untested
+PortGroup apache2 1.0
+
+name apache24-devel
+apache.name apache2
+# Both apache and apache2 want to install dbmmanage.1 and other manpages.
+version 2.4.6
+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.
+homepage http://httpd.apache.org/
+platforms darwin freebsd openbsd
+
+master_sites apache:httpd
+distname httpd-${version}
+use_bzip2 yes
+use_parallel_build yes
+
+checksums rmd160 27baf9cdfc60f578c1f692137cd2d4b608e3361d \
+ sha256 dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea
+
+depends_lib port:apr \
+ port:apr-util \
+ port:expat \
+ port:openssl \
+ port:pcre \
+ port:perl5
+
+patch.pre_args -p1
+patchfiles patch-build-rules.mk.in.diff \
+ patch-config.layout.diff \
+ patch-support-apxs.in.diff
+
+post-patch {
+ reinplace "s, at MANDIR@,\${prefix}/share/${apache.name},g" \
+ ${worksrcpath}/config.layout
+ reinplace "s, at APACHE_NAME@,${apache.name},g" \
+ ${worksrcpath}/config.layout
+}
+
+platform darwin 9 {
+ post-extract {
+ reinplace "s|-export-symbols-regex ssl_module||g" ${worksrcpath}/configure
+ }
+}
+
+configure.pre_args --prefix=${prefix}
+configure.args --with-apr=${prefix}/bin/apr-1-config \
+ --with-apr-util=${prefix}/bin/apu-1-config \
+ --enable-layout=MacPorts \
+ --with-expat=${prefix} \
+ --with-pcre=${prefix} \
+ --enable-mods-shared=all \
+ --enable-authn-alias=shared \
+ --enable-ssl \
+ --with-ssl=${prefix} \
+ --enable-cache \
+ --enable-disk_cache \
+ --enable-file_cache \
+ --enable-mem_cache \
+ --enable-deflate \
+ --enable-proxy \
+ --enable-proxy-connect \
+ --enable-proxy-http \
+ --enable-proxy-ftp
+
+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
+}
+
+post-build {
+ reinplace -E {s| -arch [a-z0-9_]+||g} \
+ ${worksrcpath}/config.nice \
+ ${worksrcpath}/build/config_vars.mk
+ if {[tbool configure.ccache]} {
+ reinplace -E {s|ccache ||g} \
+ ${worksrcpath}/config.nice \
+ ${worksrcpath}/build/config_vars.mk
+ }
+}
+
+post-destroot {
+
+ move ${destroot}${apache.sysconfdir}/httpd.conf \
+ ${destroot}${apache.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}
+
+ # fix libtool path
+ reinplace "s|/build/libtool|/share/apr-1/build/libtool|g" \
+ ${destroot}${apache.installbuilddir}/config_vars.mk
+
+ set docdir ${prefix}/share/doc/apache-${version}
+ xinstall -d ${destroot}${docdir}
+ xinstall -m 0644 -W ${worksrcpath} ABOUT_APACHE CHANGES LICENSE NOTICE README \
+ README.platforms ROADMAP VERSIONING ${destroot}${docdir}
+
+# foreach {module args} [array get apache_default_modules] {
+# apxsInstall ${module} "yes" {}
+# }
+}
+
+# post-activate {
+#
+# if {![file exists ${apache.sbindir}/envvars]} {
+# xinstall -m 755 ${apache.sbindir}/envvars-std ${apache.sbindir}/envvars
+# }
+#
+# fileInstall "install" "${prefix}" "0644"
+#
+# set listenFile [open "${apache.sysconfdir}/ports.conf" w 0644]
+# foreach listen_port ${apache.listen_ports} {
+# puts ${listenFile} "Listen ${listen_port}"
+# }
+# close ${listenFile}
+#
+# foreach action {enmod dismod} {
+# foreach module ${apache.default_ ${action}} {
+# exec "${apache.sbindir}/a2${action}" ${module}
+# }
+# }
+# }
+
+platform openbsd {
+ 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"
+ }
+ }
+}
+
+variant preforkmpm conflicts workermpm eventmpm description {Use prefork MPM} {
+ configure.args-append --with-mpm=prefork
+}
+
+variant workermpm conflicts preforkmpm eventmpm description {Use worker MPM} {
+ configure.args-append --with-mpm=worker
+}
+
+variant eventmpm conflicts preforkmpm workermpm description {Use event MPM (experimental)} {
+ configure.args-append --with-mpm=event
+}
+
+if {![variant_isset workermpm] && ![variant_isset eventmpm]} {
+ default_variants +preforkmpm
+}
+
+startupitem.create yes
+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"
+startupitem.restart \
+"${prefix}/sbin/apachectl graceful > /dev/null"
+
+livecheck.type regex
+livecheck.url ${homepage}download.cgi
+livecheck.regex httpd-(\[0-9.\]+)${extract.suffix}
Property changes on: trunk/dports/www/apache24-devel/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/dports/www/apache24-devel/files/patch-build-rules.mk.in.diff
===================================================================
--- trunk/dports/www/apache24-devel/files/patch-build-rules.mk.in.diff (rev 0)
+++ trunk/dports/www/apache24-devel/files/patch-build-rules.mk.in.diff 2013-09-11 04:04:08 UTC (rev 110953)
@@ -0,0 +1,36 @@
+--- a/build/rules.mk.in 2013-08-30 10:36:36.000000000 -0700
++++ b/build/rules.mk.in 2013-08-30 10:37:03.000000000 -0700
+@@ -41,17 +41,17 @@
+ COMPILE = $(BASE_CC) $(PICFLAGS)
+ CXX_COMPILE = $(BASE_CXX) $(PICFLAGS)
+
+-SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) $(SHLTCFLAGS) -c $< && touch $@
+-SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CXX) $(SHLTCFLAGS) -c $< && touch $@
++SH_COMPILE = $(LIBTOOL) --mode=compile --tag=CC $(BASE_CC) @SHLTCFLAGS@ -c $< && touch $@
++SH_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(BASE_CXX) @SHLTCFLAGS@ -c $< && touch $@
+
+-LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(LTCFLAGS) -c $< && touch $@
+-LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) $(LTCFLAGS) -c $< && touch $@
++LT_COMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) @LTCFLAGS@ -c $< && touch $@
++LT_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX_COMPILE) @LTCFLAGS@ -c $< && touch $@
+
+ # Link-related commands
+
+-LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(PILDFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+-SH_LINK = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
+-MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
++SH_LINK = $(SH_LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
++MOD_LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+
+ # Cross compile commands
+
+@@ -228,7 +228,7 @@
+
+ # Makes an import library from a def file
+ .def.la:
+- $(LIBTOOL) --mode=compile $(MK_IMPLIB) -o $@ $<
++ $(LIBTOOL) --mode=compile --tag=CC $(MK_IMPLIB) -o $@ $<
+
+ #
+ # Dependencies
Added: trunk/dports/www/apache24-devel/files/patch-config.layout.diff
===================================================================
--- trunk/dports/www/apache24-devel/files/patch-config.layout.diff (rev 0)
+++ trunk/dports/www/apache24-devel/files/patch-config.layout.diff 2013-09-11 04:04:08 UTC (rev 110953)
@@ -0,0 +1,33 @@
+--- a/config.layout 2013-08-30 10:36:36.000000000 -0700
++++ b/config.layout 2013-08-30 10:37:03.000000000 -0700
+@@ -33,6 +33,30 @@
+ proxycachedir: ${localstatedir}/proxy
+ </Layout>
+
++# MacPorts path layout.
++<Layout MacPorts>
++ prefix: ${prefix}
++ exec_prefix: ${prefix}
++ bindir: ${exec_prefix}/bin
++ sbindir: ${exec_prefix}/sbin
++ libdir: ${exec_prefix}/lib/@APACHE_NAME@
++ libexecdir: ${libdir}/modules
++ mandir: @MANDIR@
++ sysconfdir: ${prefix}/etc/@APACHE_NAME@
++ datadir: ${prefix}/www/@APACHE_NAME@
++ installbuilddir: ${datadir}/build
++ errordir: ${datadir}/error
++ iconsdir: ${datadir}/icons
++ htdocsdir: ${datadir}/html
++ manualdir: ${datadir}/manual
++ cgidir: ${datadir}/cgi-bin
++ includedir: ${prefix}/include/@APACHE_NAME@
++ localstatedir: ${prefix}/var
++ runtimedir: ${localstatedir}/run/@APACHE_NAME@
++ logfiledir: ${localstatedir}/log/@APACHE_NAME@
++ proxycachedir: ${localstatedir}/tmp/@APACHE_NAME@
++</Layout>
++
+ # GNU standards conforming path layout.
+ # See FSF's GNU project `make-stds' document for details.
+ <Layout GNU>
Added: trunk/dports/www/apache24-devel/files/patch-support-apxs.in.diff
===================================================================
--- trunk/dports/www/apache24-devel/files/patch-support-apxs.in.diff (rev 0)
+++ trunk/dports/www/apache24-devel/files/patch-support-apxs.in.diff 2013-09-11 04:04:08 UTC (rev 110953)
@@ -0,0 +1,38 @@
+--- a/support/apxs.in 2013-08-30 10:36:39.000000000 -0700
++++ b/support/apxs.in 2013-08-30 10:37:05.000000000 -0700
+@@ -219,7 +219,7 @@
+ ? $config_vars{$arg}
+ : $config_vars{lc $arg};
+ $val =~ s/[()]//g;
+- $result .= eval "qq($val)" if defined $val;
++ $result = eval "qq($val)" if defined $val;
+ $result .= ";;";
+ $ok = 1;
+ }
+@@ -227,7 +227,7 @@
+ if (exists $internal_vars{$arg} or exists $internal_vars{lc $arg}) {
+ my $val = exists $internal_vars{$arg} ? $arg : lc $arg;
+ $val = eval "\$CFG_$val";
+- $result .= eval "qq($val)" if defined $val;
++ $result = eval "qq($val)" if defined $val;
+ $result .= ";;";
+ $ok = 1;
+ }
+@@ -428,7 +428,7 @@
+ $la =~ s|\.c$|.la|;
+ my $o = $s;
+ $o =~ s|\.c$|.o|;
+- push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
++ push(@cmds, "$libtool $ltflags --mode=compile --tag=CC $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
+ unshift(@objs, $lo);
+ }
+
+@@ -469,7 +469,7 @@
+ $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
+ }
+
+- push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file $opt $lo");
++ push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC $ldflags -o $dso_file $opt $lo");
+
+ # execute the commands
+ &execute_cmds(@cmds);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130910/5e3f998c/attachment.html>
More information about the macports-changes
mailing list