From owner-svn-ports-head@FreeBSD.ORG  Mon Aug  6 11:02:38 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB65110657FA;
	Mon,  6 Aug 2012 11:02:38 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D2878FC15;
	Mon,  6 Aug 2012 11:02:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q76B2c1J028383;
	Mon, 6 Aug 2012 11:02:38 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q76B2ccD028381;
	Mon, 6 Aug 2012 11:02:38 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201208061102.q76B2ccD028381@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Mon, 6 Aug 2012 11:02:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302161 - head/multimedia/ffmpeg
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2012 11:02:38 -0000

Author: mm
Date: Mon Aug  6 11:02:38 2012
New Revision: 302161
URL: http://svn.freebsd.org/changeset/ports/302161

Log:
  Make manpages independent of DOCS option
  Remove conflict with ffmpeg-devel

Modified:
  head/multimedia/ffmpeg/Makefile

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Mon Aug  6 10:46:49 2012	(r302160)
+++ head/multimedia/ffmpeg/Makefile	Mon Aug  6 11:02:38 2012	(r302161)
@@ -6,7 +6,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.13
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -15,9 +15,8 @@ MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
-		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-
-CONFLICTS=	ffmpeg-20*
+		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
+		${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
@@ -25,6 +24,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_SDL=	yes
+USE_PERL5_BUILD=	yes
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
 		FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
@@ -32,7 +32,7 @@ OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_
 		VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID
 
 OPTIONS_DEFAULT=	FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER THEORA \
-		VORBIS VPX X264 XVID
+			VORBIS VPX X264 XVID
 
 FFSERVER_DESC=	Build and install ffserver
 X11GRAB_DESC=	Enable x11 grabbing
@@ -64,18 +64,13 @@ COMPAT_HEADERS=libavcodec/avcodec.h \
 	libpostproc/postprocess.h \
 	libswscale/swscale.h
 
+MAN1+=		ffmpeg.1 ffprobe.1
+
 .include <bsd.port.options.mk>
 
 # PORTDOCS
-.if ${PORT_OPTIONS:MDOCS}
-USE_PERL5_BUILD=	yes
-BUILD_DEPENDS+=		${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
-MAN1+=		ffmpeg.1 ffprobe.1
 .if ${PORT_OPTIONS:MFFSERVER}
 MAN1+=		ffserver.1
-. endif
-.else
-CONFIGURE_ARGS+=	--disable-doc
 .endif
 
 # rtmp
@@ -289,9 +284,7 @@ CONFIGURE_ARGS+=	--disable-libschroeding
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
 PLIST_FILES+=	bin/ffplay
-.if ${PORT_OPTIONS:MDOCS}
 MAN1+=	ffplay.1
-.endif
 .else
 CONFIGURE_ARGS+=	--disable-ffplay
 .endif