From b71656f19ee1cc0502404ab799daf8a838f64ea6 Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Thu, 10 Oct 2013 20:12:31 +0000 Subject: [PATCH] multimedia/ffmpeg0: fix FFSERVER option - Fix pkg-plist without FFSERVER Reported by: izen mail.ru --- multimedia/ffmpeg0/Makefile | 2 +- multimedia/ffmpeg0/pkg-plist | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index f7d88d43892f..cdbfe76824b0 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -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/ diff --git a/multimedia/ffmpeg0/pkg-plist b/multimedia/ffmpeg0/pkg-plist index 4a98fbe4e5bd..162a5f0c282f 100644 --- a/multimedia/ffmpeg0/pkg-plist +++ b/multimedia/ffmpeg0/pkg-plist @@ -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