2 files changed, 35 insertions, 35 deletions

diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index da77af6805c4..e86d65e633a6 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=		handbrake
 PORTVERSION=	0.9.3
 CATEGORIES=		multimedia
-MASTER_SITES=	http://download.m0k.org/handbrake/releases/:main \
-				http://download.m0k.org/handbrake/contrib/:contrib
+MASTER_SITES=			LOCAL/beech/handbrake/:main \
+				LOCAL/beech/handbrake/:contrib
 DISTFILES=		HandBrake-${PORTVERSION}.tar.gz:main \
 				a52dec-0.7.4.tar.gz:contrib \
 				faad2-2.6.1.tar.gz:contrib \
@@ -33,19 +33,20 @@ MAINTAINER=		jonathan@kc8onw.net
 COMMENT=	A DVD to MPEG-4 ripper and encoder
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
-		pkg-config:${PORTSDIR}/devel/pkg-config \
-		${ACLOCAL}:${PORTSDIR}/devel/automake19
+		pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_GMAKE=	yes
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:15 aclocal:110
 
 LIBTOOLFILES=	${WRKSRC}/configure
 
 WRKSRC=		${WRKDIR}/HandBrake-0.9.3
 PLIST_FILES=	bin/handbrake
 
+ONLY_FOR_ARCHS=	i386
+
 JAM?=		${LOCALBASE}/bin/jam
 APPLY?=		/usr/bin/apply
 
@@ -61,6 +62,8 @@ BUILD_DEPENDS+=	yasm>=0.6.0:${PORTSDIR}/devel/yasm
 CONFIGURE_ENV+=	PKG_CONFIG_PATH=${WRKSRC}/contrib/lib/pkgconfig
 MAKE_ENV+=	ARCH=${ARCH} MAKE=${GMAKE}
 
+run-autotools-aclocal:
+
 post-extract:
 	@${APPLY} "${MV} %1 ${WRKSRC}/contrib/" \
 		${WRKDIR}/a52dec \
diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo
index 8b044bd2afb0..0e8cd1e3f3dd 100644
--- a/multimedia/handbrake/distinfo
+++ b/multimedia/handbrake/distinfo
@@ -1,54 +1,51 @@
 MD5 (handbrake/HandBrake-0.9.3.tar.gz) = ee79c94b5acd68f28351ba2704b4d55d
 SHA256 (handbrake/HandBrake-0.9.3.tar.gz) = 2a776ded48285648aedaa73dd90997a0648473a2d9932203b931e7ef54393d30
 SIZE (handbrake/HandBrake-0.9.3.tar.gz) = 2067663
+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
 MD5 (handbrake/faad2-2.6.1.tar.gz) = 5f0f3c24c7ab3971acb03995afedb4a5
 SHA256 (handbrake/faad2-2.6.1.tar.gz) = f86eb8d089150c92547721136cae7d228924a085a59fbf7b5af3da625acdb25c
 SIZE (handbrake/faad2-2.6.1.tar.gz) = 849708
-MD5 (handbrake/faac-1.26.tar.gz) = 1d7c019bd2dbb4f3101b8937ebc59cf6
-SHA256 (handbrake/faac-1.26.tar.gz) = 4b48e2e22267e9260365c7bee4513bf13d262b8b13cf7f9504e9fa612b6aa951
-SIZE (handbrake/faac-1.26.tar.gz) = 400915
-MD5 (handbrake/lame-3.98.tar.gz) = 7036b52e792538fd665595d56b9e49a0
-SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
-SIZE (handbrake/lame-3.98.tar.gz) = 1411318
+MD5 (handbrake/ffmpeg-r15462.tar.gz) = 0330982d8b3ef9d24d0169fda164a182
+SHA256 (handbrake/ffmpeg-r15462.tar.gz) = 28d2ef1414fa49f5d10d90234b9a06855561f8231a816ef4c060a1aea069eefc
+SIZE (handbrake/ffmpeg-r15462.tar.gz) = 3154052
 MD5 (handbrake/libdca-r81-strapped.tar.gz) = 448bab6df6e4f738e4afaa6ebc085d65
 SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
 SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
 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/faac-1.26.tar.gz) = 1d7c019bd2dbb4f3101b8937ebc59cf6
+SHA256 (handbrake/faac-1.26.tar.gz) = 4b48e2e22267e9260365c7bee4513bf13d262b8b13cf7f9504e9fa612b6aa951
+SIZE (handbrake/faac-1.26.tar.gz) = 400915
+MD5 (handbrake/lame-3.98.tar.gz) = 7036b52e792538fd665595d56b9e49a0
+SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
+SIZE (handbrake/lame-3.98.tar.gz) = 1411318
+MD5 (handbrake/libmp4v2-r45.tar.gz) = b568ba3440c91155f21121c7f378fc14
+SHA256 (handbrake/libmp4v2-r45.tar.gz) = 137cbc22c368c85fcbee8460605d93350044bc4c1a6f781e8d84357ce5f6afe1
+SIZE (handbrake/libmp4v2-r45.tar.gz) = 461723
 MD5 (handbrake/libmkv-0.6.3.tar.gz) = 852f72926c40fb191c1656edc0001753
 SHA256 (handbrake/libmkv-0.6.3.tar.gz) = 3ad2aee66e26987b3cad63620d84661bd149a8a70e0350f0d762f153f58c68b7
 SIZE (handbrake/libmkv-0.6.3.tar.gz) = 341121
-MD5 (handbrake/libogg-1.1.3.tar.gz) = e3b881ea94a6d29749a19b024d2974ef
-SHA256 (handbrake/libogg-1.1.3.tar.gz) = 645676dd006c8424fde52df2edd0f52d6402b12c563b50c46e9540083241d50c
-SIZE (handbrake/libogg-1.1.3.tar.gz) = 401303
-MD5 (handbrake/libvorbis-aotuv_b5.tar.gz) = e282d60273dcc8cc6602f65b434f3591
-SHA256 (handbrake/libvorbis-aotuv_b5.tar.gz) = 1e3c5b974e3d16a924eb0af12516a2b0b14aae24d46d32395cd997d833e84509
-SIZE (handbrake/libvorbis-aotuv_b5.tar.gz) = 1345888
 MD5 (handbrake/mpeg2dec-0.5.1.tar.gz) = a6173dc90cfe7f0414624c3c8bbad727
 SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
 SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
-MD5 (handbrake/mpeg4ip-1.3.tar.gz) = fdc1b857485842f8daa2b17d77a45e69
-SHA256 (handbrake/mpeg4ip-1.3.tar.gz) = 052b2fc6a880a3c7834a9a60b9520f6e8e7846534e4c99fb15e6675a75eff2a3
-SIZE (handbrake/mpeg4ip-1.3.tar.gz) = 4719855
-MD5 (handbrake/xvidcore-1.1.3.tar.gz) = 1416161e20d4b2ca2b8d608fc5cfcac6
-SHA256 (handbrake/xvidcore-1.1.3.tar.gz) = 1a4a7748e93d3a1a4033fc843d6170f803520c5844047ae75df0269a093bedb6
-SIZE (handbrake/xvidcore-1.1.3.tar.gz) = 739835
-MD5 (handbrake/ffmpeg-r15462.tar.gz) = 0330982d8b3ef9d24d0169fda164a182
-SHA256 (handbrake/ffmpeg-r15462.tar.gz) = 28d2ef1414fa49f5d10d90234b9a06855561f8231a816ef4c060a1aea069eefc
-SIZE (handbrake/ffmpeg-r15462.tar.gz) = 3154052
-MD5 (handbrake/x264-r1028-83baa7f.tar.gz) = ccf66883c5e33c30675c3bfad5c31875
-SHA256 (handbrake/x264-r1028-83baa7f.tar.gz) = ed36cb12f7d98b56d1ce19be22bf9c40c9aa9e46bb718e4505864294af023f83
-SIZE (handbrake/x264-r1028-83baa7f.tar.gz) = 2325933
-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
+MD5 (handbrake/libogg-1.1.3.tar.gz) = e3b881ea94a6d29749a19b024d2974ef
+SHA256 (handbrake/libogg-1.1.3.tar.gz) = 645676dd006c8424fde52df2edd0f52d6402b12c563b50c46e9540083241d50c
+SIZE (handbrake/libogg-1.1.3.tar.gz) = 401303
 MD5 (handbrake/libsamplerate-0.1.4.tar.gz) = 69ec6c05f487458f688dda8f3e722e5d
 SHA256 (handbrake/libsamplerate-0.1.4.tar.gz) = 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75
 SIZE (handbrake/libsamplerate-0.1.4.tar.gz) = 4259244
+MD5 (handbrake/libvorbis-aotuv_b5.tar.gz) = e282d60273dcc8cc6602f65b434f3591
+SHA256 (handbrake/libvorbis-aotuv_b5.tar.gz) = 1e3c5b974e3d16a924eb0af12516a2b0b14aae24d46d32395cd997d833e84509
+SIZE (handbrake/libvorbis-aotuv_b5.tar.gz) = 1345888
 MD5 (handbrake/libtheora-1.0.tar.gz) = d6d8ac6c75a3d0e5995f328c2d721df0
 SHA256 (handbrake/libtheora-1.0.tar.gz) = 34f82b0b187ae4d8161693f396d1a4457b1bade0ee15c54a46630a2f4bfc33fc
 SIZE (handbrake/libtheora-1.0.tar.gz) = 1946620
-MD5 (handbrake/libmp4v2-r45.tar.gz) = b568ba3440c91155f21121c7f378fc14
-SHA256 (handbrake/libmp4v2-r45.tar.gz) = 137cbc22c368c85fcbee8460605d93350044bc4c1a6f781e8d84357ce5f6afe1
-SIZE (handbrake/libmp4v2-r45.tar.gz) = 461723
+MD5 (handbrake/x264-r1028-83baa7f.tar.gz) = ccf66883c5e33c30675c3bfad5c31875
+SHA256 (handbrake/x264-r1028-83baa7f.tar.gz) = ed36cb12f7d98b56d1ce19be22bf9c40c9aa9e46bb718e4505864294af023f83
+SIZE (handbrake/x264-r1028-83baa7f.tar.gz) = 2325933
+MD5 (handbrake/xvidcore-1.1.3.tar.gz) = 1416161e20d4b2ca2b8d608fc5cfcac6
+SHA256 (handbrake/xvidcore-1.1.3.tar.gz) = 1a4a7748e93d3a1a4033fc843d6170f803520c5844047ae75df0269a093bedb6
+SIZE (handbrake/xvidcore-1.1.3.tar.gz) = 739835