From 8ba735a8c89883d9525efe808e07cd1b2b2b2862 Mon Sep 17 00:00:00 2001 From: Stephen Montgomery-Smith Date: Tue, 5 Jun 2012 15:58:21 +0000 Subject: [PATCH] - Add afni-[0-9]* to CONFLICTS. Submitted by: Sulev-Madis 'ketas' Silber --- math/qhull/Makefile | 2 +- math/qhull5/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/math/qhull/Makefile b/math/qhull/Makefile index 0a1823becc47..ca42e444105b 100644 --- a/math/qhull/Makefile +++ b/math/qhull/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAN1= qhull.1 rbox.1 -CONFLICTS= qhull-1.0* +CONFLICTS= qhull-1.0* afni-[0-9]* post-patch: .if !defined(NOPORTDOCS) diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile index 143ab921cde3..ac472e89f795 100644 --- a/math/qhull5/Makefile +++ b/math/qhull5/Makefile @@ -19,7 +19,7 @@ MAINTAINER= stephen@FreeBSD.org COMMENT= Qhull computes convex hulls, Delaunay triangulations and halfspaces LATEST_LINK= qhull5 -CONFLICTS= qhull-2011* +CONFLICTS= qhull-2011* afni-[0-9]* USE_AUTOTOOLS= libtool USE_GMAKE= yes