Index: head/www/apache20/Makefile =================================================================== --- head/www/apache20/Makefile (revision 150323) +++ head/www/apache20/Makefile (revision 150324) @@ -1,267 +1,268 @@ # New ports collection makefile for: apache2 # Date created: 7 April 2001 # Whom: Hye-Shik Chang # # $FreeBSD$ # # For more information, please read Makefile.doc # PORTNAME= apache PORTVERSION= 2.0.55 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITE_LOCAL:S/$/:powerlogo/} MASTER_SITE_SUBDIR= clement/:powerlogo DISTNAME= httpd-${PORTVERSION} DISTFILES= ${DISTNAME}.tar.bz2 powerlogo.gif:powerlogo DIST_SUBDIR= apache2 EXTRACT_ONLY= ${DISTNAME}.tar.bz2 MAINTAINER?= clement@FreeBSD.org COMMENT?= Version 2 of Apache web server with ${WITH_MPM:L} MPM. LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 LATEST_LINK= apache20 CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \ apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ apache+mod_ssl+mod_snmp+mod_accel-1.* \ apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \ caudium-devel-1.* caudium10-1.* caudium12-* \ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* # patch files EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta + .if defined (WITH_WINDOWSUPDATEFIX) EXTRA_PATCHES+= ${FILESDIR}/exp-windowsupdate.patch .endif .if defined(WITH_EXPERIMENTAL_PATCHES) IGNORE= : Please define WITH_KQUEUE_SUPPORT instead .endif .if defined(WITH_KQUEUE_SUPPORT) EXTRA_PATCHES+= ${FILESDIR}/exp-apr-kqueue.patch .endif SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ AUTOHEADER=${AUTOHEADER} USE_ICONV= yes USE_AUTOTOOLS= autoconf:259 libtool:15 USE_PERL5= yes USE_RC_SUBR= yes USE_REINPLACE= yes LIBTOOLFILES= configure INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${PREFIX}/lib/apache2 USE_BZIP2= yes CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ --with-perl=${PERL5} \ --with-port=${WITH_HTTP_PORT} \ --with-expat=${LOCALBASE} \ --with-iconv=${LOCALBASE} \ --libdir=${PREFIX_RELDEST}/lib/apache2 \ --includedir=${PREFIX_RELDEST}/include/apache2 CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes WITH_MPM?= prefork # or worker, perchild, threadpool WITH_HTTP_PORT?= 80 .if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .else CATEGORIES+= ipv6 . if defined(WITH_IPV6_V6ONLY) && defined(WITHOUT_V4MAPPED) CONFIGURE_ARGS+= --disable-v4-mapped . else CONFIGURE_ARGS+= --enable-v4-mapped . endif .endif #backward compatibility .if defined(WITHOUT_SSL) WITHOUT_SSL_MODULES= YES .endif .if !defined(WITHOUT_SSL_MODULES) USE_OPENSSL= yes .endif .if defined(WITH_STATIC_SUPPORT) CONFIGURE_ARGS+= --enable-static-support .endif .if defined(WITH_SSL_EXPERIMENTAL_ENGINE) CFLAGS+= -DSSL_EXPERIMENTAL_ENGINE .endif # debug overrides CFLAGS .if defined(WITH_DEBUG) DEBUG_FLAGS?= -O0 -g -ggdb3 CFLAGS= ${DEBUG_FLAGS} CONFIGURE_ARGS+= --enable-maintainer-mode WITH_EXCEPTION_HOOK= YES .endif .if defined(WITH_EXCEPTION_HOOK) CONFIGURE_ARGS+= --enable-exception-hook .endif # for slave ports .if !defined(MASTERDIR) APACHEDIR= ${.CURDIR} .else APACHEDIR= ${MASTERDIR} .endif .if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES) USE_OPENLDAP= YES CONFIGURE_ARGS+= --with-ldap \ --with-ldap-lib="${LOCALBASE}/lib" \ --with-ldap-include="${LOCALBASE}/include" .endif .include .if exists(${LOCALBASE}/lib/libapr-0.so) || defined(WITH_APR_FROM_PORTS) IGNORE= : apr from ports (WITH_APR_FROM_PORTS) is no longer supported .endif WITH_PTHREAD_LIBS?= ${PTHREAD_LIBS:S/-l//:S/-//} WITH_PTHREAD_CFLAGS?= ${PTHREAD_CFLAGS} .include "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.modules" WANT_APACHE= common2 .include "${APACHEDIR}/Makefile.modules.3rd" CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET} show-options: @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc show-categories: .for category in ${ALL_MODULES_CATEGORIES} @${ECHO_MSG} "${category} contains these modules:" @${ECHO_MSG} " ${${category}_MODULES}" .endfor show-modules: @for module in ${AVAILABLE_MODULES} ; do \ ${ECHO_MSG} -n "$${module}: ";\ if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \ ${ECHO_CMD} -n "enabled "; \ if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \ ${ECHO_CMD} "(static)" ; \ else \ ${ECHO_CMD} "(shared)" ;\ fi;\ else\ ${ECHO_CMD} disabled ;\ fi;\ done pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} " To enable a module category: WITH__MODULES" @${ECHO_MSG} " To disable a module category: WITHOUT__MODULES" @${ECHO_MSG} "" @${ECHO_MSG} " Per default categories are:" @${ECHO_MSG} " ${DEFAULT_MODULES_CATEGORIES}" @${ECHO_MSG} " Categories available:" @${ECHO_MSG} " ${ALL_MODULES_CATEGORIES}" @${ECHO_MSG} "" @${ECHO_MSG} " To see all available knobs, type make show-options" @${ECHO_MSG} " To see all modules in different categories, type make show-categories" @${ECHO_MSG} " You can check your modules configuration by using make show-modules" @${ECHO_MSG} "" @${ECHO_MSG} "To save apache.org bandwidth, please use the closest" @${ECHO_MSG} "mirror. Hit Ctrl+C now and do a "make print-closest-mirrors." @${ECHO_MSG} "To automatically update /etc/make.conf do:" @${ECHO_MSG} "make print-closest-mirrors >> /etc/make.conf" @${ECHO_MSG} "" print-closest-mirrors: @${ECHO_MSG} -n "Fetching list of nearest mirror: " >&2 @MIRRORS=`${FETCH_CMD} -T 30 -qo - http://www.apache.org/dyn/closer.cgi/httpd/ 2> /dev/null\ | ${GREP} /httpd/ | ${SED} 's/.*href="\(.*\)">&2; if [ "x$$MIRRORS" != "x" ]; then \ ${ECHO_MSG} -n "MASTER_SITE_APACHE_HTTPD?= ";\ ${ECHO_MSG} $$MIRRORS; else \ ${ECHO_MSG} "No mirrors found!">&2 ; fi post-extract: @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif post-patch: @cd ${WRKSRC}/docs/docroot && \ for f in index.html.*; do (\ ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\ ALT="[Powered by FreeBSD]"> ${WRKDIR}/apache2.sh @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/apache2libs.sh > ${WRKDIR}/apache2libs.sh .endif @${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script." @${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh @${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script." @${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh post-install: install-startup-script @${MKDIR} ${PREFIX}/etc/apache2/envvars.d @${MKDIR} ${PREFIX}/etc/apache2/Includes @${ECHO_CMD} "" @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/apache20/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.228 \ No newline at end of property +1.229 \ No newline at end of property Index: head/www/apache20/Makefile.modules.3rd =================================================================== --- head/www/apache20/Makefile.modules.3rd (revision 150323) +++ head/www/apache20/Makefile.modules.3rd (revision 150324) @@ -1,294 +1,305 @@ # Makefile.modules.3rd # # $FreeBSD$ # # Author: Clement Laforet # If you have questions, please contact me. # .ifdef(USE_APACHE) .error USE_APACHE and Makefile.modules.3rd can't be used together. .endif APXS?= ${LOCALBASE}/sbin/apxs MODULENAME?= ${PORTNAME} SHORTMODNAME?= ${MODULENAME:S/mod_//} SRC_FILE?= ${MODULENAME}.c OVERRIDABLE_VARS= SRC_FILE MODULENAME SHORTMODNAME WRKSRC \ PKGNAMESUFFIX .if exists(${LOCALBASE}/include/apache2/http_core.h) WITH_APACHE2= YES . if defined (WANT_APACHE) . if ${WANT_APACHE} == 13 IGNORE= "This module require apache13 and you have apache2 installed" . endif . endif .elif exists(${LOCALBASE}/include/apache/http_core.h) WITH_APACHE13= YES . if defined (WANT_APACHE) . if ${WANT_APACHE} == 2 IGNORE= "This module require apache2 and you have apache13 installed" . endif . endif . ifdef(WITH_APACHE2) -.error You have `WITH_APACHE2' variable defined either in environment or in make(1) argumentsm. but apache13 is installed Please undefine and try again. +IGNORE= You have 'WITH_APACHE2' variable defined either in environment or in make(1) arguments. but apache13 is installed Please undefine and try again. . endif .endif .if defined (WANT_APACHE) . if ${WANT_APACHE} == 13 WITH_APACHE13= YES . elif ${WANT_APACHE} == 2 WITH_APACHE2= YES .elif ${WANT_APACHE:Mcommon*} != "" PORT_IS_SERVER= YES . else IGNORE= "Unknown apache version" . endif .endif .if !defined(PORT_IS_SERVER) .if exists(${APXS}) APXS_PREFIX!= ${APXS} -q prefix 2> /dev/null || echo NULL . if ${APXS_PREFIX} == NULL IGNORE= : Your apache does not support DSO modules . endif . if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX} IGNORE?= PREFIX must be egal to APXS_PREFIX. . endif .else APXS_PREFIX= ${APXS:S/\/sbin\/apxs//} .endif .if defined(WITH_APACHE2) AP_BUILDEXT= la PLIST_SUB+= APACHEMODDIR="libexec/apache2" APACHE_PORT= www/apache2 AP_VER= 2 .else AP_BUILDEXT= so PLIST_SUB+= APACHEMODDIR="libexec/apache" APACHE_PORT?= www/apache13 AP_VER= 13 .endif .for VAR in ${OVERRIDABLE_VARS} . if defined(AP${AP_VER}_${VAR}) ${VAR}= ${AP${AP_VER}_${VAR}} . endif .endfor BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} PLIST_SUB+= AP_NAME="${SHORTMODNAME}" PLIST_SUB+= AP_MODULE="${MODULENAME}.so" .if defined(AP_GENPLIST) PLIST?= ${WRKDIR}/ap-plist .endif .if defined(AP_INC) AP_EXTRAS+= -I ${AP_INC} .endif .if defined(AP_LIB) AP_EXTRAS+= -L ${AP_LIB} .endif .if defined(AP_FAST_BUILD) ap-gen-plist: .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} @${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST} . endif .else @${DO_NADA} .endif do-build: ap-gen-plist @cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE} do-install: @${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} .endif .else # PORT_IS_SERVER # For slave ports: .if defined(SLAVE_DESIGNED_FOR) && ${PORTVERSION} != ${SLAVE_DESIGNED_FOR} IGNORE= "Sorry, ${SLAVENAME} and ${PORTNAME} versions are out of sync" .endif .if defined(SLAVE_PORT_MODULES) DEFAULT_MODULES_CATEGORIES+= SLAVE_PORT ALL_MODULES_CATEGORIES+= SLAVE_PORT .endif # Module selection .for category in ${DEFAULT_MODULES_CATEGORIES} DEFAULT_MODULES+= ${${category}_MODULES} # We select them WITH_${category}_MODULES= YES .endfor .for category in ${ALL_MODULES_CATEGORIES} AVAILABLE_MODULES+= ${${category}_MODULES} .endfor # Setting "@comment " as default. .for module in ${AVAILABLE_MODULES} ${module}_PLIST_SUB= "@comment " .endfor # Configure .if ${WANT_APACHE} == common13 # dirty hack to make sure all modules are disabled before we select them CONFIGURE_ARGS+= --disable-module="all" .elif ${WANT_APACHE} == common2 CONFIGURE_ARGS+= --disable-access --disable-auth \ --disable-charset-lite --disable-include \ --disable-log-config --disable-env --disable-setenvif \ --disable-mime --disable-status --disable-autoindex \ --disable-asis --disable-cgid --disable-cgi \ --disable-negotiation --disable-dir --disable-imap \ --disable-actions --disable-userdir --disable-alias +.elif ${WANT_APACHE} == common21 +CONFIGURE_ARGS+= --disable-authn-file --disable-authn-default \ + --disable-authz-host --disable-authz-groupfile \ + --disable-authz-user --disable-authz-default \ + --disable-auth-basic --disable-charset-lite \ + --disable-include --disable-log-config --disable-env \ + --disable-setenvif --disable-mime --disable-status \ + --disable-autoindex --disable-asis --disable-cgid \ + --disable-cgi --disable-negotiation --disable-dir \ + --disable-imagemap --disable-actions --disable-userdir \ + --disable-alias .endif .if defined(WITH_MODULES) _APACHE_MODULES+= ${WITH_MODULES} .else .for category in ${ALL_MODULES_CATEGORIES} .if defined (WITHOUT_${category}_MODULES) || defined (WITH_CUSTOM_${category}) . if defined(WITH_${category}_MODULES}) . undef WITH_${category}_MODULES . endif . if defined (WITH_CUSTOM_${category}) _APACHE_MODULES+= ${WITH_CUSTOM_${category}} . endif .elif defined(WITH_${category}_MODULES) _APACHE_MODULES+= ${${category}_MODULES} .endif .endfor . if defined(WITH_EXTRA_MODULES) _APACHE_MODULES+= ${WITH_EXTRA_MODULES} . endif .endif .if !defined(WITH_STATIC_APACHE) -. if ${WANT_APACHE} == common2 +. if ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21 # FYI #DYNAMIC_MODULES= so CONFIGURE_ARGS+= --enable-so . endif .else -. if ${WANT_APACHE} == common2 +. if ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21 CONFIGURE_ARGS+= --disable-so . endif WITH_ALL_STATIC_MODULES= YES .endif .if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES) .if ${WANT_APACHE} == common13 SUEXEC_CONFARGS= suexec CONFIGURE_ARGS+= --enable-suexec -.elif ${WANT_APACHE} == common2 +.elif ${WANT_APACHE} == common2 || ${WANT_APACHE} == common21 SUEXEC_CONFARGS= with-suexec .else IGNORE= Can not determine apache version .endif SUEXEC_DOCROOT?= ${PREFIX}/www/data SUEXEC_USERDIR?= public_html SUEXEC_SAFEPATH?= ${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin SUEXEC_LOGFILE?= /var/log/httpd-suexec.log SUEXEC_UIDMIN?= 1000 SUEXEC_GIDMIN?= 1000 SUEXEC_CALLER?= ${WWWOWN} _APACHE_MODULES+= ${SUEXEC_MODULES} CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-caller=${SUEXEC_CALLER} \ --${SUEXEC_CONFARGS}-uidmin=${SUEXEC_UIDMIN} \ --${SUEXEC_CONFARGS}-gidmin=${SUEXEC_GIDMIN} \ --${SUEXEC_CONFARGS}-userdir="${SUEXEC_USERDIR}" \ --${SUEXEC_CONFARGS}-docroot="${SUEXEC_DOCROOT}" \ --${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \ --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}" \ --${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec" . if defined(WITH_SUEXEC_UMASK) CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${WITH_SUEXEC_UMASK} . endif .endif .if !defined(WITHOUT_MODULES) APACHE_MODULES= ${_APACHE_MODULES} .else APACHE_MODULES!= \ for module in ${_APACHE_MODULES}; do \ ${ECHO_CMD} ${WITHOUT_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \ ${ECHO_CMD} $${module}; \ done .endif .if defined(WITH_STATIC_MODULES) . if WANT_APACHE=13 STATIC_MODULE_CONFARG= --enable-module=$${module} DSO_MODULE_CONFARG= --enable-module=$${module} --enable-shared=$${module} . else STATIC_MODULE_CONFARG= --enable-$${module} DSO_MODULE_CONFARG= --enable-$${module}=shared .endif _CONFIGURE_ARGS!= \ for module in ${APACHE_MODULES} ; do \ ${ECHO_CMD} ${WITH_STATIC_MODULES} | \ ${GREP} -wq $${module} 2> /dev/null ; \ if [ "$${?}" = "0" ] ; then \ ${ECHO_CMD} "${STATIC_MODULE_CONFARG}"; \ else \ ${ECHO_CMD} "${DSO_MODULE_CONFARG}"; \ fi; done CONFIGURE_ARGS+= ${_CONFIGURE_ARGS} .elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES) WITH_STATIC_MODULES= ${APACHE_MODULES} . if ${WANT_APACHE} == common13 . for module in ${APACHE_MODULES} CONFIGURE_ARGS+= --enable-module=${module} . endfor . else CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}" . endif .else . if ${WANT_APACHE} == common13 . for module in ${APACHE_MODULES} CONFIGURE_ARGS+= --enable-module=${module} --enable-shared=${module} . endfor . else CONFIGURE_ARGS+= --enable-mods-shared="${APACHE_MODULES}" . endif .endif .if defined(WITH_STATIC_MODULES) _SHARED_MODULES!= \ for module in ${APACHE_MODULES} ; do \ ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null || \ ${ECHO_CMD} $${module}; \ done SHARED_MODULES= ${_SHARED_MODULES} .elif !defined(WITH_ALL_STATIC_MODULES) SHARED_MODULES= ${APACHE_MODULES} .endif . for module in ${SHARED_MODULES} ${module}_PLIST_SUB= "" . endfor .for module in ${AVAILABLE_MODULES} PLIST_SUB+= MOD_${module:U}=${${module}_PLIST_SUB} .endfor .endif #PORT_IS_SERVER Property changes on: head/www/apache20/Makefile.modules.3rd ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.20 \ No newline at end of property +1.21 \ No newline at end of property Index: head/www/apache20/files/apache.sh =================================================================== --- head/www/apache20/files/apache.sh (revision 150323) +++ head/www/apache20/files/apache.sh (revision 150324) @@ -1,116 +1,116 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: apache2 # REQUIRE: NETWORKING SERVERS # BEFORE: DAEMON # KEYWORD: FreeBSD shutdown # # Add the following lines to /etc/rc.conf to enable apache2: # apache2_enable (bool): Set to "NO" by default. # Set it to "YES" to enable apache2 # apache2_profiles (string): Undefined by default. Define here your profiles. # apache2ssl_enable (bool): Set to "NO" by default. # Set it to "YES" to start apache with SSL # (if exists in httpd.conf) # apache2limits_enable (bool):Set to "NO" by default. # Set it to yes to run `limits $limits_args` # just before apache starts. # apache2_flags (str): Set to "" by default. # Extra flags passed to start command. # apache2limits_args (str): Default to "-e -C daemon" # Arguments of pre-start limits run. # . %%RC_SUBR%% name="apache2" rcvar=`set_rcvar` start_precmd="apache2_precmd" restart_precmd="apache2_checkconfig" reload_precmd="apache2_checkconfig" command="%%PREFIX%%/sbin/httpd" _pidprefix="/var/run/httpd" pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/apache2/httpd.conf [ -z "${apache2_enable}" ] && apache2_enable="NO" [ -z "${apache2ssl_enable}" ] && apache2ssl_enable="NO" [ -z "${apache2_flags}" ] && apache2_flags="" [ -z "${apache2limits_enable}" ] && apache2limits_enable="NO" [ -z "${apache2limits_args}" ] && apache2limits_args="-e -C daemon" [ -z "${apache2_configfile}" ] && apache2_configfile="" load_rc_config $name if [ -n "${2}" ]; then profile=${2} if [ "x${apache2_profiles}" != "x" ]; then pidfile="${_pidprefix}.${profile}.pid" eval apache2_configfile=\${apache2_${profile}_configfile} [ "x${apache2_configfile}" = "x" ] && { echo "You must define a configuration file (apache2_${profile}_configfile)" exit 1 } eval apache2_enable=\${apache2_${profile}_enable:-YES} eval apache2ssl_enable=\${apache2ssl_${profile}_enable:-NO} eval apache2_flags=\${apache2_${profile}_flags:-${apache2_flags}} eval apache2limits_enable=\${apache2limits_${profile}_enable:-${apache2limits_enable}} eval apache2limits_args=\${apache2limits_${profile}_args:-${apache2limits_args}} pidfile="${_pidprefix}.${profile}.pid" apache2_flags="-c \"PidFile ${pidfile}\" ${apache2_flags}" else echo "$0: extra argument ignored" fi else if [ "x${apache2_profiles}" != "x" -a "x${1}" != "xrestart" ]; then for profile in ${apache2_profiles}; do echo "===> apache2 profile: ${profile}" $0 $1 $profile retcode=$? if [ "$?" -ne 0 ]; then failed="${profile} ({$retcode}) ${failed}" else success="${profile} ${success}" fi done exit 0 fi fi checkyesno apache2ssl_enable && \ apache2_flags="-DSSL $apache2_flags" [ "x${apache2_configfile}" != "x" ] && { apache2_flags="-f ${apache2_configfile} ${apache2_flags}" required_files=${apache2_configfile} } apache2_checkconfig() { echo "Performing sanity check on apache2 configuration:" - ${command} ${apache2_flags} -t + eval "${command} ${apache2_flags} -t" } apache2_precmd() { if test -f %%PREFIX%%/sbin/envvars then . %%PREFIX%%/sbin/envvars fi if checkyesno apache2limits_enable then eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null else return 0 fi } sig_reload=SIGUSR1 extra_commands="reload" run_rc_command "$1" Property changes on: head/www/apache20/files/apache.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property