diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-05-10 21:10:00 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-05-10 21:10:00 +0000 |
| commit | fbdf96410f8e803568c33397323dd9d8d3af995f (patch) | |
| tree | 27bbfdde999f3c290bdf5dcff924431220d9c006 /net | |
| parent | Register conflicts between pwlib ptlib and ptlib26. (diff) | |
Register conflict between opal and opal3.
Diffstat (limited to 'net')
| -rw-r--r-- | net/opal/Makefile | 2 | ||||
| -rw-r--r-- | net/opal3/Makefile | 2 |
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 |