Index: apache2/Makefile =================================================================== RCS file: /WORK/CHROOT/home/ncvs/ports/www/apache2/Makefile,v retrieving revision 1.198 diff -u -r1.198 Makefile --- apache2/Makefile 19 Aug 2004 14:38:36 -0000 1.198 +++ apache2/Makefile 6 Sep 2004 12:14:44 -0000 @@ -87,7 +87,7 @@ . endif .endif -.if !defined(WITHOUT_SSL) +.if !defined(WITHOUT_SSL) || defined(WITHOUT_SSL_MODULES) USE_OPENSSL= yes .endif @@ -118,7 +118,7 @@ APACHEDIR= ${MASTERDIR} .endif -.if defined (WITH_LDAP) +.if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES) USE_OPENLDAP= YES CONFIGURE_ARGS+= --with-ldap \ --with-ldap-lib="${LOCALBASE}/lib" \ @@ -161,6 +161,12 @@ show-options: @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc +show-categories: +.for category in ${ALL_MODULES_CATEGORIES:S/SLAVE_PORT//} + @${ECHO_MSG} "${category} contains these modules:" + @${ECHO_MSG} " ${${category}_MODULES}" +.endfor + show-modules: @for module in ${AVAILABLE_MODULES} ; do \ ${ECHO_MSG} -n "$${module}: ";\ @@ -178,6 +184,14 @@ 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:C/SLAVE_PORT//}" + @${ECHO_MSG} "" @${ECHO_MSG} " To see all available knobs, type make show-options" @${ECHO_MSG} " You can check your modules configuration by using show-modules" @${ECHO_MSG} "" Index: apache2/Makefile.doc =================================================================== RCS file: /WORK/CHROOT/home/ncvs/ports/www/apache2/Makefile.doc,v retrieving revision 1.9 diff -u -r1.9 Makefile.doc --- apache2/Makefile.doc 19 Aug 2004 14:38:36 -0000 1.9 +++ apache2/Makefile.doc 6 Sep 2004 12:24:08 -0000 @@ -11,25 +11,28 @@ ## Available knobs: ## By default, modules are compiled as dynamically loadable (DSO) modules. ## +## Modules knobs philosophy: +## Modules are split in categories, "make show-categories" shows you +## which modules they contain. You can enable/disable/customize a category: +## - To enable a category: WITH__MODULES=yes +## [WITH_PROXY_MODULES=yes] +## - To disable a category: WITHOUT__MODULES=yes +## [WITHOUT_DAV_MODULES=yes] +## - To customize a category: WITH_CUSTOM_ +## [WITH_CUSTOM_PROXY="proxy proxy_http"] +## ## Apache-related ## WITH_MPM: prefork (default) ## worker ## perchild (deprecated) ## threadpool (testing purpose only) ## WITH_HTTP_PORT: default: 80 -## WITH_LDAP: Enable LDAP support (mod_auth_ldap) -## WITHOUT_PROXY: Disable proxy support -## WITH_CUSTOM_PROXY: Let you choose which proxy modules you wish -## WITHOUT_AUTH: Disable auth modules -## WITH_CUSTOM_AUTH: Let you choose which auth modules you wish -## WITHOUT_DAV: Disable DAV support -## WITHOUT_IPV6: Disable IPv6 support +## WITH_LDAP: Enable LDAP support (mod_auth_ldap) (implies WITH_LDAP_MODULES) ## WITHOUT_V4MAPPED ## WITH_IPV6_V6ONLY: Don't allow IPv6 sockets to handle IPv4 ## connections ## WITHOUT_SSL: Disable SSL support ## WITH_THREADS: Enable threads support !! USE IT WITH CARE !! -## WITH_CUSTOM_THREADS: Let you choose which threaded modules you want ## WITH_DBM: Choose your DBM: bdb (Berkeley DB), gdbm or ## ndbm (default) ## WITH_BERKELEYDB: Choose your BerkeleyDB version: db2, db3, @@ -44,11 +47,8 @@ ## WITH_MODULES or with default configuration ## use 'make show-modules', to check if they are ## enabled) -## WITH_EXPERIMENTAL: Build and install experimental modules -## WITH_EXTRA_MODULES: Use this to support additional modules (plist -## entry is NOT yet supported) -## WITH_MODULES: List of your own modules -## WITHOUT_MODULES: Disable listed modules +## WITH_MODULES: List of modules you choose +## WITHOUT_MODULES: Disable selected modules ## WITH_SUEXEC: Enable suExec support ## SUEXEC_DOCROOT: SuExec root directory ## SUEXEC_USERDIR: User subdirectory (default public_html) @@ -73,16 +73,21 @@ ## WITH_APR_FROM_PORTS: Utilise apr and apr-utils from ## ${PORTSDIR}/devel/apr ## +## Optionnal patches: +## WITH_EXPERIMENTAL_PATCHES Add performance patches (generally backported +## from apr/httpd CVS) +## WITH_WINDOWSUPDATEFIX Add a fix to use apache as proxy with +## Windows Update service. +## ## Available make targets: ## show-options: prints this message ## show-modules: prints list of available modules +## show-categories: prints list of modules sorted by category ## ## Examples: -## make WITHOUT_SSL=yes WITH_EXTRA_MODULES="bucketeer case_filter \ -## case_filter_in" WITHOUT_PROXY=yes -## make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL=yes \ +## make WITH_STATIC_MODULES="ssl rewrite include" WITH_EXPERIMENTAL_MODULES=yes \ ## WITH_CUSTOM_AUTH="auth auth_dbm" -## make WITH_EXPERIMENTAL=yes WITHOUT_MODULES="access speling status" +## make WITHOUT_MODULES="access speling status" WITH_PROXY_MODULES=yes ## make WITH_MODULES="include rewrite auth" ## Index: apache2/Makefile.modules.3rd =================================================================== RCS file: /WORK/CHROOT/home/ncvs/ports/www/apache2/Makefile.modules.3rd,v retrieving revision 1.10 diff -u -r1.10 Makefile.modules.3rd --- apache2/Makefile.modules.3rd 3 Sep 2004 12:41:17 -0000 1.10 +++ apache2/Makefile.modules.3rd 6 Sep 2004 12:16:59 -0000 @@ -170,7 +170,7 @@ WITH_ALL_STATIC_MODULES= YES .endif -.if defined(WITH_SUEXEC) +.if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES) .if ${WANT_APACHE} == common13 SUEXEC_CONFARGS= suexec CONFIGURE_ARGS+= --enable-suexec