From nobody@FreeBSD.org  Thu Jul 12 09:28:36 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1466F1065670
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Jul 2012 09:28:36 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id F29E88FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Jul 2012 09:28:35 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6C9SZ6v024197
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 12 Jul 2012 09:28:35 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q6C9SZYD024196;
	Thu, 12 Jul 2012 09:28:35 GMT
	(envelope-from nobody)
Message-Id: <201207120928.q6C9SZYD024196@red.freebsd.org>
Date: Thu, 12 Jul 2012 09:28:35 GMT
From: Damjan Marion <dmarion@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: update multimedia/handbrake to 0.9.6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         169799
>Category:       ports
>Synopsis:       update multimedia/handbrake to 0.9.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danfe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 12 09:30:03 UTC 2012
>Closed-Date:    Thu Aug 23 14:02:24 UTC 2012
>Last-Modified:  Thu Aug 23 14:02:24 UTC 2012
>Originator:     Damjan Marion
>Release:        9.0
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	.
#	./files
#	./files/patch-contrib__ffmpeg__module.defs
#	./files/patch-contrib__freetype__module.defs
#	./files/patch-make__include__contrib.defs
#	./files/patch-test__module.defs
#	./files/patch-libhb__module.defs
#	./files/patch-contrib__libass__module.defs
#	./files/patch-make__include__select.defs
#	./files/patch-build__contrib__x264__x264__configure
#	./files/patch-build__contrib__x264__x264__common__cpu.c
#	./files/patch-make__configure.py
#	./files/patch-contrib__fontconfig__module.defs
#	./pkg-descr
#	./distinfo
#	./Makefile
#
echo c - .
mkdir -p . > /dev/null 2>&1
echo c - ./files
mkdir -p ./files > /dev/null 2>&1
echo x - ./files/patch-contrib__ffmpeg__module.defs
sed 's/^X//' >./files/patch-contrib__ffmpeg__module.defs << '96e150076b96e7df30262dd9c072ae0c'
X--- ./contrib/ffmpeg/module.defs.orig	2010-11-10 11:51:35.000000000 -0500
X+++ ./contrib/ffmpeg/module.defs	2011-05-24 05:51:19.600807346 -0400
X@@ -43,6 +43,8 @@
X         --arch=i386 \
X         --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
X     FFMPEG.GCC.args.extra += -fno-common
X+else ifeq (freebsd,$(BUILD.system))
X+    FFMPEG.CONFIGURE.extra += --enable-pthreads --disable-devices
X else
X     FFMPEG.CONFIGURE.extra += --enable-pthreads
X endif
96e150076b96e7df30262dd9c072ae0c
echo x - ./files/patch-contrib__freetype__module.defs
sed 's/^X//' >./files/patch-contrib__freetype__module.defs << '3d66f82c79e92c180bb0af72d831356d'
X--- ./contrib/freetype/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
X+++ ./contrib/freetype/module.defs	2011-05-24 05:50:46.062809316 -0400
X@@ -3,3 +3,5 @@
X 
X FREETYPE.FETCH.url = http://download.m0k.org/handbrake/contrib/freetype-2.3.9.tar.gz
X FREETYPE.EXTRACT.tarbase = freetype-2.3.9
X+FREETYPE.CONFIGURE.env.GNUMAKE = GNUMAKE="gmake"
X+FREETYPE.CONFIGURE.env.args += !GNUMAKE
3d66f82c79e92c180bb0af72d831356d
echo x - ./files/patch-make__include__contrib.defs
sed 's/^X//' >./files/patch-make__include__contrib.defs << 'fcd903360bb04186d329ca4cd5b9a72e'
X--- ./make/include/contrib.defs.orig	2010-04-25 17:15:43.000000000 -0400
X+++ ./make/include/contrib.defs	2011-05-24 05:50:46.071806770 -0400
X@@ -28,7 +28,7 @@
X     $(1).FETCH.url    = FETCH_IS_UNDEFINED
X     $(1).FETCH.target = $$($(1).FETCH.tar)
X     define $(1).FETCH
X-        $$(call FETCH,$$@,$$($(1).FETCH.url))
X+#        $$(call FETCH,$$@,$$($(1).FETCH.url))
X     endef
X 
X     ##
X@@ -38,8 +38,8 @@
X     $(1).EXTRACT.dir/    = $$($(1).build/)$$($(1).EXTRACT.tarbase)/
X     $(1).EXTRACT.target  = $$($(1).build/).stamp.extract
X     define $(1).EXTRACT
X-        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)
X-        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)
X+#        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)
X+#        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)
X         $$(TOUCH.exe) $$@
X     endef
X 
fcd903360bb04186d329ca4cd5b9a72e
echo x - ./files/patch-test__module.defs
sed 's/^X//' >./files/patch-test__module.defs << 'd0bfd11c7e568499c1b9096057617be0'
X--- ./test/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
X+++ ./test/module.defs	2011-05-24 05:50:46.097808812 -0400
X@@ -10,8 +10,8 @@
X TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
X 
X TEST.libs = $(LIBHB.a) $(foreach n, \
X-        a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
X-        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
X+        a52 ass avformat avcodec avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
X+        samplerate swscale theora vorbis vorbisenc ogg x264 xml2 bluray, \
X         $(CONTRIB.build/)lib/lib$(n).a )
X 
X TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
X@@ -50,6 +50,9 @@
X     TEST.GCC.l += iconv
X else ifeq ($(BUILD.system),linux)
X     TEST.GCC.l += pthread dl m
X+else ifeq ($(BUILD.system),freebsd)
X+	TEST.GCC.l += pthread iconv
X+	TEST.GCC.L += /usr/local/lib
X else ifeq ($(BUILD.system),solaris)
X     TEST.GCC.l += pthread nsl socket
X else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
d0bfd11c7e568499c1b9096057617be0
echo x - ./files/patch-libhb__module.defs
sed 's/^X//' >./files/patch-libhb__module.defs << 'caca008fca321be1878b4ad946c71c0d'
X--- ./libhb/module.defs.orig	2010-10-23 13:21:56.000000000 -0400
X+++ ./libhb/module.defs	2011-05-24 05:50:46.097808812 -0400
X@@ -47,6 +47,9 @@
X     LIBHB.c += $(wildcard $(LIBHB.src/)platform/macosx/*.c)
X else ifeq ($(BUILD.system),linux)
X     LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
X+else ifeq ($(BUILD.system),freebsd)
X+    LIBHB.GCC.D += SYS_FREEBSD
X+    LIBHB.GCC.I += /usr/local/include
X else ifeq ($(BUILD.system),mingw)
X     LIBHB.GCC.D += SYS_MINGW PTW32_STATIC_LIB
X 	LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import -static
caca008fca321be1878b4ad946c71c0d
echo x - ./files/patch-contrib__libass__module.defs
sed 's/^X//' >./files/patch-contrib__libass__module.defs << 'a6d6c0912420c4b975093a733c4b8fe5'
X--- ./contrib/libass/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
X+++ ./contrib/libass/module.defs	2011-05-24 05:50:46.096807667 -0400
X@@ -10,6 +10,6 @@
X LIBASS.CONFIGURE.extra = \
X     --disable-png --disable-enca \
X     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
X-    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
X+    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2 -I/usr/local/include" \
X     FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
X     FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
a6d6c0912420c4b975093a733c4b8fe5
echo x - ./files/patch-make__include__select.defs
sed 's/^X//' >./files/patch-make__include__select.defs << '2bb194d11c582e4b12cee19dbae139f8'
X--- ./make/include/select.defs.orig	2009-03-01 12:28:24.000000000 -0500
X+++ ./make/include/select.defs	2011-05-24 05:50:46.073808851 -0400
X@@ -7,6 +7,6 @@
X FETCH = $(FETCH.$(FETCH.select))
X 
X FETCH.select  = MISSING
X-FETCH.MISSING = $(error one of the following tools is required: wget, curl)
X+##FETCH.MISSING = $(error one of the following tools is required: wget, curl)
X FETCH.curl    = $(CURL.exe) -q -L -o $(1) $(2)
X FETCH.wget    = $(WGET.exe) -O $(1) $(2)
2bb194d11c582e4b12cee19dbae139f8
echo x - ./files/patch-build__contrib__x264__x264__configure
sed 's/^X//' >./files/patch-build__contrib__x264__x264__configure << 'c6832160db68578eb2d4ba1a6804cddd'
X--- ./build/contrib/x264/x264/configure.orig	2010-12-14 15:00:07.000000000 -0500
X+++ ./build/contrib/x264/x264/configure	2011-05-24 05:50:46.083820790 -0400
X@@ -1,4 +1,4 @@
X-#!/bin/bash
X+#!/bin/sh
X 
X if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
X 
X@@ -496,11 +496,15 @@
X         AS="yasm"
X         ASFLAGS="$ASFLAGS -O2"
X         if [ $compiler = GNU ]; then
X-            if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
X-                CFLAGS="$CFLAGS -march=i686"
X-            fi
X-            if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
X-                CFLAGS="$CFLAGS -mfpmath=sse -msse"
X+            if [ "$asm" = yes ]; then
X+                case "$CFLAGS" in
X+                    *-march*) ;;
X+                    *) CFLAGS="$CFLAGS -march=i686" ;;
X+                esac
X+                case "$CFLAGS" in
X+                    *-mfpmath*) ;;
X+                    *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;;
X+                esac
X             fi
X         else
X             # icc on linux has various degrees of mod16 stack support
X@@ -369,7 +373,7 @@
X             ASFLAGS="$ASFLAGS -f elf"
X         fi
X         ;;
X-    x86_64)
X+    x86_64|amd64)
X         ARCH="X86_64"
X         AS="yasm"
X         if [ "$SYS" = MACOSX ]; then
c6832160db68578eb2d4ba1a6804cddd
echo x - ./files/patch-build__contrib__x264__x264__common__cpu.c
sed 's/^X//' >./files/patch-build__contrib__x264__x264__common__cpu.c << '674035d9544b04a777d7dd08dbd4054d'
X--- ./build/contrib/x264/x264/common/cpu.c.orig	2010-12-14 15:00:07.000000000 -0500
X+++ ./build/contrib/x264/x264/common/cpu.c	2011-05-24 05:50:46.053810885 -0400
X@@ -237,7 +237,7 @@
X 
X #elif ARCH_PPC
X 
X-#if SYS_MACOSX || SYS_OPENBSD
X+#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
X #include <sys/sysctl.h>
X uint32_t x264_cpu_detect( void )
X {
X@@ -245,12 +245,16 @@
X     uint32_t cpu = 0;
X #if SYS_OPENBSD
X     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
X-#else
X+#elif SYS_MACOSX
X     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
X #endif
X     int      has_altivec = 0;
X     size_t   length = sizeof( has_altivec );
X+#if SYS_MACOSX || SYS_OPENBSD
X     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
X+#else
X+    int      error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 );
X+#endif
X 
X     if( error == 0 && has_altivec != 0 )
X         cpu |= X264_CPU_ALTIVEC;
674035d9544b04a777d7dd08dbd4054d
echo x - ./files/patch-make__configure.py
sed 's/^X//' >./files/patch-make__configure.py << 'b87551e4ac0b83bf8f903daf4c3326a0'
X--- ./make/configure.py.orig	2011-01-03 15:32:27.000000000 -0500
X+++ ./make/configure.py	2011-05-24 05:50:46.069810487 -0400
X@@ -1249,7 +1249,7 @@
X         xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
X         lipo       = ToolProbe( 'LIPO.exe',       'lipo', abort=False )
X 
X-        fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl] )
X+        #fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl] )
X 
X     ## run tool probes
X     for tool in ToolProbe.tools:
X@@ -1512,16 +1512,16 @@
X         asm = ''
X         if build.match( 'i?86-*' ):
X             asm = 'x86'
X-            doc.add( 'LIBHB.GCC.D', 'HAVE_MMX', append=True )
X+            #doc.add( 'LIBHB.GCC.D', 'HAVE_MMX', append=True )
X             doc.add( 'LIBHB.YASM.D', 'ARCH_X86', append=True )
X             if build.match( '*-*-darwin*' ):
X                 doc.add( 'LIBHB.YASM.f', 'macho32' )
X             else:
X                 doc.add( 'LIBHB.YASM.f', 'elf32' )
X             doc.add( 'LIBHB.YASM.m', 'x86' )
X-        elif build.match( 'x86_64-*' ):
X+        elif build.match( 'amd64-*' ):
X             asm = 'x86'
X-            doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True )
X+            #doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True )
X             if build.match( '*-*-darwin*' ):
X                 doc.add( 'LIBHB.YASM.D', 'ARCH_X86_64 PIC', append=True )
X                 doc.add( 'LIBHB.YASM.f', 'macho64' )
b87551e4ac0b83bf8f903daf4c3326a0
echo x - ./files/patch-contrib__fontconfig__module.defs
sed 's/^X//' >./files/patch-contrib__fontconfig__module.defs << 'f928608051408666db47f5449196c251'
X--- ./contrib/fontconfig/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
X+++ ./contrib/fontconfig/module.defs	2011-05-24 05:50:46.060808283 -0400
X@@ -19,6 +19,8 @@
X     FONTCONFIG.config_archoption  = --with-arch=i386
X else ifeq ($(BUILD.system),linux)
X     FONTCONFIG.cc_archoption      = 
X+else ifeq ($(BUILD.system),freebsd)
X+    FONTCONFIG.cc_archoption      = 
X else
X     FONTCONFIG.cc_archoption      = -arch $(FONTCONFIG.GCC.archs)
X     FONTCONFIG.config_archoption  = --with-arch=$(FONTCONFIG.GCC.archs)
f928608051408666db47f5449196c251
echo x - ./pkg-descr
sed 's/^X//' >./pkg-descr << '0e313719ff012ceaf97a028d51caa8f5'
XHandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
Xtranscoder, available for MacOS X, Linux and Windows (...and FreeBSD).
X
XSupported Sources:
X
X    * Any DVD or Bluray-like source: VIDEO_TS folder, DVD image, real DVD or
X      bluray (unencrypted -- removal of copy protection is not supported),
X      and some .VOB, .TS and M2TS files
X    * Most any multimedia file it can get libavformat to read and libavcodec
X      to decode.
X
XOutputs:
X
X    * File format: MP4(M4V) and MKV
X    * Video: MPEG-4(ffmpeg), H.264(x264), or Theora(libtheora)
X    * Audio: AAC, CoreAudio AAC (OS X Only), MP3, or Vorbis. AC-3
X      pass-through, DTS pass-thorugh (MKV only)
X
XHandBrake also includes support for chapters, subtitles, advanced video
Xfilters and more!
X
XWWW: http://handbrake.fr/
X
0e313719ff012ceaf97a028d51caa8f5
echo x - ./distinfo
sed 's/^X//' >./distinfo << 'aec8793adfd5b7c3f00e62ae41a09ac2'
XSHA256 (handbrake/HandBrake-0.9.6.tar.bz2) = 8e7d3dd6d9eb10ba633bf0b6cabcc50a995699ec448f86cb9579c0d2fc7005f5
XSIZE (handbrake/HandBrake-0.9.6.tar.bz2) = 3234016
XSHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
XSIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
XSHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
XSIZE (handbrake/faac-1.28.tar.gz) = 678891
XSHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
XSIZE (handbrake/faad2-2.7.tar.gz) = 1137407
XSHA256 (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497
XSIZE (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = 4242565
XSHA256 (handbrake/fontconfig-2.8.0.tar.gz) = fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
XSIZE (handbrake/fontconfig-2.8.0.tar.gz) = 1548409
XSHA256 (handbrake/freetype-2.4.7.tar.bz2) = ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77
XSIZE (handbrake/freetype-2.4.7.tar.bz2) = 1490543
XSHA256 (handbrake/libxml2-2.7.7.tar.gz) = af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68
XSIZE (handbrake/libxml2-2.7.7.tar.gz) = 4868502
XSHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
XSIZE (handbrake/lame-3.98.tar.gz) = 1411318
XSHA256 (handbrake/libass-0.10.0-1.tar.gz) = a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867
XSIZE (handbrake/libass-0.10.0-1.tar.gz) = 745314
XSHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
XSIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
XSHA256 (handbrake/libdvdread-svn1168.tar.gz) = a489b618962e31a2b151b2e6d7b0c3fcb42cccc196ec7cb352c559898c3f1f1e
XSIZE (handbrake/libdvdread-svn1168.tar.gz) = 946033
XSHA256 (handbrake/libdvdnav-svn1168.tar.gz) = 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7
XSIZE (handbrake/libdvdnav-svn1168.tar.gz) = 1844832
XSHA256 (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97
XSIZE (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 32742
XSHA256 (handbrake/libogg-1.3.0.tar.gz) = a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780
XSIZE (handbrake/libogg-1.3.0.tar.gz) = 425144
XSHA256 (handbrake/libsamplerate-0.1.4.tar.gz) = 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75
XSIZE (handbrake/libsamplerate-0.1.4.tar.gz) = 4259244
XSHA256 (handbrake/libtheora-1.1.0.tar.bz2) = 74be9fe9f85d18c45bdcbb018cebf12c74e2234aeecb4d4c4cb92d80bdd287e2
XSIZE (handbrake/libtheora-1.1.0.tar.bz2) = 1785634
XSHA256 (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd
XSIZE (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 1250659
XSHA256 (handbrake/mp4v2-trunk-r355.tar.bz2) = 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f
XSIZE (handbrake/mp4v2-trunk-r355.tar.bz2) = 475488
XSHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
XSIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
XSHA256 (handbrake/x264-r2146-bcd41db.tar.gz) = 7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1
XSIZE (handbrake/x264-r2146-bcd41db.tar.gz) = 656089
XSHA256 (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76
XSIZE (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 241927
aec8793adfd5b7c3f00e62ae41a09ac2
echo x - ./Makefile
sed 's/^X//' >./Makefile << '464ef7c6571951809b23e262cbe26e19'
X# New ports collection makefile for: handbrake
X# Date created:		19 November 2004
X# Whom:				Andrew Thompson <andy@fud.org.nz>
X#
X# $FreeBSD: ports/multimedia/handbrake/Makefile,v 1.31 2010/12/08 22:26:19 ade Exp $
X#
X
XPORTNAME=	handbrake
XPORTVERSION=	0.9.6
XCATEGORIES=	multimedia
XMAINTAINER=	ports@FreeBSD.org
XCOMMENT=	A powerful DVD and video converter
X
XLICENSE=	GPLv2
XLICENSE_FILE=	${WRKSRC}/COPYING
X
XDIST_SUBDIR=	handbrake
XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
X		http://download.handbrake.fr/handbrake/contrib/:contrib
XMASTER_SITE_SUBDIR=${PORTNAME}/${PORTVERSION}
XDISTFILES=	HandBrake-${PORTVERSION}.tar.bz2 \
X		a52dec-0.7.4.tar.gz:contrib \
X		faac-1.28.tar.gz:contrib \
X		faad2-2.7.tar.gz:contrib \
X		ffmpeg-v0.7-1696-gcae4f4b.tar.bz2:contrib \
X		fontconfig-2.8.0.tar.gz:contrib \
X		freetype-2.4.7.tar.bz2:contrib \
X		libxml2-2.7.7.tar.gz:contrib \
X		lame-3.98.tar.gz:contrib \
X		libass-0.10.0-1.tar.gz:contrib \
X		libdca-r81-strapped.tar.gz:contrib \
X		libdvdread-svn1168.tar.gz:contrib \
X		libdvdnav-svn1168.tar.gz:contrib \
X		libmkv-0.6.5-0-g82075ae.tar.gz:contrib \
X		libogg-1.3.0.tar.gz:contrib \
X		libsamplerate-0.1.4.tar.gz:contrib \
X		libtheora-1.1.0.tar.bz2:contrib \
X		libvorbis-aotuv_b6.03.tar.bz2:contrib \
X		mp4v2-trunk-r355.tar.bz2:contrib \
X		mpeg2dec-0.5.1.tar.gz:contrib \
X		x264-r2146-bcd41db.tar.gz:contrib \
X		libbluray-0.0.1-pre-213-ga869da8.tar.gz:contrib
X
XBUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config \
X		python:${PORTSDIR}/lang/python \
X		yasm>=0.6.0:${PORTSDIR}/devel/yasm
XLIB_DEPENDS=	fribidi:${PORTSDIR}/converters/fribidi
X
XUSE_AUTOTOOLS=	libtool aclocal
XLIBTOOLFILES=	configure
XUSE_GMAKE=	yes
XWRKSRC=		${WRKDIR}/HandBrake-0.9.6
XPLIST_FILES=	bin/handbrake
XAPPLY?=		/usr/bin/apply
X
X.include <bsd.port.pre.mk>
X
X# old binutils can't hang
X.if ${OSVERSION} < 900033
XBUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
XCONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
XMAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
X.endif
X
X#CONFIGURE_ENV+= PKG_CONFIG_PATH=${WRKSRC}/contrib/lib/pkgconfig
XCONFIGURE_ARGS= --force --disable-gtk
XCONFIGURE_TARGET=build
X
X# for ffmpeg and x264
XNOPRECIOUSMAKEVARS=yes
X
Xrun-autotools-aclocal:
X
Xpost-extract:
X.for d in a52dec lame libdca libdvdread libdvdnav libsamplerate mpeg2dec x264
X	@${MKDIR} ${WRKSRC}/build/contrib/${d}
X	@${MV} ${WRKDIR}/${d} ${WRKSRC}/build/contrib/${d}/
X.endfor
X
X	@${MKDIR} ${WRKSRC}/build/contrib/faac
X	@${MV} ${WRKDIR}/faac-1.28 ${WRKSRC}/build/contrib/faac/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/faad2
X	@${MV} ${WRKDIR}/faad2-2.7 ${WRKSRC}/build/contrib/faad2/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/ffmpeg
X	@${MV} ${WRKDIR}/ffmpeg-v0.7-1696-gcae4f4b ${WRKSRC}/build/contrib/ffmpeg/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/fontconfig
X	@${MV} ${WRKDIR}/fontconfig-2.8.0 ${WRKSRC}/build/contrib/fontconfig/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/freetype
X	@${MV} ${WRKDIR}/freetype-2.4.7 ${WRKSRC}/build/contrib/freetype/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/libxml2
X	@${MV} ${WRKDIR}/libxml2-2.7.7 ${WRKSRC}/build/contrib/libxml2/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/libass
X	@${MV} ${WRKDIR}/libass-0.10.0-1 ${WRKSRC}/build/contrib/libass/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/libmkv
X	@${MV} ${WRKDIR}/libmkv-0.6.5-0-g82075ae ${WRKSRC}/build/contrib/libmkv/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/libtheora
X	@${MV} ${WRKDIR}/libtheora-1.1.0 ${WRKSRC}/build/contrib/libtheora/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/mp4v2
X	@${MV} ${WRKDIR}/mp4v2-trunk-r355 ${WRKSRC}/build/contrib/mp4v2/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/libbluray
X	@${MV} ${WRKDIR}/libbluray-0.0.1-pre-213-ga869da8 ${WRKSRC}/build/contrib/libbluray/
X
X	@${MKDIR} ${WRKSRC}/build/contrib/libogg
X	@${MV} ${WRKDIR}/libogg-1.3.0 ${WRKSRC}/build/contrib/libogg/
X	
X	@${MKDIR} ${WRKSRC}/build/contrib/libvorbis
X	@${MV} ${WRKDIR}/aotuv-b6.03_20110424 ${WRKSRC}/build/contrib/libvorbis/
X
Xpost-patch:
X	@${REINPLACE_CMD} -E \
X		-e 's|machine/soundcard.h|sys/soundcard.h|g' \
X		${WRKSRC}/build/contrib/a52dec/a52dec/libao/audio_out_oss.c
X
X	@${REINPLACE_CMD} -E \
X		-e 's|bin/bash|bin/sh|g' \
X		${WRKSRC}/build/contrib/x264/x264/configure
X	@${REINPLACE_CMD} -E \
X		-e 's|bin/bash|bin/sh|g' \
X		${WRKSRC}/build/contrib/x264/x264/version.sh
X
X	@${REINPLACE_CMD} -E \
X		-e 's|-ldl|-lc|g' \
X		-e 's|\[dl\]|\[c\]|g' \
X		${WRKSRC}/build/contrib/libbluray/libbluray-0.0.1-pre-213-ga869da8/configure.ac
X
X	@${REINPLACE_CMD} -E \
X		-e 's|<malloc.h>|<stdlib.h>|g' \
X		${WRKSRC}/libhb/fifo.c
X
X# Set release version so we don't depend on subversion
X#	@${REINPLACE_CMD} -E \
X#		-e 's|`svnversion`|0.9.6_freebsd-ports|g'  \
X#		${WRKSRC}/configure
X#	@${REINPLACE_CMD} -E \
X#		-e 's|\$$\(HB_VERSION\)|0.9.6_freebsd-ports|g'	\
X#		${WRKSRC}/Makefile
X
X	@${REINPLACE_CMD} -E \
X		-e 's|/usr/local|${LOCALBASE}|' \
X		${WRKSRC}/contrib/libass/module.defs \
X		${WRKSRC}/libhb/module.defs \
X		${WRKSRC}/test/module.defs
X
Xpre-configure:
X	@${MV}  ${WRKSRC}/contrib/fontconfig/A00-config.patch ${WRKSRC}/contrib/fontconfig/A00-config.patch_disabled
X
Xdo-build:
X	@(cd ${WRKSRC}/build && ${SETENV} ${MAKE_ENV} ${GMAKE})
X
Xdo-install:
X	${INSTALL_PROGRAM} ${WRKSRC}/build/HandBrakeCLI ${PREFIX}/bin/handbrake
X
X.include <bsd.port.post.mk>
464ef7c6571951809b23e262cbe26e19
exit



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dmarion 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jul 12 09:30:16 UTC 2012 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169799 
Responsible-Changed-From-To: dmarion->freebsd-ports-bugs 
Responsible-Changed-By: dmarion 
Responsible-Changed-When: Sun Aug 19 21:32:20 UTC 2012 
Responsible-Changed-Why:  
I don't know why is this routed to myself, as I'm not ports commiter so sending back to freebsd-ports-bugs. 
Tried to clarify by contacting edwin@ by email but no reply. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169799 
Responsible-Changed-From-To: freebsd-ports-bugs->danfe 
Responsible-Changed-By: danfe 
Responsible-Changed-When: Tue Aug 21 14:04:25 UTC 2012 
Responsible-Changed-Why:  
I'll handle it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169799 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/169799: commit references a PR
Date: Thu, 23 Aug 2012 03:47:35 +0000 (UTC)

 Author: danfe
 Date: Thu Aug 23 03:47:15 2012
 New Revision: 302977
 URL: http://svn.freebsd.org/changeset/ports/302977
 
 Log:
   - Update to version 0.9.8, the latest to date
   - Define LICENSE knob, cleanup Makefile, add comments, etc.
   - Do not rename binary name upon install to match packages for other OSes
   - Tidy up port description to match upstream text closer
   - Make COMMENT more user-friendly (looking at Ubuntu)
   
   PR:		ports/169799 (version update + patches)
   Submitted by:	dmarion
 
 Added:
   head/multimedia/handbrake/files/patch-build_contrib_x264_x264_common_cpu.c   (contents, props changed)
   head/multimedia/handbrake/files/patch-build_contrib_x264_x264_configure   (contents, props changed)
   head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-contrib_fontconfig_module.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-contrib_freetype_module.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-contrib_libass_module.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-libhb_module.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-make_configure.py   (contents, props changed)
   head/multimedia/handbrake/files/patch-make_include_contrib.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-make_include_select.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-test_module.defs   (contents, props changed)
 Deleted:
   head/multimedia/handbrake/files/patch-contrib-Jamfile
   head/multimedia/handbrake/files/patch-contrib-libavformat-udp.c
   head/multimedia/handbrake/files/patch-libhb-fifo.c
 Modified:
   head/multimedia/handbrake/Makefile
   head/multimedia/handbrake/distinfo
   head/multimedia/handbrake/pkg-descr
 
 Modified: head/multimedia/handbrake/Makefile
 ==============================================================================
 --- head/multimedia/handbrake/Makefile	Thu Aug 23 03:09:32 2012	(r302976)
 +++ head/multimedia/handbrake/Makefile	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -6,114 +6,112 @@
  #
  
  PORTNAME=	handbrake
 -PORTVERSION=	0.9.3
 -PORTREVISION=	1
 +PORTVERSION=	0.9.8
  CATEGORIES=	multimedia
 -MASTER_SITES=	LOCAL/beech/handbrake/:main \
 -		LOCAL/beech/handbrake/:contrib
 -DISTFILES=	HandBrake-${PORTVERSION}.tar.gz:main \
 +MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION} \
 +		http://download.handbrake.fr/handbrake/contrib/:contrib
 +DISTFILES=	HandBrake-${PORTVERSION}.tar.bz2 \
  		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 \
 +		faac-1.28.tar.gz:contrib \
 +		faad2-2.7.tar.gz:contrib \
 +		ffmpeg-v0.7-1696-gcae4f4b.tar.bz2:contrib \
 +		fontconfig-2.8.0.tar.gz:contrib \
 +		freetype-2.4.7.tar.bz2: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 \
 +		libass-0.10.0-1.tar.gz:contrib \
 +		libbluray-0.0.1-pre-213-ga869da8.tar.gz:contrib \
 +		libdca-r81-strapped.tar.gz:contrib \
 +		libdvdnav-svn1168.tar.gz:contrib \
 +		libdvdread-svn1168.tar.gz:contrib \
 +		libmkv-0.6.5-0-g82075ae.tar.gz:contrib \
 +		libogg-1.3.0.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
 +		libtheora-1.1.0.tar.bz2:contrib \
 +		libvorbis-aotuv_b6.03.tar.bz2:contrib \
 +		libxml2-2.7.7.tar.gz:contrib \
 +		mp4v2-trunk-r355.tar.bz2:contrib \
 +		mpeg2dec-0.5.1.tar.gz:contrib \
 +		x264-r2146-bcd41db.tar.gz:contrib
 +DIST_SUBDIR=	${PORTNAME}
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	Open-source, multiplatform, multithreaded video transcoder
 +COMMENT=	Versatile DVD ripper and video transcoder
  
 -BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 -LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 +LICENSE=	GPLv2
  
 -USE_GMAKE=	yes
 -USE_PKGCONFIG=	yes
 +BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 +LIB_DEPENDS=	fribidi:${PORTSDIR}/converters/fribidi
  
  USE_AUTOTOOLS=	libtool aclocal
 -
  LIBTOOLFILES=	configure
 +USE_GMAKE=	yes
 +USE_PYTHON_BUILD=	yes
  
  WRKSRC=		${WRKDIR}/HandBrake-${PORTVERSION}
 -PLIST_FILES=	bin/handbrake
 +PLIST_FILES=	bin/HandBrakeCLI
 +
 +CONFIGURE_ARGS=	--force --disable-gtk
 +CONFIGURE_TARGET=	build
  
 -ONLY_FOR_ARCHS=	i386
 +BUILD_WRKSRC=	${WRKSRC}/build
 +MAKEFILE=	GNUmakefile
 +ALL_TARGET=	#
  
 -JAM?=		${LOCALBASE}/bin/jam
 -APPLY?=		/usr/bin/apply
 +NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
  
  .include <bsd.port.pre.mk>
  
 -# 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
 +# Recent binutils are required to handle inline SSSE3 asm (in x264)
 +.if ${OSVERSION} < 802509 || ${OSVERSION} >= 900000 && ${OSVERSION} < 900033
 +BUILD_DEPENDS+=	as:${PORTSDIR}/devel/binutils
 +CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 +MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
  .endif
  
 -CONFIGURE_ENV+=	PKG_CONFIG_PATH=${WRKSRC}/contrib/lib/pkgconfig
 -MAKE_ENV+=	ARCH=${ARCH} MAKE=${GMAKE}
 -
  run-autotools-aclocal:
 +	@${DO_NADA}
  
 -post-extract:
 -	@${APPLY} "${MV} %1 ${WRKSRC}/contrib/" \
 -		${WRKDIR}/a52dec \
 -		${WRKDIR}/faad2 \
 -		${WRKDIR}/ffmpeg \
 -		${WRKDIR}/libdca \
 -		${WRKDIR}/libdvdread \
 -		${WRKDIR}/faac \
 -		${WRKDIR}/lame \
 -		${WRKDIR}/libmp4v2 \
 -		${WRKDIR}/libmkv \
 -		${WRKDIR}/mpeg2dec \
 -		${WRKDIR}/libogg \
 -		${WRKDIR}/libsamplerate \
 -		${WRKDIR}/libvorbis \
 -		${WRKDIR}/libtheora \
 -		${WRKDIR}/x264 \
 -		${WRKDIR}/xvidcore
 +# HandBrake tries to fetch its dependencies during build phase, which is not
 +# considered good in FreeBSD.  Instead, we will prepare everything manually.
 +post-extract: .SILENT
 +# Unversioned directories can be copied in a loop
 +.for d in a52dec lame libdca libdvdnav libdvdread libsamplerate mpeg2dec x264
 +	${MKDIR} ${BUILD_WRKSRC}/contrib/${d}
 +	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}
 +.endfor
 +# Others had to be processed one by one due to irregular (versioned) names
 +	cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg fontconfig \
 +		freetype libass libbluray libmkv libogg libtheora libvorbis \
 +		libxml2 mp4v2
 +	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac
 +	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2
 +	${MV} ${WRKDIR}/ffmpeg-v0.7-1696-gcae4f4b \
 +		${BUILD_WRKSRC}/contrib/ffmpeg
 +	${MV} ${WRKDIR}/fontconfig-2.8.0 ${BUILD_WRKSRC}/contrib/fontconfig
 +	${MV} ${WRKDIR}/freetype-2.4.7 ${BUILD_WRKSRC}/contrib/freetype
 +	${MV} ${WRKDIR}/libass-0.10.0-1 ${BUILD_WRKSRC}/contrib/libass
 +	${MV} ${WRKDIR}/libbluray-0.0.1-pre-213-ga869da8 \
 +		${BUILD_WRKSRC}/contrib/libbluray
 +	${MV} ${WRKDIR}/libmkv-0.6.5-0-g82075ae ${BUILD_WRKSRC}/contrib/libmkv
 +	${MV} ${WRKDIR}/libogg-1.3.0 ${BUILD_WRKSRC}/contrib/libogg
 +	${MV} ${WRKDIR}/libtheora-1.1.0 ${BUILD_WRKSRC}/contrib/libtheora
 +	${MV} ${WRKDIR}/aotuv-b6.03_20110424 ${BUILD_WRKSRC}/contrib/libvorbis
 +	${MV} ${WRKDIR}/libxml2-2.7.7 ${BUILD_WRKSRC}/contrib/libxml2
 +	${MV} ${WRKDIR}/mp4v2-trunk-r355 ${BUILD_WRKSRC}/contrib/mp4v2
 +# Remove one patch file that does not apply cleanly
 +	${RM} ${WRKSRC}/contrib/fontconfig/A00-config.patch
  
  post-patch:
 -	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|g' \
 -		${WRKSRC}/contrib/a52dec/libao/audio_out_oss.c
 -# Remove the ports extraction code as it has already been done in post-extract:
 -# Fix a hardcoded "make" so gmake is used properly
 -# Remove a hardcoded "bash"
 -	@${REINPLACE_CMD} -E \
 -		-e 's|rm -rf [a-z0-9.-]* &&||g' \
 -		-e 's|\(gzip.*-) &&||g' \
 -		-e 's|\(gzip.*- ) &&||g' \
 -		-e 's| make | $$(MAKE) |g' \
 -		-e 's|bash ||g' \
 -		${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 's|,X86)|,i386)|g ; s|,X86_64)|,amd64)|g' \
 -		${WRKSRC}/contrib/x264/Makefile
 -# The following patch fixes CPU count detection
 -	@${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 's|`svnversion`|0.9.3_freebsd-ports|g' \
 -		${WRKSRC}/configure
 -	@${REINPLACE_CMD} -E 's|\$$\(HB_VERSION\)|0.9.3_freebsd-ports|g' \
 -		${WRKSRC}/Makefile
 -
 -do-build:
 -	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${JAM} -q)
 +	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \
 +		${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c
 +	@${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \
 +		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.0.1-pre-213-ga869da8/configure.ac
 +	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
 +	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 +		${WRKSRC}/contrib/libass/module.defs \
 +		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
  
  do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/HandBrakeCLI ${PREFIX}/bin/handbrake
 +	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin
  
  .include <bsd.port.post.mk>
 
 Modified: head/multimedia/handbrake/distinfo
 ==============================================================================
 --- head/multimedia/handbrake/distinfo	Thu Aug 23 03:09:32 2012	(r302976)
 +++ head/multimedia/handbrake/distinfo	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -1,34 +1,44 @@
 -SHA256 (handbrake/HandBrake-0.9.3.tar.gz) = 2a776ded48285648aedaa73dd90997a0648473a2d9932203b931e7ef54393d30
 -SIZE (handbrake/HandBrake-0.9.3.tar.gz) = 2067663
 +SHA256 (handbrake/HandBrake-0.9.8.tar.bz2) = dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798
 +SIZE (handbrake/HandBrake-0.9.8.tar.bz2) = 3156964
  SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
  SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
 -SHA256 (handbrake/faad2-2.6.1.tar.gz) = f86eb8d089150c92547721136cae7d228924a085a59fbf7b5af3da625acdb25c
 -SIZE (handbrake/faad2-2.6.1.tar.gz) = 849708
 -SHA256 (handbrake/ffmpeg-r15462.tar.gz) = 28d2ef1414fa49f5d10d90234b9a06855561f8231a816ef4c060a1aea069eefc
 -SIZE (handbrake/ffmpeg-r15462.tar.gz) = 3154052
 -SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
 -SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
 -SHA256 (handbrake/libdvdread-0.9.7.tar.gz) = 18cf0ee3887264f09f2e23672923aec821ae9b806415ae0d78d0e310c1304c1f
 -SIZE (handbrake/libdvdread-0.9.7.tar.gz) = 388570
 -SHA256 (handbrake/faac-1.26.tar.gz) = 4b48e2e22267e9260365c7bee4513bf13d262b8b13cf7f9504e9fa612b6aa951
 -SIZE (handbrake/faac-1.26.tar.gz) = 400915
 +SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
 +SIZE (handbrake/faac-1.28.tar.gz) = 678891
 +SHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
 +SIZE (handbrake/faad2-2.7.tar.gz) = 1137407
 +SHA256 (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497
 +SIZE (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = 4242565
 +SHA256 (handbrake/fontconfig-2.8.0.tar.gz) = fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
 +SIZE (handbrake/fontconfig-2.8.0.tar.gz) = 1548409
 +SHA256 (handbrake/freetype-2.4.7.tar.bz2) = ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77
 +SIZE (handbrake/freetype-2.4.7.tar.bz2) = 1490543
  SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
  SIZE (handbrake/lame-3.98.tar.gz) = 1411318
 -SHA256 (handbrake/libmp4v2-r45.tar.gz) = 137cbc22c368c85fcbee8460605d93350044bc4c1a6f781e8d84357ce5f6afe1
 -SIZE (handbrake/libmp4v2-r45.tar.gz) = 461723
 -SHA256 (handbrake/libmkv-0.6.3.tar.gz) = 3ad2aee66e26987b3cad63620d84661bd149a8a70e0350f0d762f153f58c68b7
 -SIZE (handbrake/libmkv-0.6.3.tar.gz) = 341121
 -SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
 -SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
 -SHA256 (handbrake/libogg-1.1.3.tar.gz) = 645676dd006c8424fde52df2edd0f52d6402b12c563b50c46e9540083241d50c
 -SIZE (handbrake/libogg-1.1.3.tar.gz) = 401303
 +SHA256 (handbrake/libass-0.10.0-1.tar.gz) = a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867
 +SIZE (handbrake/libass-0.10.0-1.tar.gz) = 745314
 +SHA256 (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76
 +SIZE (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 241927
 +SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
 +SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
 +SHA256 (handbrake/libdvdnav-svn1168.tar.gz) = 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7
 +SIZE (handbrake/libdvdnav-svn1168.tar.gz) = 1844832
 +SHA256 (handbrake/libdvdread-svn1168.tar.gz) = a489b618962e31a2b151b2e6d7b0c3fcb42cccc196ec7cb352c559898c3f1f1e
 +SIZE (handbrake/libdvdread-svn1168.tar.gz) = 946033
 +SHA256 (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97
 +SIZE (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 32742
 +SHA256 (handbrake/libogg-1.3.0.tar.gz) = a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780
 +SIZE (handbrake/libogg-1.3.0.tar.gz) = 425144
  SHA256 (handbrake/libsamplerate-0.1.4.tar.gz) = 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75
  SIZE (handbrake/libsamplerate-0.1.4.tar.gz) = 4259244
 -SHA256 (handbrake/libvorbis-aotuv_b5.tar.gz) = 1e3c5b974e3d16a924eb0af12516a2b0b14aae24d46d32395cd997d833e84509
 -SIZE (handbrake/libvorbis-aotuv_b5.tar.gz) = 1345888
 -SHA256 (handbrake/libtheora-1.0.tar.gz) = 34f82b0b187ae4d8161693f396d1a4457b1bade0ee15c54a46630a2f4bfc33fc
 -SIZE (handbrake/libtheora-1.0.tar.gz) = 1946620
 -SHA256 (handbrake/x264-r1028-83baa7f.tar.gz) = ed36cb12f7d98b56d1ce19be22bf9c40c9aa9e46bb718e4505864294af023f83
 -SIZE (handbrake/x264-r1028-83baa7f.tar.gz) = 2325933
 -SHA256 (handbrake/xvidcore-1.1.3.tar.gz) = 1a4a7748e93d3a1a4033fc843d6170f803520c5844047ae75df0269a093bedb6
 -SIZE (handbrake/xvidcore-1.1.3.tar.gz) = 739835
 +SHA256 (handbrake/libtheora-1.1.0.tar.bz2) = 74be9fe9f85d18c45bdcbb018cebf12c74e2234aeecb4d4c4cb92d80bdd287e2
 +SIZE (handbrake/libtheora-1.1.0.tar.bz2) = 1785634
 +SHA256 (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd
 +SIZE (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 1250659
 +SHA256 (handbrake/libxml2-2.7.7.tar.gz) = af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68
 +SIZE (handbrake/libxml2-2.7.7.tar.gz) = 4868502
 +SHA256 (handbrake/mp4v2-trunk-r355.tar.bz2) = 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f
 +SIZE (handbrake/mp4v2-trunk-r355.tar.bz2) = 475488
 +SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
 +SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
 +SHA256 (handbrake/x264-r2146-bcd41db.tar.gz) = 7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1
 +SIZE (handbrake/x264-r2146-bcd41db.tar.gz) = 656089
 
 Added: head/multimedia/handbrake/files/patch-build_contrib_x264_x264_common_cpu.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-build_contrib_x264_x264_common_cpu.c	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,29 @@
 +--- ./build/contrib/x264/x264/common/cpu.c.orig	2010-12-14 15:00:07.000000000 -0500
 ++++ ./build/contrib/x264/x264/common/cpu.c	2011-05-24 05:50:46.053810885 -0400
 +@@ -237,7 +237,7 @@
 + 
 + #elif ARCH_PPC
 + 
 +-#if SYS_MACOSX || SYS_OPENBSD
 ++#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
 + #include <sys/sysctl.h>
 + uint32_t x264_cpu_detect( void )
 + {
 +@@ -245,12 +245,16 @@
 +     uint32_t cpu = 0;
 + #if SYS_OPENBSD
 +     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
 +-#else
 ++#elif SYS_MACOSX
 +     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
 + #endif
 +     int      has_altivec = 0;
 +     size_t   length = sizeof( has_altivec );
 ++#if SYS_MACOSX || SYS_OPENBSD
 +     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
 ++#else
 ++    int      error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 );
 ++#endif
 + 
 +     if( error == 0 && has_altivec != 0 )
 +         cpu |= X264_CPU_ALTIVEC;
 
 Added: head/multimedia/handbrake/files/patch-build_contrib_x264_x264_configure
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-build_contrib_x264_x264_configure	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,98 @@
 +--- ./build/contrib/x264/x264/configure.orig	2012-01-19 07:48:34.000000000 +0800
 ++++ ./build/contrib/x264/x264/configure	2012-08-23 09:37:56.000000000 +0800
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/bin/sh
 + 
 + if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
 + cat <<EOF
 +@@ -75,8 +75,8 @@
 +     # Intel Compiler issues an incredibly large number of warnings on any warning level,
 +     # suppress them by disabling all warnings rather than having to use #pragmas to disable most of them
 +     for arg in $*; do
 +-        [ $arg = -ffast-math ] && arg=
 +-        [[ "$arg" = -falign-loops* ]] && arg=
 ++        [ "$arg" = -ffast-math ] && arg=
 ++        [ -z "${arg%%-falign-loops*}" ] && arg=
 +         [ "$arg" = -fno-tree-vectorize ] && arg=
 +         [ "$arg" = -Wshadow ] && arg=
 +         if [ $compiler = ICL ]; then
 +@@ -96,7 +96,7 @@
 + icl_ldflags() {
 +     for arg in $*; do
 +         arg=${arg/LIBPATH/libpath}
 +-        [ ${arg#-libpath:} == $arg -a ${arg#-l} != $arg ] && arg=${arg#-l}.lib
 ++        [ ${arg#-libpath:} = $arg -a ${arg#-l} != $arg ] && arg=${arg#-l}.lib
 +         [ ${arg#-L} != $arg ] && arg=-libpath:${arg#-L}
 +         [ $arg = -Wl,--large-address-aware ] && arg=-largeaddressaware
 +         [ $arg = -s ] && arg=
 +@@ -396,10 +396,10 @@
 + host_os="${host#*-}"
 + 
 + # test for use of Intel Compiler
 +-if [[ $host_os = mingw* || $host_os = cygwin* ]]; then
 +-    if [[ `basename "$CC"` = icl* ]]; then
 ++if [ -z "${host_os%%mingw*}" -o -z "${host_os%%cygwin*}" ]; then
 ++    if [ "${CC%%icl*}" != "${CC}" ]; then
 +         # Windows Intel Compiler creates dependency generation with absolute Windows paths, Cygwin's make does not support Windows paths.
 +-        [[ $host_os = cygwin* ]] && die "Windows Intel Compiler support requires MSYS"
 ++        [ -z "${host_os%%cygwin*}" ] && die "Windows Intel Compiler support requires MSYS"
 +         compiler=ICL
 +         CFLAGS="$CFLAGS -Qstd=c99 -nologo -Qms0 -DHAVE_STRING_H -Iextras"
 +         QPRE="-Q"
 +@@ -408,7 +408,7 @@
 +         cpp_check "" "" "_MSC_VER >= 1400" || die "Windows Intel Compiler support requires Visual Studio 2005 or newer"
 +     fi
 + else
 +-    if [[ `basename "$CC"` = icc* ]]; then
 ++    if [ "${CC%%icc*}" != "${CC}" ]; then
 +         AR="xiar"
 +         compiler=ICC
 +         QPRE="-"
 +@@ -496,11 +496,15 @@
 +         AS="yasm"
 +         ASFLAGS="$ASFLAGS -O2"
 +         if [ $compiler = GNU ]; then
 +-            if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
 +-                CFLAGS="$CFLAGS -march=i686"
 +-            fi
 +-            if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
 +-                CFLAGS="$CFLAGS -mfpmath=sse -msse"
 ++            if [ "$asm" = yes ]; then
 ++                case "$CFLAGS" in
 ++                    *-march*) ;;
 ++                    *) CFLAGS="$CFLAGS -march=i686" ;;
 ++                esac
 ++                case "$CFLAGS" in
 ++                    *-mfpmath*) ;;
 ++                    *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;;
 ++                esac
 +             fi
 +         else
 +             # icc on linux has various degrees of mod16 stack support
 +@@ -526,7 +530,7 @@
 +             ASFLAGS="$ASFLAGS -f elf"
 +         fi
 +         ;;
 +-    x86_64)
 ++    x86_64|amd64)
 +         ARCH="X86_64"
 +         AS="yasm"
 +         if [ "$SYS" = MACOSX ]; then
 +@@ -990,7 +994,7 @@
 + # generate exported config file
 + 
 + config_chroma_format="X264_CSP_I$chroma_format"
 +-[ "$config_chroma_format" == "X264_CSP_Iall" ] && config_chroma_format="0"
 ++[ "$config_chroma_format" = "X264_CSP_Iall" ] && config_chroma_format="0"
 + cat > x264_config.h << EOF
 + #define X264_BIT_DEPTH     $bit_depth
 + #define X264_GPL           $x264_gpl
 +--- ./build/contrib/x264/x264/version.sh.orig	2012-01-19 07:48:34.000000000 +0800
 ++++ ./build/contrib/x264/x264/version.sh	2012-08-22 12:00:27.000000000 +0800
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/bin/sh
 + [ -n "$1" ] && cd $1
 + git rev-list HEAD | sort > config.git-hash
 + LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
 
 Added: head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,11 @@
 +--- ./contrib/ffmpeg/module.defs.orig	2010-11-10 11:51:35.000000000 -0500
 ++++ ./contrib/ffmpeg/module.defs	2011-05-24 05:51:19.600807346 -0400
 +@@ -43,6 +43,8 @@
 +         --arch=i386 \
 +         --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
 +     FFMPEG.GCC.args.extra += -fno-common
 ++else ifeq (freebsd,$(BUILD.system))
 ++    FFMPEG.CONFIGURE.extra += --enable-pthreads --disable-devices
 + else
 +     FFMPEG.CONFIGURE.extra += --enable-pthreads
 + endif
 
 Added: head/multimedia/handbrake/files/patch-contrib_fontconfig_module.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-contrib_fontconfig_module.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,11 @@
 +--- ./contrib/fontconfig/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
 ++++ ./contrib/fontconfig/module.defs	2011-05-24 05:50:46.060808283 -0400
 +@@ -19,6 +19,8 @@
 +     FONTCONFIG.config_archoption  = --with-arch=i386
 + else ifeq ($(BUILD.system),linux)
 +     FONTCONFIG.cc_archoption      = 
 ++else ifeq ($(BUILD.system),freebsd)
 ++    FONTCONFIG.cc_archoption      = 
 + else
 +     FONTCONFIG.cc_archoption      = -arch $(FONTCONFIG.GCC.archs)
 +     FONTCONFIG.config_archoption  = --with-arch=$(FONTCONFIG.GCC.archs)
 
 Added: head/multimedia/handbrake/files/patch-contrib_freetype_module.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-contrib_freetype_module.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,8 @@
 +--- ./contrib/freetype/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
 ++++ ./contrib/freetype/module.defs	2011-05-24 05:50:46.062809316 -0400
 +@@ -3,3 +3,5 @@
 + 
 + FREETYPE.FETCH.url = http://download.m0k.org/handbrake/contrib/freetype-2.3.9.tar.gz
 + FREETYPE.EXTRACT.tarbase = freetype-2.3.9
 ++FREETYPE.CONFIGURE.env.GNUMAKE = GNUMAKE="gmake"
 ++FREETYPE.CONFIGURE.env.args += !GNUMAKE
 
 Added: head/multimedia/handbrake/files/patch-contrib_libass_module.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-contrib_libass_module.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,10 @@
 +--- ./contrib/libass/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
 ++++ ./contrib/libass/module.defs	2011-05-24 05:50:46.096807667 -0400
 +@@ -10,6 +10,6 @@
 + LIBASS.CONFIGURE.extra = \
 +     --disable-png --disable-enca \
 +     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
 +-    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
 ++    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2 -I/usr/local/include" \
 +     FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
 +     FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
 
 Added: head/multimedia/handbrake/files/patch-libhb_module.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-libhb_module.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,12 @@
 +--- ./libhb/module.defs.orig	2010-10-23 13:21:56.000000000 -0400
 ++++ ./libhb/module.defs	2011-05-24 05:50:46.097808812 -0400
 +@@ -47,6 +47,9 @@
 +     LIBHB.c += $(wildcard $(LIBHB.src/)platform/macosx/*.c)
 + else ifeq ($(BUILD.system),linux)
 +     LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
 ++else ifeq ($(BUILD.system),freebsd)
 ++    LIBHB.GCC.D += SYS_FREEBSD
 ++    LIBHB.GCC.I += /usr/local/include
 + else ifeq ($(BUILD.system),mingw)
 +     LIBHB.GCC.D += SYS_MINGW PTW32_STATIC_LIB
 + 	LIBHB.GCC.args.extra.dylib++ += -Wl,--enable-auto-import -static
 
 Added: head/multimedia/handbrake/files/patch-make_configure.py
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-make_configure.py	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,31 @@
 +--- ./make/configure.py.orig	2011-01-03 15:32:27.000000000 -0500
 ++++ ./make/configure.py	2011-05-24 05:50:46.069810487 -0400
 +@@ -1249,7 +1249,7 @@
 +         xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
 +         lipo       = ToolProbe( 'LIPO.exe',       'lipo', abort=False )
 + 
 +-        fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl] )
 ++        #fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl] )
 + 
 +     ## run tool probes
 +     for tool in ToolProbe.tools:
 +@@ -1512,16 +1512,16 @@
 +         asm = ''
 +         if build.match( 'i?86-*' ):
 +             asm = 'x86'
 +-            doc.add( 'LIBHB.GCC.D', 'HAVE_MMX', append=True )
 ++            #doc.add( 'LIBHB.GCC.D', 'HAVE_MMX', append=True )
 +             doc.add( 'LIBHB.YASM.D', 'ARCH_X86', append=True )
 +             if build.match( '*-*-darwin*' ):
 +                 doc.add( 'LIBHB.YASM.f', 'macho32' )
 +             else:
 +                 doc.add( 'LIBHB.YASM.f', 'elf32' )
 +             doc.add( 'LIBHB.YASM.m', 'x86' )
 +-        elif build.match( 'x86_64-*' ):
 ++        elif build.match( 'amd64-*' ):
 +             asm = 'x86'
 +-            doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True )
 ++            #doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True )
 +             if build.match( '*-*-darwin*' ):
 +                 doc.add( 'LIBHB.YASM.D', 'ARCH_X86_64 PIC', append=True )
 +                 doc.add( 'LIBHB.YASM.f', 'macho64' )
 
 Added: head/multimedia/handbrake/files/patch-make_include_contrib.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-make_include_contrib.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,22 @@
 +--- ./make/include/contrib.defs.orig	2010-04-25 17:15:43.000000000 -0400
 ++++ ./make/include/contrib.defs	2011-05-24 05:50:46.071806770 -0400
 +@@ -28,7 +28,7 @@
 +     $(1).FETCH.url    = FETCH_IS_UNDEFINED
 +     $(1).FETCH.target = $$($(1).FETCH.tar)
 +     define $(1).FETCH
 +-        $$(call FETCH,$$@,$$($(1).FETCH.url))
 ++#        $$(call FETCH,$$@,$$($(1).FETCH.url))
 +     endef
 + 
 +     ##
 +@@ -38,8 +38,8 @@
 +     $(1).EXTRACT.dir/    = $$($(1).build/)$$($(1).EXTRACT.tarbase)/
 +     $(1).EXTRACT.target  = $$($(1).build/).stamp.extract
 +     define $(1).EXTRACT
 +-        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)
 +-        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)
 ++#        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)
 ++#        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)
 +         $$(TOUCH.exe) $$@
 +     endef
 + 
 
 Added: head/multimedia/handbrake/files/patch-make_include_select.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-make_include_select.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,10 @@
 +--- ./make/include/select.defs.orig	2009-03-01 12:28:24.000000000 -0500
 ++++ ./make/include/select.defs	2011-05-24 05:50:46.073808851 -0400
 +@@ -7,6 +7,6 @@
 + FETCH = $(FETCH.$(FETCH.select))
 + 
 + FETCH.select  = MISSING
 +-FETCH.MISSING = $(error one of the following tools is required: wget, curl)
 ++##FETCH.MISSING = $(error one of the following tools is required: wget, curl)
 + FETCH.curl    = $(CURL.exe) -q -L -o $(1) $(2)
 + FETCH.wget    = $(WGET.exe) -O $(1) $(2)
 
 Added: head/multimedia/handbrake/files/patch-test_module.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-test_module.defs	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -0,0 +1,23 @@
 +--- ./test/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
 ++++ ./test/module.defs	2011-05-24 05:50:46.097808812 -0400
 +@@ -10,8 +10,8 @@
 + TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
 + 
 + TEST.libs = $(LIBHB.a) $(foreach n, \
 +-        a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
 +-        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
 ++        a52 ass avformat avcodec avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
 ++        samplerate swscale theora vorbis vorbisenc ogg x264 xml2 bluray, \
 +         $(CONTRIB.build/)lib/lib$(n).a )
 + 
 + TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
 +@@ -50,6 +50,9 @@
 +     TEST.GCC.l += iconv
 + else ifeq ($(BUILD.system),linux)
 +     TEST.GCC.l += pthread dl m
 ++else ifeq ($(BUILD.system),freebsd)
 ++	TEST.GCC.l += pthread iconv
 ++	TEST.GCC.L += /usr/local/lib
 + else ifeq ($(BUILD.system),solaris)
 +     TEST.GCC.l += pthread nsl socket
 + else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
 
 Modified: head/multimedia/handbrake/pkg-descr
 ==============================================================================
 --- head/multimedia/handbrake/pkg-descr	Thu Aug 23 03:09:32 2012	(r302976)
 +++ head/multimedia/handbrake/pkg-descr	Thu Aug 23 03:47:15 2012	(r302977)
 @@ -3,19 +3,19 @@ transcoder with rich selection of featur
  
  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.
 +  * Most common multimedia files that libavformat and libavcodec support
 +  * Any DVD or Bluray-like source which is NOT copy-protected (removal of
 +    copy protection is not supported)
  
  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 (M4V) and MKV
 +  * Video: H.264 (x264), MPEG-2/MPEG-4 (ffmpeg), or Theora (libtheora)
 +  * Audio: AAC, CoreAudio AAC/HE-AAC (OS X only), MP3, Flac, AC3, or Vorbis;
 +    AC-3, DTS, DTS-HD, AAC, and MP3 pass-thru
 +
 +HandBrake also includes support for chapters, subtitles, advanced video
 +filters, and more.  It is also useful for making videos compatible with
 +portable video devices such as the Apple iPod/iPhone.
  
  WWW: http://handbrake.fr/
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: danfe 
State-Changed-When: Thu Aug 23 14:00:45 UTC 2012 
State-Changed-Why:  
Port was updated to version 0.9.8, thanks!  (This PR of yours was of very good 
quality; shall you want to become maintainer of this port, drop me an email.) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169799 
>Unformatted:
