aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2006-07-14 07:41:48 +0000
committerPeter Pentchev <roam@FreeBSD.org>2006-07-14 07:41:48 +0000
commit0a99a9bb69aa41547436c44c8daf6ce963cb8384 (patch)
tree311e4aabecf6a3e93c4fea6f97a2ed6121271a33
parent0987c64ceb5a4ee6f015decce2d3c7fa983919da (diff)
downloadports-0a99a9bb69aa41547436c44c8daf6ce963cb8384.tar.gz
ports-0a99a9bb69aa41547436c44c8daf6ce963cb8384.zip
Note that dns/ares and dns/c-ares are in conflict.
Notes
Notes: svn path=/head/; revision=167770
-rw-r--r--dns/ares/Makefile2
-rw-r--r--dns/c-ares/Makefile3
2 files changed, 5 insertions, 0 deletions
diff --git a/dns/ares/Makefile b/dns/ares/Makefile
index a315d64c9890..7067ef268b88 100644
--- a/dns/ares/Makefile
+++ b/dns/ares/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES= http://curl.haxx.se/dev/ \
MAINTAINER= roam@FreeBSD.org
COMMENT= An asynchronous DNS resolver library
+CONFLICTS= c-ares-1.*
+
GNU_CONFIGURE= yes
MAN3= ares_destroy.3 ares_expand_name.3 ares_fds.3 \
diff --git a/dns/c-ares/Makefile b/dns/c-ares/Makefile
index 7cb87883f1ed..23b30c5432a9 100644
--- a/dns/c-ares/Makefile
+++ b/dns/c-ares/Makefile
@@ -13,6 +13,9 @@ MASTER_SITES= http://daniel.haxx.se/projects/c-ares/
MAINTAINER= roam@FreeBSD.org
COMMENT= An asynchronous DNS resolver library
+CONFLICTS= ares-1.*
+
+GNU_CONFIGURE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --mandir=${PREFIX}/man