mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

Remove thttpd from conflicts list, it has a different name for its

Browse Source 
passwd program now.

Approved by:	maintainers/erwin
This commit is contained in:
Anders Nordby 2007-06-17 16:59:27 +00:00
parent 8a509d1cad
commit 675c2953eb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=193725
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/apache13+ipv6/Makefile
View File

@ -24,7 +24,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
apache+mod_ssl+mod_snmp+mod_accel-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.*
ru-apache+mod_ssl-1.* ru-apache-1.*
USE_PERL5= yes
USE_RC_SUBR= yes

3
www/apache13-modperl/Makefile
View File

@ -27,8 +27,7 @@ CONFLICTS= apache-1.* apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+
apache+mod_ssl+mod_snmp+mod_accel-1.* \
apache+ipv6-1.* apache+ssl-1.* apache-2.* apache_fp-1.* \
caudium-devel-1.* caudium10-1.* caudium12-* \
ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* \
apache-*-2.*
ru-apache+mod_ssl-1.* ru-apache-1.* apache-*-2.*
USE_PERL5= YES
USE_RC_SUBR= apache

2
www/apache13-modssl/Makefile
View File

@ -35,7 +35,7 @@ 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.*
ru-apache+mod_ssl-1.* ru-apache-1.* w3c-httpd-3.*
VERSION_APACHE= 1.3.37
VERSION_MODSSL= 2.8.28
VERSION_MODSNMP= 1.3.14.13

2
www/apache13-ssl/Makefile
View File

@ -29,7 +29,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
apache+mod_ssl+mod_snmp+mod_accel-1.* \
apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \
caudium-devel-1.* caudium10-1.* caudium12-* \
ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
ru-apache+mod_ssl-1.* ru-apache-1.*
APACHE_VERSION= 1.3.37
APACHE_SSL_VERSION= 1.57

2
www/apache20/Makefile
View File

@ -30,7 +30,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.* thttpd-2.*
ru-apache+mod_ssl-1.* ru-apache-1.*
# patch files
EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta

2
www/apache21/Makefile
View File

@ -32,7 +32,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.* thttpd-2.* \
ru-apache+mod_ssl-1.* ru-apache-1.* \
apache-2.0.* apache-*-2.0.*
SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \

2
www/apache22/Makefile
View File

@ -37,7 +37,7 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.* thttpd-2.* \
ru-apache+mod_ssl-1.* ru-apache-1.* \
apache-2.0.* apache-*-2.0.* apache-2.1.* apache-*-2.1.*
SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \