From nobody@FreeBSD.org  Wed May 21 04:01:26 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24859106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 May 2008 04:01:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A5768FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 May 2008 04:01:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m4L4030b017161
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 May 2008 04:00:03 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m4L4037h017160;
	Wed, 21 May 2008 04:00:03 GMT
	(envelope-from nobody)
Message-Id: <200805210400.m4L4037h017160@www.freebsd.org>
Date: Wed, 21 May 2008 04:00:03 GMT
From: Jonathan Stewart <jonathan@kc8onw.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] update for multimedia/handbrake
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: jaj@hcl-club.lu

>Number:         123849
>Category:       ports
>Synopsis:       [PATCH] update for multimedia/handbrake
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 21 04:10:02 UTC 2008
>Closed-Date:    Thu Jul 17 21:06:33 UTC 2008
>Last-Modified:  Thu Jul 17 21:10:00 UTC 2008
>Originator:     Jonathan Stewart
>Release:        7-stable
>Organization:
>Environment:
FreeBSD storage.kc8onw.net 7.0-STABLE FreeBSD 7.0-STABLE #11: Sun May  4 01:14:54 AST 2008     root@storage.kc8onw.net:/usr/obj/usr/src/sys/STORAGE  i386

>Description:
Update multimedia/handbrake to the latest release, patches included.
>How-To-Repeat:

>Fix:
This update has been verified to compile correctly on my system.

Replace the current patch-contrib-Jamfile with the attached one and apply the patch below to the Makefile

--- Makefile.orig       2008-05-21 04:07:46.000000000 +0300
+++ Makefile    2008-05-21 06:28:42.000000000 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      handbrake
-PORTVERSION=   0.9.1
+PORTVERSION=   0.9.2
 CATEGORIES=    multimedia
 MASTER_SITES=  http://saintdevelopment.com/mirror/handbrake/:main \
                http://junk.phantomgorilla.com/hb/:main \
@@ -21,14 +21,14 @@
                libdca-r81-strapped.tar.gz:contrib \
                libdvdcss-1.2.9.tar.gz:contrib \
                libdvdread-0.9.7.tar.gz:contrib \
-               libmkv-0.6.1.2.tar.gz:contrib \
+               libmkv-0.6.1.3.tar.gz:contrib \
                libogg-1.1.2.tar.gz:contrib \
                libvorbis-aotuv_b5.tar.gz:contrib \
                mpeg2dec-0.4.1.tar.gz:contrib \
                mpeg4ip-1.3.tar.gz:contrib \
                xvidcore-1.1.2.tar.gz:contrib \
                ffmpeg-9816.tar.gz:contrib \
-               x264-r665.tar.gz:contrib \
+               x264-r736.tar.gz:contrib \
                a52dec-0.7.4.tar.gz:contrib \
                libsamplerate-0.1.2.tar.gz:contrib
 DIST_SUBDIR=   handbrake



Patch attached with submission follows:

--- contrib/Jamfile.orig	2008-05-21 05:18:06.844254734 +0300
+++ contrib/Jamfile	2008-05-21 06:00:18.032459924 +0300
@@ -34,9 +34,10 @@
 }
 actions Wget
 {
-    $(RM) $(<) &&
-    $(WGET) $(<) `cat $(>)` &&
-    ( touch $(<) || true )
+#    $(RM) $(<) &&
+#    $(WGET) $(<) `cat $(>)` &&
+#    ( touch $(<) || true )
+    true
 }
 
 # liba52
@@ -48,10 +49,9 @@
 actions LibA52
 {
 
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && 
-    cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/a52dec && patch -p1 < ../patch-a52dec.patch &&
+    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/liba52.a
 }
 Wget   $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
@@ -75,10 +75,9 @@
 }
 actions LibAvCodec
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf ffmpeg && (gzip -dc ffmpeg.tar.gz | tar xf -) &&
-    cd ffmpeg && $(FFMPEG_PATCH) &&
-    ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/ffmpeg && $(FFMPEG_PATCH) &&
+    ./configure --prefix="$CONTRIB" --cc="%%CC%%" --extra-libs="%%PTHREAD_LIBS%%" --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static --disable-opts \
         --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \
         --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
         --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&
@@ -113,10 +112,9 @@
     }
     actions LibDvdCss
     {
-        cd `dirname $(>)` && CONTRIB=`pwd` &&
-        rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && 
-        cd libdvdcss &&
-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
+        CONTRIB=%%CONTRIB%% &&
+        cd $CONTRIB/libdvdcss &&
+        ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
         $(STRIP) $CONTRIB/lib/libdvdcss.a
     }
     Wget      $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
@@ -131,10 +129,9 @@
 }
 actions LibDCA
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && 
-    cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/libdca && patch -p1 < ../patch-libdca.patch &&
+    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libdca.a
 }
 Wget   $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
@@ -150,10 +147,9 @@
 {
     actions LibDvdRead
     {
-        cd `dirname $(>)` && CONTRIB=`pwd` &&
-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
-        cd libdvdread &&
-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&
+        CONTRIB=%%CONTRIB%% &&
+        cd $CONTRIB/libdvdread &&
+        ./configure --prefix=$CONTRIB --disable-shared --with-libdvdcss=$CONTRIB &&
         $(MAKE) && $(MAKE) install &&
         $(STRIP) $CONTRIB/lib/libdvdread.a
     }
@@ -163,10 +159,9 @@
     # configure line.
     actions LibDvdRead
     {
-        cd `dirname $(>)` && CONTRIB=`pwd` &&
-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
-        cd libdvdread &&
-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+        CONTRIB=%%CONTRIB%% &&
+        cd $CONTRIB/libdvdread &&
+        ./configure --prefix=$CONTRIB --disable-shared &&
         $(MAKE) && $(MAKE) install &&
         $(STRIP) $CONTRIB/lib/libdvdread.a
     }
@@ -182,9 +177,9 @@
 }
 actions LibFaac
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/faac &&
+    ./configure --prefix=$CONTRIB --disable-shared --enable-static &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libfaac.a
 }
@@ -199,9 +194,9 @@
 }
 actions LibMp3Lame
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/lame &&
+    ./configure --prefix=$CONTRIB --disable-shared &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmp3lame.a
 }
@@ -224,10 +219,10 @@
 }
 actions LibMp4v2
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
-    cd mpeg4ip && $(LIBMP4V2_PATCH)
-    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/mpeg4ip &&
+    $(LIBMP4V2_PATCH)
+    ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
     $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
     cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
         include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
@@ -243,10 +238,9 @@
 }
 actions LibMkv
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && 
-    cd libmkv &&
-    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/libmkv &&
+    ./configure --disable-shared --enable-static --prefix=$CONTRIB &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmkv.a
 }
@@ -261,10 +255,9 @@
 }
 actions LibMpeg2
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
-    cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
+    ./configure --prefix=$CONTRIB --disable-shared --disable-sdl &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmpeg2.a
 }
@@ -279,10 +272,9 @@
 }
 actions LibOgg
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && 
-    cd libogg &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/libogg &&
+    ./configure --prefix=$CONTRIB --disable-shared &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libogg.a
 }
@@ -297,10 +289,9 @@
 }
 actions LibSampleRate
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && 
-    cd libsamplerate &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/libsamplerate &&
+    ./configure --prefix=$CONTRIB --disable-shared &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libsamplerate.a
 }
@@ -315,10 +306,9 @@
 }
 actions LibVorbis
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) &&
-    cd libvorbis &&
-    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/libvorbis &&
+    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --disable-shared &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libvorbis.a
 }
@@ -356,10 +346,9 @@
 }
 actions LibX264
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
-    cd x264 && $(LIBX264_PATCH)
-    bash ./configure --prefix=$CONTRIB --enable-pthread &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/x264 && $(LIBX264_PATCH)
+    ./configure --prefix=$CONTRIB --enable-pthread && $(MAKE) &&
     $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
 }
 Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
@@ -383,10 +372,9 @@
 }
 actions LibXvidCore
 {
-    cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) &&
-    cd xvidcore && $(LIBXVIDCORE_PATCH)
-    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&
+    CONTRIB=%%CONTRIB%% &&
+    cd $CONTRIB/xvidcore && $(LIBXVIDCORE_PATCH)
+    cd build/generic/ && ./configure --prefix=$CONTRIB && $(MAKE) libxvidcore.a &&
     cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
     cp ../../src/xvid.h $CONTRIB/include/ &&
     $(STRIP) $CONTRIB/lib/libxvidcore.a
@@ -404,9 +392,8 @@
     }
     actions Zlib
     {
-        cd `dirname $(>)` && CONTRIB=`pwd` &&
-        rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
-        cd zlib && ./configure --prefix=$CONTRIB &&
+        CONTRIB=%%CONTRIB%% &&
+        cd $CONTRIB/zlib && ./configure --prefix=$CONTRIB &&
         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
         $(STRIP) $CONTRIB/lib/libz.a
     }


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed May 21 04:10:08 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jaj@hcl-club.lu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Wed, 21 May 2008 04:10:06 UT

 Maintainer of multimedia/handbrake,
 
 Please note that PR ports/123849 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/123849
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Jonathan Stewart <jonathan@kc8onw.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Wed, 04 Jun 2008 09:10:04 +0300

 This is a multi-part message in MIME format.
 --------------090508050904090103040609
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 A revised patch for .9.2 is attached using diff -ruN this time.
 
 I am also volunteering to take over maintainership of the port if the 
 current maintainer approves this patch and an ownership change.
 
 Jonathan Stewart
 
 --------------090508050904090103040609
 Content-Type: text/plain;
  name="handbrake_0.9.2.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="handbrake_0.9.2.diff"
 
 diff -ruN handbrake.orig/Makefile handbrake/Makefile
 --- handbrake.orig/Makefile	2008-02-20 04:19:09.000000000 +0300
 +++ handbrake/Makefile	2008-06-04 01:54:54.000000000 +0300
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	handbrake
 -PORTVERSION=	0.9.1
 +PORTVERSION=	0.9.2
  CATEGORIES=	multimedia
  MASTER_SITES=	http://saintdevelopment.com/mirror/handbrake/:main \
  		http://junk.phantomgorilla.com/hb/:main \
 @@ -21,14 +21,14 @@
  		libdca-r81-strapped.tar.gz:contrib \
  		libdvdcss-1.2.9.tar.gz:contrib \
  		libdvdread-0.9.7.tar.gz:contrib \
 -		libmkv-0.6.1.2.tar.gz:contrib \
 +		libmkv-0.6.1.3.tar.gz:contrib \
  		libogg-1.1.2.tar.gz:contrib \
  		libvorbis-aotuv_b5.tar.gz:contrib \
  		mpeg2dec-0.4.1.tar.gz:contrib \
  		mpeg4ip-1.3.tar.gz:contrib \
  		xvidcore-1.1.2.tar.gz:contrib \
  		ffmpeg-9816.tar.gz:contrib \
 -		x264-r665.tar.gz:contrib \
 +		x264-r736.tar.gz:contrib \
  		a52dec-0.7.4.tar.gz:contrib \
  		libsamplerate-0.1.2.tar.gz:contrib
  DIST_SUBDIR=	handbrake
 diff -ruN handbrake.orig/distinfo handbrake/distinfo
 --- handbrake.orig/distinfo	2007-12-13 19:50:15.000000000 +0300
 +++ handbrake/distinfo	2008-06-04 01:54:54.000000000 +0300
 @@ -1,6 +1,6 @@
 -MD5 (handbrake/HandBrake-0.9.1.tar.gz) = 0eefe9189d59a0bfd9aeee41fd3d01a2
 -SHA256 (handbrake/HandBrake-0.9.1.tar.gz) = ae29b03dfd9724d7856f8b44a5a52bc60ad0af2846efe7db302d90dccc57d54b
 -SIZE (handbrake/HandBrake-0.9.1.tar.gz) = 1160277
 +MD5 (handbrake/HandBrake-0.9.2.tar.gz) = d21e0a097699e98f308d8c24dfa1594a
 +SHA256 (handbrake/HandBrake-0.9.2.tar.gz) = d5752e29e67d790be6e4ae2578054e5bc303cac8beade46d1851c0ee7e8860a6
 +SIZE (handbrake/HandBrake-0.9.2.tar.gz) = 1692074
  MD5 (handbrake/faac-1.24.tar.gz) = 81dc3efd98f1f2da0ac8bfa315284e95
  SHA256 (handbrake/faac-1.24.tar.gz) = 8eda7b69669f9d57c114d740555eb8bab29e4add90fade1aed41dd2ac1d19df6
  SIZE (handbrake/faac-1.24.tar.gz) = 627837
 @@ -16,9 +16,9 @@
  MD5 (handbrake/libdvdread-0.9.7.tar.gz) = a89a8532d5f850014f375bd3f5972082
  SHA256 (handbrake/libdvdread-0.9.7.tar.gz) = 18cf0ee3887264f09f2e23672923aec821ae9b806415ae0d78d0e310c1304c1f
  SIZE (handbrake/libdvdread-0.9.7.tar.gz) = 388570
 -MD5 (handbrake/libmkv-0.6.1.2.tar.gz) = be5d3a31477efb54766c8d9da89e1865
 -SHA256 (handbrake/libmkv-0.6.1.2.tar.gz) = 5d14627e98e0e8e3ff94ad11cb37dd5a35e909c5ba6444ef9e8b53b937ff3f3b
 -SIZE (handbrake/libmkv-0.6.1.2.tar.gz) = 334575
 +MD5 (handbrake/libmkv-0.6.1.3.tar.gz) = b0a81a416bffe19d54236f241632933c
 +SHA256 (handbrake/libmkv-0.6.1.3.tar.gz) = b116504390d3ec178ecb3cd6fb12e062b62b0909a7f1adcbaba00ed64fe63347
 +SIZE (handbrake/libmkv-0.6.1.3.tar.gz) = 329899
  MD5 (handbrake/libogg-1.1.2.tar.gz) = 4018e57063a9e5ce35145d73bea4b18b
  SHA256 (handbrake/libogg-1.1.2.tar.gz) = 0572ac9027caadb6ee4c2e3c87f98b045a66216ff2006041b12fceb5fb2f0332
  SIZE (handbrake/libogg-1.1.2.tar.gz) = 423463
 @@ -37,9 +37,9 @@
  MD5 (handbrake/ffmpeg-9816.tar.gz) = cfc6b97f830eddccbbb82b97ee6e3b78
  SHA256 (handbrake/ffmpeg-9816.tar.gz) = 23a38e102fa3d2df67e17e21a52d068665580d4fa5bb1d0e6ca4abb5a23894f2
  SIZE (handbrake/ffmpeg-9816.tar.gz) = 2706937
 -MD5 (handbrake/x264-r665.tar.gz) = a0fbe36eb7b03e61a96dd146e9c1ebbc
 -SHA256 (handbrake/x264-r665.tar.gz) = b61d2122ff559867d173413b1f3eba649d614a5a2e3be90642375d79bd79d30e
 -SIZE (handbrake/x264-r665.tar.gz) = 751198
 +MD5 (handbrake/x264-r736.tar.gz) = ea5dc8c2bfe33dc136687366237556db
 +SHA256 (handbrake/x264-r736.tar.gz) = fb020efbf89e8baf3b1ec93ee05c8cace4557a9658dffb99ef7d3e37521bbf3b
 +SIZE (handbrake/x264-r736.tar.gz) = 794658
  MD5 (handbrake/a52dec-0.7.4.tar.gz) = ce5a978bb359f642dcbd24c6e14a45a7
  SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
  SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
 diff -ruN handbrake.orig/files/patch-contrib-Jamfile handbrake/files/patch-contrib-Jamfile
 --- handbrake.orig/files/patch-contrib-Jamfile	2007-12-13 19:50:15.000000000 +0300
 +++ handbrake/files/patch-contrib-Jamfile	2008-06-04 01:54:54.000000000 +0300
 @@ -1,6 +1,6 @@
 ---- contrib/Jamfile.orig	2007-10-08 15:57:23.000000000 -0500
 -+++ contrib/Jamfile	2007-12-07 17:58:44.000000000 -0600
 -@@ -23,9 +23,10 @@
 +--- contrib/Jamfile.orig	2008-05-21 05:18:06.844254734 +0300
 ++++ contrib/Jamfile	2008-05-21 06:00:18.032459924 +0300
 +@@ -34,9 +34,10 @@
   }
   actions Wget
   {
 @@ -14,26 +14,26 @@
   }
   
   # liba52
 -@@ -36,10 +37,9 @@
 - }
 +@@ -48,10 +49,9 @@
   actions LibA52
   {
 --
 + 
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf a52dec && tar xzf a52dec.tar.gz && cd a52dec && patch -p1 < ../patch-a52dec.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && 
 +-    cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/a52dec && patch -p1 < ../patch-a52dec.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/liba52.a
 +     $(STRIP) $CONTRIB/lib/liba52.a
   }
   Wget   $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
 -@@ -58,14 +58,13 @@
 +@@ -75,10 +75,9 @@
   }
   actions LibAvCodec
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf ffmpeg && tar xzf ffmpeg.tar.gz &&
 +-    rm -rf ffmpeg && (gzip -dc ffmpeg.tar.gz | tar xf -) &&
  -    cd ffmpeg && $(FFMPEG_PATCH) &&
  -    ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \
  +    CONTRIB=%%CONTRIB%% &&
 @@ -42,244 +42,210 @@
           --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \
           --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
           --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&
 --    make && make install &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libavcodec.a
 - }
 - Wget       $(SUBDIR)/ffmpeg.tar.gz    : $(SUBDIR)/version_ffmpeg.txt ;
 -@@ -96,9 +95,9 @@
 +@@ -113,10 +112,9 @@
       }
       actions LibDvdCss
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdcss && tar xzf libdvdcss.tar.gz && cd libdvdcss &&
 --        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-        rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && 
 +-        cd libdvdcss &&
 +-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdcss &&
  +        ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdcss.a
 +         $(STRIP) $CONTRIB/lib/libdvdcss.a
       }
       Wget      $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
 -@@ -113,9 +112,9 @@
 +@@ -131,10 +129,9 @@
   }
   actions LibDCA
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libdca && tar xzf libdca.tar.gz && cd libdca && patch -p1 < ../patch-libdca.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && 
 +-    cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libdca && patch -p1 < ../patch-libdca.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libdca.a
 +     $(STRIP) $CONTRIB/lib/libdca.a
   }
   Wget   $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
 -@@ -131,10 +130,10 @@
 +@@ -150,10 +147,9 @@
   {
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared --with-libdvdcss=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -143,10 +142,10 @@
 +@@ -163,10 +159,9 @@
       # configure line.
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -161,10 +160,10 @@
 +@@ -182,9 +177,9 @@
   }
   actions LibFaac
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf faac && tar xzf faac.tar.gz && cd faac &&
 +-    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/faac &&
  +    ./configure --prefix=$CONTRIB --disable-shared --enable-static &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libfaac.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libfaac.a
   }
 - Wget    $(SUBDIR)/faac.tar.gz   : $(SUBDIR)/version_faac.txt ;
 -@@ -178,10 +177,10 @@
 +@@ -199,9 +194,9 @@
   }
   actions LibMp3Lame
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf lame && tar xzf lame.tar.gz && cd lame &&
 +-    rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/lame &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmp3lame.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmp3lame.a
   }
 - Wget       $(SUBDIR)/lame.tar.gz      : $(SUBDIR)/version_lame.txt ;
 -@@ -197,11 +196,11 @@
 - {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -211,11 +210,11 @@
 +@@ -224,10 +219,10 @@
 + }
 + actions LibMp4v2
   {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p1 < ../patch_mpeg4ip_cygwin.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -231,10 +230,10 @@
 +-    cd `dirname $(>)` && CONTRIB=`pwd` &&
 +-    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
 +-    cd mpeg4ip && $(LIBMP4V2_PATCH)
 +-    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 ++    CONTRIB=%%CONTRIB%% &&
 ++    cd $CONTRIB/mpeg4ip &&
 ++    $(LIBMP4V2_PATCH)
 ++    ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 +     $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 +     cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 +         include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 +@@ -243,10 +238,9 @@
   }
   actions LibMkv
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libmkv && tar xzf libmkv.tar.gz && cd libmkv &&
 +-    rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && 
 +-    cd libmkv &&
  -    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libmkv &&
  +    ./configure --disable-shared --enable-static --prefix=$CONTRIB &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmkv.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmkv.a
   }
 - Wget    $(SUBDIR)/libmkv.tar.gz : $(SUBDIR)/version_libmkv.txt ;
 -@@ -248,10 +247,10 @@
 +@@ -261,10 +255,9 @@
   }
   actions LibMpeg2
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf mpeg2dec && tar xzf mpeg2dec.tar.gz && cd mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
 +-    rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
 +-    cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
  +    ./configure --prefix=$CONTRIB --disable-shared --disable-sdl &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmpeg2.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmpeg2.a
   }
 - Wget     $(SUBDIR)/mpeg2dec.tar.gz : $(SUBDIR)/version_mpeg2dec.txt ;
 -@@ -265,10 +264,10 @@
 +@@ -279,10 +272,9 @@
   }
   actions LibOgg
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libogg && tar xzf libogg.tar.gz && cd libogg &&
 +-    rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && 
 +-    cd libogg &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libogg &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libogg.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libogg.a
   }
 - Wget   $(SUBDIR)/libogg.tar.gz : $(SUBDIR)/version_libogg.txt ;
 -@@ -282,10 +281,10 @@
 +@@ -297,10 +289,9 @@
   }
   actions LibSampleRate
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libsamplerate && tar xzf libsamplerate.tar.gz && cd libsamplerate &&
 +-    rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && 
 +-    cd libsamplerate &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libsamplerate &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libsamplerate.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libsamplerate.a
   }
 - Wget          $(SUBDIR)/libsamplerate.tar.gz : $(SUBDIR)/version_libsamplerate.txt ;
 -@@ -299,10 +298,10 @@
 +@@ -315,10 +306,9 @@
   }
   actions LibVorbis
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libvorbis && tar xzf libvorbis.tar.gz && cd libvorbis &&
 +-    rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) &&
 +-    cd libvorbis &&
  -    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libvorbis &&
  +    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libvorbis.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libvorbis.a
   }
 - Wget      $(SUBDIR)/libvorbis.tar.gz : $(SUBDIR)/version_libvorbis.txt ;
 -@@ -338,10 +337,10 @@
 +@@ -356,10 +346,9 @@
   }
   actions LibX264
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf x264 && tar xzf x264.tar.gz && cd x264 && $(LIBX264_PATCH)
 --    ./configure --prefix=$CONTRIB --enable-pthread && make &&
 --    make install &&
 +-    rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
 +-    cd x264 && $(LIBX264_PATCH)
 +-    bash ./configure --prefix=$CONTRIB --enable-pthread &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/x264 && $(LIBX264_PATCH)
  +    ./configure --prefix=$CONTRIB --enable-pthread && $(MAKE) &&
 -+    $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libx264.a
 +     $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
   }
   Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
 -@@ -364,10 +363,9 @@
 +@@ -383,10 +372,9 @@
   }
   actions LibXvidCore
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf xvidcore && tar xzf xvidcore.tar.gz &&
 +-    rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) &&
  -    cd xvidcore && $(LIBXVIDCORE_PATCH)
 --    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make libxvidcore.a &&
 +-    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/xvidcore && $(LIBXVIDCORE_PATCH)
  +    cd build/generic/ && ./configure --prefix=$CONTRIB && $(MAKE) libxvidcore.a &&
       cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
       cp ../../src/xvid.h $CONTRIB/include/ &&
 -     strip -S $CONTRIB/lib/libxvidcore.a
 -@@ -385,10 +383,9 @@
 +     $(STRIP) $CONTRIB/lib/libxvidcore.a
 +@@ -404,9 +392,8 @@
       }
       actions Zlib
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf zlib && tar xzf zlib.tar.gz &&
 --        cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --        make && make install && touch $CONTRIB/.contrib &&
 +-        rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
 +-        cd zlib && ./configure --prefix=$CONTRIB &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/zlib && ./configure --prefix=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 -         strip -S $CONTRIB/lib/libz.a
 +         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 +         $(STRIP) $CONTRIB/lib/libz.a
       }
 -     Wget  $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ;
 
 --------------090508050904090103040609--

From: Jona Joachim <jaj@hcl-club.lu>
To: bug-followup@FreeBSD.org
Cc: jonathan@kc8onw.net, edwin@FreeBSD.org
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Wed, 4 Jun 2008 20:32:32 +0200

 does this actually build for you?
 I get several build errors.
 
 Here's a complete build log:
 http://www.hcl-club.lu/~jaj/stuff/handbrake-0.9.2_buildlog
 
 uname -a
 FreeBSD nirvana.my.domain 7.0-STABLE FreeBSD 7.0-STABLE #0: Wed May 28 19:35:33 CEST 2008     root@nirvana.my.domain:/usr/obj/usr/src/sys/HYPOCENTER  i386

From: jonathan@kc8onw.net
To: "Jona Joachim" <jaj@hcl-club.lu>
Cc: bug-followup@freebsd.org,
 jonathan@kc8onw.net,
 edwin@freebsd.org
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Thu, 5 Jun 2008 01:14:49 -0400 (EDT)

 On Wed, June 4, 2008 14:32, Jona Joachim wrote:
 > does this actually build for you? I get several build errors.
 >
 >
 > Here's a complete build log:
 > http://www.hcl-club.lu/~jaj/stuff/handbrake-0.9.2_buildlog
 
 I have a build log up at http://iraq.kc8onw.net/handbrake_.9.2.log now. 
 Our logs differ after a bit, yours has
 
 Making all in autotools
 cd: can't cd to autotools
 gmake: *** [all-recursive] Error 1
 
 While mine has
 
 Making all in autotools
 gmake[1]: Entering directory
 `/usr/ports/multimedia/handbrake/work/HandBrake/contrib/a52dec/autotools'
 
 I don't know why it would be doing this though.  I won't be able to look
 into it for a couple of days but I will try and see if I missed something
 on my end when I get a chance.  (This log is from a build I did after
 receiving your email)
 
 Jonathan
 
 

From: jonathan@kc8onw.net
To: jonathan@kc8onw.net
Cc: "Jona Joachim" <jaj@hcl-club.lu>,
 bug-followup@freebsd.org,
 jonathan@kc8onw.net,
 edwin@freebsd.org
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Mon, 9 Jun 2008 13:13:47 -0400 (EDT)

 ------=_20080609131347_85746
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 On Thu, June 5, 2008 01:14, jonathan@kc8onw.net wrote:
 > On Wed, June 4, 2008 14:32, Jona Joachim wrote:
 >
 >> does this actually build for you? I get several build errors.
 
 I just blew away my ports tree, recreated it, and applied the patch.  It
 built without problems again.  I'll attach the patch I used to this email
 in case something got messed up last time.
 
 Jonathan Stewart
 
 ------=_20080609131347_85746
 Content-Type: application/octet-stream; name="handbrake_0.9.2.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="handbrake_0.9.2.diff"
 
 ZGlmZiAtcnVOIGhhbmRicmFrZS5vcmlnL01ha2VmaWxlIGhhbmRicmFrZS9NYWtlZmlsZQotLS0g
 aGFuZGJyYWtlLm9yaWcvTWFrZWZpbGUJMjAwOC0wMi0yMCAwNDoxOTowOS4wMDAwMDAwMDAgKzAz
 MDAKKysrIGhhbmRicmFrZS9NYWtlZmlsZQkyMDA4LTA2LTA0IDAxOjU0OjU0LjAwMDAwMDAwMCAr
 MDMwMApAQCAtNiw3ICs2LDcgQEAKICMKIAogUE9SVE5BTUU9CWhhbmRicmFrZQotUE9SVFZFUlNJ
 T049CTAuOS4xCitQT1JUVkVSU0lPTj0JMC45LjIKIENBVEVHT1JJRVM9CW11bHRpbWVkaWEKIE1B
 U1RFUl9TSVRFUz0JaHR0cDovL3NhaW50ZGV2ZWxvcG1lbnQuY29tL21pcnJvci9oYW5kYnJha2Uv
 Om1haW4gXAogCQlodHRwOi8vanVuay5waGFudG9tZ29yaWxsYS5jb20vaGIvOm1haW4gXApAQCAt
 MjEsMTQgKzIxLDE0IEBACiAJCWxpYmRjYS1yODEtc3RyYXBwZWQudGFyLmd6OmNvbnRyaWIgXAog
 CQlsaWJkdmRjc3MtMS4yLjkudGFyLmd6OmNvbnRyaWIgXAogCQlsaWJkdmRyZWFkLTAuOS43LnRh
 ci5nejpjb250cmliIFwKLQkJbGlibWt2LTAuNi4xLjIudGFyLmd6OmNvbnRyaWIgXAorCQlsaWJt
 a3YtMC42LjEuMy50YXIuZ3o6Y29udHJpYiBcCiAJCWxpYm9nZy0xLjEuMi50YXIuZ3o6Y29udHJp
 YiBcCiAJCWxpYnZvcmJpcy1hb3R1dl9iNS50YXIuZ3o6Y29udHJpYiBcCiAJCW1wZWcyZGVjLTAu
 NC4xLnRhci5nejpjb250cmliIFwKIAkJbXBlZzRpcC0xLjMudGFyLmd6OmNvbnRyaWIgXAogCQl4
 dmlkY29yZS0xLjEuMi50YXIuZ3o6Y29udHJpYiBcCiAJCWZmbXBlZy05ODE2LnRhci5nejpjb250
 cmliIFwKLQkJeDI2NC1yNjY1LnRhci5nejpjb250cmliIFwKKwkJeDI2NC1yNzM2LnRhci5nejpj
 b250cmliIFwKIAkJYTUyZGVjLTAuNy40LnRhci5nejpjb250cmliIFwKIAkJbGlic2FtcGxlcmF0
 ZS0wLjEuMi50YXIuZ3o6Y29udHJpYgogRElTVF9TVUJESVI9CWhhbmRicmFrZQpkaWZmIC1ydU4g
 aGFuZGJyYWtlLm9yaWcvZGlzdGluZm8gaGFuZGJyYWtlL2Rpc3RpbmZvCi0tLSBoYW5kYnJha2Uu
 b3JpZy9kaXN0aW5mbwkyMDA3LTEyLTEzIDE5OjUwOjE1LjAwMDAwMDAwMCArMDMwMAorKysgaGFu
 ZGJyYWtlL2Rpc3RpbmZvCTIwMDgtMDYtMDQgMDE6NTQ6NTQuMDAwMDAwMDAwICswMzAwCkBAIC0x
 LDYgKzEsNiBAQAotTUQ1IChoYW5kYnJha2UvSGFuZEJyYWtlLTAuOS4xLnRhci5neikgPSAwZWVm
 ZTkxODlkNTlhMGJmZDlhZWVlNDFmZDNkMDFhMgotU0hBMjU2IChoYW5kYnJha2UvSGFuZEJyYWtl
 LTAuOS4xLnRhci5neikgPSBhZTI5YjAzZGZkOTcyNGQ3ODU2ZjhiNDRhNWE1MmJjNjBhZDBhZjI4
 NDZlZmU3ZGIzMDJkOTBkY2NjNTdkNTRiCi1TSVpFIChoYW5kYnJha2UvSGFuZEJyYWtlLTAuOS4x
 LnRhci5neikgPSAxMTYwMjc3CitNRDUgKGhhbmRicmFrZS9IYW5kQnJha2UtMC45LjIudGFyLmd6
 KSA9IGQyMWUwYTA5NzY5OWU5OGYzMDhkOGMyNGRmYTE1OTRhCitTSEEyNTYgKGhhbmRicmFrZS9I
 YW5kQnJha2UtMC45LjIudGFyLmd6KSA9IGQ1NzUyZTI5ZTY3ZDc5MGJlNmU0YWUyNTc4MDU0ZTVi
 YzMwM2NhYzhiZWFkZTQ2ZDE4NTFjMGVlN2U4ODYwYTYKK1NJWkUgKGhhbmRicmFrZS9IYW5kQnJh
 a2UtMC45LjIudGFyLmd6KSA9IDE2OTIwNzQKIE1ENSAoaGFuZGJyYWtlL2ZhYWMtMS4yNC50YXIu
 Z3opID0gODFkYzNlZmQ5OGYxZjJkYTBhYzhiZmEzMTUyODRlOTUKIFNIQTI1NiAoaGFuZGJyYWtl
 L2ZhYWMtMS4yNC50YXIuZ3opID0gOGVkYTdiNjk2NjlmOWQ1N2MxMTRkNzQwNTU1ZWI4YmFiMjll
 NGFkZDkwZmFkZTFhZWQ0MWRkMmFjMWQxOWRmNgogU0laRSAoaGFuZGJyYWtlL2ZhYWMtMS4yNC50
 YXIuZ3opID0gNjI3ODM3CkBAIC0xNiw5ICsxNiw5IEBACiBNRDUgKGhhbmRicmFrZS9saWJkdmRy
 ZWFkLTAuOS43LnRhci5neikgPSBhODlhODUzMmQ1Zjg1MDAxNGYzNzViZDNmNTk3MjA4MgogU0hB
 MjU2IChoYW5kYnJha2UvbGliZHZkcmVhZC0wLjkuNy50YXIuZ3opID0gMThjZjBlZTM4ODcyNjRm
 MDlmMmUyMzY3MjkyM2FlYzgyMWFlOWI4MDY0MTVhZTBkNzhkMGUzMTBjMTMwNGMxZgogU0laRSAo
 aGFuZGJyYWtlL2xpYmR2ZHJlYWQtMC45LjcudGFyLmd6KSA9IDM4ODU3MAotTUQ1IChoYW5kYnJh
 a2UvbGlibWt2LTAuNi4xLjIudGFyLmd6KSA9IGJlNWQzYTMxNDc3ZWZiNTQ3NjZjOGQ5ZGE4OWUx
 ODY1Ci1TSEEyNTYgKGhhbmRicmFrZS9saWJta3YtMC42LjEuMi50YXIuZ3opID0gNWQxNDYyN2U5
 OGUwZThlM2ZmOTRhZDExY2IzN2RkNWEzNWU5MDljNWJhNjQ0NGVmOWU4YjUzYjkzN2ZmM2YzYgot
 U0laRSAoaGFuZGJyYWtlL2xpYm1rdi0wLjYuMS4yLnRhci5neikgPSAzMzQ1NzUKK01ENSAoaGFu
 ZGJyYWtlL2xpYm1rdi0wLjYuMS4zLnRhci5neikgPSBiMGE4MWE0MTZiZmZlMTlkNTQyMzZmMjQx
 NjMyOTMzYworU0hBMjU2IChoYW5kYnJha2UvbGlibWt2LTAuNi4xLjMudGFyLmd6KSA9IGIxMTY1
 MDQzOTBkM2VjMTc4ZWNiM2NkNmZiMTJlMDYyYjYyYjA5MDlhN2YxYWRjYmFiYTAwZWQ2NGZlNjMz
 NDcKK1NJWkUgKGhhbmRicmFrZS9saWJta3YtMC42LjEuMy50YXIuZ3opID0gMzI5ODk5CiBNRDUg
 KGhhbmRicmFrZS9saWJvZ2ctMS4xLjIudGFyLmd6KSA9IDQwMThlNTcwNjNhOWU1Y2UzNTE0NWQ3
 M2JlYTRiMThiCiBTSEEyNTYgKGhhbmRicmFrZS9saWJvZ2ctMS4xLjIudGFyLmd6KSA9IDA1NzJh
 YzkwMjdjYWFkYjZlZTRjMmUzYzg3Zjk4YjA0NWE2NjIxNmZmMjAwNjA0MWIxMmZjZWI1ZmIyZjAz
 MzIKIFNJWkUgKGhhbmRicmFrZS9saWJvZ2ctMS4xLjIudGFyLmd6KSA9IDQyMzQ2MwpAQCAtMzcs
 OSArMzcsOSBAQAogTUQ1IChoYW5kYnJha2UvZmZtcGVnLTk4MTYudGFyLmd6KSA9IGNmYzZiOTdm
 ODMwZWRkY2NiYmI4MmI5N2VlNmUzYjc4CiBTSEEyNTYgKGhhbmRicmFrZS9mZm1wZWctOTgxNi50
 YXIuZ3opID0gMjNhMzhlMTAyZmEzZDJkZjY3ZTE3ZTIxYTUyZDA2ODY2NTU4MGQ0ZmE1YmIxZDBl
 NmNhNGFiYjVhMjM4OTRmMgogU0laRSAoaGFuZGJyYWtlL2ZmbXBlZy05ODE2LnRhci5neikgPSAy
 NzA2OTM3Ci1NRDUgKGhhbmRicmFrZS94MjY0LXI2NjUudGFyLmd6KSA9IGEwZmJlMzZlYjdiMDNl
 NjFhOTZkZDE0NmU5YzFlYmJjCi1TSEEyNTYgKGhhbmRicmFrZS94MjY0LXI2NjUudGFyLmd6KSA9
 IGI2MWQyMTIyZmY1NTk4NjdkMTczNDEzYjFmM2ViYTY0OWQ2MTRhNWEyZTNiZTkwNjQyMzc1ZDc5
 YmQ3OWQzMGUKLVNJWkUgKGhhbmRicmFrZS94MjY0LXI2NjUudGFyLmd6KSA9IDc1MTE5OAorTUQ1
 IChoYW5kYnJha2UveDI2NC1yNzM2LnRhci5neikgPSBlYTVkYzhjMmJmZTMzZGMxMzY2ODczNjYy
 Mzc1NTZkYgorU0hBMjU2IChoYW5kYnJha2UveDI2NC1yNzM2LnRhci5neikgPSBmYjAyMGVmYmY4
 OWU4YmFmM2IxZWM5M2VlMDVjOGNhY2U0NTU3YTk2NThkZmZiOTllZjdkM2UzNzUyMWJiZjNiCitT
 SVpFIChoYW5kYnJha2UveDI2NC1yNzM2LnRhci5neikgPSA3OTQ2NTgKIE1ENSAoaGFuZGJyYWtl
 L2E1MmRlYy0wLjcuNC50YXIuZ3opID0gY2U1YTk3OGJiMzU5ZjY0MmRjYmQyNGM2ZTE0YTQ1YTcK
 IFNIQTI1NiAoaGFuZGJyYWtlL2E1MmRlYy0wLjcuNC50YXIuZ3opID0gNTQ5ODFhYjA4ZmMwOWE2
 NzViOTkyNDM3MmNmMGNjYTVhYTUzNjNiOTE4YzRjMTkwNjVjMmQ0MGUyODU4YmU0NwogU0laRSAo
 aGFuZGJyYWtlL2E1MmRlYy0wLjcuNC50YXIuZ3opID0gMjQyOTc4CmRpZmYgLXJ1TiBoYW5kYnJh
 a2Uub3JpZy9maWxlcy9wYXRjaC1jb250cmliLUphbWZpbGUgaGFuZGJyYWtlL2ZpbGVzL3BhdGNo
 LWNvbnRyaWItSmFtZmlsZQotLS0gaGFuZGJyYWtlLm9yaWcvZmlsZXMvcGF0Y2gtY29udHJpYi1K
 YW1maWxlCTIwMDctMTItMTMgMTk6NTA6MTUuMDAwMDAwMDAwICswMzAwCisrKyBoYW5kYnJha2Uv
 ZmlsZXMvcGF0Y2gtY29udHJpYi1KYW1maWxlCTIwMDgtMDYtMDQgMDE6NTQ6NTQuMDAwMDAwMDAw
 ICswMzAwCkBAIC0xLDYgKzEsNiBAQAotLS0tIGNvbnRyaWIvSmFtZmlsZS5vcmlnCTIwMDctMTAt
 MDggMTU6NTc6MjMuMDAwMDAwMDAwIC0wNTAwCi0rKysgY29udHJpYi9KYW1maWxlCTIwMDctMTIt
 MDcgMTc6NTg6NDQuMDAwMDAwMDAwIC0wNjAwCi1AQCAtMjMsOSArMjMsMTAgQEAKKy0tLSBjb250
 cmliL0phbWZpbGUub3JpZwkyMDA4LTA1LTIxIDA1OjE4OjA2Ljg0NDI1NDczNCArMDMwMAorKysr
 IGNvbnRyaWIvSmFtZmlsZQkyMDA4LTA1LTIxIDA2OjAwOjE4LjAzMjQ1OTkyNCArMDMwMAorQEAg
 LTM0LDkgKzM0LDEwIEBACiAgfQogIGFjdGlvbnMgV2dldAogIHsKQEAgLTE0LDI2ICsxNCwyNiBA
 QAogIH0KICAKICAjIGxpYmE1MgotQEAgLTM2LDEwICszNyw5IEBACi0gfQorQEAgLTQ4LDEwICs0
 OSw5IEBACiAgYWN0aW9ucyBMaWJBNTIKICB7Ci0tCisgCiAtICAgIGNkIGBkaXJuYW1lICQoPilg
 ICYmIENPTlRSSUI9YHB3ZGAgJiYKLS0gICAgcm0gLXJmIGE1MmRlYyAmJiB0YXIgeHpmIGE1MmRl
 Yy50YXIuZ3ogJiYgY2QgYTUyZGVjICYmIHBhdGNoIC1wMSA8IC4uL3BhdGNoLWE1MmRlYy5wYXRj
 aCAmJgotLSAgICAuL2NvbmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJQiAtLWNhY2hlLWZpbGU9JENP
 TlRSSUIvY29uZmlnLmNhY2hlICYmIG1ha2UgJiYgbWFrZSBpbnN0YWxsICYmCistICAgIHJtIC1y
 ZiBhNTJkZWMgJiYgKGd6aXAgLWRjIGE1MmRlYy50YXIuZ3ogfCB0YXIgeGYgLSkgJiYgCistICAg
 IGNkIGE1MmRlYyAmJiAkKFBBVENIKSAtcDEgPCAuLi9wYXRjaC1hNTJkZWMucGF0Y2ggJiYKKy0g
 ICAgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1jYWNoZS1maWxlPSRDT05UUklCL2Nv
 bmZpZy5jYWNoZSAmJiAkKE1BS0UpICYmICQoTUFLRSkgaW5zdGFsbCAmJgogKyAgICBDT05UUklC
 PSUlQ09OVFJJQiUlICYmCiArICAgIGNkICRDT05UUklCL2E1MmRlYyAmJiBwYXRjaCAtcDEgPCAu
 Li9wYXRjaC1hNTJkZWMucGF0Y2ggJiYKICsgICAgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRS
 SUIgJiYgJChNQUtFKSAmJiAkKE1BS0UpIGluc3RhbGwgJiYKLSAgICAgc3RyaXAgLVMgJENPTlRS
 SUIvbGliL2xpYmE1Mi5hCisgICAgICQoU1RSSVApICRDT05UUklCL2xpYi9saWJhNTIuYQogIH0K
 ICBXZ2V0ICAgJChTVUJESVIpL2E1MmRlYy50YXIuZ3ogOiAkKFNVQkRJUikvdmVyc2lvbl9hNTJk
 ZWMudHh0IDsKLUBAIC01OCwxNCArNTgsMTMgQEAKK0BAIC03NSwxMCArNzUsOSBAQAogIH0KICBh
 Y3Rpb25zIExpYkF2Q29kZWMKICB7CiAtICAgIGNkIGBkaXJuYW1lICQoPilgICYmIENPTlRSSUI9
 YHB3ZGAgJiYKLS0gICAgcm0gLXJmIGZmbXBlZyAmJiB0YXIgeHpmIGZmbXBlZy50YXIuZ3ogJiYK
 Ky0gICAgcm0gLXJmIGZmbXBlZyAmJiAoZ3ppcCAtZGMgZmZtcGVnLnRhci5neiB8IHRhciB4ZiAt
 KSAmJgogLSAgICBjZCBmZm1wZWcgJiYgJChGRk1QRUdfUEFUQ0gpICYmCiAtICAgIC4vY29uZmln
 dXJlIC0tcHJlZml4PSRDT05UUklCIC0tZW5hYmxlLWdwbCAtLWVuYWJsZS1wdGhyZWFkcyAtLWVu
 YWJsZS1zd3NjYWxlciAtLWRpc2FibGUtYXVkaW8tYmVvcyAtLWRpc2FibGUtc2hhcmVkIC0tZW5h
 YmxlLXN0YXRpYyBcCiArICAgIENPTlRSSUI9JSVDT05UUklCJSUgJiYKQEAgLTQyLDI0NCArNDIs
 MjEwIEBACiAgICAgICAgICAtLWRpc2FibGUtZGVjb2RlcnMgLS1lbmFibGUtZGVjb2Rlcj1tcDIg
 LS1kaXNhYmxlLXBhcnNlcnMgLS1lbmFibGUtcGFyc2VyPW1wZWdhdWRpbyBcCiAgICAgICAgICAt
 LWRpc2FibGUtZW5jb2RlcnMgLS1lbmFibGUtZW5jb2Rlcj1tcGVnNCAtLWVuYWJsZS1lbmNvZGVy
 PWFjMyAtLWVuYWJsZS1lbmNvZGVyPXNub3cgXAogICAgICAgICAgLS1kaXNhYmxlLW11eGVycyAt
 LWVuYWJsZS1tdXhlcj1pcG9kIC0tZGlzYWJsZS1kZW11eGVycyAtLWRpc2FibGUtcHJvdG9jb2xz
 IC0tZGlzYWJsZS1ic2ZzICYmCi0tICAgIG1ha2UgJiYgbWFrZSBpbnN0YWxsICYmCi0rICAgICQo
 TUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYmCi0gICAgIHN0cmlwIC1TICRDT05UUklCL2xpYi9s
 aWJhdmNvZGVjLmEKLSB9Ci0gV2dldCAgICAgICAkKFNVQkRJUikvZmZtcGVnLnRhci5neiAgICA6
 ICQoU1VCRElSKS92ZXJzaW9uX2ZmbXBlZy50eHQgOwotQEAgLTk2LDkgKzk1LDkgQEAKK0BAIC0x
 MTMsMTAgKzExMiw5IEBACiAgICAgIH0KICAgICAgYWN0aW9ucyBMaWJEdmRDc3MKICAgICAgewog
 LSAgICAgICAgY2QgYGRpcm5hbWUgJCg+KWAgJiYgQ09OVFJJQj1gcHdkYCAmJgotLSAgICAgICAg
 cm0gLXJmIGxpYmR2ZGNzcyAmJiB0YXIgeHpmIGxpYmR2ZGNzcy50YXIuZ3ogJiYgY2QgbGliZHZk
 Y3NzICYmCi0tICAgICAgICAuL2NvbmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJQiAtLWNhY2hlLWZp
 bGU9JENPTlRSSUIvY29uZmlnLmNhY2hlICYmIG1ha2UgJiYgbWFrZSBpbnN0YWxsICYmCistICAg
 ICAgICBybSAtcmYgbGliZHZkY3NzICYmIChnemlwIC1kYyBsaWJkdmRjc3MudGFyLmd6IHwgdGFy
 IHhmIC0gKSAmJiAKKy0gICAgICAgIGNkIGxpYmR2ZGNzcyAmJgorLSAgICAgICAgLi9jb25maWd1
 cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1jYWNoZS1maWxlPSRDT05UUklCL2NvbmZpZy5jYWNoZSAm
 JiAkKE1BS0UpICYmICQoTUFLRSkgaW5zdGFsbCAmJgogKyAgICAgICAgQ09OVFJJQj0lJUNPTlRS
 SUIlJSAmJgogKyAgICAgICAgY2QgJENPTlRSSUIvbGliZHZkY3NzICYmCiArICAgICAgICAuL2Nv
 bmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJQiAmJiAkKE1BS0UpICYmICQoTUFLRSkgaW5zdGFsbCAm
 JgotICAgICAgICAgc3RyaXAgLVMgJENPTlRSSUIvbGliL2xpYmR2ZGNzcy5hCisgICAgICAgICAk
 KFNUUklQKSAkQ09OVFJJQi9saWIvbGliZHZkY3NzLmEKICAgICAgfQogICAgICBXZ2V0ICAgICAg
 JChTVUJESVIpL2xpYmR2ZGNzcy50YXIuZ3ogOiAkKFNVQkRJUikvdmVyc2lvbl9saWJkdmRjc3Mu
 dHh0IDsKLUBAIC0xMTMsOSArMTEyLDkgQEAKK0BAIC0xMzEsMTAgKzEyOSw5IEBACiAgfQogIGFj
 dGlvbnMgTGliRENBCiAgewogLSAgICBjZCBgZGlybmFtZSAkKD4pYCAmJiBDT05UUklCPWBwd2Rg
 ICYmCi0tICAgIHJtIC1yZiBsaWJkY2EgJiYgdGFyIHh6ZiBsaWJkY2EudGFyLmd6ICYmIGNkIGxp
 YmRjYSAmJiBwYXRjaCAtcDEgPCAuLi9wYXRjaC1saWJkY2EucGF0Y2ggJiYKLS0gICAgLi9jb25m
 aWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1jYWNoZS1maWxlPSRDT05UUklCL2NvbmZpZy5jYWNo
 ZSAmJiBtYWtlICYmIG1ha2UgaW5zdGFsbCAmJgorLSAgICBybSAtcmYgbGliZGNhICYmIChnemlw
 IC1kYyBsaWJkY2EudGFyLmd6IHwgdGFyIHhmIC0gKSAmJiAKKy0gICAgY2QgbGliZGNhICYmICQo
 UEFUQ0gpIC1wMSA8IC4uL3BhdGNoLWxpYmRjYS5wYXRjaCAmJgorLSAgICAuL2NvbmZpZ3VyZSAt
 LXByZWZpeD0kQ09OVFJJQiAtLWNhY2hlLWZpbGU9JENPTlRSSUIvY29uZmlnLmNhY2hlICYmICQo
 TUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYmCiArICAgIENPTlRSSUI9JSVDT05UUklCJSUgJiYK
 ICsgICAgY2QgJENPTlRSSUIvbGliZGNhICYmIHBhdGNoIC1wMSA8IC4uL3BhdGNoLWxpYmRjYS5w
 YXRjaCAmJgogKyAgICAuL2NvbmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJQiAmJiAkKE1BS0UpICYm
 ICQoTUFLRSkgaW5zdGFsbCAmJgotICAgICBzdHJpcCAtUyAkQ09OVFJJQi9saWIvbGliZGNhLmEK
 KyAgICAgJChTVFJJUCkgJENPTlRSSUIvbGliL2xpYmRjYS5hCiAgfQogIFdnZXQgICAkKFNVQkRJ
 UikvbGliZGNhLnRhci5neiA6ICQoU1VCRElSKS92ZXJzaW9uX2xpYmRjYS50eHQgOwotQEAgLTEz
 MSwxMCArMTMwLDEwIEBACitAQCAtMTUwLDEwICsxNDcsOSBAQAogIHsKICAgICAgYWN0aW9ucyBM
 aWJEdmRSZWFkCiAgICAgIHsKIC0gICAgICAgIGNkIGBkaXJuYW1lICQoPilgICYmIENPTlRSSUI9
 YHB3ZGAgJiYKLS0gICAgICAgIHJtIC1yZiBsaWJkdmRyZWFkICYmIHRhciB4emYgbGliZHZkcmVh
 ZC50YXIuZ3ogJiYgY2QgbGliZHZkcmVhZCAmJgorLSAgICAgICAgcm0gLXJmIGxpYmR2ZHJlYWQg
 JiYgKGd6aXAgLWRjIGxpYmR2ZHJlYWQudGFyLmd6IHwgdGFyIHhmIC0gKSAmJiAKKy0gICAgICAg
 IGNkIGxpYmR2ZHJlYWQgJiYKIC0gICAgICAgIC4vY29uZmlndXJlIC0tcHJlZml4PSRDT05UUklC
 IC0tY2FjaGUtZmlsZT0kQ09OVFJJQi9jb25maWcuY2FjaGUgLS1kaXNhYmxlLXNoYXJlZCAtLXdp
 dGgtbGliZHZkY3NzPSRDT05UUklCICYmCi0tICAgICAgICBtYWtlICYmIG1ha2UgaW5zdGFsbCAm
 JgogKyAgICAgICAgQ09OVFJJQj0lJUNPTlRSSUIlJSAmJgogKyAgICAgICAgY2QgJENPTlRSSUIv
 bGliZHZkcmVhZCAmJgogKyAgICAgICAgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1k
 aXNhYmxlLXNoYXJlZCAtLXdpdGgtbGliZHZkY3NzPSRDT05UUklCICYmCi0rICAgICAgICAkKE1B
 S0UpICYmICQoTUFLRSkgaW5zdGFsbCAmJgotICAgICAgICAgc3RyaXAgLVMgJENPTlRSSUIvbGli
 L2xpYmR2ZHJlYWQuYQorICAgICAgICAgJChNQUtFKSAmJiAkKE1BS0UpIGluc3RhbGwgJiYKKyAg
 ICAgICAgICQoU1RSSVApICRDT05UUklCL2xpYi9saWJkdmRyZWFkLmEKICAgICAgfQotIH0KLUBA
 IC0xNDMsMTAgKzE0MiwxMCBAQAorQEAgLTE2MywxMCArMTU5LDkgQEAKICAgICAgIyBjb25maWd1
 cmUgbGluZS4KICAgICAgYWN0aW9ucyBMaWJEdmRSZWFkCiAgICAgIHsKIC0gICAgICAgIGNkIGBk
 aXJuYW1lICQoPilgICYmIENPTlRSSUI9YHB3ZGAgJiYKLS0gICAgICAgIHJtIC1yZiBsaWJkdmRy
 ZWFkICYmIHRhciB4emYgbGliZHZkcmVhZC50YXIuZ3ogJiYgY2QgbGliZHZkcmVhZCAmJgorLSAg
 ICAgICAgcm0gLXJmIGxpYmR2ZHJlYWQgJiYgKGd6aXAgLWRjIGxpYmR2ZHJlYWQudGFyLmd6IHwg
 dGFyIHhmIC0gKSAmJiAKKy0gICAgICAgIGNkIGxpYmR2ZHJlYWQgJiYKIC0gICAgICAgIC4vY29u
 ZmlndXJlIC0tcHJlZml4PSRDT05UUklCIC0tY2FjaGUtZmlsZT0kQ09OVFJJQi9jb25maWcuY2Fj
 aGUgLS1kaXNhYmxlLXNoYXJlZCAmJgotLSAgICAgICAgbWFrZSAmJiBtYWtlIGluc3RhbGwgJiYK
 ICsgICAgICAgIENPTlRSSUI9JSVDT05UUklCJSUgJiYKICsgICAgICAgIGNkICRDT05UUklCL2xp
 YmR2ZHJlYWQgJiYKICsgICAgICAgIC4vY29uZmlndXJlIC0tcHJlZml4PSRDT05UUklCIC0tZGlz
 YWJsZS1zaGFyZWQgJiYKLSsgICAgICAgICQoTUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYmCi0g
 ICAgICAgICBzdHJpcCAtUyAkQ09OVFJJQi9saWIvbGliZHZkcmVhZC5hCisgICAgICAgICAkKE1B
 S0UpICYmICQoTUFLRSkgaW5zdGFsbCAmJgorICAgICAgICAgJChTVFJJUCkgJENPTlRSSUIvbGli
 L2xpYmR2ZHJlYWQuYQogICAgICB9Ci0gfQotQEAgLTE2MSwxMCArMTYwLDEwIEBACitAQCAtMTgy
 LDkgKzE3Nyw5IEBACiAgfQogIGFjdGlvbnMgTGliRmFhYwogIHsKIC0gICAgY2QgYGRpcm5hbWUg
 JCg+KWAgJiYgQ09OVFJJQj1gcHdkYCAmJgotLSAgICBybSAtcmYgZmFhYyAmJiB0YXIgeHpmIGZh
 YWMudGFyLmd6ICYmIGNkIGZhYWMgJiYKKy0gICAgcm0gLXJmIGZhYWMgJiYgKGd6aXAgLWRjIGZh
 YWMudGFyLmd6IHwgdGFyIHhmIC0gKSAmJiBjZCBmYWFjICYmCiAtICAgIC4vY29uZmlndXJlIC0t
 cHJlZml4PSRDT05UUklCIC0tY2FjaGUtZmlsZT0kQ09OVFJJQi9jb25maWcuY2FjaGUgLS1kaXNh
 YmxlLXNoYXJlZCAtLWVuYWJsZS1zdGF0aWMgJiYKLS0gICAgbWFrZSAmJiBtYWtlIGluc3RhbGwg
 JiYKICsgICAgQ09OVFJJQj0lJUNPTlRSSUIlJSAmJgogKyAgICBjZCAkQ09OVFJJQi9mYWFjICYm
 CiArICAgIC4vY29uZmlndXJlIC0tcHJlZml4PSRDT05UUklCIC0tZGlzYWJsZS1zaGFyZWQgLS1l
 bmFibGUtc3RhdGljICYmCi0rICAgICQoTUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYmCi0gICAg
 IHN0cmlwIC1TICRDT05UUklCL2xpYi9saWJmYWFjLmEKKyAgICAgJChNQUtFKSAmJiAkKE1BS0Up
 IGluc3RhbGwgJiYKKyAgICAgJChTVFJJUCkgJENPTlRSSUIvbGliL2xpYmZhYWMuYQogIH0KLSBX
 Z2V0ICAgICQoU1VCRElSKS9mYWFjLnRhci5neiAgIDogJChTVUJESVIpL3ZlcnNpb25fZmFhYy50
 eHQgOwotQEAgLTE3OCwxMCArMTc3LDEwIEBACitAQCAtMTk5LDkgKzE5NCw5IEBACiAgfQogIGFj
 dGlvbnMgTGliTXAzTGFtZQogIHsKIC0gICAgY2QgYGRpcm5hbWUgJCg+KWAgJiYgQ09OVFJJQj1g
 cHdkYCAmJgotLSAgICBybSAtcmYgbGFtZSAmJiB0YXIgeHpmIGxhbWUudGFyLmd6ICYmIGNkIGxh
 bWUgJiYKKy0gICAgcm0gLXJmIGxhbWUgJiYgKGd6aXAgLWRjIGxhbWUudGFyLmd6IHwgdGFyIHhm
 IC0gKSAmJiBjZCBsYW1lICYmCiAtICAgIC4vY29uZmlndXJlIC0tcHJlZml4PSRDT05UUklCIC0t
 Y2FjaGUtZmlsZT0kQ09OVFJJQi9jb25maWcuY2FjaGUgLS1kaXNhYmxlLXNoYXJlZCAmJgotLSAg
 ICBtYWtlICYmIG1ha2UgaW5zdGFsbCAmJgogKyAgICBDT05UUklCPSUlQ09OVFJJQiUlICYmCiAr
 ICAgIGNkICRDT05UUklCL2xhbWUgJiYKICsgICAgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRS
 SUIgLS1kaXNhYmxlLXNoYXJlZCAmJgotKyAgICAkKE1BS0UpICYmICQoTUFLRSkgaW5zdGFsbCAm
 JgotICAgICBzdHJpcCAtUyAkQ09OVFJJQi9saWIvbGlibXAzbGFtZS5hCisgICAgICQoTUFLRSkg
 JiYgJChNQUtFKSBpbnN0YWxsICYmCisgICAgICQoU1RSSVApICRDT05UUklCL2xpYi9saWJtcDNs
 YW1lLmEKICB9Ci0gV2dldCAgICAgICAkKFNVQkRJUikvbGFtZS50YXIuZ3ogICAgICA6ICQoU1VC
 RElSKS92ZXJzaW9uX2xhbWUudHh0IDsKLUBAIC0xOTcsMTEgKzE5NiwxMSBAQAotIHsKLSAgICAg
 YWN0aW9ucyBMaWJNcDR2MgotICAgICB7Ci0tICAgICAgICBjZCBgZGlybmFtZSAkKD4pYCAmJiBD
 T05UUklCPWBwd2RgICYmCi0tICAgICAgICBybSAtcmYgbXBlZzRpcCAmJiB0YXIgeHpmIG1wZWc0
 aXAudGFyLmd6ICYmIGNkIG1wZWc0aXAgJiYKLSsgICAgICAgIENPTlRSSUI9JSVDT05UUklCJSUg
 JiYKLSsgICAgICAgIGNkICRDT05UUklCL21wZWc0aXAgJiYKLSAgICAgICAgIHBhdGNoIC1wMSA8
 IC4uL3BhdGNoLW1wZWc0aXAucGF0Y2ggJiYgcGF0Y2ggLXAwIDwgLi4vcGF0Y2gtbXBlZzRpcC1w
 YXNjYWwtc3RyLnBhdGNoICYmCi0tICAgICAgICAuL2Jvb3RzdHJhcCAtLWNhY2hlLWZpbGU9JENP
 TlRSSUIvY29uZmlnLmNhY2hlIC0tZGlzYWJsZS1tcDNsYW1lIC0tZGlzYWJsZS1mYWFjIC0tZGlz
 YWJsZS14MjY0IC0tZGlzYWJsZS1zZXJ2ZXIgLS1kaXNhYmxlLXBsYXllciAmJgotLSAgICAgICAg
 bWFrZSAtQyBsaWIvbXA0djIgbGlibXA0djIubGEgJiYgY3AgbGliL21wNHYyLy5saWJzL2xpYm1w
 NHYyLmEgJENPTlRSSUIvbGliICYmCi0rICAgICAgICAuL2Jvb3RzdHJhcCAtLWRpc2FibGUtbXAz
 bGFtZSAtLWRpc2FibGUtZmFhYyAtLWRpc2FibGUteDI2NCAtLWRpc2FibGUtc2VydmVyIC0tZGlz
 YWJsZS1wbGF5ZXIgJiYKLSsgICAgICAgICQoTUFLRSkgLUMgbGliL21wNHYyIGxpYm1wNHYyLmxh
 ICYmIGNwIGxpYi9tcDR2Mi8ubGlicy9saWJtcDR2Mi5hICRDT05UUklCL2xpYiAmJgotICAgICAg
 ICAgY3AgbXBlZzRpcF9jb25maWcuaCBpbmNsdWRlL21wZWc0aXAuaCBpbmNsdWRlL21wZWc0aXBf
 dmVyc2lvbi5oIFwKLSAgICAgICAgICAgICBpbmNsdWRlL21wZWc0aXBfd2luMzIuaCBsaWIvbXA0
 djIvKi5oICRDT05UUklCL2luY2x1ZGUgJiYKLSAgICAgICAgIHN0cmlwIC1TICRDT05UUklCL2xp
 Yi9saWJtcDR2Mi5hCi1AQCAtMjExLDExICsyMTAsMTEgQEAKK0BAIC0yMjQsMTAgKzIxOSwxMCBA
 QAorIH0KKyBhY3Rpb25zIExpYk1wNHYyCiAgewotICAgICBhY3Rpb25zIExpYk1wNHYyCi0gICAg
 IHsKLS0gICAgICAgIGNkIGBkaXJuYW1lICQoPilgICYmIENPTlRSSUI9YHB3ZGAgJiYKLS0gICAg
 ICAgIHJtIC1yZiBtcGVnNGlwICYmIHRhciB4emYgbXBlZzRpcC50YXIuZ3ogJiYgY2QgbXBlZzRp
 cCAmJgotKyAgICAgICAgQ09OVFJJQj0lJUNPTlRSSUIlJSAmJgotKyAgICAgICAgY2QgJENPTlRS
 SUIvbXBlZzRpcCAmJgotICAgICAgICAgcGF0Y2ggLXAxIDwgLi4vcGF0Y2gtbXBlZzRpcC5wYXRj
 aCAmJiBwYXRjaCAtcDEgPCAuLi9wYXRjaF9tcGVnNGlwX2N5Z3dpbi5wYXRjaCAmJiBwYXRjaCAt
 cDAgPCAuLi9wYXRjaC1tcGVnNGlwLXBhc2NhbC1zdHIucGF0Y2ggJiYKLS0gICAgICAgIC4vYm9v
 dHN0cmFwIC0tY2FjaGUtZmlsZT0kQ09OVFJJQi9jb25maWcuY2FjaGUgLS1kaXNhYmxlLW1wM2xh
 bWUgLS1kaXNhYmxlLWZhYWMgLS1kaXNhYmxlLXgyNjQgLS1kaXNhYmxlLXNlcnZlciAtLWRpc2Fi
 bGUtcGxheWVyICYmCi0tICAgICAgICBtYWtlIC1DIGxpYi9tcDR2MiBsaWJtcDR2Mi5sYSAmJiBj
 cCBsaWIvbXA0djIvLmxpYnMvbGlibXA0djIuYSAkQ09OVFJJQi9saWIgJiYKLSsgICAgICAgIC4v
 Ym9vdHN0cmFwIC0tZGlzYWJsZS1tcDNsYW1lIC0tZGlzYWJsZS1mYWFjIC0tZGlzYWJsZS14MjY0
 IC0tZGlzYWJsZS1zZXJ2ZXIgLS1kaXNhYmxlLXBsYXllciAmJgotKyAgICAgICAgJChNQUtFKSAt
 QyBsaWIvbXA0djIgbGlibXA0djIubGEgJiYgY3AgbGliL21wNHYyLy5saWJzL2xpYm1wNHYyLmEg
 JENPTlRSSUIvbGliICYmCi0gICAgICAgICBjcCBtcGVnNGlwX2NvbmZpZy5oIGluY2x1ZGUvbXBl
 ZzRpcC5oIGluY2x1ZGUvbXBlZzRpcF92ZXJzaW9uLmggXAotICAgICAgICAgICAgIGluY2x1ZGUv
 bXBlZzRpcF93aW4zMi5oIGxpYi9tcDR2Mi8qLmggJENPTlRSSUIvaW5jbHVkZSAmJgotICAgICAg
 ICAgc3RyaXAgLVMgJENPTlRSSUIvbGliL2xpYm1wNHYyLmEKLUBAIC0yMzEsMTAgKzIzMCwxMCBA
 QAorLSAgICBjZCBgZGlybmFtZSAkKD4pYCAmJiBDT05UUklCPWBwd2RgICYmCistICAgIHJtIC1y
 ZiBtcGVnNGlwICYmIChnemlwIC1kYyBtcGVnNGlwLnRhci5neiB8IHRhciB4ZiAtICkgJiYKKy0g
 ICAgY2QgbXBlZzRpcCAmJiAkKExJQk1QNFYyX1BBVENIKQorLSAgICAuL2Jvb3RzdHJhcCAtLWNh
 Y2hlLWZpbGU9JENPTlRSSUIvY29uZmlnLmNhY2hlIC0tZGlzYWJsZS1tcDNsYW1lIC0tZGlzYWJs
 ZS1mYWFjIC0tZGlzYWJsZS14MjY0IC0tZGlzYWJsZS1zZXJ2ZXIgLS1kaXNhYmxlLXBsYXllciAm
 JgorKyAgICBDT05UUklCPSUlQ09OVFJJQiUlICYmCisrICAgIGNkICRDT05UUklCL21wZWc0aXAg
 JiYKKysgICAgJChMSUJNUDRWMl9QQVRDSCkKKysgICAgLi9ib290c3RyYXAgLS1kaXNhYmxlLW1w
 M2xhbWUgLS1kaXNhYmxlLWZhYWMgLS1kaXNhYmxlLXgyNjQgLS1kaXNhYmxlLXNlcnZlciAtLWRp
 c2FibGUtcGxheWVyICYmCisgICAgICQoTUFLRSkgLUMgbGliL21wNHYyIGxpYm1wNHYyLmxhICYm
 IGNwIGxpYi9tcDR2Mi8ubGlicy9saWJtcDR2Mi5hICRDT05UUklCL2xpYiAmJgorICAgICBjcCBt
 cGVnNGlwX2NvbmZpZy5oIGluY2x1ZGUvbXBlZzRpcC5oIGluY2x1ZGUvbXBlZzRpcF92ZXJzaW9u
 LmggXAorICAgICAgICAgaW5jbHVkZS9tcGVnNGlwX3dpbjMyLmggbGliL21wNHYyLyouaCAkQ09O
 VFJJQi9pbmNsdWRlICYmCitAQCAtMjQzLDEwICsyMzgsOSBAQAogIH0KICBhY3Rpb25zIExpYk1r
 dgogIHsKIC0gICAgY2QgYGRpcm5hbWUgJCg+KWAgJiYgQ09OVFJJQj1gcHdkYCAmJgotLSAgICBy
 bSAtcmYgbGlibWt2ICYmIHRhciB4emYgbGlibWt2LnRhci5neiAmJiBjZCBsaWJta3YgJiYKKy0g
 ICAgcm0gLXJmIGxpYm1rdiAmJiAoZ3ppcCAtZGMgbGlibWt2LnRhci5neiB8IHRhciB4ZiAtICkg
 JiYgCistICAgIGNkIGxpYm1rdiAmJgogLSAgICAuL2NvbmZpZ3VyZSAtLWRpc2FibGUtc2hhcmVk
 IC0tZW5hYmxlLXN0YXRpYyAtLXByZWZpeD0kQ09OVFJJQiAtLWNhY2hlLWZpbGU9JENPTlRSSUIv
 Y29uZmlnLmNhY2hlICYmCi0tICAgIG1ha2UgJiYgbWFrZSBpbnN0YWxsICYmCiArICAgIENPTlRS
 SUI9JSVDT05UUklCJSUgJiYKICsgICAgY2QgJENPTlRSSUIvbGlibWt2ICYmCiArICAgIC4vY29u
 ZmlndXJlIC0tZGlzYWJsZS1zaGFyZWQgLS1lbmFibGUtc3RhdGljIC0tcHJlZml4PSRDT05UUklC
 ICYmCi0rICAgICQoTUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYmCi0gICAgIHN0cmlwIC1TICRD
 T05UUklCL2xpYi9saWJta3YuYQorICAgICAkKE1BS0UpICYmICQoTUFLRSkgaW5zdGFsbCAmJgor
 ICAgICAkKFNUUklQKSAkQ09OVFJJQi9saWIvbGlibWt2LmEKICB9Ci0gV2dldCAgICAkKFNVQkRJ
 UikvbGlibWt2LnRhci5neiA6ICQoU1VCRElSKS92ZXJzaW9uX2xpYm1rdi50eHQgOwotQEAgLTI0
 OCwxMCArMjQ3LDEwIEBACitAQCAtMjYxLDEwICsyNTUsOSBAQAogIH0KICBhY3Rpb25zIExpYk1w
 ZWcyCiAgewogLSAgICBjZCBgZGlybmFtZSAkKD4pYCAmJiBDT05UUklCPWBwd2RgICYmCi0tICAg
 IHJtIC1yZiBtcGVnMmRlYyAmJiB0YXIgeHpmIG1wZWcyZGVjLnRhci5neiAmJiBjZCBtcGVnMmRl
 YyAmJiBwYXRjaCAtcDEgPCAuLi9wYXRjaC1saWJtcGVnMi5wYXRjaCAmJgorLSAgICBybSAtcmYg
 bXBlZzJkZWMgJiYgKGd6aXAgLWRjIG1wZWcyZGVjLnRhci5neiB8IHRhciB4ZiAtICkgJiYgCist
 ICAgIGNkIG1wZWcyZGVjICYmICQoUEFUQ0gpIC1wMSA8IC4uL3BhdGNoLWxpYm1wZWcyLnBhdGNo
 ICYmCiAtICAgIC4vY29uZmlndXJlIC0tcHJlZml4PSRDT05UUklCIC0tY2FjaGUtZmlsZT0kQ09O
 VFJJQi9jb25maWcuY2FjaGUgLS1kaXNhYmxlLXNoYXJlZCAtLWRpc2FibGUtc2RsICYmCi0tICAg
 IG1ha2UgJiYgbWFrZSBpbnN0YWxsICYmCiArICAgIENPTlRSSUI9JSVDT05UUklCJSUgJiYKICsg
 ICAgY2QgJENPTlRSSUIvbXBlZzJkZWMgJiYgcGF0Y2ggLXAxIDwgLi4vcGF0Y2gtbGlibXBlZzIu
 cGF0Y2ggJiYKICsgICAgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1kaXNhYmxlLXNo
 YXJlZCAtLWRpc2FibGUtc2RsICYmCi0rICAgICQoTUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYm
 Ci0gICAgIHN0cmlwIC1TICRDT05UUklCL2xpYi9saWJtcGVnMi5hCisgICAgICQoTUFLRSkgJiYg
 JChNQUtFKSBpbnN0YWxsICYmCisgICAgICQoU1RSSVApICRDT05UUklCL2xpYi9saWJtcGVnMi5h
 CiAgfQotIFdnZXQgICAgICQoU1VCRElSKS9tcGVnMmRlYy50YXIuZ3ogOiAkKFNVQkRJUikvdmVy
 c2lvbl9tcGVnMmRlYy50eHQgOwotQEAgLTI2NSwxMCArMjY0LDEwIEBACitAQCAtMjc5LDEwICsy
 NzIsOSBAQAogIH0KICBhY3Rpb25zIExpYk9nZwogIHsKIC0gICAgY2QgYGRpcm5hbWUgJCg+KWAg
 JiYgQ09OVFJJQj1gcHdkYCAmJgotLSAgICBybSAtcmYgbGlib2dnICYmIHRhciB4emYgbGlib2dn
 LnRhci5neiAmJiBjZCBsaWJvZ2cgJiYKKy0gICAgcm0gLXJmIGxpYm9nZyAmJiAoZ3ppcCAtZGMg
 bGlib2dnLnRhci5neiB8IHRhciB4ZiAtICkgJiYgCistICAgIGNkIGxpYm9nZyAmJgogLSAgICAu
 L2NvbmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJQiAtLWNhY2hlLWZpbGU9JENPTlRSSUIvY29uZmln
 LmNhY2hlIC0tZGlzYWJsZS1zaGFyZWQgJiYKLS0gICAgbWFrZSAmJiBtYWtlIGluc3RhbGwgJiYK
 ICsgICAgQ09OVFJJQj0lJUNPTlRSSUIlJSAmJgogKyAgICBjZCAkQ09OVFJJQi9saWJvZ2cgJiYK
 ICsgICAgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1kaXNhYmxlLXNoYXJlZCAmJgot
 KyAgICAkKE1BS0UpICYmICQoTUFLRSkgaW5zdGFsbCAmJgotICAgICBzdHJpcCAtUyAkQ09OVFJJ
 Qi9saWIvbGlib2dnLmEKKyAgICAgJChNQUtFKSAmJiAkKE1BS0UpIGluc3RhbGwgJiYKKyAgICAg
 JChTVFJJUCkgJENPTlRSSUIvbGliL2xpYm9nZy5hCiAgfQotIFdnZXQgICAkKFNVQkRJUikvbGli
 b2dnLnRhci5neiA6ICQoU1VCRElSKS92ZXJzaW9uX2xpYm9nZy50eHQgOwotQEAgLTI4MiwxMCAr
 MjgxLDEwIEBACitAQCAtMjk3LDEwICsyODksOSBAQAogIH0KICBhY3Rpb25zIExpYlNhbXBsZVJh
 dGUKICB7CiAtICAgIGNkIGBkaXJuYW1lICQoPilgICYmIENPTlRSSUI9YHB3ZGAgJiYKLS0gICAg
 cm0gLXJmIGxpYnNhbXBsZXJhdGUgJiYgdGFyIHh6ZiBsaWJzYW1wbGVyYXRlLnRhci5neiAmJiBj
 ZCBsaWJzYW1wbGVyYXRlICYmCistICAgIHJtIC1yZiBsaWJzYW1wbGVyYXRlICYmIChnemlwIC1k
 YyBsaWJzYW1wbGVyYXRlLnRhci5neiB8IHRhciB4ZiAtICkgJiYgCistICAgIGNkIGxpYnNhbXBs
 ZXJhdGUgJiYKIC0gICAgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1jYWNoZS1maWxl
 PSRDT05UUklCL2NvbmZpZy5jYWNoZSAtLWRpc2FibGUtc2hhcmVkICYmCi0tICAgIG1ha2UgJiYg
 bWFrZSBpbnN0YWxsICYmCiArICAgIENPTlRSSUI9JSVDT05UUklCJSUgJiYKICsgICAgY2QgJENP
 TlRSSUIvbGlic2FtcGxlcmF0ZSAmJgogKyAgICAuL2NvbmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJ
 QiAtLWRpc2FibGUtc2hhcmVkICYmCi0rICAgICQoTUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYm
 Ci0gICAgIHN0cmlwIC1TICRDT05UUklCL2xpYi9saWJzYW1wbGVyYXRlLmEKKyAgICAgJChNQUtF
 KSAmJiAkKE1BS0UpIGluc3RhbGwgJiYKKyAgICAgJChTVFJJUCkgJENPTlRSSUIvbGliL2xpYnNh
 bXBsZXJhdGUuYQogIH0KLSBXZ2V0ICAgICAgICAgICQoU1VCRElSKS9saWJzYW1wbGVyYXRlLnRh
 ci5neiA6ICQoU1VCRElSKS92ZXJzaW9uX2xpYnNhbXBsZXJhdGUudHh0IDsKLUBAIC0yOTksMTAg
 KzI5OCwxMCBAQAorQEAgLTMxNSwxMCArMzA2LDkgQEAKICB9CiAgYWN0aW9ucyBMaWJWb3JiaXMK
 ICB7CiAtICAgIGNkIGBkaXJuYW1lICQoPilgICYmIENPTlRSSUI9YHB3ZGAgJiYKLS0gICAgcm0g
 LXJmIGxpYnZvcmJpcyAmJiB0YXIgeHpmIGxpYnZvcmJpcy50YXIuZ3ogJiYgY2QgbGlidm9yYmlz
 ICYmCistICAgIHJtIC1yZiBsaWJ2b3JiaXMgJiYgKGd6aXAgLWRjIGxpYnZvcmJpcy50YXIuZ3og
 fCB0YXIgeGYgLSApICYmCistICAgIGNkIGxpYnZvcmJpcyAmJgogLSAgICAuL2NvbmZpZ3VyZSAt
 LXByZWZpeD0kQ09OVFJJQiAtLXdpdGgtb2dnPSRDT05UUklCIC0tY2FjaGUtZmlsZT0kQ09OVFJJ
 Qi9jb25maWcuY2FjaGUgLS1kaXNhYmxlLXNoYXJlZCAmJgotLSAgICBtYWtlICYmIG1ha2UgaW5z
 dGFsbCAmJgogKyAgICBDT05UUklCPSUlQ09OVFJJQiUlICYmCiArICAgIGNkICRDT05UUklCL2xp
 YnZvcmJpcyAmJgogKyAgICAuL2NvbmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJQiAtLXdpdGgtb2dn
 PSRDT05UUklCIC0tZGlzYWJsZS1zaGFyZWQgJiYKLSsgICAgJChNQUtFKSAmJiAkKE1BS0UpIGlu
 c3RhbGwgJiYKLSAgICAgc3RyaXAgLVMgJENPTlRSSUIvbGliL2xpYnZvcmJpcy5hCisgICAgICQo
 TUFLRSkgJiYgJChNQUtFKSBpbnN0YWxsICYmCisgICAgICQoU1RSSVApICRDT05UUklCL2xpYi9s
 aWJ2b3JiaXMuYQogIH0KLSBXZ2V0ICAgICAgJChTVUJESVIpL2xpYnZvcmJpcy50YXIuZ3ogOiAk
 KFNVQkRJUikvdmVyc2lvbl9saWJ2b3JiaXMudHh0IDsKLUBAIC0zMzgsMTAgKzMzNywxMCBAQAor
 QEAgLTM1NiwxMCArMzQ2LDkgQEAKICB9CiAgYWN0aW9ucyBMaWJYMjY0CiAgewogLSAgICBjZCBg
 ZGlybmFtZSAkKD4pYCAmJiBDT05UUklCPWBwd2RgICYmCi0tICAgIHJtIC1yZiB4MjY0ICYmIHRh
 ciB4emYgeDI2NC50YXIuZ3ogJiYgY2QgeDI2NCAmJiAkKExJQlgyNjRfUEFUQ0gpCi0tICAgIC4v
 Y29uZmlndXJlIC0tcHJlZml4PSRDT05UUklCIC0tZW5hYmxlLXB0aHJlYWQgJiYgbWFrZSAmJgot
 LSAgICBtYWtlIGluc3RhbGwgJiYKKy0gICAgcm0gLXJmIHgyNjQgJiYgKGd6aXAgLWRjIHgyNjQu
 dGFyLmd6IHwgdGFyIHhmIC0gKSAmJiAKKy0gICAgY2QgeDI2NCAmJiAkKExJQlgyNjRfUEFUQ0gp
 CistICAgIGJhc2ggLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1lbmFibGUtcHRocmVh
 ZCAmJgogKyAgICBDT05UUklCPSUlQ09OVFJJQiUlICYmCiArICAgIGNkICRDT05UUklCL3gyNjQg
 JiYgJChMSUJYMjY0X1BBVENIKQogKyAgICAuL2NvbmZpZ3VyZSAtLXByZWZpeD0kQ09OVFJJQiAt
 LWVuYWJsZS1wdGhyZWFkICYmICQoTUFLRSkgJiYKLSsgICAgJChNQUtFKSBpbnN0YWxsICYmCi0g
 ICAgIHN0cmlwIC1TICRDT05UUklCL2xpYi9saWJ4MjY0LmEKKyAgICAgJChNQUtFKSBsaWJ4MjY0
 LmEgJiYgY3AgbGlieDI2NC5hICRDT05UUklCL2xpYi8gJiYgY3AgeDI2NC5oICRDT05UUklCL2lu
 Y2x1ZGUvICYmICQoU1RSSVApICRDT05UUklCL2xpYi9saWJ4MjY0LmEKICB9CiAgV2dldCAgICAk
 KFNVQkRJUikveDI2NC50YXIuZ3ogICA6ICQoU1VCRElSKS92ZXJzaW9uX3gyNjQudHh0IDsKLUBA
 IC0zNjQsMTAgKzM2Myw5IEBACitAQCAtMzgzLDEwICszNzIsOSBAQAogIH0KICBhY3Rpb25zIExp
 Ylh2aWRDb3JlCiAgewogLSAgICBjZCBgZGlybmFtZSAkKD4pYCAmJiBDT05UUklCPWBwd2RgICYm
 Ci0tICAgIHJtIC1yZiB4dmlkY29yZSAmJiB0YXIgeHpmIHh2aWRjb3JlLnRhci5neiAmJgorLSAg
 ICBybSAtcmYgeHZpZGNvcmUgJiYgKGd6aXAgLWRjIHh2aWRjb3JlLnRhci5neiB8IHRhciB4ZiAt
 ICkgJiYKIC0gICAgY2QgeHZpZGNvcmUgJiYgJChMSUJYVklEQ09SRV9QQVRDSCkKLS0gICAgY2Qg
 YnVpbGQvZ2VuZXJpYy8gJiYgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1jYWNoZS1m
 aWxlPSRDT05UUklCL2NvbmZpZy5jYWNoZSAmJiBtYWtlIGxpYnh2aWRjb3JlLmEgJiYKKy0gICAg
 Y2QgYnVpbGQvZ2VuZXJpYy8gJiYgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgLS1jYWNo
 ZS1maWxlPSRDT05UUklCL2NvbmZpZy5jYWNoZSAmJiAkKE1BS0UpIGxpYnh2aWRjb3JlLmEgJiYK
 ICsgICAgQ09OVFJJQj0lJUNPTlRSSUIlJSAmJgogKyAgICBjZCAkQ09OVFJJQi94dmlkY29yZSAm
 JiAkKExJQlhWSURDT1JFX1BBVENIKQogKyAgICBjZCBidWlsZC9nZW5lcmljLyAmJiAuL2NvbmZp
 Z3VyZSAtLXByZWZpeD0kQ09OVFJJQiAmJiAkKE1BS0UpIGxpYnh2aWRjb3JlLmEgJiYKICAgICAg
 Y3AgLi89YnVpbGQvbGlieHZpZGNvcmUuYSAkQ09OVFJJQi9saWIvICYmCiAgICAgIGNwIC4uLy4u
 L3NyYy94dmlkLmggJENPTlRSSUIvaW5jbHVkZS8gJiYKLSAgICAgc3RyaXAgLVMgJENPTlRSSUIv
 bGliL2xpYnh2aWRjb3JlLmEKLUBAIC0zODUsMTAgKzM4Myw5IEBACisgICAgICQoU1RSSVApICRD
 T05UUklCL2xpYi9saWJ4dmlkY29yZS5hCitAQCAtNDA0LDkgKzM5Miw4IEBACiAgICAgIH0KICAg
 ICAgYWN0aW9ucyBabGliCiAgICAgIHsKIC0gICAgICAgIGNkIGBkaXJuYW1lICQoPilgICYmIENP
 TlRSSUI9YHB3ZGAgJiYKLS0gICAgICAgIHJtIC1yZiB6bGliICYmIHRhciB4emYgemxpYi50YXIu
 Z3ogJiYKLS0gICAgICAgIGNkIHpsaWIgJiYgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIg
 LS1jYWNoZS1maWxlPSRDT05UUklCL2NvbmZpZy5jYWNoZSAmJgotLSAgICAgICAgbWFrZSAmJiBt
 YWtlIGluc3RhbGwgJiYgdG91Y2ggJENPTlRSSUIvLmNvbnRyaWIgJiYKKy0gICAgICAgIHJtIC1y
 ZiB6bGliICYmIChnemlwIC1kYyB6bGliLnRhci5neiB8IHRhciB4ZiAtICkgJiYKKy0gICAgICAg
 IGNkIHpsaWIgJiYgLi9jb25maWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgJiYKICsgICAgICAgIENP
 TlRSSUI9JSVDT05UUklCJSUgJiYKICsgICAgICAgIGNkICRDT05UUklCL3psaWIgJiYgLi9jb25m
 aWd1cmUgLS1wcmVmaXg9JENPTlRSSUIgJiYKLSsgICAgICAgICQoTUFLRSkgJiYgJChNQUtFKSBp
 bnN0YWxsICYmIHRvdWNoICRDT05UUklCLy5jb250cmliICYmCi0gICAgICAgICBzdHJpcCAtUyAk
 Q09OVFJJQi9saWIvbGliei5hCisgICAgICAgICAkKE1BS0UpICYmICQoTUFLRSkgaW5zdGFsbCAm
 JiB0b3VjaCAkQ09OVFJJQi8uY29udHJpYiAmJgorICAgICAgICAgJChTVFJJUCkgJENPTlRSSUIv
 bGliL2xpYnouYQogICAgICB9Ci0gICAgIFdnZXQgICQoU1VCRElSKS96bGliLnRhci5neiA6ICQo
 U1VCRElSKS92ZXJzaW9uX3psaWIudHh0IDsK
 ------=_20080609131347_85746--
 
 

From: Jona Joachim <jaj@hcl-club.lu>
To: bug-followup@FreeBSD.org
Cc: edwin@FreeBSD.org, jonathan@kc8onw.net
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Tue, 17 Jun 2008 23:31:53 +0200

 --9amGYk9869ThD9tj
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 The following patch is based on the submitter's diff and does:
 
 - Update multimedia/handbrake to 0.9.2 (current release).
 - Make some patches upstream-friendlier.
 - Remove some private mirrors (which we shouldn't have in the port according to
   the devs).
 - Mark broken on amd64. Some people reported trouble (even though it should
   build fine). Neither submitter nor me can test on this platform.
 - Pass maintainership to the submitter.
 
 Best regards,
 Jona (current maintainer)
 
 --9amGYk9869ThD9tj
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="handbrake.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- Makefile	20 Feb 2008 01:19:09 -0000	1.23
 +++ Makefile	17 Jun 2008 21:25:48 -0000
 @@ -6,14 +6,11 @@
  #
  
  PORTNAME=	handbrake
 -PORTVERSION=	0.9.1
 +PORTVERSION=	0.9.2
  CATEGORIES=	multimedia
 -MASTER_SITES=	http://saintdevelopment.com/mirror/handbrake/:main \
 -		http://junk.phantomgorilla.com/hb/:main \
 -		http://daigertech.com/handbrake/:main \
 -		http://www.mirrors.ausmac.net/ftp/Audio-SW/HandBrake/testing/:main \
 -		http://asshatandi.com/:main \
 -		http://download.m0k.org/handbrake/testing/:main \
 +MASTER_SITES=	http://download.handbrake.fr/handbrake/releases/:main \
 +		http://download.m0k.org/handbrake/releases/:main \
 +		http://download.handbrake.fr/handbrake/contrib/:contrib \
  		http://download.m0k.org/handbrake/contrib/:contrib
  DISTFILES=	HandBrake-${PORTVERSION}.tar.gz:main \
  		faac-1.24.tar.gz:contrib \
 @@ -21,19 +18,19 @@
  		libdca-r81-strapped.tar.gz:contrib \
  		libdvdcss-1.2.9.tar.gz:contrib \
  		libdvdread-0.9.7.tar.gz:contrib \
 -		libmkv-0.6.1.2.tar.gz:contrib \
 +		libmkv-0.6.1.3.tar.gz:contrib \
  		libogg-1.1.2.tar.gz:contrib \
  		libvorbis-aotuv_b5.tar.gz:contrib \
  		mpeg2dec-0.4.1.tar.gz:contrib \
  		mpeg4ip-1.3.tar.gz:contrib \
  		xvidcore-1.1.2.tar.gz:contrib \
  		ffmpeg-9816.tar.gz:contrib \
 -		x264-r665.tar.gz:contrib \
 +		x264-r736.tar.gz:contrib \
  		a52dec-0.7.4.tar.gz:contrib \
  		libsamplerate-0.1.2.tar.gz:contrib
  DIST_SUBDIR=	handbrake
  
 -MAINTAINER=	jaj@hcl-club.lu
 +MAINTAINER=	jonathan@kc8onw.net
  COMMENT=	A DVD to MPEG-4 ripper and encoder
  
  BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
 @@ -64,8 +61,8 @@
  
  .include <bsd.port.pre.mk>
  
 -.if ${ARCH} == "amd64" && ${OSVERSION} < 700000
 -BROKEN=		Does not compile
 +.if ${ARCH} == "amd64"
 +BROKEN=		Needs testing
  .endif
  
  # nasm/yasm needed by x264
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo	13 Dec 2007 16:50:15 -0000	1.4
 +++ distinfo	17 Jun 2008 21:25:48 -0000
 @@ -1,6 +1,6 @@
 -MD5 (handbrake/HandBrake-0.9.1.tar.gz) = 0eefe9189d59a0bfd9aeee41fd3d01a2
 -SHA256 (handbrake/HandBrake-0.9.1.tar.gz) = ae29b03dfd9724d7856f8b44a5a52bc60ad0af2846efe7db302d90dccc57d54b
 -SIZE (handbrake/HandBrake-0.9.1.tar.gz) = 1160277
 +MD5 (handbrake/HandBrake-0.9.2.tar.gz) = d21e0a097699e98f308d8c24dfa1594a
 +SHA256 (handbrake/HandBrake-0.9.2.tar.gz) = d5752e29e67d790be6e4ae2578054e5bc303cac8beade46d1851c0ee7e8860a6
 +SIZE (handbrake/HandBrake-0.9.2.tar.gz) = 1692074
  MD5 (handbrake/faac-1.24.tar.gz) = 81dc3efd98f1f2da0ac8bfa315284e95
  SHA256 (handbrake/faac-1.24.tar.gz) = 8eda7b69669f9d57c114d740555eb8bab29e4add90fade1aed41dd2ac1d19df6
  SIZE (handbrake/faac-1.24.tar.gz) = 627837
 @@ -16,9 +16,9 @@
  MD5 (handbrake/libdvdread-0.9.7.tar.gz) = a89a8532d5f850014f375bd3f5972082
  SHA256 (handbrake/libdvdread-0.9.7.tar.gz) = 18cf0ee3887264f09f2e23672923aec821ae9b806415ae0d78d0e310c1304c1f
  SIZE (handbrake/libdvdread-0.9.7.tar.gz) = 388570
 -MD5 (handbrake/libmkv-0.6.1.2.tar.gz) = be5d3a31477efb54766c8d9da89e1865
 -SHA256 (handbrake/libmkv-0.6.1.2.tar.gz) = 5d14627e98e0e8e3ff94ad11cb37dd5a35e909c5ba6444ef9e8b53b937ff3f3b
 -SIZE (handbrake/libmkv-0.6.1.2.tar.gz) = 334575
 +MD5 (handbrake/libmkv-0.6.1.3.tar.gz) = b0a81a416bffe19d54236f241632933c
 +SHA256 (handbrake/libmkv-0.6.1.3.tar.gz) = b116504390d3ec178ecb3cd6fb12e062b62b0909a7f1adcbaba00ed64fe63347
 +SIZE (handbrake/libmkv-0.6.1.3.tar.gz) = 329899
  MD5 (handbrake/libogg-1.1.2.tar.gz) = 4018e57063a9e5ce35145d73bea4b18b
  SHA256 (handbrake/libogg-1.1.2.tar.gz) = 0572ac9027caadb6ee4c2e3c87f98b045a66216ff2006041b12fceb5fb2f0332
  SIZE (handbrake/libogg-1.1.2.tar.gz) = 423463
 @@ -37,9 +37,9 @@
  MD5 (handbrake/ffmpeg-9816.tar.gz) = cfc6b97f830eddccbbb82b97ee6e3b78
  SHA256 (handbrake/ffmpeg-9816.tar.gz) = 23a38e102fa3d2df67e17e21a52d068665580d4fa5bb1d0e6ca4abb5a23894f2
  SIZE (handbrake/ffmpeg-9816.tar.gz) = 2706937
 -MD5 (handbrake/x264-r665.tar.gz) = a0fbe36eb7b03e61a96dd146e9c1ebbc
 -SHA256 (handbrake/x264-r665.tar.gz) = b61d2122ff559867d173413b1f3eba649d614a5a2e3be90642375d79bd79d30e
 -SIZE (handbrake/x264-r665.tar.gz) = 751198
 +MD5 (handbrake/x264-r736.tar.gz) = ea5dc8c2bfe33dc136687366237556db
 +SHA256 (handbrake/x264-r736.tar.gz) = fb020efbf89e8baf3b1ec93ee05c8cace4557a9658dffb99ef7d3e37521bbf3b
 +SIZE (handbrake/x264-r736.tar.gz) = 794658
  MD5 (handbrake/a52dec-0.7.4.tar.gz) = ce5a978bb359f642dcbd24c6e14a45a7
  SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
  SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/pkg-descr,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-descr
 --- pkg-descr	13 Dec 2007 16:50:15 -0000	1.3
 +++ pkg-descr	17 Jun 2008 21:25:48 -0000
 @@ -27,4 +27,4 @@
      * Picture deinterlacing, cropping and scaling
      * Grayscale encoding
  
 -WWW: http://handbrake.m0k.org/
 +WWW: http://handbrake.fr/
 Index: files/patch-contrib-Jamfile
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-contrib-Jamfile,v
 retrieving revision 1.1
 diff -u -r1.1 patch-contrib-Jamfile
 --- files/patch-contrib-Jamfile	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-contrib-Jamfile	17 Jun 2008 21:25:48 -0000
 @@ -1,6 +1,6 @@
 ---- contrib/Jamfile.orig	2007-10-08 15:57:23.000000000 -0500
 -+++ contrib/Jamfile	2007-12-07 17:58:44.000000000 -0600
 -@@ -23,9 +23,10 @@
 +--- contrib/Jamfile.orig	2008-05-21 05:18:06.844254734 +0300
 ++++ contrib/Jamfile	2008-05-21 06:00:18.032459924 +0300
 +@@ -34,9 +34,10 @@
   }
   actions Wget
   {
 @@ -14,26 +14,26 @@
   }
   
   # liba52
 -@@ -36,10 +37,9 @@
 - }
 +@@ -48,10 +49,9 @@
   actions LibA52
   {
 --
 + 
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf a52dec && tar xzf a52dec.tar.gz && cd a52dec && patch -p1 < ../patch-a52dec.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && 
 +-    cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/a52dec && patch -p1 < ../patch-a52dec.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/liba52.a
 +     $(STRIP) $CONTRIB/lib/liba52.a
   }
   Wget   $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
 -@@ -58,14 +58,13 @@
 +@@ -75,10 +75,9 @@
   }
   actions LibAvCodec
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf ffmpeg && tar xzf ffmpeg.tar.gz &&
 +-    rm -rf ffmpeg && (gzip -dc ffmpeg.tar.gz | tar xf -) &&
  -    cd ffmpeg && $(FFMPEG_PATCH) &&
  -    ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \
  +    CONTRIB=%%CONTRIB%% &&
 @@ -42,244 +42,210 @@
           --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \
           --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
           --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&
 --    make && make install &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libavcodec.a
 - }
 - Wget       $(SUBDIR)/ffmpeg.tar.gz    : $(SUBDIR)/version_ffmpeg.txt ;
 -@@ -96,9 +95,9 @@
 +@@ -113,10 +112,9 @@
       }
       actions LibDvdCss
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdcss && tar xzf libdvdcss.tar.gz && cd libdvdcss &&
 --        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-        rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && 
 +-        cd libdvdcss &&
 +-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdcss &&
  +        ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdcss.a
 +         $(STRIP) $CONTRIB/lib/libdvdcss.a
       }
       Wget      $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
 -@@ -113,9 +112,9 @@
 +@@ -131,10 +129,9 @@
   }
   actions LibDCA
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libdca && tar xzf libdca.tar.gz && cd libdca && patch -p1 < ../patch-libdca.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && 
 +-    cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libdca && patch -p1 < ../patch-libdca.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libdca.a
 +     $(STRIP) $CONTRIB/lib/libdca.a
   }
   Wget   $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
 -@@ -131,10 +130,10 @@
 +@@ -150,10 +147,9 @@
   {
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared --with-libdvdcss=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -143,10 +142,10 @@
 +@@ -163,10 +159,9 @@
       # configure line.
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -161,10 +160,10 @@
 +@@ -182,9 +177,9 @@
   }
   actions LibFaac
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf faac && tar xzf faac.tar.gz && cd faac &&
 +-    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/faac &&
  +    ./configure --prefix=$CONTRIB --disable-shared --enable-static &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libfaac.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libfaac.a
   }
 - Wget    $(SUBDIR)/faac.tar.gz   : $(SUBDIR)/version_faac.txt ;
 -@@ -178,10 +177,10 @@
 +@@ -199,9 +194,9 @@
   }
   actions LibMp3Lame
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf lame && tar xzf lame.tar.gz && cd lame &&
 +-    rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/lame &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmp3lame.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmp3lame.a
   }
 - Wget       $(SUBDIR)/lame.tar.gz      : $(SUBDIR)/version_lame.txt ;
 -@@ -197,11 +196,11 @@
 - {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -211,11 +210,11 @@
 +@@ -224,10 +219,10 @@
 + }
 + actions LibMp4v2
   {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p1 < ../patch_mpeg4ip_cygwin.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -231,10 +230,10 @@
 +-    cd `dirname $(>)` && CONTRIB=`pwd` &&
 +-    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
 +-    cd mpeg4ip && $(LIBMP4V2_PATCH)
 +-    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 ++    CONTRIB=%%CONTRIB%% &&
 ++    cd $CONTRIB/mpeg4ip &&
 ++    $(LIBMP4V2_PATCH)
 ++    ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 +     $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 +     cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 +         include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 +@@ -243,10 +238,9 @@
   }
   actions LibMkv
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libmkv && tar xzf libmkv.tar.gz && cd libmkv &&
 +-    rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && 
 +-    cd libmkv &&
  -    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libmkv &&
  +    ./configure --disable-shared --enable-static --prefix=$CONTRIB &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmkv.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmkv.a
   }
 - Wget    $(SUBDIR)/libmkv.tar.gz : $(SUBDIR)/version_libmkv.txt ;
 -@@ -248,10 +247,10 @@
 +@@ -261,10 +255,9 @@
   }
   actions LibMpeg2
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf mpeg2dec && tar xzf mpeg2dec.tar.gz && cd mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
 +-    rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
 +-    cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
  +    ./configure --prefix=$CONTRIB --disable-shared --disable-sdl &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmpeg2.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmpeg2.a
   }
 - Wget     $(SUBDIR)/mpeg2dec.tar.gz : $(SUBDIR)/version_mpeg2dec.txt ;
 -@@ -265,10 +264,10 @@
 +@@ -279,10 +272,9 @@
   }
   actions LibOgg
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libogg && tar xzf libogg.tar.gz && cd libogg &&
 +-    rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && 
 +-    cd libogg &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libogg &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libogg.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libogg.a
   }
 - Wget   $(SUBDIR)/libogg.tar.gz : $(SUBDIR)/version_libogg.txt ;
 -@@ -282,10 +281,10 @@
 +@@ -297,10 +289,9 @@
   }
   actions LibSampleRate
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libsamplerate && tar xzf libsamplerate.tar.gz && cd libsamplerate &&
 +-    rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && 
 +-    cd libsamplerate &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libsamplerate &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libsamplerate.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libsamplerate.a
   }
 - Wget          $(SUBDIR)/libsamplerate.tar.gz : $(SUBDIR)/version_libsamplerate.txt ;
 -@@ -299,10 +298,10 @@
 +@@ -315,10 +306,9 @@
   }
   actions LibVorbis
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libvorbis && tar xzf libvorbis.tar.gz && cd libvorbis &&
 +-    rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) &&
 +-    cd libvorbis &&
  -    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libvorbis &&
  +    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libvorbis.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libvorbis.a
   }
 - Wget      $(SUBDIR)/libvorbis.tar.gz : $(SUBDIR)/version_libvorbis.txt ;
 -@@ -338,10 +337,10 @@
 +@@ -356,10 +346,9 @@
   }
   actions LibX264
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf x264 && tar xzf x264.tar.gz && cd x264 && $(LIBX264_PATCH)
 --    ./configure --prefix=$CONTRIB --enable-pthread && make &&
 --    make install &&
 +-    rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
 +-    cd x264 && $(LIBX264_PATCH)
 +-    bash ./configure --prefix=$CONTRIB --enable-pthread &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/x264 && $(LIBX264_PATCH)
  +    ./configure --prefix=$CONTRIB --enable-pthread && $(MAKE) &&
 -+    $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libx264.a
 +     $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
   }
   Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
 -@@ -364,10 +363,9 @@
 +@@ -383,10 +372,9 @@
   }
   actions LibXvidCore
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf xvidcore && tar xzf xvidcore.tar.gz &&
 +-    rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) &&
  -    cd xvidcore && $(LIBXVIDCORE_PATCH)
 --    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make libxvidcore.a &&
 +-    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/xvidcore && $(LIBXVIDCORE_PATCH)
  +    cd build/generic/ && ./configure --prefix=$CONTRIB && $(MAKE) libxvidcore.a &&
       cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
       cp ../../src/xvid.h $CONTRIB/include/ &&
 -     strip -S $CONTRIB/lib/libxvidcore.a
 -@@ -385,10 +383,9 @@
 +     $(STRIP) $CONTRIB/lib/libxvidcore.a
 +@@ -404,9 +392,8 @@
       }
       actions Zlib
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf zlib && tar xzf zlib.tar.gz &&
 --        cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --        make && make install && touch $CONTRIB/.contrib &&
 +-        rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
 +-        cd zlib && ./configure --prefix=$CONTRIB &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/zlib && ./configure --prefix=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 -         strip -S $CONTRIB/lib/libz.a
 +         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 +         $(STRIP) $CONTRIB/lib/libz.a
       }
 -     Wget  $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ;
 Index: files/patch-libhb-fifo.c
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-fifo.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-libhb-fifo.c
 --- files/patch-libhb-fifo.c	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-libhb-fifo.c	17 Jun 2008 21:25:48 -0000
 @@ -1,13 +1,13 @@
 ---- HandBrake_old/libhb/fifo.c	2007-10-08 22:57:08.000000000 +0200
 -+++ libhb/fifo.c	2007-12-04 05:55:37.000000000 +0100
 -@@ -6,9 +6,7 @@
 +--- ../../work_old/HandBrake/libhb/fifo.c	2008-02-19 19:28:17.000000000 +0100
 ++++ libhb/fifo.c	2008-06-17 23:02:48.000000000 +0200
 +@@ -6,7 +6,9 @@
   
   #include "hb.h"
   
  -#ifndef SYS_DARWIN
 --#include <malloc.h>
 --#endif
 ++#if defined( SYS_FREEBSD )
  +#include <stdlib.h>
 ++#elif !defined( SYS_DARWIN )
 + #include <malloc.h>
 + #endif
   
 - /* Fifo */
 - struct hb_fifo_s
 Index: files/patch-libhb-ports.c
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-ports.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-libhb-ports.c
 --- files/patch-libhb-ports.c	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-libhb-ports.c	17 Jun 2008 21:25:48 -0000
 @@ -1,10 +1,10 @@
 ---- HandBrake_old/libhb/ports.c	2007-10-08 22:57:08.000000000 +0200
 -+++ libhb/ports.c	2007-12-04 07:48:47.000000000 +0100
 -@@ -28,6 +28,11 @@
 +--- ../../work/HandBrake/libhb/ports.c	2008-02-19 19:28:17.000000000 +0100
 ++++ libhb/ports.c	2008-06-17 13:20:42.000000000 +0200
 +@@ -30,6 +30,11 @@
   #include <netinet/in.h>
   //#endif
   
 -+#if defined(__FreeBSD__)
 ++#if defined( SYS_FREEBSD )
  +#include <sys/types.h>
  +#include <sys/sysctl.h>
  +#endif
 @@ -12,26 +12,21 @@
   #include "hb.h"
   
   /************************************************************************
 -@@ -105,21 +110,17 @@
 +@@ -107,7 +112,7 @@
           cpu_count = info.cpu_count;
       }
   
  -#elif defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
 --    FILE * info;
 --    char   buffer[16];
 --
 --    if( ( info = popen( "/usr/sbin/sysctl hw.ncpu", "r" ) ) )
 -+#elif defined(__FreeBSD__)
 -     {
 --        memset( buffer, 0, 16 );
 --        if( fgets( buffer, 15, info ) )
 --        {
 --            if( sscanf( buffer, "hw.ncpu: %d", &cpu_count ) != 1 )
 --            {
 --                cpu_count = 1;
 --            }
 --        }
 --        fclose( info );
 ++#elif defined( SYS_DARWIN )
 +     FILE * info;
 +     char   buffer[16];
 + 
 +@@ -124,6 +129,19 @@
 +         fclose( info );
 +     }
 + 
 ++#elif defined( SYS_FREEBSD )
 ++    {
  +        int mib[2];
  +        size_t len;
  +
 @@ -41,6 +36,8 @@
  +
  +        if(sysctl(mib, 2, &cpu_count, &len, NULL, 0) != 0)
  +          cpu_count = 1;
 -     }
 - 
 ++    }
 ++
   #elif defined( SYS_LINUX )
 +     {
 +         FILE * info;
 
 --9amGYk9869ThD9tj--

From: Jona Joachim <jaj@hcl-club.lu>
To: bug-followup@FreeBSD.org
Cc: edwin@FreeBSD.org, jonathan@kc8onw.net
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Tue, 17 Jun 2008 23:31:53 +0200

 --9amGYk9869ThD9tj
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 The following patch is based on the submitter's diff and does:
 
 - Update multimedia/handbrake to 0.9.2 (current release).
 - Make some patches upstream-friendlier.
 - Remove some private mirrors (which we shouldn't have in the port according to
   the devs).
 - Mark broken on amd64. Some people reported trouble (even though it should
   build fine). Neither submitter nor me can test on this platform.
 - Pass maintainership to the submitter.
 
 Best regards,
 Jona (current maintainer)
 
 --9amGYk9869ThD9tj
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="handbrake.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- Makefile	20 Feb 2008 01:19:09 -0000	1.23
 +++ Makefile	17 Jun 2008 21:25:48 -0000
 @@ -6,14 +6,11 @@
  #
  
  PORTNAME=	handbrake
 -PORTVERSION=	0.9.1
 +PORTVERSION=	0.9.2
  CATEGORIES=	multimedia
 -MASTER_SITES=	http://saintdevelopment.com/mirror/handbrake/:main \
 -		http://junk.phantomgorilla.com/hb/:main \
 -		http://daigertech.com/handbrake/:main \
 -		http://www.mirrors.ausmac.net/ftp/Audio-SW/HandBrake/testing/:main \
 -		http://asshatandi.com/:main \
 -		http://download.m0k.org/handbrake/testing/:main \
 +MASTER_SITES=	http://download.handbrake.fr/handbrake/releases/:main \
 +		http://download.m0k.org/handbrake/releases/:main \
 +		http://download.handbrake.fr/handbrake/contrib/:contrib \
  		http://download.m0k.org/handbrake/contrib/:contrib
  DISTFILES=	HandBrake-${PORTVERSION}.tar.gz:main \
  		faac-1.24.tar.gz:contrib \
 @@ -21,19 +18,19 @@
  		libdca-r81-strapped.tar.gz:contrib \
  		libdvdcss-1.2.9.tar.gz:contrib \
  		libdvdread-0.9.7.tar.gz:contrib \
 -		libmkv-0.6.1.2.tar.gz:contrib \
 +		libmkv-0.6.1.3.tar.gz:contrib \
  		libogg-1.1.2.tar.gz:contrib \
  		libvorbis-aotuv_b5.tar.gz:contrib \
  		mpeg2dec-0.4.1.tar.gz:contrib \
  		mpeg4ip-1.3.tar.gz:contrib \
  		xvidcore-1.1.2.tar.gz:contrib \
  		ffmpeg-9816.tar.gz:contrib \
 -		x264-r665.tar.gz:contrib \
 +		x264-r736.tar.gz:contrib \
  		a52dec-0.7.4.tar.gz:contrib \
  		libsamplerate-0.1.2.tar.gz:contrib
  DIST_SUBDIR=	handbrake
  
 -MAINTAINER=	jaj@hcl-club.lu
 +MAINTAINER=	jonathan@kc8onw.net
  COMMENT=	A DVD to MPEG-4 ripper and encoder
  
  BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
 @@ -64,8 +61,8 @@
  
  .include <bsd.port.pre.mk>
  
 -.if ${ARCH} == "amd64" && ${OSVERSION} < 700000
 -BROKEN=		Does not compile
 +.if ${ARCH} == "amd64"
 +BROKEN=		Needs testing
  .endif
  
  # nasm/yasm needed by x264
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo	13 Dec 2007 16:50:15 -0000	1.4
 +++ distinfo	17 Jun 2008 21:25:48 -0000
 @@ -1,6 +1,6 @@
 -MD5 (handbrake/HandBrake-0.9.1.tar.gz) = 0eefe9189d59a0bfd9aeee41fd3d01a2
 -SHA256 (handbrake/HandBrake-0.9.1.tar.gz) = ae29b03dfd9724d7856f8b44a5a52bc60ad0af2846efe7db302d90dccc57d54b
 -SIZE (handbrake/HandBrake-0.9.1.tar.gz) = 1160277
 +MD5 (handbrake/HandBrake-0.9.2.tar.gz) = d21e0a097699e98f308d8c24dfa1594a
 +SHA256 (handbrake/HandBrake-0.9.2.tar.gz) = d5752e29e67d790be6e4ae2578054e5bc303cac8beade46d1851c0ee7e8860a6
 +SIZE (handbrake/HandBrake-0.9.2.tar.gz) = 1692074
  MD5 (handbrake/faac-1.24.tar.gz) = 81dc3efd98f1f2da0ac8bfa315284e95
  SHA256 (handbrake/faac-1.24.tar.gz) = 8eda7b69669f9d57c114d740555eb8bab29e4add90fade1aed41dd2ac1d19df6
  SIZE (handbrake/faac-1.24.tar.gz) = 627837
 @@ -16,9 +16,9 @@
  MD5 (handbrake/libdvdread-0.9.7.tar.gz) = a89a8532d5f850014f375bd3f5972082
  SHA256 (handbrake/libdvdread-0.9.7.tar.gz) = 18cf0ee3887264f09f2e23672923aec821ae9b806415ae0d78d0e310c1304c1f
  SIZE (handbrake/libdvdread-0.9.7.tar.gz) = 388570
 -MD5 (handbrake/libmkv-0.6.1.2.tar.gz) = be5d3a31477efb54766c8d9da89e1865
 -SHA256 (handbrake/libmkv-0.6.1.2.tar.gz) = 5d14627e98e0e8e3ff94ad11cb37dd5a35e909c5ba6444ef9e8b53b937ff3f3b
 -SIZE (handbrake/libmkv-0.6.1.2.tar.gz) = 334575
 +MD5 (handbrake/libmkv-0.6.1.3.tar.gz) = b0a81a416bffe19d54236f241632933c
 +SHA256 (handbrake/libmkv-0.6.1.3.tar.gz) = b116504390d3ec178ecb3cd6fb12e062b62b0909a7f1adcbaba00ed64fe63347
 +SIZE (handbrake/libmkv-0.6.1.3.tar.gz) = 329899
  MD5 (handbrake/libogg-1.1.2.tar.gz) = 4018e57063a9e5ce35145d73bea4b18b
  SHA256 (handbrake/libogg-1.1.2.tar.gz) = 0572ac9027caadb6ee4c2e3c87f98b045a66216ff2006041b12fceb5fb2f0332
  SIZE (handbrake/libogg-1.1.2.tar.gz) = 423463
 @@ -37,9 +37,9 @@
  MD5 (handbrake/ffmpeg-9816.tar.gz) = cfc6b97f830eddccbbb82b97ee6e3b78
  SHA256 (handbrake/ffmpeg-9816.tar.gz) = 23a38e102fa3d2df67e17e21a52d068665580d4fa5bb1d0e6ca4abb5a23894f2
  SIZE (handbrake/ffmpeg-9816.tar.gz) = 2706937
 -MD5 (handbrake/x264-r665.tar.gz) = a0fbe36eb7b03e61a96dd146e9c1ebbc
 -SHA256 (handbrake/x264-r665.tar.gz) = b61d2122ff559867d173413b1f3eba649d614a5a2e3be90642375d79bd79d30e
 -SIZE (handbrake/x264-r665.tar.gz) = 751198
 +MD5 (handbrake/x264-r736.tar.gz) = ea5dc8c2bfe33dc136687366237556db
 +SHA256 (handbrake/x264-r736.tar.gz) = fb020efbf89e8baf3b1ec93ee05c8cace4557a9658dffb99ef7d3e37521bbf3b
 +SIZE (handbrake/x264-r736.tar.gz) = 794658
  MD5 (handbrake/a52dec-0.7.4.tar.gz) = ce5a978bb359f642dcbd24c6e14a45a7
  SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
  SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/pkg-descr,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-descr
 --- pkg-descr	13 Dec 2007 16:50:15 -0000	1.3
 +++ pkg-descr	17 Jun 2008 21:25:48 -0000
 @@ -27,4 +27,4 @@
      * Picture deinterlacing, cropping and scaling
      * Grayscale encoding
  
 -WWW: http://handbrake.m0k.org/
 +WWW: http://handbrake.fr/
 Index: files/patch-contrib-Jamfile
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-contrib-Jamfile,v
 retrieving revision 1.1
 diff -u -r1.1 patch-contrib-Jamfile
 --- files/patch-contrib-Jamfile	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-contrib-Jamfile	17 Jun 2008 21:25:48 -0000
 @@ -1,6 +1,6 @@
 ---- contrib/Jamfile.orig	2007-10-08 15:57:23.000000000 -0500
 -+++ contrib/Jamfile	2007-12-07 17:58:44.000000000 -0600
 -@@ -23,9 +23,10 @@
 +--- contrib/Jamfile.orig	2008-05-21 05:18:06.844254734 +0300
 ++++ contrib/Jamfile	2008-05-21 06:00:18.032459924 +0300
 +@@ -34,9 +34,10 @@
   }
   actions Wget
   {
 @@ -14,26 +14,26 @@
   }
   
   # liba52
 -@@ -36,10 +37,9 @@
 - }
 +@@ -48,10 +49,9 @@
   actions LibA52
   {
 --
 + 
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf a52dec && tar xzf a52dec.tar.gz && cd a52dec && patch -p1 < ../patch-a52dec.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && 
 +-    cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/a52dec && patch -p1 < ../patch-a52dec.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/liba52.a
 +     $(STRIP) $CONTRIB/lib/liba52.a
   }
   Wget   $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
 -@@ -58,14 +58,13 @@
 +@@ -75,10 +75,9 @@
   }
   actions LibAvCodec
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf ffmpeg && tar xzf ffmpeg.tar.gz &&
 +-    rm -rf ffmpeg && (gzip -dc ffmpeg.tar.gz | tar xf -) &&
  -    cd ffmpeg && $(FFMPEG_PATCH) &&
  -    ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \
  +    CONTRIB=%%CONTRIB%% &&
 @@ -42,244 +42,210 @@
           --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \
           --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
           --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&
 --    make && make install &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libavcodec.a
 - }
 - Wget       $(SUBDIR)/ffmpeg.tar.gz    : $(SUBDIR)/version_ffmpeg.txt ;
 -@@ -96,9 +95,9 @@
 +@@ -113,10 +112,9 @@
       }
       actions LibDvdCss
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdcss && tar xzf libdvdcss.tar.gz && cd libdvdcss &&
 --        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-        rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && 
 +-        cd libdvdcss &&
 +-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdcss &&
  +        ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdcss.a
 +         $(STRIP) $CONTRIB/lib/libdvdcss.a
       }
       Wget      $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
 -@@ -113,9 +112,9 @@
 +@@ -131,10 +129,9 @@
   }
   actions LibDCA
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libdca && tar xzf libdca.tar.gz && cd libdca && patch -p1 < ../patch-libdca.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && 
 +-    cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libdca && patch -p1 < ../patch-libdca.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libdca.a
 +     $(STRIP) $CONTRIB/lib/libdca.a
   }
   Wget   $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
 -@@ -131,10 +130,10 @@
 +@@ -150,10 +147,9 @@
   {
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared --with-libdvdcss=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -143,10 +142,10 @@
 +@@ -163,10 +159,9 @@
       # configure line.
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -161,10 +160,10 @@
 +@@ -182,9 +177,9 @@
   }
   actions LibFaac
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf faac && tar xzf faac.tar.gz && cd faac &&
 +-    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/faac &&
  +    ./configure --prefix=$CONTRIB --disable-shared --enable-static &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libfaac.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libfaac.a
   }
 - Wget    $(SUBDIR)/faac.tar.gz   : $(SUBDIR)/version_faac.txt ;
 -@@ -178,10 +177,10 @@
 +@@ -199,9 +194,9 @@
   }
   actions LibMp3Lame
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf lame && tar xzf lame.tar.gz && cd lame &&
 +-    rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/lame &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmp3lame.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmp3lame.a
   }
 - Wget       $(SUBDIR)/lame.tar.gz      : $(SUBDIR)/version_lame.txt ;
 -@@ -197,11 +196,11 @@
 - {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -211,11 +210,11 @@
 +@@ -224,10 +219,10 @@
 + }
 + actions LibMp4v2
   {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p1 < ../patch_mpeg4ip_cygwin.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -231,10 +230,10 @@
 +-    cd `dirname $(>)` && CONTRIB=`pwd` &&
 +-    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
 +-    cd mpeg4ip && $(LIBMP4V2_PATCH)
 +-    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 ++    CONTRIB=%%CONTRIB%% &&
 ++    cd $CONTRIB/mpeg4ip &&
 ++    $(LIBMP4V2_PATCH)
 ++    ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 +     $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 +     cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 +         include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 +@@ -243,10 +238,9 @@
   }
   actions LibMkv
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libmkv && tar xzf libmkv.tar.gz && cd libmkv &&
 +-    rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && 
 +-    cd libmkv &&
  -    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libmkv &&
  +    ./configure --disable-shared --enable-static --prefix=$CONTRIB &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmkv.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmkv.a
   }
 - Wget    $(SUBDIR)/libmkv.tar.gz : $(SUBDIR)/version_libmkv.txt ;
 -@@ -248,10 +247,10 @@
 +@@ -261,10 +255,9 @@
   }
   actions LibMpeg2
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf mpeg2dec && tar xzf mpeg2dec.tar.gz && cd mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
 +-    rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
 +-    cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
  +    ./configure --prefix=$CONTRIB --disable-shared --disable-sdl &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmpeg2.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmpeg2.a
   }
 - Wget     $(SUBDIR)/mpeg2dec.tar.gz : $(SUBDIR)/version_mpeg2dec.txt ;
 -@@ -265,10 +264,10 @@
 +@@ -279,10 +272,9 @@
   }
   actions LibOgg
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libogg && tar xzf libogg.tar.gz && cd libogg &&
 +-    rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && 
 +-    cd libogg &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libogg &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libogg.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libogg.a
   }
 - Wget   $(SUBDIR)/libogg.tar.gz : $(SUBDIR)/version_libogg.txt ;
 -@@ -282,10 +281,10 @@
 +@@ -297,10 +289,9 @@
   }
   actions LibSampleRate
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libsamplerate && tar xzf libsamplerate.tar.gz && cd libsamplerate &&
 +-    rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && 
 +-    cd libsamplerate &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libsamplerate &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libsamplerate.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libsamplerate.a
   }
 - Wget          $(SUBDIR)/libsamplerate.tar.gz : $(SUBDIR)/version_libsamplerate.txt ;
 -@@ -299,10 +298,10 @@
 +@@ -315,10 +306,9 @@
   }
   actions LibVorbis
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libvorbis && tar xzf libvorbis.tar.gz && cd libvorbis &&
 +-    rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) &&
 +-    cd libvorbis &&
  -    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libvorbis &&
  +    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libvorbis.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libvorbis.a
   }
 - Wget      $(SUBDIR)/libvorbis.tar.gz : $(SUBDIR)/version_libvorbis.txt ;
 -@@ -338,10 +337,10 @@
 +@@ -356,10 +346,9 @@
   }
   actions LibX264
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf x264 && tar xzf x264.tar.gz && cd x264 && $(LIBX264_PATCH)
 --    ./configure --prefix=$CONTRIB --enable-pthread && make &&
 --    make install &&
 +-    rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
 +-    cd x264 && $(LIBX264_PATCH)
 +-    bash ./configure --prefix=$CONTRIB --enable-pthread &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/x264 && $(LIBX264_PATCH)
  +    ./configure --prefix=$CONTRIB --enable-pthread && $(MAKE) &&
 -+    $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libx264.a
 +     $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
   }
   Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
 -@@ -364,10 +363,9 @@
 +@@ -383,10 +372,9 @@
   }
   actions LibXvidCore
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf xvidcore && tar xzf xvidcore.tar.gz &&
 +-    rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) &&
  -    cd xvidcore && $(LIBXVIDCORE_PATCH)
 --    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make libxvidcore.a &&
 +-    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/xvidcore && $(LIBXVIDCORE_PATCH)
  +    cd build/generic/ && ./configure --prefix=$CONTRIB && $(MAKE) libxvidcore.a &&
       cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
       cp ../../src/xvid.h $CONTRIB/include/ &&
 -     strip -S $CONTRIB/lib/libxvidcore.a
 -@@ -385,10 +383,9 @@
 +     $(STRIP) $CONTRIB/lib/libxvidcore.a
 +@@ -404,9 +392,8 @@
       }
       actions Zlib
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf zlib && tar xzf zlib.tar.gz &&
 --        cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --        make && make install && touch $CONTRIB/.contrib &&
 +-        rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
 +-        cd zlib && ./configure --prefix=$CONTRIB &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/zlib && ./configure --prefix=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 -         strip -S $CONTRIB/lib/libz.a
 +         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 +         $(STRIP) $CONTRIB/lib/libz.a
       }
 -     Wget  $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ;
 Index: files/patch-libhb-fifo.c
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-fifo.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-libhb-fifo.c
 --- files/patch-libhb-fifo.c	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-libhb-fifo.c	17 Jun 2008 21:25:48 -0000
 @@ -1,13 +1,13 @@
 ---- HandBrake_old/libhb/fifo.c	2007-10-08 22:57:08.000000000 +0200
 -+++ libhb/fifo.c	2007-12-04 05:55:37.000000000 +0100
 -@@ -6,9 +6,7 @@
 +--- ../../work_old/HandBrake/libhb/fifo.c	2008-02-19 19:28:17.000000000 +0100
 ++++ libhb/fifo.c	2008-06-17 23:02:48.000000000 +0200
 +@@ -6,7 +6,9 @@
   
   #include "hb.h"
   
  -#ifndef SYS_DARWIN
 --#include <malloc.h>
 --#endif
 ++#if defined( SYS_FREEBSD )
  +#include <stdlib.h>
 ++#elif !defined( SYS_DARWIN )
 + #include <malloc.h>
 + #endif
   
 - /* Fifo */
 - struct hb_fifo_s
 Index: files/patch-libhb-ports.c
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-ports.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-libhb-ports.c
 --- files/patch-libhb-ports.c	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-libhb-ports.c	17 Jun 2008 21:25:48 -0000
 @@ -1,10 +1,10 @@
 ---- HandBrake_old/libhb/ports.c	2007-10-08 22:57:08.000000000 +0200
 -+++ libhb/ports.c	2007-12-04 07:48:47.000000000 +0100
 -@@ -28,6 +28,11 @@
 +--- ../../work/HandBrake/libhb/ports.c	2008-02-19 19:28:17.000000000 +0100
 ++++ libhb/ports.c	2008-06-17 13:20:42.000000000 +0200
 +@@ -30,6 +30,11 @@
   #include <netinet/in.h>
   //#endif
   
 -+#if defined(__FreeBSD__)
 ++#if defined( SYS_FREEBSD )
  +#include <sys/types.h>
  +#include <sys/sysctl.h>
  +#endif
 @@ -12,26 +12,21 @@
   #include "hb.h"
   
   /************************************************************************
 -@@ -105,21 +110,17 @@
 +@@ -107,7 +112,7 @@
           cpu_count = info.cpu_count;
       }
   
  -#elif defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
 --    FILE * info;
 --    char   buffer[16];
 --
 --    if( ( info = popen( "/usr/sbin/sysctl hw.ncpu", "r" ) ) )
 -+#elif defined(__FreeBSD__)
 -     {
 --        memset( buffer, 0, 16 );
 --        if( fgets( buffer, 15, info ) )
 --        {
 --            if( sscanf( buffer, "hw.ncpu: %d", &cpu_count ) != 1 )
 --            {
 --                cpu_count = 1;
 --            }
 --        }
 --        fclose( info );
 ++#elif defined( SYS_DARWIN )
 +     FILE * info;
 +     char   buffer[16];
 + 
 +@@ -124,6 +129,19 @@
 +         fclose( info );
 +     }
 + 
 ++#elif defined( SYS_FREEBSD )
 ++    {
  +        int mib[2];
  +        size_t len;
  +
 @@ -41,6 +36,8 @@
  +
  +        if(sysctl(mib, 2, &cpu_count, &len, NULL, 0) != 0)
  +          cpu_count = 1;
 -     }
 - 
 ++    }
 ++
   #elif defined( SYS_LINUX )
 +     {
 +         FILE * info;
 
 --9amGYk9869ThD9tj--
 

From: Jona Joachim <jaj@hcl-club.lu>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123849: [PATCH] update for multimedia/handbrake
Date: Mon, 14 Jul 2008 19:27:31 +0200

 --ReaqsoxgOBHFXBhH
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I resend this follow-up because GNATS mangeled my first submit...
 I hope it shows fine this time.
 
 The following patch is based on the submitter's diff and does:
  
 - Update multimedia/handbrake to 0.9.2 (current release).
 - Make some patches upstream-friendlier.
 - Remove some private mirrors (which we shouldn't have in the port according to
   the devs).
 - Mark broken on amd64. Some people reported trouble (even though it should
   build fine). Neither submitter nor me can test on this platform.
 - Pass maintainership to the submitter.
  
 Best regards,
 Jona (current maintainer)
 
 --ReaqsoxgOBHFXBhH
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="handbrake.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/Makefile,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile
 --- Makefile	20 Feb 2008 01:19:09 -0000	1.23
 +++ Makefile	17 Jun 2008 21:25:48 -0000
 @@ -6,14 +6,11 @@
  #
  
  PORTNAME=	handbrake
 -PORTVERSION=	0.9.1
 +PORTVERSION=	0.9.2
  CATEGORIES=	multimedia
 -MASTER_SITES=	http://saintdevelopment.com/mirror/handbrake/:main \
 -		http://junk.phantomgorilla.com/hb/:main \
 -		http://daigertech.com/handbrake/:main \
 -		http://www.mirrors.ausmac.net/ftp/Audio-SW/HandBrake/testing/:main \
 -		http://asshatandi.com/:main \
 -		http://download.m0k.org/handbrake/testing/:main \
 +MASTER_SITES=	http://download.handbrake.fr/handbrake/releases/:main \
 +		http://download.m0k.org/handbrake/releases/:main \
 +		http://download.handbrake.fr/handbrake/contrib/:contrib \
  		http://download.m0k.org/handbrake/contrib/:contrib
  DISTFILES=	HandBrake-${PORTVERSION}.tar.gz:main \
  		faac-1.24.tar.gz:contrib \
 @@ -21,19 +18,19 @@
  		libdca-r81-strapped.tar.gz:contrib \
  		libdvdcss-1.2.9.tar.gz:contrib \
  		libdvdread-0.9.7.tar.gz:contrib \
 -		libmkv-0.6.1.2.tar.gz:contrib \
 +		libmkv-0.6.1.3.tar.gz:contrib \
  		libogg-1.1.2.tar.gz:contrib \
  		libvorbis-aotuv_b5.tar.gz:contrib \
  		mpeg2dec-0.4.1.tar.gz:contrib \
  		mpeg4ip-1.3.tar.gz:contrib \
  		xvidcore-1.1.2.tar.gz:contrib \
  		ffmpeg-9816.tar.gz:contrib \
 -		x264-r665.tar.gz:contrib \
 +		x264-r736.tar.gz:contrib \
  		a52dec-0.7.4.tar.gz:contrib \
  		libsamplerate-0.1.2.tar.gz:contrib
  DIST_SUBDIR=	handbrake
  
 -MAINTAINER=	jaj@hcl-club.lu
 +MAINTAINER=	jonathan@kc8onw.net
  COMMENT=	A DVD to MPEG-4 ripper and encoder
  
  BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
 @@ -64,8 +61,8 @@
  
  .include <bsd.port.pre.mk>
  
 -.if ${ARCH} == "amd64" && ${OSVERSION} < 700000
 -BROKEN=		Does not compile
 +.if ${ARCH} == "amd64"
 +BROKEN=		Needs testing
  .endif
  
  # nasm/yasm needed by x264
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo	13 Dec 2007 16:50:15 -0000	1.4
 +++ distinfo	17 Jun 2008 21:25:48 -0000
 @@ -1,6 +1,6 @@
 -MD5 (handbrake/HandBrake-0.9.1.tar.gz) = 0eefe9189d59a0bfd9aeee41fd3d01a2
 -SHA256 (handbrake/HandBrake-0.9.1.tar.gz) = ae29b03dfd9724d7856f8b44a5a52bc60ad0af2846efe7db302d90dccc57d54b
 -SIZE (handbrake/HandBrake-0.9.1.tar.gz) = 1160277
 +MD5 (handbrake/HandBrake-0.9.2.tar.gz) = d21e0a097699e98f308d8c24dfa1594a
 +SHA256 (handbrake/HandBrake-0.9.2.tar.gz) = d5752e29e67d790be6e4ae2578054e5bc303cac8beade46d1851c0ee7e8860a6
 +SIZE (handbrake/HandBrake-0.9.2.tar.gz) = 1692074
  MD5 (handbrake/faac-1.24.tar.gz) = 81dc3efd98f1f2da0ac8bfa315284e95
  SHA256 (handbrake/faac-1.24.tar.gz) = 8eda7b69669f9d57c114d740555eb8bab29e4add90fade1aed41dd2ac1d19df6
  SIZE (handbrake/faac-1.24.tar.gz) = 627837
 @@ -16,9 +16,9 @@
  MD5 (handbrake/libdvdread-0.9.7.tar.gz) = a89a8532d5f850014f375bd3f5972082
  SHA256 (handbrake/libdvdread-0.9.7.tar.gz) = 18cf0ee3887264f09f2e23672923aec821ae9b806415ae0d78d0e310c1304c1f
  SIZE (handbrake/libdvdread-0.9.7.tar.gz) = 388570
 -MD5 (handbrake/libmkv-0.6.1.2.tar.gz) = be5d3a31477efb54766c8d9da89e1865
 -SHA256 (handbrake/libmkv-0.6.1.2.tar.gz) = 5d14627e98e0e8e3ff94ad11cb37dd5a35e909c5ba6444ef9e8b53b937ff3f3b
 -SIZE (handbrake/libmkv-0.6.1.2.tar.gz) = 334575
 +MD5 (handbrake/libmkv-0.6.1.3.tar.gz) = b0a81a416bffe19d54236f241632933c
 +SHA256 (handbrake/libmkv-0.6.1.3.tar.gz) = b116504390d3ec178ecb3cd6fb12e062b62b0909a7f1adcbaba00ed64fe63347
 +SIZE (handbrake/libmkv-0.6.1.3.tar.gz) = 329899
  MD5 (handbrake/libogg-1.1.2.tar.gz) = 4018e57063a9e5ce35145d73bea4b18b
  SHA256 (handbrake/libogg-1.1.2.tar.gz) = 0572ac9027caadb6ee4c2e3c87f98b045a66216ff2006041b12fceb5fb2f0332
  SIZE (handbrake/libogg-1.1.2.tar.gz) = 423463
 @@ -37,9 +37,9 @@
  MD5 (handbrake/ffmpeg-9816.tar.gz) = cfc6b97f830eddccbbb82b97ee6e3b78
  SHA256 (handbrake/ffmpeg-9816.tar.gz) = 23a38e102fa3d2df67e17e21a52d068665580d4fa5bb1d0e6ca4abb5a23894f2
  SIZE (handbrake/ffmpeg-9816.tar.gz) = 2706937
 -MD5 (handbrake/x264-r665.tar.gz) = a0fbe36eb7b03e61a96dd146e9c1ebbc
 -SHA256 (handbrake/x264-r665.tar.gz) = b61d2122ff559867d173413b1f3eba649d614a5a2e3be90642375d79bd79d30e
 -SIZE (handbrake/x264-r665.tar.gz) = 751198
 +MD5 (handbrake/x264-r736.tar.gz) = ea5dc8c2bfe33dc136687366237556db
 +SHA256 (handbrake/x264-r736.tar.gz) = fb020efbf89e8baf3b1ec93ee05c8cace4557a9658dffb99ef7d3e37521bbf3b
 +SIZE (handbrake/x264-r736.tar.gz) = 794658
  MD5 (handbrake/a52dec-0.7.4.tar.gz) = ce5a978bb359f642dcbd24c6e14a45a7
  SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
  SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/pkg-descr,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-descr
 --- pkg-descr	13 Dec 2007 16:50:15 -0000	1.3
 +++ pkg-descr	17 Jun 2008 21:25:48 -0000
 @@ -27,4 +27,4 @@
      * Picture deinterlacing, cropping and scaling
      * Grayscale encoding
  
 -WWW: http://handbrake.m0k.org/
 +WWW: http://handbrake.fr/
 Index: files/patch-contrib-Jamfile
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-contrib-Jamfile,v
 retrieving revision 1.1
 diff -u -r1.1 patch-contrib-Jamfile
 --- files/patch-contrib-Jamfile	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-contrib-Jamfile	17 Jun 2008 21:25:48 -0000
 @@ -1,6 +1,6 @@
 ---- contrib/Jamfile.orig	2007-10-08 15:57:23.000000000 -0500
 -+++ contrib/Jamfile	2007-12-07 17:58:44.000000000 -0600
 -@@ -23,9 +23,10 @@
 +--- contrib/Jamfile.orig	2008-05-21 05:18:06.844254734 +0300
 ++++ contrib/Jamfile	2008-05-21 06:00:18.032459924 +0300
 +@@ -34,9 +34,10 @@
   }
   actions Wget
   {
 @@ -14,26 +14,26 @@
   }
   
   # liba52
 -@@ -36,10 +37,9 @@
 - }
 +@@ -48,10 +49,9 @@
   actions LibA52
   {
 --
 + 
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf a52dec && tar xzf a52dec.tar.gz && cd a52dec && patch -p1 < ../patch-a52dec.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf a52dec && (gzip -dc a52dec.tar.gz | tar xf -) && 
 +-    cd a52dec && $(PATCH) -p1 < ../patch-a52dec.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/a52dec && patch -p1 < ../patch-a52dec.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/liba52.a
 +     $(STRIP) $CONTRIB/lib/liba52.a
   }
   Wget   $(SUBDIR)/a52dec.tar.gz : $(SUBDIR)/version_a52dec.txt ;
 -@@ -58,14 +58,13 @@
 +@@ -75,10 +75,9 @@
   }
   actions LibAvCodec
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf ffmpeg && tar xzf ffmpeg.tar.gz &&
 +-    rm -rf ffmpeg && (gzip -dc ffmpeg.tar.gz | tar xf -) &&
  -    cd ffmpeg && $(FFMPEG_PATCH) &&
  -    ./configure --prefix=$CONTRIB --enable-gpl --enable-pthreads --enable-swscaler --disable-audio-beos --disable-shared --enable-static \
  +    CONTRIB=%%CONTRIB%% &&
 @@ -42,244 +42,210 @@
           --disable-decoders --enable-decoder=mp2 --disable-parsers --enable-parser=mpegaudio \
           --disable-encoders --enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
           --disable-muxers --enable-muxer=ipod --disable-demuxers --disable-protocols --disable-bsfs &&
 --    make && make install &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libavcodec.a
 - }
 - Wget       $(SUBDIR)/ffmpeg.tar.gz    : $(SUBDIR)/version_ffmpeg.txt ;
 -@@ -96,9 +95,9 @@
 +@@ -113,10 +112,9 @@
       }
       actions LibDvdCss
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdcss && tar xzf libdvdcss.tar.gz && cd libdvdcss &&
 --        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-        rm -rf libdvdcss && (gzip -dc libdvdcss.tar.gz | tar xf - ) && 
 +-        cd libdvdcss &&
 +-        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdcss &&
  +        ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdcss.a
 +         $(STRIP) $CONTRIB/lib/libdvdcss.a
       }
       Wget      $(SUBDIR)/libdvdcss.tar.gz : $(SUBDIR)/version_libdvdcss.txt ;
 -@@ -113,9 +112,9 @@
 +@@ -131,10 +129,9 @@
   }
   actions LibDCA
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libdca && tar xzf libdca.tar.gz && cd libdca && patch -p1 < ../patch-libdca.patch &&
 --    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make && make install &&
 +-    rm -rf libdca && (gzip -dc libdca.tar.gz | tar xf - ) && 
 +-    cd libdca && $(PATCH) -p1 < ../patch-libdca.patch &&
 +-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) && $(MAKE) install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libdca && patch -p1 < ../patch-libdca.patch &&
  +    ./configure --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libdca.a
 +     $(STRIP) $CONTRIB/lib/libdca.a
   }
   Wget   $(SUBDIR)/libdca.tar.gz : $(SUBDIR)/version_libdca.txt ;
 -@@ -131,10 +130,10 @@
 +@@ -150,10 +147,9 @@
   {
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --with-libdvdcss=$CONTRIB &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared --with-libdvdcss=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -143,10 +142,10 @@
 +@@ -163,10 +159,9 @@
       # configure line.
       actions LibDvdRead
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf libdvdread && tar xzf libdvdread.tar.gz && cd libdvdread &&
 +-        rm -rf libdvdread && (gzip -dc libdvdread.tar.gz | tar xf - ) && 
 +-        cd libdvdread &&
  -        ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --        make && make install &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/libdvdread &&
  +        ./configure --prefix=$CONTRIB --disable-shared &&
 -+        $(MAKE) && $(MAKE) install &&
 -         strip -S $CONTRIB/lib/libdvdread.a
 +         $(MAKE) && $(MAKE) install &&
 +         $(STRIP) $CONTRIB/lib/libdvdread.a
       }
 - }
 -@@ -161,10 +160,10 @@
 +@@ -182,9 +177,9 @@
   }
   actions LibFaac
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf faac && tar xzf faac.tar.gz && cd faac &&
 +-    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/faac &&
  +    ./configure --prefix=$CONTRIB --disable-shared --enable-static &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libfaac.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libfaac.a
   }
 - Wget    $(SUBDIR)/faac.tar.gz   : $(SUBDIR)/version_faac.txt ;
 -@@ -178,10 +177,10 @@
 +@@ -199,9 +194,9 @@
   }
   actions LibMp3Lame
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf lame && tar xzf lame.tar.gz && cd lame &&
 +-    rm -rf lame && (gzip -dc lame.tar.gz | tar xf - ) && cd lame &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/lame &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmp3lame.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmp3lame.a
   }
 - Wget       $(SUBDIR)/lame.tar.gz      : $(SUBDIR)/version_lame.txt ;
 -@@ -197,11 +196,11 @@
 - {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -211,11 +210,11 @@
 +@@ -224,10 +219,10 @@
 + }
 + actions LibMp4v2
   {
 -     actions LibMp4v2
 -     {
 --        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf mpeg4ip && tar xzf mpeg4ip.tar.gz && cd mpeg4ip &&
 -+        CONTRIB=%%CONTRIB%% &&
 -+        cd $CONTRIB/mpeg4ip &&
 -         patch -p1 < ../patch-mpeg4ip.patch && patch -p1 < ../patch_mpeg4ip_cygwin.patch && patch -p0 < ../patch-mpeg4ip-pascal-str.patch &&
 --        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 --        make -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -+        ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 -+        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 -         cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 -             include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 -         strip -S $CONTRIB/lib/libmp4v2.a
 -@@ -231,10 +230,10 @@
 +-    cd `dirname $(>)` && CONTRIB=`pwd` &&
 +-    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
 +-    cd mpeg4ip && $(LIBMP4V2_PATCH)
 +-    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 ++    CONTRIB=%%CONTRIB%% &&
 ++    cd $CONTRIB/mpeg4ip &&
 ++    $(LIBMP4V2_PATCH)
 ++    ./bootstrap --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
 +     $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
 +     cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
 +         include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
 +@@ -243,10 +238,9 @@
   }
   actions LibMkv
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libmkv && tar xzf libmkv.tar.gz && cd libmkv &&
 +-    rm -rf libmkv && (gzip -dc libmkv.tar.gz | tar xf - ) && 
 +-    cd libmkv &&
  -    ./configure --disable-shared --enable-static --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libmkv &&
  +    ./configure --disable-shared --enable-static --prefix=$CONTRIB &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmkv.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmkv.a
   }
 - Wget    $(SUBDIR)/libmkv.tar.gz : $(SUBDIR)/version_libmkv.txt ;
 -@@ -248,10 +247,10 @@
 +@@ -261,10 +255,9 @@
   }
   actions LibMpeg2
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf mpeg2dec && tar xzf mpeg2dec.tar.gz && cd mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
 +-    rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
 +-    cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/mpeg2dec && patch -p1 < ../patch-libmpeg2.patch &&
  +    ./configure --prefix=$CONTRIB --disable-shared --disable-sdl &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libmpeg2.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libmpeg2.a
   }
 - Wget     $(SUBDIR)/mpeg2dec.tar.gz : $(SUBDIR)/version_mpeg2dec.txt ;
 -@@ -265,10 +264,10 @@
 +@@ -279,10 +272,9 @@
   }
   actions LibOgg
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libogg && tar xzf libogg.tar.gz && cd libogg &&
 +-    rm -rf libogg && (gzip -dc libogg.tar.gz | tar xf - ) && 
 +-    cd libogg &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libogg &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libogg.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libogg.a
   }
 - Wget   $(SUBDIR)/libogg.tar.gz : $(SUBDIR)/version_libogg.txt ;
 -@@ -282,10 +281,10 @@
 +@@ -297,10 +289,9 @@
   }
   actions LibSampleRate
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libsamplerate && tar xzf libsamplerate.tar.gz && cd libsamplerate &&
 +-    rm -rf libsamplerate && (gzip -dc libsamplerate.tar.gz | tar xf - ) && 
 +-    cd libsamplerate &&
  -    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libsamplerate &&
  +    ./configure --prefix=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libsamplerate.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libsamplerate.a
   }
 - Wget          $(SUBDIR)/libsamplerate.tar.gz : $(SUBDIR)/version_libsamplerate.txt ;
 -@@ -299,10 +298,10 @@
 +@@ -315,10 +306,9 @@
   }
   actions LibVorbis
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf libvorbis && tar xzf libvorbis.tar.gz && cd libvorbis &&
 +-    rm -rf libvorbis && (gzip -dc libvorbis.tar.gz | tar xf - ) &&
 +-    cd libvorbis &&
  -    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared &&
 --    make && make install &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/libvorbis &&
  +    ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --disable-shared &&
 -+    $(MAKE) && $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libvorbis.a
 +     $(MAKE) && $(MAKE) install &&
 +     $(STRIP) $CONTRIB/lib/libvorbis.a
   }
 - Wget      $(SUBDIR)/libvorbis.tar.gz : $(SUBDIR)/version_libvorbis.txt ;
 -@@ -338,10 +337,10 @@
 +@@ -356,10 +346,9 @@
   }
   actions LibX264
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf x264 && tar xzf x264.tar.gz && cd x264 && $(LIBX264_PATCH)
 --    ./configure --prefix=$CONTRIB --enable-pthread && make &&
 --    make install &&
 +-    rm -rf x264 && (gzip -dc x264.tar.gz | tar xf - ) && 
 +-    cd x264 && $(LIBX264_PATCH)
 +-    bash ./configure --prefix=$CONTRIB --enable-pthread &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/x264 && $(LIBX264_PATCH)
  +    ./configure --prefix=$CONTRIB --enable-pthread && $(MAKE) &&
 -+    $(MAKE) install &&
 -     strip -S $CONTRIB/lib/libx264.a
 +     $(MAKE) libx264.a && cp libx264.a $CONTRIB/lib/ && cp x264.h $CONTRIB/include/ && $(STRIP) $CONTRIB/lib/libx264.a
   }
   Wget    $(SUBDIR)/x264.tar.gz   : $(SUBDIR)/version_x264.txt ;
 -@@ -364,10 +363,9 @@
 +@@ -383,10 +372,9 @@
   }
   actions LibXvidCore
   {
  -    cd `dirname $(>)` && CONTRIB=`pwd` &&
 --    rm -rf xvidcore && tar xzf xvidcore.tar.gz &&
 +-    rm -rf xvidcore && (gzip -dc xvidcore.tar.gz | tar xf - ) &&
  -    cd xvidcore && $(LIBXVIDCORE_PATCH)
 --    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && make libxvidcore.a &&
 +-    cd build/generic/ && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache && $(MAKE) libxvidcore.a &&
  +    CONTRIB=%%CONTRIB%% &&
  +    cd $CONTRIB/xvidcore && $(LIBXVIDCORE_PATCH)
  +    cd build/generic/ && ./configure --prefix=$CONTRIB && $(MAKE) libxvidcore.a &&
       cp ./=build/libxvidcore.a $CONTRIB/lib/ &&
       cp ../../src/xvid.h $CONTRIB/include/ &&
 -     strip -S $CONTRIB/lib/libxvidcore.a
 -@@ -385,10 +383,9 @@
 +     $(STRIP) $CONTRIB/lib/libxvidcore.a
 +@@ -404,9 +392,8 @@
       }
       actions Zlib
       {
  -        cd `dirname $(>)` && CONTRIB=`pwd` &&
 --        rm -rf zlib && tar xzf zlib.tar.gz &&
 --        cd zlib && ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache &&
 --        make && make install && touch $CONTRIB/.contrib &&
 +-        rm -rf zlib && (gzip -dc zlib.tar.gz | tar xf - ) &&
 +-        cd zlib && ./configure --prefix=$CONTRIB &&
  +        CONTRIB=%%CONTRIB%% &&
  +        cd $CONTRIB/zlib && ./configure --prefix=$CONTRIB &&
 -+        $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 -         strip -S $CONTRIB/lib/libz.a
 +         $(MAKE) && $(MAKE) install && touch $CONTRIB/.contrib &&
 +         $(STRIP) $CONTRIB/lib/libz.a
       }
 -     Wget  $(SUBDIR)/zlib.tar.gz : $(SUBDIR)/version_zlib.txt ;
 Index: files/patch-libhb-fifo.c
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-fifo.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-libhb-fifo.c
 --- files/patch-libhb-fifo.c	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-libhb-fifo.c	17 Jun 2008 21:25:48 -0000
 @@ -1,13 +1,13 @@
 ---- HandBrake_old/libhb/fifo.c	2007-10-08 22:57:08.000000000 +0200
 -+++ libhb/fifo.c	2007-12-04 05:55:37.000000000 +0100
 -@@ -6,9 +6,7 @@
 +--- ../../work_old/HandBrake/libhb/fifo.c	2008-02-19 19:28:17.000000000 +0100
 ++++ libhb/fifo.c	2008-06-17 23:02:48.000000000 +0200
 +@@ -6,7 +6,9 @@
   
   #include "hb.h"
   
  -#ifndef SYS_DARWIN
 --#include <malloc.h>
 --#endif
 ++#if defined( SYS_FREEBSD )
  +#include <stdlib.h>
 ++#elif !defined( SYS_DARWIN )
 + #include <malloc.h>
 + #endif
   
 - /* Fifo */
 - struct hb_fifo_s
 Index: files/patch-libhb-ports.c
 ===================================================================
 RCS file: /home/ncvs/ports/multimedia/handbrake/files/patch-libhb-ports.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-libhb-ports.c
 --- files/patch-libhb-ports.c	13 Dec 2007 16:50:15 -0000	1.1
 +++ files/patch-libhb-ports.c	17 Jun 2008 21:25:48 -0000
 @@ -1,10 +1,10 @@
 ---- HandBrake_old/libhb/ports.c	2007-10-08 22:57:08.000000000 +0200
 -+++ libhb/ports.c	2007-12-04 07:48:47.000000000 +0100
 -@@ -28,6 +28,11 @@
 +--- ../../work/HandBrake/libhb/ports.c	2008-02-19 19:28:17.000000000 +0100
 ++++ libhb/ports.c	2008-06-17 13:20:42.000000000 +0200
 +@@ -30,6 +30,11 @@
   #include <netinet/in.h>
   //#endif
   
 -+#if defined(__FreeBSD__)
 ++#if defined( SYS_FREEBSD )
  +#include <sys/types.h>
  +#include <sys/sysctl.h>
  +#endif
 @@ -12,26 +12,21 @@
   #include "hb.h"
   
   /************************************************************************
 -@@ -105,21 +110,17 @@
 +@@ -107,7 +112,7 @@
           cpu_count = info.cpu_count;
       }
   
  -#elif defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
 --    FILE * info;
 --    char   buffer[16];
 --
 --    if( ( info = popen( "/usr/sbin/sysctl hw.ncpu", "r" ) ) )
 -+#elif defined(__FreeBSD__)
 -     {
 --        memset( buffer, 0, 16 );
 --        if( fgets( buffer, 15, info ) )
 --        {
 --            if( sscanf( buffer, "hw.ncpu: %d", &cpu_count ) != 1 )
 --            {
 --                cpu_count = 1;
 --            }
 --        }
 --        fclose( info );
 ++#elif defined( SYS_DARWIN )
 +     FILE * info;
 +     char   buffer[16];
 + 
 +@@ -124,6 +129,19 @@
 +         fclose( info );
 +     }
 + 
 ++#elif defined( SYS_FREEBSD )
 ++    {
  +        int mib[2];
  +        size_t len;
  +
 @@ -41,6 +36,8 @@
  +
  +        if(sysctl(mib, 2, &cpu_count, &len, NULL, 0) != 0)
  +          cpu_count = 1;
 -     }
 - 
 ++    }
 ++
   #elif defined( SYS_LINUX )
 +     {
 +         FILE * info;
 
 --ReaqsoxgOBHFXBhH--
State-Changed-From-To: feedback->closed 
State-Changed-By: erwin 
State-Changed-When: Thu Jul 17 21:06:27 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/123849: commit references a PR
Date: Thu, 17 Jul 2008 21:06:24 +0000 (UTC)

 erwin       2008-07-17 21:06:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/handbrake Makefile distinfo pkg-descr 
     multimedia/handbrake/files patch-contrib-Jamfile 
                                patch-libhb-fifo.c 
                                patch-libhb-ports.c 
   Removed files:
     multimedia/handbrake/files patch-contrib-mpeg4ip-configure 
   Log:
    - Update multimedia/handbrake to 0.9.2 (current release).
    - Make some patches upstream-friendlier.
    - Remove some private mirrors (which we shouldn't have in the port according to
      the devs).
    - Mark broken on amd64. Some people reported trouble (even though it should
      build fine). Neither submitter nor me can test on this platform.
    - Pass maintainership to the submitter.
   
   PR:             123849
   Submitted by:   Jona Joachim <jaj@hcl-club.lu> (old maintainer),
                   Jonathan Stewart <jonathan@kc8onw.net> (new maintainer)
   
   Revision  Changes    Path
   1.24      +9 -12     ports/multimedia/handbrake/Makefile
   1.5       +9 -9      ports/multimedia/handbrake/distinfo
   1.2       +92 -126   ports/multimedia/handbrake/files/patch-contrib-Jamfile
   1.2       +0 -11     ports/multimedia/handbrake/files/patch-contrib-mpeg4ip-configure (dead)
   1.2       +7 -7      ports/multimedia/handbrake/files/patch-libhb-fifo.c
   1.2       +19 -22    ports/multimedia/handbrake/files/patch-libhb-ports.c
   1.4       +1 -1      ports/multimedia/handbrake/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
