Index: head/www/apache20/Makefile =================================================================== --- head/www/apache20/Makefile (revision 199279) +++ head/www/apache20/Makefile (revision 199280) @@ -1,223 +1,224 @@ # 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.61 +PORTREVISION= 1 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.6:${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.* # patch files EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta .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= apache2.sh USE_APACHE= common20 LIBTOOLFILES= configure USE_LDCONFIG= ${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+= 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 "${APACHEDIR}/Makefile.doc" .include "${APACHEDIR}/Makefile.modules" .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 .if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads . if ${OSVERSION} > 500023 . if ${ARCH} == i386 CONFIGURE_ARGS+= --enable-nonportable-atomics . endif . else CFLAGS+= -DFREEBSD_THREAD_HACK . endif .endif CONFIGURE_ARGS+= --with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET} show-options: @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc 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} "" 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]"> Property changes on: head/www/apache20/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.247 \ No newline at end of property +1.248 \ No newline at end of property Index: head/www/apache20/files/apache2.sh.in =================================================================== --- head/www/apache20/files/apache2.sh.in (revision 199279) +++ head/www/apache20/files/apache2.sh.in (revision 199280) @@ -1,123 +1,131 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: apache2 # REQUIRE: LOGIN cleanvar # KEYWORD: 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 (str): Set to "" by default. # Define your profiles here. +# 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" reload_cmd="apache2_graceful" graceful_cmd="apache2_graceful" configtest_cmd="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_profiles" ] && apache2_profiles="" [ -z "$apache2_flags" ] && apache2_flags="" [ -z "$apache2limits_enable" ] && apache2limits_enable="NO" [ -z "$apache2limits_args" ] && apache2limits_args="-e -C daemon" 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:-}" if [ "x${apache2_configfile}" = "x" ]; then echo "You must define a configuration file (apache2_${profile}_configfile)" exit 1 fi required_files="${apache2_configfile}" eval apache2_enable="\${apache2_${profile}_enable:-${apache2_enable}}" + eval apache2ssl_enable=\${apache2ssl_${profile}_enable:-NO} eval apache2_flags="\${apache2_${profile}_flags:-${apache2_flags}}" eval apache2_http_accept_enable="\${apache2_${profile}_http_accept_enable:-${apache2_http_accept_enable}}" eval apache2limits_enable="\${apache2limits_${profile}_enable:-${apache2limits_enable}}" eval apache2limits_args="\${apache2limits_${profile}_args:-${apache2limits_args}}" apache2_flags="-f ${apache2_configfile} -c \"PidFile ${pidfile}\" ${apache2_flags}" else echo "$0: extra argument ignored" fi else if [ "x${apache2_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${apache2_profiles}; do echo "===> apache2 profile: ${profile}" %%PREFIX%%/etc/rc.d/apache2%%RC_SUBR_SUFFIX%% $1 ${profile} retcode="$?" if [ "0${retcode}" -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" apache2_requirepidfile() { if [ ! "0`check_pidfile ${pidfile} ${command}`" -gt 1 ]; then echo "${name} not running? (check $pidfile)." exit 1 fi } apache2_checkconfig() { echo "Performing sanity check on apache2 configuration:" eval ${command} ${apache2_flags} -t } apache2_graceful() { apache2_requirepidfile echo "Performing a graceful restart" eval ${command} ${apache2_flags} -k graceful } apache2_precmd() { apache2_checkconfig 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 } extra_commands="reload graceful configtest" run_rc_command "$1" Property changes on: head/www/apache20/files/apache2.sh.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property