aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroam <roam@FreeBSD.org>2006-07-14 15:41:48 +0800
committerroam <roam@FreeBSD.org>2006-07-14 15:41:48 +0800
commitfc138adfd0621de44b1c0962caa43aafc576fcf0 (patch)
tree962255a08d878e994fab2587aea4829716772e54
parent6487f5dc74028262450f0803fb3411c04a8c5337 (diff)
downloadfreebsd-ports-gnome-fc138adfd0621de44b1c0962caa43aafc576fcf0.tar.gz
freebsd-ports-gnome-fc138adfd0621de44b1c0962caa43aafc576fcf0.tar.zst
freebsd-ports-gnome-fc138adfd0621de44b1c0962caa43aafc576fcf0.zip
Note that dns/ares and dns/c-ares are in conflict.
-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