aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2010-05-11 05:10:00 +0800
committerkwm <kwm@FreeBSD.org>2010-05-11 05:10:00 +0800
commit0e415a93a0424a4b284c88c39b19d93d80b66c8a (patch)
treee8fb5678072698938d003717d93cfc134b5593be /net
parent03fef30dc97d3d990de6db6f3115d823df278e7e (diff)
downloadfreebsd-ports-gnome-0e415a93a0424a4b284c88c39b19d93d80b66c8a.tar.gz
freebsd-ports-gnome-0e415a93a0424a4b284c88c39b19d93d80b66c8a.tar.zst
freebsd-ports-gnome-0e415a93a0424a4b284c88c39b19d93d80b66c8a.zip
Register conflict between opal and opal3.
Diffstat (limited to 'net')
-rw-r--r--net/opal/Makefile2
-rw-r--r--net/opal3/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/net/opal/Makefile b/net/opal/Makefile
index e18a7d037cce..1ebd2bfa5a33 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -19,6 +19,8 @@ OPTIONS= FFMPEG "Support H263 audio/video codec" on \
LIB_DEPENDS= pt_r:${PORTSDIR}/devel/pwlib
+CONFLICTS= opal-3.*
+
# In opal's Makefile the default make's target is optshared
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` optshared
USE_GMAKE= yes
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 0e73edc0b3a7..52d2558d1088 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -17,6 +17,8 @@ COMMENT= VoIP abstraction library
LIB_DEPENDS= pt-2.6.[4-9]:${PORTSDIR}/devel/ptlib26
+CONFLICTS= opal-2.*
+
WRKSRC= ${WRKDIR}/opal-${PORTVERSION}
USE_BZIP2= yes