aboutsummaryrefslogtreecommitdiffstats
path: root/russian
diff options
context:
space:
mode:
authorlev <lev@FreeBSD.org>2003-06-25 22:13:16 +0800
committerlev <lev@FreeBSD.org>2003-06-25 22:13:16 +0800
commit91f4c936a54fc7eb8349cb5807f323e7da62fd09 (patch)
tree7047abeac76d20689c95cc9a44af07154ea55842 /russian
parent2991cb7bab44e3ec0a1ddea1a44a8dfa6adadd63 (diff)
downloadfreebsd-ports-gnome-91f4c936a54fc7eb8349cb5807f323e7da62fd09.tar.gz
freebsd-ports-gnome-91f4c936a54fc7eb8349cb5807f323e7da62fd09.tar.zst
freebsd-ports-gnome-91f4c936a54fc7eb8349cb5807f323e7da62fd09.zip
Add CONFLICTS with other httpd ports: all apache variants and `www/publicfile'
Approved by: sobomax
Diffstat (limited to 'russian')
-rw-r--r--russian/apache13-modssl/Makefile9
-rw-r--r--russian/apache13/Makefile8
2 files changed, 17 insertions, 0 deletions
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 5b1c31fef0a6..e7add3db7a1a 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -33,6 +33,15 @@ MASTER_SITES_MODSSL= http://www.modssl.org/source/ \
MASTER_SITES_RA= ftp://ftp.lexa.ru/pub/apache-rus/ \
ftp://ftp.lexa.ru/pub/apache-rus/old-versions/
+
+# New feature: conflicts
+CONFLICTS= apache+ipv6-* \
+ apache+mod_ssl-* \
+ apache-* \
+ apache_fp-* \
+ publicfile-* \
+ apache+mod_ssl-*
+
USE_OPENSSL= YES
USE_PERL5= yes
diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile
index 31c1269b4c2e..f98b252a1a93 100644
--- a/russian/apache13/Makefile
+++ b/russian/apache13/Makefile
@@ -18,6 +18,14 @@ PATCHFILES= patches_${APACHE_VERSION}rusPL${RA_VERSION}.tar.gz
MAINTAINER= lev@FreeBSD.org
COMMENT= The extremely popular Apache http server. Very fast, very clean
+# New ports feature: conflicts
+CONFLICTS= apache+ipv6-* \
+ apache+mod_ssl-* \
+ apache-* \
+ apache_fp-* \
+ publicfile-* \
+ ru-apache+mod_ssl-*
+
RA_VERSION= 30.17
APACHE_VERSION= 1.3.27