Date: Sat, 6 Jul 2013 08:56:37 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322370 - in head/www/apache24: . files Message-ID: <201307060856.r668ub5L091973@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Jul 6 08:56:37 2013 New Revision: 322370 URL: http://svnweb.freebsd.org/changeset/ports/322370 Log: - enable NSS crypto driver - use service(8) in apachectl where it makes sence - bump PORTREVISION Modified: head/www/apache24/Makefile head/www/apache24/Makefile.modules head/www/apache24/files/patch-support__apachectl.in Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Sat Jul 6 08:50:22 2013 (r322369) +++ head/www/apache24/Makefile Sat Jul 6 08:56:37 2013 (r322370) @@ -2,7 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} Modified: head/www/apache24/Makefile.modules ============================================================================== --- head/www/apache24/Makefile.modules Sat Jul 6 08:50:22 2013 (r322369) +++ head/www/apache24/Makefile.modules Sat Jul 6 08:56:37 2013 (r322370) @@ -41,7 +41,7 @@ IGNORE= LDAP and AUTHNZ_LDAP requires AP . endif . if ${PORT_OPTIONS:MSESSION_CRYPTO} -. if !exists(${APU_CRYPTO_OPENSSL}) +. if !exists(${APU_CRYPTO_OPENSSL}) && !exists(${APU_CRYPTO_NSS}) IGNORE= SESSION_CRYPTO requires APR-util to have crypto openssl support build in.\ Please rebuild APR with crypto openssl support . endif Modified: head/www/apache24/files/patch-support__apachectl.in ============================================================================== --- head/www/apache24/files/patch-support__apachectl.in Sat Jul 6 08:50:22 2013 (r322369) +++ head/www/apache24/files/patch-support__apachectl.in Sat Jul 6 08:56:37 2013 (r322370) @@ -1,6 +1,14 @@ --- ./support/apachectl.in.orig 2012-02-01 04:47:28.000000000 +0100 +++ ./support/apachectl.in 2013-03-22 18:55:53.000000000 +0100 -@@ -66,6 +66,7 @@ +@@ -43,6 +43,7 @@ + # + # the path to your httpd binary, including options if necessary + HTTPD='@exp_sbindir@/@progname@' ++SERVICE='/usr/sbin/service apache24' + # + # pick up any necessary environment variables + if test -f @exp_sbindir@/envvars; then +@@ -66,19 +67,21 @@ # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| @@ -8,3 +16,37 @@ # Set the maximum number of file descriptors allowed per child process. if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then $ULIMIT_MAX_FILES + fi + + ERROR=0 +-if [ "x$ARGV" = "x" ] ; then +- ARGV="-h" ++if [ "x$ACMD" = "x" ] ; then ++ ACMD="-h" + fi + + case $ACMD in +-start|stop|restart|graceful|graceful-stop) +- $HTTPD -k $ARGV ++start|stop|restart|rcvar|reload|graceful|gracefulstop|graceful-stop) ++# $HTTPD -k $ARGV ++ $SERVICE $( echo $ACMD | tr -d '-' ) + ERROR=$? + ;; + startssl|sslstart|start-SSL) +@@ -88,11 +91,13 @@ + ERROR=2 + ;; + configtest) +- $HTTPD -t ++# $HTTPD -t ++ $SERVICE $ACMD + ERROR=$? + ;; + status) +- $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' ++# $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } ' ++ $SERVICE $ACMD + ;; + fullstatus) + $LYNX $STATUSURL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307060856.r668ub5L091973>