aboutsummaryrefslogtreecommitdiffstats
path: root/russian
diff options
context:
space:
mode:
authorlev <lev@FreeBSD.org>2004-05-24 01:16:16 +0800
committerlev <lev@FreeBSD.org>2004-05-24 01:16:16 +0800
commit70f41cb139a667483aba4c95d2b952b9d666d71a (patch)
tree9b0f4c1ede44629b59b9d0126ed69a1bebed3871 /russian
parent9728f2178549fe761cbd11614ae552ae3bab561f (diff)
downloadfreebsd-ports-gnome-70f41cb139a667483aba4c95d2b952b9d666d71a.tar.gz
freebsd-ports-gnome-70f41cb139a667483aba4c95d2b952b9d666d71a.tar.zst
freebsd-ports-gnome-70f41cb139a667483aba4c95d2b952b9d666d71a.zip
Make CONFLICTS more specific: conflicts with apache-[0-9]*, not with apache-*
PR: ports/67066 Submitted by: Vassily Ragosin <vr@vrgraphics.ru>
Diffstat (limited to 'russian')
-rw-r--r--russian/apache13-modssl/Makefile2
-rw-r--r--russian/apache13/Makefile2
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-*