diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2011-01-04 11:56:56 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2011-01-04 11:56:56 +0000 |
| commit | c191bf75cd15b75fa886e296cac52cf007dc87d0 (patch) | |
| tree | 8b7d0ca69bc5c7b40c83aa3a4e8522702f3bebe4 /multimedia | |
| parent | Bump memory constants in texmf.cnf to suit recent machines with large memory. (diff) | |
Remove conflicted files with rtmpdump and a CONFLICTS line. The
flvstreamer can coexist with rtmpdump now.
Pointed out by: Jan Henrik Sylvester
Notes
Notes:
svn path=/head/; revision=267374
Diffstat (limited to 'multimedia')
| -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: |