diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2004-03-26 13:58:24 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2004-03-26 13:58:24 +0000 |
| commit | b665752e3833179c6b595428e5365882d9356b95 (patch) | |
| tree | 3476c2d683c06b548532bb843d4917b78d4fff89 | |
| parent | - Update RINGSERVER subdir (diff) | |
- update CONFLICTS
Notes
Notes:
svn path=/head/; revision=105322
| -rw-r--r-- | www/apache13-modssl/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile index 4ef506e2580b..786d94f8b4ec 100644 --- a/www/apache13-modssl/Makefile +++ b/www/apache13-modssl/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ http://www.mod-snmp.com/distr/:mod_snmp \ http://sysoev.ru/mod_accel/:mod_accel \ http://sysoev.ru/mod_deflate/:mod_deflate -PKGNAMESUFFIX= ${MODSNMP_SUFFIX}${MODACCEL_SUFFIX}${MODDEFLATE_SUFFIX}${IPV6_SUFFIX}${PKGNAMESUFFIX2} +PKGNAMESUFFIX?= ${MODSNMP_SUFFIX}${MODACCEL_SUFFIX}${MODDEFLATE_SUFFIX}${IPV6_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= apache_${VERSION_APACHE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MODSSL_FILE}:mod_ssl \ ${MODSNMP_DISTFILE} ${MODACCEL_DISTFILE} ${MODDEFLATE_DISTFILE} @@ -157,6 +157,7 @@ CFLAGS+= -DSNMP -DUSE_DB -DSNMP_CONFIG_H -DHARD_VIRTUAL_HOST_MAX=1000 \ EXTRA_PATCHES+= ${WRKSRC}/src/modules/snmp_agt/mod_snmp.patch PLIST_SUB+= WITHSNMP="" .else +CONFLICTS+= apache+mod_snmp*-1.* PLIST_SUB+= WITHSNMP="@comment " .endif @@ -180,6 +181,7 @@ CONFIGURE_ARGS+= --activate-module=src/modules/extra/mod_randban.o \ EXTRA_PATCHES+= ${FILESDIR}/mod_accel-preservehost.patch PLIST_SUB+= WITHACCEL="" .else +CONFLICTS+= apache+mod_accel*-1.* PLIST_SUB+= WITHACCEL="@comment " .endif @@ -200,6 +202,7 @@ PVERSION_MODDEFLATE= +${VERSION_MODDEFLATE} CONFIGURE_ARGS+= --activate-module=src/modules/extra/mod_deflate.o PLIST_SUB+= WITHDEFLATE="" .else +CONFLICTS+= apache+mod_deflate*-1.* PLIST_SUB+= WITHDEFLATE="@comment " .endif |