From owner-svn-ports-all@FreeBSD.ORG Thu Oct 10 20:12:32 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 35397ED; Thu, 10 Oct 2013 20:12:32 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 08921299A; Thu, 10 Oct 2013 20:12:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AKCVFS044148; Thu, 10 Oct 2013 20:12:31 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AKCVN6044143; Thu, 10 Oct 2013 20:12:31 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310102012.r9AKCVN6044143@svn.freebsd.org> From: William Grzybowski Date: Thu, 10 Oct 2013 20:12:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330032 - head/multimedia/ffmpeg0 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 20:12:32 -0000 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