From owner-svn-ports-head@FreeBSD.ORG Tue Aug 21 08:27:02 2012 Return-Path: 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 8828D106564A; Tue, 21 Aug 2012 08:27:02 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 67F8A8FC0A; Tue, 21 Aug 2012 08:27:02 +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 q7L8R2ED095463; Tue, 21 Aug 2012 08:27:02 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7L8R2i3095459; Tue, 21 Aug 2012 08:27:02 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201208210827.q7L8R2i3095459@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 21 Aug 2012 08:27:02 +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: r302848 - head/multimedia/handbrake 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Aug 2012 08:27:02 -0000 Author: danfe Date: Tue Aug 21 08:27:01 2012 New Revision: 302848 URL: http://svn.freebsd.org/changeset/ports/302848 Log: Sanitize Makefile formatting (and, to a less extent, port description). Modified: head/multimedia/handbrake/Makefile head/multimedia/handbrake/pkg-descr Modified: head/multimedia/handbrake/Makefile ============================================================================== --- head/multimedia/handbrake/Makefile Tue Aug 21 06:00:31 2012 (r302847) +++ head/multimedia/handbrake/Makefile Tue Aug 21 08:27:01 2012 (r302848) @@ -1,37 +1,37 @@ -# New ports collection makefile for: handbrake -# Date created: 19 November 2004 -# Whom: Andrew Thompson +# New ports collection makefile for: HandBrake +# Date created: 19 November 2004 +# Whom: Andrew Thompson # # $FreeBSD$ # -PORTNAME= handbrake +PORTNAME= handbrake PORTVERSION= 0.9.3 PORTREVISION= 1 -CATEGORIES= multimedia -MASTER_SITES= LOCAL/beech/handbrake/:main \ - LOCAL/beech/handbrake/:contrib -DISTFILES= HandBrake-${PORTVERSION}.tar.gz:main \ - a52dec-0.7.4.tar.gz:contrib \ - faad2-2.6.1.tar.gz:contrib \ - ffmpeg-r15462.tar.gz:contrib \ - libdca-r81-strapped.tar.gz:contrib \ - libdvdread-0.9.7.tar.gz:contrib \ - faac-1.26.tar.gz:contrib \ - lame-3.98.tar.gz:contrib \ - libmp4v2-r45.tar.gz:contrib \ - libmkv-0.6.3.tar.gz:contrib \ - mpeg2dec-0.5.1.tar.gz:contrib \ - libogg-1.1.3.tar.gz:contrib \ - libsamplerate-0.1.4.tar.gz:contrib \ - libvorbis-aotuv_b5.tar.gz:contrib \ - libtheora-1.0.tar.gz:contrib \ - x264-r1028-83baa7f.tar.gz:contrib \ - xvidcore-1.1.3.tar.gz:contrib +CATEGORIES= multimedia +MASTER_SITES= LOCAL/beech/handbrake/:main \ + LOCAL/beech/handbrake/:contrib +DISTFILES= HandBrake-${PORTVERSION}.tar.gz:main \ + a52dec-0.7.4.tar.gz:contrib \ + faad2-2.6.1.tar.gz:contrib \ + ffmpeg-r15462.tar.gz:contrib \ + libdca-r81-strapped.tar.gz:contrib \ + libdvdread-0.9.7.tar.gz:contrib \ + faac-1.26.tar.gz:contrib \ + lame-3.98.tar.gz:contrib \ + libmp4v2-r45.tar.gz:contrib \ + libmkv-0.6.3.tar.gz:contrib \ + mpeg2dec-0.5.1.tar.gz:contrib \ + libogg-1.1.3.tar.gz:contrib \ + libsamplerate-0.1.4.tar.gz:contrib \ + libvorbis-aotuv_b5.tar.gz:contrib \ + libtheora-1.0.tar.gz:contrib \ + x264-r1028-83baa7f.tar.gz:contrib \ + xvidcore-1.1.3.tar.gz:contrib DIST_SUBDIR= handbrake -MAINTAINER= ports@FreeBSD.org -COMMENT= A DVD to MPEG-4 ripper and encoder +MAINTAINER= ports@FreeBSD.org +COMMENT= Open-source, multiplatform, multithreaded video transcoder BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 @@ -43,7 +43,7 @@ USE_AUTOTOOLS= libtool aclocal LIBTOOLFILES= configure -WRKSRC= ${WRKDIR}/HandBrake-0.9.3 +WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} PLIST_FILES= bin/handbrake ONLY_FOR_ARCHS= i386 @@ -53,8 +53,8 @@ APPLY?= /usr/bin/apply .include -# nasm/yasm needed by x264 -.if ${ARCH}=="i386" +# nasm/yasm is needed for x264 +.if ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .else BUILD_DEPENDS+= yasm>=0.6.0:${PORTSDIR}/devel/yasm @@ -99,24 +99,19 @@ post-patch: ${WRKSRC}/contrib/Jamfile # Following multimedia/x264 replace X86 with i386 and X86_64 with amd64 # This appears to be an issue only when building within the ports system - @${REINPLACE_CMD} -E \ - -e 's|,X86)|,i386)|g' \ - -e 's|,X86_64)|,amd64)|g' \ + @${REINPLACE_CMD} -E 's|,X86)|,i386)|g ; s|,X86_64)|,amd64)|g' \ ${WRKSRC}/contrib/x264/Makefile # The following patch fixes CPU count detection - @${REINPLACE_CMD} -E \ - -e 's|/usr/sbin/sysctl|/sbin/sysctl|g' \ + @${REINPLACE_CMD} -E 's|/usr/sbin/sysctl|/sbin/sysctl|g' \ ${WRKSRC}/libhb/ports.c # Set release version so we don't depend on subversion - @${REINPLACE_CMD} -E \ - -e 's|`svnversion`|0.9.3_freebsd-ports|g' \ + @${REINPLACE_CMD} -E 's|`svnversion`|0.9.3_freebsd-ports|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -E \ - -e 's|\$$\(HB_VERSION\)|0.9.3_freebsd-ports|g' \ + @${REINPLACE_CMD} -E 's|\$$\(HB_VERSION\)|0.9.3_freebsd-ports|g' \ ${WRKSRC}/Makefile do-build: - @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${JAM} -q) + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${JAM} -q) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/HandBrakeCLI ${PREFIX}/bin/handbrake Modified: head/multimedia/handbrake/pkg-descr ============================================================================== --- head/multimedia/handbrake/pkg-descr Tue Aug 21 06:00:31 2012 (r302847) +++ head/multimedia/handbrake/pkg-descr Tue Aug 21 08:27:01 2012 (r302848) @@ -1,21 +1,21 @@ HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video -transcoder, available for MacOS X, Linux and Windows (...and FreeBSD). +transcoder with rich selection of features. Supported sources: * Any DVD-like source: VIDEO_TS folder, DVD image or real DVD - (unencrypted--protection methods including CSS are not supported internally - and must be handled externally with third-party software and libraries), and - some .VOB and .TS files - * Most any multimedia file it can get libavformat to - read and libavcodec to decode. + (unencrypted: protection methods including CSS are not supported + internally and must be handled externally with third-party software + and libraries), and some .VOB and .TS files + * Most any multimedia file it can get libavformat to read and + libavcodec to decode. Outputs: - * File format: MP4, MKV, AVI or OGM - * Video: MPEG-4, H.264, or Theora (1 or 2 passes or constant quantizer/rate - encoding) - * Audio: AAC, MP3, Vorbis or AC-3 pass-through (supports encoding of several - audio tracks) + * File format: MP4, MKV, AVI, or OGM + * Video: MPEG-4, H.264, or Theora (1 or 2 passes or constant + quantizer/rate encoding) + * Audio: AAC, MP3, Vorbis or AC-3 pass-through (supports encoding + of several audio tracks) WWW: http://handbrake.fr/