Update to 0.7.1.

Submitted by:	Rainer Alves <rainer.alves@gmail.com> (tweaked by mezz)

16 files changed, 118 insertions, 383 deletions

diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index e81f054323d0..05a88a36e0b4 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	handbrake
-PORTVERSION=	0.6.2
-PORTREVISION=	3
+PORTVERSION=	0.7.1
 CATEGORIES=	multimedia
-MASTER_SITES=	http://download.m0k.org/${PORTNAME}/
-DISTNAME=	HandBrake-${PORTVERSION}-src
+MASTER_SITES=	http://download.m0k.org/${PORTNAME}/ \
+		http://www.mirrors.ausmac.net/ftp/AudioVisual-SW/HandBrake/ \
+		http://apple.doit.wisc.edu/mirrors/ausmac/Audio-SW/HandBrake/
+DISTNAME=	HandBrake-${PORTVERSION}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A DVD to MPEG-4 ripper and encoder
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
-		nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
 		faac.0:${PORTSDIR}/audio/faac \
@@ -28,34 +27,30 @@ LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		ogg.5:${PORTSDIR}/audio/libogg \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
-		xvidcore.4:${PORTSDIR}/multimedia/xvid
+		xvidcore.4:${PORTSDIR}/multimedia/xvid \
+		x264.47:${PORTSDIR}/multimedia/x264
 
-PLIST_FILES=	bin/handbrake
 WRKSRC=		${WRKDIR}/HandBrake-${PORTVERSION}
+HAS_CONFIGURE=	yes
+PLIST_FILES=	bin/handbrake
 
-USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
-
+JAM?=		${LOCALBASE}/bin/jam
 SYSCTL_CMD?=	/sbin/sysctl
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude beos \
+			--exclude contrib \
+			--exclude gtk2 \
 			--exclude macosx \
-			--exclude packageOSX.sh \
-			--exclude contrib/liba52 \
-			--exclude contrib/libavcodec \
-			--exclude contrib/libdvdcss \
-			--exclude contrib/libdvdread \
-			--exclude contrib/libfaac \
-			--exclude contrib/libmp3lame \
-			--exclude contrib/libmp4v2 \
-			--exclude contrib/libmpeg2 \
-			--exclude contrib/libogg \
-			--exclude contrib/libsamplerate \
-			--exclude contrib/libvorbis \
-			--exclude contrib/libxvidcore
+			--exclude wx
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libavformat.a) && !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc)
+BROKEN=	ffmpeg exists, handbrake needs ffmpeg-devel so uninstall ffmpeg if you still want handbrake
+.else
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
+.endif
+
 .if ${OSVERSION} < 500000
 USE_GETOPT_LONG=	yes
 MAKE_ENV=		EXTRA_LIBS="-lcipher -lgnugetopt"
@@ -64,24 +59,21 @@ WITH_DVD_DEVICE?=	acd0c
 WITH_DVD_DEVICE?=	acd0
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; s|HBTest|${PORTNAME}|g' \
+			${WRKSRC}/configure ${WRKSRC}/Jamfile \
+			${WRKSRC}/libhb/Jamfile ${WRKSRC}/test/test.c
+	@${REINPLACE_CMD} -e 's|/usr/sbin/sysctl|${SYSCTL_CMD}|g' \
+		${WRKSRC}/libhb/ports.c
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
+		${WRKSRC}/libhb/fifo.c
+
 # jam -dx, it will giving a verbose of build.
 do-build:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam -dx)
+	@(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${JAM} -dx)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gtk2HB ${PREFIX}/bin/handbrake
-
-post-patch:
-	@${REINPLACE_CMD} -e 's:%%PREFIX%%:${LOCALBASE}:g' \
-		-e 's:%%PTHREAD_LIBS%%:${PTHREAD_LIBS}:g' \
-		-e 's:%%CC%%:${CC}:g' -e 's:%%CXX%%:${CXX}:g' \
-		-e 's:-g ::g' -e 's:%%CFLAGS%%:${CFLAGS}:g' \
-		${BUILD_WRKSRC}/Jamfile ${BUILD_WRKSRC}/core/Jamfile \
-		${BUILD_WRKSRC}/Jamrules
-	@${REINPLACE_CMD} -e 's:%%DVD_DEVICE%%:${WITH_DVD_DEVICE}:g' \
-		${BUILD_WRKSRC}/gtk2/main.c
-# sysctl
-	@${REINPLACE_CMD} -e 's|/usr/sbin/sysctl|${SYSCTL_CMD}|' \
-		${BUILD_WRKSRC}/core/HandBrake.c
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo
index e94b3870b00c..8af553ed1405 100644
--- a/multimedia/handbrake/distinfo
+++ b/multimedia/handbrake/distinfo
@@ -1,3 +1,3 @@
-MD5 (HandBrake-0.6.2-src.tar.gz) = a787787622cfa5411c13b7a4bc057ea5
-SHA256 (HandBrake-0.6.2-src.tar.gz) = 1efa2778ad0955e0f19769de23a25dd137c34b6695d4014f99b959300d49b6a4
-SIZE (HandBrake-0.6.2-src.tar.gz) = 1992682
+MD5 (HandBrake-0.7.1.tar.gz) = 0053ebfa950959286024333b4964907e
+SHA256 (HandBrake-0.7.1.tar.gz) = 6f42e31bc882cbefc8bda4584faa42f6382108b0574ef62ce5b94898d2846042
+SIZE (HandBrake-0.7.1.tar.gz) = 254694
diff --git a/multimedia/handbrake/files/patch-Jamfile b/multimedia/handbrake/files/patch-Jamfile
index 49153375b27e..d5286155f542 100644
--- a/multimedia/handbrake/files/patch-Jamfile
+++ b/multimedia/handbrake/files/patch-Jamfile
@@ -1,24 +1,43 @@
---- Jamfile.orig	Wed May 26 05:51:32 2004
-+++ Jamfile	Sun Dec 19 11:14:57 2004
-@@ -54,6 +54,21 @@
-     ObjectCcFlags   $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
-     Main            $(GTK2_BIN) : $(GTK2_SRC) ;
+--- Jamfile.orig	Thu Feb 23 18:29:33 2006
++++ Jamfile	Mon Jun 26 00:03:33 2006
+@@ -6,16 +6,8 @@
+ 
+ SubDir TOP ;
+ 
+-# libhb + contrib libraries
+-HB_LIBS = libhb.a
+-          contrib/lib/liba52.a        contrib/lib/libavcodec.a
+-          contrib/lib/libavutil.a     contrib/lib/libdvdread.a
+-          contrib/lib/libdvdcss.a     contrib/lib/libfaac.a
+-          contrib/lib/libmp3lame.a    contrib/lib/libmp4v2.a
+-          contrib/lib/libmpeg2.a      contrib/lib/libvorbis.a
+-          contrib/lib/libvorbisenc.a  contrib/lib/libogg.a
+-          contrib/lib/libsamplerate.a contrib/lib/libx264.a
+-          contrib/lib/libxvidcore.a ;
++# libhb
++HB_LIBS = libhb.a ;
+ 
+ # Interfaces
+ TEST_BIN = HBTest ;
+@@ -63,6 +55,14 @@
+     #ObjectC++Flags  $(WX_SRC) : `wx-config --cflags` ;
+     #Main            $(WX_BIN) : $(WX_SRC) ;
  }
 +if $(OS) = FREEBSD
 +{
-+    HB_LIBS = libhb.a libx264.a ;
-+    SystemLibraries $(TEST_BIN) : -L%%PREFIX%%/lib %%PTHREAD_LIBS%% -la52
-+    		-lavcodec -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 -lmpeg2
-+		-logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore
-+		$(EXTRA_LIBS) ;
-+    SystemLibraries $(GTK2_BIN) : -L%%PREFIX%%/lib %%PTHREAD_LIBS%% 
-+    		$(EXTRA_LIBS) `pkg-config gtk+-2.0 --libs` -la52 -lavcodec
-+    		-ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 -lmpeg2 -logg
-+		-lsamplerate -lvorbis -lvorbisenc -lxvidcore ;
-+    ObjectCcFlags   $(TEST_SRC) : -I%%PREFIX%%/include ;
-+    ObjectCcFlags   $(GTK2_SRC) : `pkg-config gtk+-2.0 --cflags` ;
-+    Main            $(GTK2_BIN) : $(GTK2_SRC) ;
++    SystemLibraries $(TEST_BIN) : -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%% -la52
++	    -lavcodec -ldvdcss -ldvdread -lfaac -lmp3lame -lmp4v2 -lmpeg2
++	    -logg -lsamplerate -lvorbis -lvorbisenc -lxvidcore -lx264
++	    $(EXTRA_LIBS) ;
++    ObjectCcFlags   $(TEST_SRC) : -I%%LOCALBASE%%/include ;
 +}
- if $(OS) = CYGWIN
- {
-     SystemLibraries $(TEST_BIN) : -lws2_32 ;
+ 
+ ObjectHdrs     $(UI_SRC) : $(TOP)/libhb ;
+ LinkLibraries  $(UI_BIN) : $(HB_LIBS) ;
+@@ -71,6 +71,4 @@
+ NotFile package ;
+ Depends package : $(HB_PACKAGES) ;
+ 
+-SubInclude TOP contrib ;
+ SubInclude TOP libhb ;
+-
diff --git a/multimedia/handbrake/files/patch-Jamrules b/multimedia/handbrake/files/patch-Jamrules
index 5483bf3d2e54..1664e2f5c44e 100644
--- a/multimedia/handbrake/files/patch-Jamrules
+++ b/multimedia/handbrake/files/patch-Jamrules
@@ -1,29 +1,12 @@
---- Jamrules.orig	Tue May 25 13:51:32 2004
-+++ Jamrules	Mon Nov 22 12:57:16 2004
-@@ -8,11 +8,11 @@
- LANGUAGES  = fr de it pl ru nl es pt ja ;
- 
- # Compilers & flags
--CC      = gcc ;
--C++     = g++ ;
-+CC      = %%CC%% ;
-+C++     = %%CXX%% ;
- AS      = nasm ;
--LINK    = g++ ;
--OPTIM   = -O3 -funroll-loops ;
-+LINK    = %%CXX%% ;
-+OPTIM   = %%CFLAGS%% ;
- DEFINES = HB_$(OS) HB_VERSION=\\\"$(HB_VERSION)\\\" ;
- 
- if $(OS) = BEOS
-@@ -32,6 +32,10 @@
- if $(OS) = LINUX
- {
-     ASFLAGS   = -f elf ;
-+}
-+if $(OS) = FREEBSD
-+{
-+    OPTIM     = %%CFLAGS%% ;
+--- Jamrules.orig	Sun May  7 21:21:57 2006
++++ Jamrules	Sun May  7 21:22:12 2006
+@@ -80,3 +80,9 @@
+       zip -9 -r $(<) "HandBrake $(HB_VERSION)" && \
+       rm -rf "HandBrake $(HB_VERSION)"
  }
- if $(OS) = CYGWIN
- {
++
++rule SystemLibraries
++{
++    LINKLIBS on [ FAppendSuffix $(<) : $(SUFEXE) ] +=  $(>) ;
++}
++
diff --git a/multimedia/handbrake/files/patch-configure b/multimedia/handbrake/files/patch-configure
new file mode 100644
index 000000000000..90d992da8cfd
--- /dev/null
+++ b/multimedia/handbrake/files/patch-configure
@@ -0,0 +1,24 @@
+--- configure.orig	Thu Feb 23 18:29:33 2006
++++ configure	Sun Jun 25 23:37:46 2006
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ 
+-CC="gcc"
+-CXX="g++"
+-CCFLAGS="$CCFLAGS -Wall -g"
+-OPTIM="$OPTIM -O3 -funroll-loops"
++CC="${CC-gcc}"
++CXX="${CXX-g++}"
++CCFLAGS="${CFLAGS--Wall -g}"
++OPTIM=""
+ 
+ # System-specific flags
+ SYSTEM=`uname -s`
+@@ -36,6 +36,7 @@
+     ;;
+ 
+   FreeBSD)
++    CCFLAGS="$CCFLAGS -Wall"
+     DEFINES="$DEFINES SYS_FREEBSD"
+     LINKLIBS="$LINKLIBS -pthread"
+     ;;
diff --git a/multimedia/handbrake/files/patch-contrib_Jamfile b/multimedia/handbrake/files/patch-contrib_Jamfile
deleted file mode 100644
index ad9895f511a6..000000000000
--- a/multimedia/handbrake/files/patch-contrib_Jamfile
+++ /dev/null
@@ -1,18 +0,0 @@
---- contrib/Jamfile.orig	Fri Nov 19 15:50:35 2004
-+++ contrib/Jamfile	Fri Nov 19 15:50:49 2004
-@@ -1,15 +1,3 @@
- SubDir TOP contrib ;
-
--SubInclude TOP contrib liba52 ;
--SubInclude TOP contrib libavcodec ;
--SubInclude TOP contrib libdvdcss ;
--SubInclude TOP contrib libdvdread ;
--SubInclude TOP contrib libfaac ;
--SubInclude TOP contrib libmp3lame ;
--SubInclude TOP contrib libmp4v2 ;
--SubInclude TOP contrib libmpeg2 ;
--SubInclude TOP contrib libogg ;
--SubInclude TOP contrib libsamplerate ;
--SubInclude TOP contrib libvorbis ;
- SubInclude TOP contrib libx264 ;
--SubInclude TOP contrib libxvidcore ;
diff --git a/multimedia/handbrake/files/patch-core_FfmpegEnc.c b/multimedia/handbrake/files/patch-core_FfmpegEnc.c
deleted file mode 100644
index f1a61bebebb6..000000000000
--- a/multimedia/handbrake/files/patch-core_FfmpegEnc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/FfmpegEnc.c.orig	Sun Dec 19 11:16:49 2004
-+++ core/FfmpegEnc.c	Sun Dec 19 11:16:58 2004
-@@ -132,7 +132,7 @@
-     }
-
-     HBBufferClose( &scaledBuffer );
--    free( frame );
-+    av_free( frame );
-
-     return 1;
- }
diff --git a/multimedia/handbrake/files/patch-core_Fifo.c b/multimedia/handbrake/files/patch-core_Fifo.c
deleted file mode 100644
index 290a891e8070..000000000000
--- a/multimedia/handbrake/files/patch-core_Fifo.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- core/Fifo.c.orig	Wed May 26 05:51:32 2004
-+++ core/Fifo.c	Fri Nov 19 15:55:26 2004
-@@ -23,7 +23,7 @@
-
- #if defined( HB_BEOS ) || defined( HB_LINUX )
-     b->data = memalign( 16, size );
--#elif defined( HB_MACOSX )
-+#elif defined( HB_MACOSX ) || defined( HB_FREEBSD )
-     /* OS X's malloc returns 16-bytes aligned memory */
-     b->data = malloc( size );
- #elif defined( HB_CYGWIN )
-@@ -47,7 +47,7 @@
- {
-     /* We don't care about alignment here, realloc is only used in the
-        AVI muxer anyway */
--#if defined( HB_BEOS ) || defined( HB_LINUX ) || defined( HB_MACOSX )
-+#if defined( HB_BEOS ) || defined( HB_LINUX ) || defined( HB_MACOSX ) || defined( HB_FREEBSD )
-     b->data = realloc( b->data, size );
- #elif defined( HB_CYGWIN )
-     int alignment = b->data - b->dataOrig;
-@@ -66,7 +66,7 @@
- {
-     HBBuffer * b = *_b;
-
--#if defined( HB_BEOS ) || defined( HB_LINUX ) || defined( HB_MACOSX )
-+#if defined( HB_BEOS ) || defined( HB_LINUX ) || defined( HB_MACOSX ) || defined( HB_FREEBSD )
-     free( b->data );
- #elif defined( HB_CYGWIN )
-     free( b->dataOrig );
diff --git a/multimedia/handbrake/files/patch-core_HandBrake.c b/multimedia/handbrake/files/patch-core_HandBrake.c
deleted file mode 100644
index 1c77b0015cd9..000000000000
--- a/multimedia/handbrake/files/patch-core_HandBrake.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- core/HandBrake.c.orig	Wed May 26 05:51:32 2004
-+++ core/HandBrake.c	Sun Dec 19 11:02:32 2004
-@@ -277,7 +277,8 @@
-         img_resample_full_init( t->outWidth, t->outHeight,
-                                 t->inWidth, t->inHeight,
-                                 t->topCrop, t->bottomCrop,
--                                t->leftCrop, t->rightCrop );
-+                                t->leftCrop, t->rightCrop,
-+                                0,0,0,0 );
-     if( t->deinterlace )
-     {
-         avpicture_deinterlace( &pic2, &pic1, PIX_FMT_YUV420P,
-@@ -709,7 +710,7 @@
-     get_system_info( &info );
-     CPUCount = info.cpu_count;
-
--#elif defined( HB_MACOSX )
-+#elif defined( HB_MACOSX ) || defined( HB_FREEBSD )
-     FILE * info;
-     char   buffer[256];
-
diff --git a/multimedia/handbrake/files/patch-core_Jamfile b/multimedia/handbrake/files/patch-core_Jamfile
deleted file mode 100644
index 9efc0a2e751d..000000000000
--- a/multimedia/handbrake/files/patch-core_Jamfile
+++ /dev/null
@@ -1,38 +0,0 @@
---- core/Jamfile.orig	Sun May  7 11:49:29 2006
-+++ core/Jamfile	Sun May  7 11:54:18 2006
-@@ -18,22 +18,19 @@
- ObjectCcFlags $(LIBHB_SRC) : -g -Wall -W ;
- 
- # Needed includes
--ObjectHdrs Ac3Dec.c    : $(TOP)/contrib/liba52 ;
--ObjectHdrs FfmpegEnc.c
-+ObjectHdrs Ac3Dec.c
-+           FfmpegEnc.c
-            HandBrake.c
-            MpgaDec.c
--           Scale.c     : $(TOP)/contrib/libavcodec ;
--ObjectHdrs DVDRead.c
--           Scan.c      : $(TOP)/contrib/libdvdread ;
--ObjectHdrs FaacEnc.c   : $(TOP)/contrib/libfaac ;
--ObjectHdrs Mp3Enc.c    : $(TOP)/contrib/libmp3lame ;
--ObjectHdrs Mp4Mux.c    : $(TOP)/contrib/libmp4v2 ;
--ObjectHdrs Mpeg2Dec.c
--           Scan.c      : $(TOP)/contrib/libmpeg2 ;
--ObjectHdrs Resample.c  : $(TOP)/contrib/libsamplerate ;
--ObjectHdrs OgmMux.c
--           VorbisEnc.c : $(TOP)/contrib/libogg ;
--ObjectHdrs VorbisEnc.c : $(TOP)/contrib/libvorbis ;
-+           Scale.c
-+           DVDRead.c
-+           Scan.c
-+           FaacEnc.c
-+           Mp3Enc.c
-+           Mp4Mux.c
-+           Mpeg2Dec.c
-+           Resample.c
-+           OgmMux.c
-+           VorbisEnc.c
-+           XvidEnc.c   : %%PREFIX%%/include ;
- ObjectHdrs X264Enc.c   : $(TOP)/contrib/libx264 ;
--ObjectHdrs XvidEnc.c   : $(TOP)/contrib/libxvidcore ;
--
diff --git a/multimedia/handbrake/files/patch-core_Scale.c b/multimedia/handbrake/files/patch-core_Scale.c
deleted file mode 100644
index d0d33d091703..000000000000
--- a/multimedia/handbrake/files/patch-core_Scale.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- core/Scale.c.orig	Wed May 26 05:51:32 2004
-+++ core/Scale.c	Sun Dec 19 11:02:44 2004
-@@ -52,7 +52,8 @@
-         img_resample_full_init( title->outWidth, title->outHeight,
-                                 title->inWidth,  title->inHeight,
-                                 title->topCrop,  title->bottomCrop,
--                                title->leftCrop, title->rightCrop );
-+                                title->leftCrop, title->rightCrop,
-+                                0,0,0,0 );
-
-     return w;
- }
diff --git a/multimedia/handbrake/files/patch-core_Thread.c b/multimedia/handbrake/files/patch-core_Thread.c
deleted file mode 100644
index b47124180e5d..000000000000
--- a/multimedia/handbrake/files/patch-core_Thread.c
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -urN core/Thread.c core/Thread.c
---- core/Thread.c	Wed May 26 05:51:32 2004
-+++ core/Thread.c	Fri Nov 19 08:08:07 2004
-@@ -24,7 +24,7 @@
-     /* OS-specific thread id */
- #if defined( HB_BEOS )
-     int       thread;
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_t thread;
- #elif defined( HB_CYGWIN )
-     HANDLE    thread;
-@@ -74,7 +74,7 @@
-     t->thread = spawn_thread( (int32 (*)( void * )) ThreadFunc,
-                               name, priority, t );
-     resume_thread( t->thread );
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_create( &t->thread, NULL,
-                     (void * (*)( void * )) ThreadFunc, t );
- #elif defined( HB_CYGWIN )
-@@ -96,7 +96,7 @@
- #if defined( HB_BEOS )
-     long exitValue;
-     wait_for_thread( t->thread, &exitValue );
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_join( t->thread, NULL );
- #elif defined( HB_CYGWIN )
-     WaitForSingleObject( t->thread, INFINITE );
-@@ -126,7 +126,7 @@
-
- #if defined( HB_BEOS )
-     l->sem = create_sem( 1, "sem" );
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_mutex_init( &l->mutex, NULL );
- #elif defined( HB_CYGWIN )
-     l->mutex = CreateMutex( 0, FALSE, 0 );
-@@ -141,7 +141,7 @@
-
- #if defined( HB_BEOS )
-     delete_sem( l->sem );
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_mutex_destroy( &l->mutex );
- #elif defined( HB_CYGWIN )
-     CloseHandle( l->mutex );
-@@ -161,7 +161,7 @@
-
- #if defined( HB_BEOS )
-     c->thread = -1;
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_cond_init( &c->cond, NULL );
- #elif defined( HB_CYGWIN )
-     c->event = CreateEvent( NULL, FALSE, FALSE, NULL );
-@@ -175,7 +175,7 @@
-     HBCond * c = *_c;
-
- #if defined( HB_BEOS )
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_cond_destroy( &c->cond );
- #elif defined( HB_CYGWIN )
-     CloseHandle( c->event );
diff --git a/multimedia/handbrake/files/patch-core_Thread.h b/multimedia/handbrake/files/patch-core_Thread.h
deleted file mode 100644
index 59171d047127..000000000000
--- a/multimedia/handbrake/files/patch-core_Thread.h
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -urN core/Thread.h core/Thread.h
---- core/Thread.h	Wed May 26 05:51:32 2004
-+++ core/Thread.h	Fri Nov 19 08:08:07 2004
-@@ -10,7 +10,7 @@
- /* System headers */
- #if defined( HB_BEOS )
- #  include <OS.h>
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
- #  include <pthread.h>
- #elif defined( HB_CYGWIN )
- #  include <windows.h>
-@@ -25,7 +25,7 @@
- #elif defined( HB_MACOSX )
- #  define HB_LOW_PRIORITY    0
- #  define HB_NORMAL_PRIORITY 31
--#elif defined( HB_LINUX ) || defined( HB_CYGWIN )
-+#elif defined( HB_LINUX ) || defined( HB_CYGWIN ) || defined( HB_FREEBSD )
- /* Actually unused */
- #  define HB_LOW_PRIORITY    0
- #  define HB_NORMAL_PRIORITY 0
-@@ -57,7 +57,7 @@
- {
- #if defined( HB_BEOS )
-     sem_id          sem;
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_mutex_t mutex;
- #elif defined( HB_CYGWIN )
-     HANDLE          mutex;
-@@ -68,7 +68,7 @@
- {
- #if defined( HB_BEOS )
-     acquire_sem( l->sem );
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_mutex_lock( &l->mutex );
- #elif defined( HB_CYGWIN )
-     WaitForSingleObject( l->mutex, INFINITE );
-@@ -79,7 +79,7 @@
- {
- #if defined( HB_BEOS )
-     release_sem( l->sem );
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_mutex_unlock( &l->mutex );
- #elif defined( HB_CYGWIN )
-     ReleaseMutex( l->mutex );
-@@ -94,7 +94,7 @@
- {
- #if defined( HB_BEOS )
-     int                 thread;
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_cond_t      cond;
- #elif defined( HB_CYGWIN )
-     HANDLE              event;
-@@ -110,7 +110,7 @@
-     suspend_thread( c->thread );
-     acquire_sem( lock->sem );
-     c->thread = -1;
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_cond_wait( &c->cond, &lock->mutex );
- #elif defined( HB_CYGWIN )
-     SignalObjectAndWait( lock->mutex, c->event, INFINITE, FALSE );
-@@ -134,7 +134,7 @@
-            release_sem() and suspend_thread() lines, wait a bit */
-         snooze( 5000 );
-     }
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     pthread_cond_signal( &c->cond );
- #elif defined( HB_CYGWIN )
-     PulseEvent( c->event );
diff --git a/multimedia/handbrake/files/patch-core_Utils.c b/multimedia/handbrake/files/patch-core_Utils.c
deleted file mode 100644
index 17600fd81cc9..000000000000
--- a/multimedia/handbrake/files/patch-core_Utils.c
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN core/Utils.c core/Utils.c
---- core/Utils.c	Wed May 26 05:51:32 2004
-+++ core/Utils.c	Fri Nov 19 08:08:07 2004
-@@ -38,7 +38,7 @@
- {
- #if defined( HB_BEOS )
-     snooze( time );
--#elif defined( HB_MACOSX ) || defined( HB_LINUX )
-+#elif defined( HB_MACOSX ) || defined( HB_LINUX ) || defined( HB_FREEBSD )
-     usleep( time );
- #elif defined( HB_CYGWIN )
-     Sleep( time / 1000 );
diff --git a/multimedia/handbrake/files/patch-gtk2_main.c b/multimedia/handbrake/files/patch-gtk2_main.c
deleted file mode 100644
index e093de43990f..000000000000
--- a/multimedia/handbrake/files/patch-gtk2_main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk2/main.c.orig	Sat Nov 20 19:20:18 2004
-+++ gtk2/main.c	Sat Nov 20 19:21:02 2004
-@@ -85,6 +85,7 @@
-
-     /* build dvd list */
-     items = g_list_append (items, "" );
-+    items = g_list_append (items, "/dev/%%DVD_DEVICE%%" );
-     items = g_list_append (items, "/dev/dvd" );
-     gtk_combo_set_popdown_strings( GTK_COMBO(lookup_widget( hb_win_main, "combo1") ), items );
-
diff --git a/multimedia/handbrake/files/patch-libhb_Jamfile b/multimedia/handbrake/files/patch-libhb_Jamfile
new file mode 100644
index 000000000000..c195ecfdee34
--- /dev/null
+++ b/multimedia/handbrake/files/patch-libhb_Jamfile
@@ -0,0 +1,9 @@
+--- libhb/Jamfile.orig	Sun Jun 25 23:12:27 2006
++++ libhb/Jamfile	Sun Jun 25 23:13:58 2006
+@@ -14,5 +14,5 @@
+ 
+ Library libhb : $(LIBHB_SRC) ;
+ 
+-ObjectCcFlags $(LIBHB_SRC) : -I$(TOP)/contrib/include ;
++ObjectHdrs $(LIBHB_SRC) : %%LOCALBASE%%/include ;
+ ObjectDefines $(LIBHB_SRC) : __LIBHB__ ;