diff options
| author | Lev A. Serebryakov <lev@FreeBSD.org> | 2004-05-23 17:16:16 +0000 |
|---|---|---|
| committer | Lev A. Serebryakov <lev@FreeBSD.org> | 2004-05-23 17:16:16 +0000 |
| commit | 08dfe0c5cf4bc84e2c4463987ec9b0bf4605a0cd (patch) | |
| tree | 431b2098944a680370fed302433e3cf33f6a79fb /russian | |
| parent | f3b8752aafdb12c21fbc55201ac2a6fad2bc3b6b (diff) | |
Make CONFLICTS more specific: conflicts with apache-[0-9]*, not with apache-*
PR: ports/67066
Submitted by: Vassily Ragosin <vr@vrgraphics.ru>
Notes
Notes:
svn path=/head/; revision=109797
Diffstat (limited to 'russian')
| -rw-r--r-- | russian/apache13-modssl/Makefile | 2 | ||||
| -rw-r--r-- | russian/apache13/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile index 559ff60dbf7f..ca38a9ca1b85 100644 --- a/russian/apache13-modssl/Makefile +++ b/russian/apache13-modssl/Makefile @@ -43,7 +43,7 @@ CONFLICTS= apache+ipv6-* \ apache+mod_ssl+mod_snmp+ipv6-* \ apache+mod_ssl+mod_accel-* \ apache+mod_ssl+mod_snmp+mod_accel-* \ - apache-* \ + apache-[0-9]* \ apache_fp-* \ publicfile-* \ ru-apache-* diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile index a899fbb04973..078b1e519dd7 100644 --- a/russian/apache13/Makefile +++ b/russian/apache13/Makefile @@ -26,7 +26,7 @@ CONFLICTS= apache+ipv6-* \ apache+mod_ssl+mod_snmp+ipv6-* \ apache+mod_ssl+mod_accel-* \ apache+mod_ssl+mod_snmp+mod_accel-* \ - apache-* \ + apache-[0-9]* \ apache_fp-* \ publicfile-* \ ru-apache+mod_ssl-* |