From owner-svn-ports-all@FreeBSD.ORG Mon Sep 30 22:11:01 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 B3A619ED; Mon, 30 Sep 2013 22:11:01 +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 A09E6297D; Mon, 30 Sep 2013 22:11:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8UMB1V5071593; Mon, 30 Sep 2013 22:11:01 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8UMB1fR071591; Mon, 30 Sep 2013 22:11:01 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201309302211.r8UMB1fR071591@svn.freebsd.org> From: William Grzybowski Date: Mon, 30 Sep 2013 22:11:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328881 - head/multimedia/ffmpeg 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: Mon, 30 Sep 2013 22:11:01 -0000 Author: wg Date: Mon Sep 30 22:11:00 2013 New Revision: 328881 URL: http://svnweb.freebsd.org/changeset/ports/328881 Log: multimedia/ffmpeg: allow staging - Allow staging - Reorder to pet portlint Modified: head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg/pkg-plist Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Mon Sep 30 22:03:41 2013 (r328880) +++ head/multimedia/ffmpeg/Makefile Mon Sep 30 22:11:00 2013 (r328881) @@ -3,16 +3,14 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.15 -PORTEPOCH= 1 PORTREVISION= 1 +PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= wg@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server -CONFLICTS= libav-[0-9]* - LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 @@ -22,6 +20,9 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/ya ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ ${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html +CONFLICTS= libav-[0-9]* +PORTSCOUT= limit:^0\..* + HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USES= gmake perl5 pkgconfig @@ -67,16 +68,8 @@ COMPAT_HEADERS=libavcodec/avcodec.h \ libpostproc/postprocess.h \ libswscale/swscale.h -MAN1+= ffmpeg.1 ffprobe.1 - -NO_STAGE= yes .include -# PORTDOCS -.if ${PORT_OPTIONS:MFFSERVER} -MAN1+= ffserver.1 -.endif - # rtmp .if ${PORT_OPTIONS:MRTMP} USE_OPENSSL= yes @@ -287,8 +280,7 @@ CONFIGURE_ARGS+= --disable-libschroeding # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl -PLIST_FILES+= bin/ffplay -MAN1+= ffplay.1 +PLIST_FILES+= bin/ffplay man/man1/ffplay.1.gz .else CONFIGURE_ARGS+= --disable-ffplay .endif @@ -384,7 +376,7 @@ CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) -LICENSE= GPLv3 LGPL3 +LICENSE+= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 @@ -392,7 +384,7 @@ CONFIGURE_ARGS+= --enable-version3 post-patch: # {C,LD}FLAGS safeness - @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/subdir.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \ ${WRKSRC}/ffserver.c @@ -425,26 +417,21 @@ post-configure: post-install: .if ${PORT_OPTIONS:MFFSERVER} - ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist - if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \ - fi + ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${STAGEDIR}${PREFIX}/etc/ffserver.conf-dist .endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STGAEDIR}${DOCSDIR} .endfor .for FILE in ${DOC_DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -.endif - ${MKDIR} ${PREFIX}/include/ffmpeg + @${MKDIR} ${STAGEDIR}${PREFIX}/include/ffmpeg .for FILE in ${COMPAT_HEADERS} - ${LN} -sf ../${FILE} ${PREFIX}/include/ffmpeg/${FILE:C,^[^/]+/([^/]+).*,\1,} + ${LN} -sf ../${FILE} ${STAGEDIR}${PREFIX}/include/ffmpeg/${FILE:C,^[^/]+/([^/]+).*,\1,} .endfor - ${MKDIR} ${PREFIX}/include/postproc + @${MKDIR} ${STAGEDIR}${PREFIX}/include/postproc ${LN} -sf ../libpostproc/postprocess.h \ - ${PREFIX}/include/postproc/postprocess.h + ${STAGEDIR}${PREFIX}/include/postproc/postprocess.h .include Modified: head/multimedia/ffmpeg/pkg-plist ============================================================================== --- head/multimedia/ffmpeg/pkg-plist Mon Sep 30 22:03:41 2013 (r328880) +++ head/multimedia/ffmpeg/pkg-plist Mon Sep 30 22:11:00 2013 (r328881) @@ -121,6 +121,9 @@ libdata/pkgconfig/libavformat.pc libdata/pkgconfig/libavutil.pc libdata/pkgconfig/libpostproc.pc libdata/pkgconfig/libswscale.pc +man/man1/ffmpeg.1.gz +man/man1/ffprobe.1.gz +%%FFSERVER%%man/man1/ffserver.1.gz %%DATADIR%%/libvpx-360p.ffpreset %%DATADIR%%/libvpx-720p.ffpreset %%DATADIR%%/libvpx-720p50_60.ffpreset @@ -135,7 +138,7 @@ libdata/pkgconfig/libswscale.pc %%DATADIR%%/libx264-lossless_slow.ffpreset %%DATADIR%%/libx264-lossless_slower.ffpreset %%DATADIR%%/libx264-lossless_ultrafast.ffpreset -@dirrm %%DATADIR%%/ +@dirrm %%DATADIR%% @dirrm include/postproc @dirrm include/libswscale @dirrm include/libpostproc