diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-13 17:31:14 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-13 17:31:14 +0800 |
| commit | 7de06a2e7da61f5dcf7688eea26ca6c3811f5e89 (patch) | |
| tree | b7a08aa681ffda1f729098996ec39e4c03df3406 /net-im/farsight2 | |
| parent | e2afc3be2c8fe20aa471782187a1cbb4c15a0e48 (diff) | |
| download | marcuscom-ports-7de06a2e7da61f5dcf7688eea26ca6c3811f5e89.tar marcuscom-ports-7de06a2e7da61f5dcf7688eea26ca6c3811f5e89.tar.gz marcuscom-ports-7de06a2e7da61f5dcf7688eea26ca6c3811f5e89.tar.bz2 marcuscom-ports-7de06a2e7da61f5dcf7688eea26ca6c3811f5e89.tar.lz marcuscom-ports-7de06a2e7da61f5dcf7688eea26ca6c3811f5e89.tar.xz marcuscom-ports-7de06a2e7da61f5dcf7688eea26ca6c3811f5e89.tar.zst marcuscom-ports-7de06a2e7da61f5dcf7688eea26ca6c3811f5e89.zip | |
Register conflict between these two ports. gstreamer plugins conflict.
While here fix a portlint issue.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16901 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net-im/farsight2')
| -rw-r--r-- | net-im/farsight2/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index 959f45a6a..652e9c6a4 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/farsight2/Makefile,v 1.8 2011/11/22 11:40:55 kwm Exp $ +# $MCom: ports/net-im/farsight2/Makefile,v 1.9 2011/11/23 10:11:16 kwm Exp $ PORTNAME= farsight2 PORTVERSION= 0.0.31 @@ -15,6 +15,8 @@ COMMENT= Collection of GStreamer modules and libraries for videoconferencing LIB_DEPENDS= nice.10:${PORTSDIR}/net-im/libnice +CONFLICTS= farstream-[0-9]* + FETCH_ARGS= -Fpr USE_GMAKE= yes USE_GETTEXT= yes @@ -23,7 +25,7 @@ USE_PYTHON= yes USE_GNOME= gnomehack pkgconfig glib20 ltverhack USE_GSTREAMER= core good bad python USE_AUTOTOOLS= libtool -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> |