svn commit: r330032 - head/multimedia/ffmpeg0

[William Grzybowski]

Author: wg
Date: Thu Oct 10 20:12:31 2013
New Revision: 330032
URL: http://svnweb.freebsd.org/changeset/ports/330032

Log:
  multimedia/ffmpeg0: fix FFSERVER option
  
  - Fix pkg-plist without FFSERVER
  
  Reported by:	izen mail.ru

Modified:
  head/multimedia/ffmpeg0/Makefile
  head/multimedia/ffmpeg0/pkg-plist

Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile	Thu Oct 10 20:02:42 2013	(r330031)
+++ head/multimedia/ffmpeg0/Makefile	Thu Oct 10 20:12:31 2013	(r330032)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.15
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/

Modified: head/multimedia/ffmpeg0/pkg-plist
==============================================================================
--- head/multimedia/ffmpeg0/pkg-plist	Thu Oct 10 20:02:42 2013	(r330031)
+++ head/multimedia/ffmpeg0/pkg-plist	Thu Oct 10 20:12:31 2013	(r330032)
@@ -4,7 +4,7 @@ bin/ffprobe%%SUFF%%
 %%FFSERVER%%@unexec if cmp -s %D/etc/ffserver%%SUFF%%.conf %D/etc/ffserver%%SUFF%%.conf-dist; then rm -f %D/etc/ffserver%%SUFF%%.conf; fi
 %%FFSERVER%%etc/ffserver%%SUFF%%.conf-dist
 %%FFSERVER%%@exec [ -f %B/ffserver%%SUFF%%.conf ] || cp %B/%f %B/ffserver%%SUFF%%.conf
-etc/rc.d/ffserver%%SUFF%%
+%%FFSERVER%%etc/rc.d/ffserver%%SUFF%%
 include/ffmpeg%%SUFF%%/libavcodec/avcodec.h
 include/ffmpeg%%SUFF%%/libavcodec/avfft.h
 include/ffmpeg%%SUFF%%/libavcodec/dxva2.h
@@ -97,7 +97,7 @@ libdata/pkgconfig/libpostproc0.pc
 libdata/pkgconfig/libswscale0.pc
 man/man1/ffmpeg%%SUFF%%.1.gz
 man/man1/ffprobe%%SUFF%%.1.gz
-man/man1/ffserver%%SUFF%%.1.gz
+%%FFSERVER%%man/man1/ffserver%%SUFF%%.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/APIchanges
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -114,7 +114,7 @@ man/man1/ffserver%%SUFF%%.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/fate.txt
 %%PORTDOCS%%%%DOCSDIR%%/ffmpeg.html
 %%PORTDOCS%%%%DOCSDIR%%/ffprobe.html
-%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
+%%FFSERVER%%%%PORTDOCS%%%%DOCSDIR%%/ffserver.html
 %%PORTDOCS%%%%DOCSDIR%%/general.html
 %%PORTDOCS%%%%DOCSDIR%%/git-howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/issue_tracker.txt