From c191bf75cd15b75fa886e296cac52cf007dc87d0 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 4 Jan 2011 11:56:56 +0000
Subject: [PATCH] Remove conflicted files with rtmpdump and a CONFLICTS line. 
 The flvstreamer can coexist with rtmpdump now.

Pointed out by:	Jan Henrik Sylvester
---
 multimedia/flvstreamer/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multimedia/flvstreamer/Makefile b/multimedia/flvstreamer/Makefile
index 3c0ca910ac4e..8796e0ba82c5 100644
--- a/multimedia/flvstreamer/Makefile
+++ b/multimedia/flvstreamer/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	flvstreamer
 PORTVERSION=	2.1.c.1
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	${PORTNAME}/source
@@ -14,12 +15,11 @@ DISTNAME=	${PORTNAME}-2.1c1
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	An open source command-line RTMP client
 
-CONFLICTS=	rtmpdump-[0-9]*
 USE_GMAKE=	yes
 ALL_TARGET=	posix
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	bin/flvstreamer bin/streams bin/rtmpsrv bin/rtmpsuck
+PLIST_FILES=	bin/flvstreamer bin/streams
 PORTDOCS=	ChangeLog ChangeLog.rtmpdump README
 
 do-install: