diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache22-itk-mpm/Makefile | 20 | ||||
| -rw-r--r-- | www/apache22-itk-mpm/files/mpm-itk-20110321-01 (renamed from www/apache22/files/mpm-itk-20110321-01) | 0 | ||||
| -rw-r--r-- | www/apache22-itk-mpm/files/mpm-itk-limits (renamed from www/apache22/files/mpm-itk-limits) | 0 | ||||
| -rw-r--r-- | www/apache22-itk-mpm/files/mpm-itk-perdir-regex (renamed from www/apache22/files/mpm-itk-perdir-regex) | 0 | ||||
| -rw-r--r-- | www/apache22/Makefile | 17 | ||||
| -rw-r--r-- | www/apache22/Makefile.modules | 10 | ||||
| -rw-r--r-- | www/apache22/distinfo | 4 | ||||
| -rw-r--r-- | www/apache22/files/apache22.in | 2 |
8 files changed, 30 insertions, 23 deletions
diff --git a/www/apache22-itk-mpm/Makefile b/www/apache22-itk-mpm/Makefile index bc35985f8dcd..66826b3726c6 100644 --- a/www/apache22-itk-mpm/Makefile +++ b/www/apache22-itk-mpm/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -# + # To build this port with the additional mpm-itk-perdir-regex # patch use -DWITH_ITK_PERDIR_REGEX # @@ -8,7 +8,7 @@ # # Note: # It's not possible to use both patches together -#´ +# # For a quick description take a look into the mpm-itk* patches # in the apache22/files directory @@ -21,4 +21,20 @@ WITH_MPM= itk LATEST_LINK= apache22-${WITH_MPM}-mpm DESCR= ${.CURDIR}/pkg-descr +MPM_ITK_VERSION?= 20110321-01 + +EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-${MPM_ITK_VERSION} + +.if defined (WITH_ITK_PERDIR_REGEX) && defined (WITH_ITK_LIMITS) +IGNORE= use only one patch option not both (WITH_ITK_PERDIR_REGEX or WITH_ITK_LIMITS) +.endif + +.if defined (WITH_ITK_PERDIR_REGEX) +EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-perdir-regex +.endif + +.if defined (WITH_ITK_LIMITS) +EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-limits +.endif + .include "${MASTERDIR}/Makefile" diff --git a/www/apache22/files/mpm-itk-20110321-01 b/www/apache22-itk-mpm/files/mpm-itk-20110321-01 index 45f79a492eda..45f79a492eda 100644 --- a/www/apache22/files/mpm-itk-20110321-01 +++ b/www/apache22-itk-mpm/files/mpm-itk-20110321-01 diff --git a/www/apache22/files/mpm-itk-limits b/www/apache22-itk-mpm/files/mpm-itk-limits index b8a8c5b85e38..b8a8c5b85e38 100644 --- a/www/apache22/files/mpm-itk-limits +++ b/www/apache22-itk-mpm/files/mpm-itk-limits diff --git a/www/apache22/files/mpm-itk-perdir-regex b/www/apache22-itk-mpm/files/mpm-itk-perdir-regex index cbe5d2cd6a8b..cbe5d2cd6a8b 100644 --- a/www/apache22/files/mpm-itk-perdir-regex +++ b/www/apache22-itk-mpm/files/mpm-itk-perdir-regex diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 012b136eaeb9..d4ccb77c8e9b 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= apache22 -PORTVERSION= 2.2.23 -PORTREVISION= 4 +PORTVERSION= 2.2.24 +#PORTREVISION?= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -41,11 +41,9 @@ APACHEDIR= ${.CURDIR} APACHEDIR= ${MASTERDIR} .endif -WITH_MPM?= prefork # or worker, event, itk +WITH_MPM?= prefork # or worker, event, itk, peruser WITH_HTTP_PORT?= 80 -MPM_ITK_VERSION?= 20110321-01 - .include "${APACHEDIR}/Makefile.options" # stop users from using old WITH/WITHOUT parameters @@ -57,8 +55,8 @@ BROKEN= WITH/WITHOUT parameters are obsolete. \ . endif .endfor -.for cat in ${ALL_MODULES_CATEGORIES} -. if defined(WITH_${cat}_MODULES) +.for category in ${ALL_MODULES_CATEGORIES} +. if defined(WITH_${category}_MODULES) BROKEN= WITH/WITHOUT_..._MODULES parameters are obsolete. \ The port use the new options NG framework. Please read\ http://wiki.freebsd.org/Ports/Options/OptionsNG @@ -77,6 +75,9 @@ APU_DBD_PGSQL?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_pgsql.so APU_DBD_SQLITE3?= ${LOCALBASE}/lib/apr-util-1/apr_dbd_sqlite3.so # APU module used by AUTHNZ_LDAP LDAP APU_LDAP?= ${LOCALBASE}/lib/apr-util-1/apr_ldap.so +# APU crypto +APU_CRYPTO_SSL?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_openssl.so +APU_CRYPTO_NSS?= ${LOCALBASE}/lib/apr-util-1/apr_crypto_nss.so CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --enable-layout=FreeBSD \ @@ -99,7 +100,7 @@ MAKE_ENV+= EXPR_COMPAT=yes \ INSTALL_MAN="${INSTALL_MAN}" #===================================================== -# CONFIGURE_ARGS willl be handled in Makefile.modules, +# CONFIGURE_ARGS will be handled in Makefile.modules, # here we do only OPTIONS fixups .if ${PORT_OPTIONS:MSSL} diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules index 6f6d2f6423c8..69e04a7ad3a9 100644 --- a/www/apache22/Makefile.modules +++ b/www/apache22/Makefile.modules @@ -60,16 +60,6 @@ PLIST_SUB+= WORKER="@comment " EVENT="" PLIST_SUB+= WORKER="@comment " EVENT="@comment " .elif ${WITH_MPM} == "itk" PLIST_SUB+= WORKER="@comment " EVENT="@comment " -EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-${MPM_ITK_VERSION} -. if defined (WITH_ITK_PERDIR_REGEX) && defined (WITH_ITK_LIMITS) -IGNORE= Use only one patch option not both (WITH_ITK_PERDIR_REGEX or WITH_ITK_LIMITS) -. endif -. if defined (WITH_ITK_PERDIR_REGEX) -EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex -. endif -. if defined (WITH_ITK_LIMITS) -EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-limits -. endif .else IGNORE= Unknown MPM: ${WITH_MPM} .endif # MPM prefork diff --git a/www/apache22/distinfo b/www/apache22/distinfo index d8b6232d01d9..d9122d8a3189 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,2 +1,2 @@ -SHA256 (apache22/httpd-2.2.23.tar.bz2) = 14fe79bd6edd957c02cb41f4175e132c08e6ff74a7d08dc1858dd8224e351c34 -SIZE (apache22/httpd-2.2.23.tar.bz2) = 5485205 +SHA256 (apache22/httpd-2.2.24.tar.bz2) = 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 +SIZE (apache22/httpd-2.2.24.tar.bz2) = 5490439 diff --git a/www/apache22/files/apache22.in b/www/apache22/files/apache22.in index 94374fbfd867..eab30e2a7ac0 100644 --- a/www/apache22/files/apache22.in +++ b/www/apache22/files/apache22.in @@ -4,7 +4,7 @@ # # PROVIDE: apache22 -# REQUIRE: LOGIN cleanvar +# REQUIRE: LOGIN cleanvar sshd # KEYWORD: shutdown # |