diff options
| -rw-r--r-- | www/apache13-modssl/Makefile | 17 | ||||
| -rw-r--r-- | www/apache13-modssl/distinfo | 16 | ||||
| -rw-r--r-- | www/apache13-modssl/pkg-plist | 7 |
3 files changed, 19 insertions, 21 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index 371f832b5ca2..1dc6f0fd6607 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -24,7 +24,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${MODSSL_FILE} \ .if defined(WITH_APACHE_IPV6) || defined(APACHE_WITH_IPV6) || make(makesum) || defined(FETCH_ALL) PATCH_SITES+= ftp://ftp.42.org/pub/orphan/ ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= dinoex -PATCHFILES+= apache-1.3.31modssl-v6-20040514.diff.gz +PATCHFILES+= apache-1.3.32modssl-v6-20041023.diff.gz .endif MAINTAINER= dinoex@FreeBSD.org @@ -36,9 +36,9 @@ PATCH_DEPENDS= ${BUILD_DEPENDS} CONFLICTS?= apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \ apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* w3c-httpd-3.* -VERSION_APACHE= 1.3.31 -VERSION_MODSSL= 2.8.20 -VERSION_MODSNMP= 1.3.14.12 +VERSION_APACHE= 1.3.32 +VERSION_MODSSL= 2.8.21 +VERSION_MODSNMP= 1.3.14.13 VERSION_MODACCEL= 1.0.31 VERSION_MODDEFLATE= 1.0.21 USE_OPENSSL= yes @@ -171,6 +171,7 @@ CFLAGS+= -O3 MODSNMP_DISTFILE= ${MODSNMP_FILE}:mod_snmp .endif .if defined(WITH_APACHE_MODSNMP) || defined(APACHE_WITH_MODSNMP) +BROKEN= "must wait for next release of mod_snmp" CONFLICTS+= apache+mod_ssl-1.* \ apache+mod_ssl+ipv6-1.* \ apache+mod_ssl+mod_accel-1.* \ @@ -178,7 +179,7 @@ CONFLICTS+= apache+mod_ssl-1.* \ apache+mod_ssl+mod_accel+mod_deflate-1.* \ apache+mod_ssl+mod_accel+mod_deflate+ipv6-1.* \ apache+mod_ssl+mod_deflate-1.* \ - apache+mod_ssl+mod_deflate+ipv6-1.* \ + apache+mod_ssl+mod_deflate+ipv6-1.* MODSNMP_SUFFIX= +mod_snmp CONFIGURE_ARGS+= --activate-module=src/modules/snmp_agt/libsnmp_agt.a CFLAGS+= -DSNMP -DUSE_DB -DSNMP_CONFIG_H -DHARD_VIRTUAL_HOST_MAX=1000 \ @@ -193,7 +194,7 @@ PLIST_FILES+= %%DOCSDIR%%/mod/mod_snmp.html \ %%DOCSDIR%%/snmp_agt/apache-config-mib.txt PLIST_DIRS+= %%DOCSDIR%%/snmp_agt %%DOCSDIR%% www/buckets www .else -CONFLICTS+= apache+mod_snmp*-1.* +CONFLICTS+= apache+*mod_snmp*-1.* .endif .if defined(WITH_APACHE_MODACCEL) || defined(APACHE_WITH_MODACCEL) || make(makesum) || defined(FETCH_ALL) @@ -222,7 +223,7 @@ PLIST_FILES+= libexec/apache/libaccel.so \ libexec/apache/mod_randban.so \ %%DOCSDIR%%/mod/mod_accel.html .else -CONFLICTS+= apache+mod_accel*-1.* +CONFLICTS+= apache+*mod_accel*-1.* .endif .if defined(WITH_APACHE_MODDEFLATE) || defined(APACHE_WITH_MODDEFLATE) || make(makesum) || defined(FETCH_ALL) @@ -242,7 +243,7 @@ MODDEFLATE_SUFFIX= +mod_deflate CONFIGURE_ARGS+= --activate-module=src/modules/extra/mod_deflate.o PLIST_FILES+= %%DOCSDIR%%/mod/mod_deflate.html .else -CONFLICTS+= apache+mod_deflate*-1.* +CONFLICTS+= apache+*mod_deflate*-1.* .endif .if defined(WITH_APACHE_IPV6) || defined(APACHE_WITH_IPV6) diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo index e0cec51af2ce..1bf4e2c32d55 100644 --- a/www/apache13-modssl/distinfo +++ b/www/apache13-modssl/distinfo @@ -1,12 +1,12 @@ -MD5 (apache_1.3.31.tar.gz) = bd548a06ac48dda496b4e613572bb020 -SIZE (apache_1.3.31.tar.gz) = 2467371 -MD5 (mod_ssl-2.8.20-1.3.31.tar.gz) = 4843881cfa31d6bb1b045d24562be835 -SIZE (mod_ssl-2.8.20-1.3.31.tar.gz) = 754568 -MD5 (mod_snmp_1.3.14.12.tar.gz) = b0bddbb4e5ff4c6a46d114998f12740a -SIZE (mod_snmp_1.3.14.12.tar.gz) = 91462 +MD5 (apache_1.3.32.tar.gz) = 45164531fb57bfa18af4b9efd0850dd3 +SIZE (apache_1.3.32.tar.gz) = 2472811 +MD5 (mod_ssl-2.8.21-1.3.32.tar.gz) = 19994ade6f8c46aa6cac87bca797fe82 +SIZE (mod_ssl-2.8.21-1.3.32.tar.gz) = 754629 +MD5 (mod_snmp_1.3.14.13.tar.gz) = 47f47354a8317f676af3d745635fb33e +SIZE (mod_snmp_1.3.14.13.tar.gz) = 91109 MD5 (mod_accel-1.0.31.tar.gz) = edc31714cc6dc8d24396cb4ddf2ae2f6 SIZE (mod_accel-1.0.31.tar.gz) = 85443 MD5 (mod_deflate-1.0.21.tar.gz) = ece1de9b066592c89a6f2b2fec27a00a SIZE (mod_deflate-1.0.21.tar.gz) = 32505 -MD5 (apache-1.3.31modssl-v6-20040514.diff.gz) = 0bc7cf4ec619c3a5cf41b59ef9b11c04 -SIZE (apache-1.3.31modssl-v6-20040514.diff.gz) = 29122 +MD5 (apache-1.3.32modssl-v6-20041023.diff.gz) = 1a6080af395d43097cc4017cbb313b94 +SIZE (apache-1.3.32modssl-v6-20041023.diff.gz) = 29140 diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist index 5363860248d7..ad11d2c80255 100644 --- a/www/apache13-modssl/pkg-plist +++ b/www/apache13-modssl/pkg-plist @@ -165,10 +165,6 @@ www/data-dist/index.html.zh-tw.big5 %%DOCSDIR%%/bind.html.fr %%DOCSDIR%%/bind.html.html %%DOCSDIR%%/bind.html.ja.jis -%%DOCSDIR%%/cgi_path.html.en -%%DOCSDIR%%/cgi_path.html.fr -%%DOCSDIR%%/cgi_path.html.html -%%DOCSDIR%%/cgi_path.html.ja.jis %%DOCSDIR%%/configuring.html.fr %%DOCSDIR%%/configuring.html.en %%DOCSDIR%%/configuring.html.ja.jis @@ -181,6 +177,7 @@ www/data-dist/index.html.zh-tw.big5 %%DOCSDIR%%/dns-caveats.html.en %%DOCSDIR%%/dns-caveats.html.fr %%DOCSDIR%%/dns-caveats.html.html +%%DOCSDIR%%/dns-caveats.html.ja.jis %%DOCSDIR%%/dso.html %%DOCSDIR%%/ebcdic.html %%DOCSDIR%%/env.html.en @@ -218,6 +215,7 @@ www/data-dist/index.html.zh-tw.big5 %%DOCSDIR%%/install.html.ja.jis %%DOCSDIR%%/invoking.html.en %%DOCSDIR%%/invoking.html.html +%%DOCSDIR%%/invoking.html.ja.jis %%DOCSDIR%%/keepalive.html.en %%DOCSDIR%%/keepalive.html.html %%DOCSDIR%%/keepalive.html.ja.jis @@ -419,7 +417,6 @@ www/data-dist/index.html.zh-tw.big5 %%DOCSDIR%%/new_features_1_2.html %%DOCSDIR%%/new_features_1_3.html.en %%DOCSDIR%%/new_features_1_3.html.ja.jis -%%DOCSDIR%%/new_features_2_0.html %%DOCSDIR%%/process-model.html.en %%DOCSDIR%%/process-model.html.html %%DOCSDIR%%/process-model.html.ja.jis |