From 7de06a2e7da61f5dcf7688eea26ca6c3811f5e89 Mon Sep 17 00:00:00 2001 From: kwm Date: Wed, 13 Jun 2012 09:31:14 +0000 Subject: 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 --- net-im/farsight2/Makefile | 8 +++++--- net-im/farstream/Makefile | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'net-im') 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 # # $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 diff --git a/net-im/farstream/Makefile b/net-im/farstream/Makefile index ece761a83..5d3400589 100644 --- a/net-im/farstream/Makefile +++ b/net-im/farstream/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom$ +# $MCom: ports/net-im/farstream/Makefile,v 1.1 2012/06/13 02:46:09 mezz Exp $ # PORTNAME= farstream @@ -16,6 +16,8 @@ COMMENT= Collection of GStreamer modules and libraries for videoconferencing LIB_DEPENDS= nice.10:${PORTSDIR}/net-im/libnice +CONFLICTS= farsight2-[0-9]* + FETCH_ARGS= -Fpr USE_GMAKE= yes USE_GETTEXT= yes @@ -24,7 +26,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 -- cgit v1.2.3