From owner-svn-ports-all@FreeBSD.ORG  Mon Sep 30 22:24:05 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 AA7BBBDE;
 Mon, 30 Sep 2013 22:24:05 +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 972F329F3;
 Mon, 30 Sep 2013 22:24:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8UMO5fA077871;
 Mon, 30 Sep 2013 22:24:05 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8UMO5B7077861;
 Mon, 30 Sep 2013 22:24:05 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201309302224.r8UMO5B7077861@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Mon, 30 Sep 2013 22:24:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328882 - head/multimedia/ffmpeg1
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Sep 2013 22:24:05 -0000

Author: wg
Date: Mon Sep 30 22:24:04 2013
New Revision: 328882
URL: http://svnweb.freebsd.org/changeset/ports/328882

Log:
  multimedia/ffmpeg1: get rid of MAN1
  
  - Get rid of MAN1
  - Fix plist for FFSERVER option

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

Modified: head/multimedia/ffmpeg1/Makefile
==============================================================================
--- head/multimedia/ffmpeg1/Makefile	Mon Sep 30 22:11:00 2013	(r328881)
+++ head/multimedia/ffmpeg1/Makefile	Mon Sep 30 22:24:04 2013	(r328882)
@@ -183,7 +183,6 @@ FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 # ffserver
 .if ${PORT_OPTIONS:MFFSERVER}
 PLIST_SUB+=	FFSERVER=""
-MAN1+=		ffserver${FFMPEG_SUFFIX}.1
 FFPROGS+=	ffserver
 . if ${PORT_OPTIONS:MDOCS}
 DOC_DOCFILES+=	ffserver.html
@@ -264,9 +263,8 @@ SCHROEDINGER_CONFIGURE_ENABLE=	libschroe
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
-PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX}
+PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
 FFPROGS+=	ffplay
-MAN1+=	ffplay${FFMPEG_SUFFIX}.1
 .if ${PORT_OPTIONS:MDOCS}
 DOC_DOCFILES+=	ffplay.html
 .endif

Modified: head/multimedia/ffmpeg1/pkg-plist
==============================================================================
--- head/multimedia/ffmpeg1/pkg-plist	Mon Sep 30 22:11:00 2013	(r328881)
+++ head/multimedia/ffmpeg1/pkg-plist	Mon Sep 30 22:24:04 2013	(r328882)
@@ -127,7 +127,7 @@ libdata/pkgconfig/libswresample%%SUFF%%.
 libdata/pkgconfig/libswscale%%SUFF%%.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
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/README
 %%DATADIR%%/examples/decoding_encoding.c