diff options
| author | hrs <hrs@FreeBSD.org> | 2011-01-04 19:56:56 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2011-01-04 19:56:56 +0800 |
| commit | bacd8124d33c2390be3fa97fbd3280b26b05be17 (patch) | |
| tree | 3fd4fa4b4511a1d17f2c5686bf406adb0617dd64 | |
| parent | e93190784b04d87224c03b67ce5c0b6947444f62 (diff) | |
| download | freebsd-ports-gnome-bacd8124d33c2390be3fa97fbd3280b26b05be17.tar.gz freebsd-ports-gnome-bacd8124d33c2390be3fa97fbd3280b26b05be17.tar.zst freebsd-ports-gnome-bacd8124d33c2390be3fa97fbd3280b26b05be17.zip | |
Remove conflicted files with rtmpdump and a CONFLICTS line. The
flvstreamer can coexist with rtmpdump now.
Pointed out by: Jan Henrik Sylvester
| -rw-r--r-- | multimedia/flvstreamer/Makefile | 4 |
1 files 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: |