aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2004-07-13 20:21:35 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2004-07-13 20:21:35 +0000
commit1c6d47cc7c1f9959cc03daabc990a434921099f1 (patch)
treefe61c028687d5d3fa4885e6d8f4e015769b3f349
parent29cce3da56880ed2ada079c7039741518cd2231b (diff)
Add CONFLICTS - both pkg-plist files containes bin/ltrace.
Notes
Notes: svn path=/head/; revision=113583
-rw-r--r--benchmarks/polygraph/Makefile2
-rw-r--r--benchmarks/polygraph31/Makefile2
-rw-r--r--sysutils/ltrace/Makefile2
3 files changed, 6 insertions, 0 deletions
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 881458b5ca5c..2eb7c1a8ea46 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -21,4 +21,6 @@ GNU_CONFIGURE= YES
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+CONFLICTS= ltrace-0*
+
.include <bsd.port.mk>
diff --git a/benchmarks/polygraph31/Makefile b/benchmarks/polygraph31/Makefile
index 881458b5ca5c..2eb7c1a8ea46 100644
--- a/benchmarks/polygraph31/Makefile
+++ b/benchmarks/polygraph31/Makefile
@@ -21,4 +21,6 @@ GNU_CONFIGURE= YES
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+CONFLICTS= ltrace-0*
+
.include <bsd.port.mk>
diff --git a/sysutils/ltrace/Makefile b/sysutils/ltrace/Makefile
index 27f819c4b845..c364281b16b1 100644
--- a/sysutils/ltrace/Makefile
+++ b/sysutils/ltrace/Makefile
@@ -25,6 +25,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
PLIST_FILES= bin/ltrace etc/ltrace.conf
+CONFLICTS= polygraph-2*
+
MAN1= ltrace.1
post-patch: