From be48a67e7f995007da5d348a468541066a7556bc Mon Sep 17 00:00:00 2001 From: "Lev A. Serebryakov" Date: Wed, 25 Jun 2003 14:13:16 +0000 Subject: Add CONFLICTS with other httpd ports: all apache variants and `www/publicfile' Approved by: sobomax --- russian/apache13-modssl/Makefile | 9 +++++++++ russian/apache13/Makefile | 8 ++++++++ 2 files changed, 17 insertions(+) (limited to 'russian') 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 -- cgit v1.2.3