From nobody@FreeBSD.org  Sun Feb  2 19:46:42 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 74CD1EC6
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  2 Feb 2014 19:46:42 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 487BB17FC
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  2 Feb 2014 19:46:42 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s12JkeHR060595
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 2 Feb 2014 19:46:40 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s12Jked1060594;
	Sun, 2 Feb 2014 19:46:40 GMT
	(envelope-from nobody)
Message-Id: <201402021946.s12Jked1060594@oldred.freebsd.org>
Date: Sun, 2 Feb 2014 19:46:40 GMT
From: Arjan Gijsberts <arjan@liralab.it>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port multimedia/handbrake to 0.9.9
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186387
>Category:       ports
>Synopsis:       Update port multimedia/handbrake to 0.9.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    riggs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 02 19:50:00 UTC 2014
>Closed-Date:    Fri Feb 14 20:13:03 UTC 2014
>Last-Modified:  Fri Feb 14 20:13:03 UTC 2014
>Originator:     Arjan Gijsberts
>Release:        10
>Organization:
>Environment:
FreeBSD localhost 10.0-RELEASE FreeBSD 10.0-RELEASE #34 r260687: Wed Jan 15 15:24:29 CET 2014     root@localhost:/usr/obj/usr/src/sys/CUSTOM amd64
>Description:
The current multimedia/handbrake port is outdated and fails to build on FreeBSD 10/11 due to gcc and iconv issues (see ports/183914).

The attached patch updates the port to the most recent upstream version 0.9.9. In this version, a number of bundled packages have been replaced with system libraries; these are now pulled in from the corresponding ports. Building with clang fails on the bundled version of mp4v2, so the port still depends on gcc. Finally, hardcoded dependencies on libiconv have been patched to allow the port to use the native iconv implementation in base.

I could only test the port on FreeBSD 10.0 without X11, so additional testing is definitely appreciated. This is my first non-trivial patch for a port, so comments on quality and style are equally appreciated.
>How-To-Repeat:

>Fix:
Patch attached.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 342361)
+++ Makefile	(working copy)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	handbrake
-PORTVERSION=	0.9.8
-PORTREVISION=	2
+PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION} \
 		http://download.handbrake.fr/handbrake/contrib/:contrib
@@ -11,24 +11,16 @@
 		a52dec-0.7.4.tar.gz:contrib \
 		faac-1.28.tar.gz:contrib \
 		faad2-2.7.tar.gz:contrib \
-		ffmpeg-v0.7-1696-gcae4f4b.tar.bz2:contrib \
-		fontconfig-2.8.0.tar.gz:contrib \
-		freetype-2.4.7.tar.bz2:contrib \
+		libav-v9.6.tar.bz2:contrib \
 		lame-3.98.tar.gz:contrib \
-		libass-0.10.0-1.tar.gz:contrib \
-		libbluray-0.0.1-pre-213-ga869da8.tar.gz:contrib \
+		libbluray-0.2.3.tar.bz2:contrib \
 		libdca-r81-strapped.tar.gz:contrib \
 		libdvdnav-svn1168.tar.gz:contrib \
 		libdvdread-svn1168.tar.gz:contrib \
 		libmkv-0.6.5-0-g82075ae.tar.gz:contrib \
-		libogg-1.3.0.tar.gz:contrib \
-		libsamplerate-0.1.4.tar.gz:contrib \
-		libtheora-1.1.0.tar.bz2:contrib \
-		libvorbis-aotuv_b6.03.tar.bz2:contrib \
-		libxml2-2.7.7.tar.gz:contrib \
 		mp4v2-trunk-r355.tar.bz2:contrib \
 		mpeg2dec-0.5.1.tar.gz:contrib \
-		x264-r2146-bcd41db.tar.gz:contrib
+		x264-r2273-b3065e6.tar.gz:contrib
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dmarion@FreeBSD.org
@@ -37,10 +29,22 @@
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
-LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libfribidi.so:${PORTSDIR}/converters/fribidi \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libass.so:${PORTSDIR}/multimedia/libass \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libvorbisenc.so:${PORTSDIR}/audio/libvorbis \
+		libtheoradec.so:${PORTSDIR}/multimedia/libtheora \
+		libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+		
 RUN_DEPENDS=	${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig iconv
+USE_GCC=	any
 USE_AUTOTOOLS=	libtool aclocal
 LIBTOOLFILES=	configure
 USE_PYTHON_BUILD=	yes
@@ -92,7 +96,7 @@
 # considered good in FreeBSD.  Instead, we will prepare everything manually.
 post-extract: .SILENT
 # Unversioned directories can be copied in a loop
-.for d in a52dec lame libdca libdvdnav libdvdread libsamplerate mpeg2dec x264
+.for d in a52dec lame libdca libdvdnav libdvdread mpeg2dec x264
 	${MKDIR} ${BUILD_WRKSRC}/contrib/${d}
 	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}
 .endfor
@@ -102,21 +106,10 @@
 		libxml2 mp4v2
 	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac
 	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2
-	${MV} ${WRKDIR}/ffmpeg-v0.7-1696-gcae4f4b \
-		${BUILD_WRKSRC}/contrib/ffmpeg
-	${MV} ${WRKDIR}/fontconfig-2.8.0 ${BUILD_WRKSRC}/contrib/fontconfig
-	${MV} ${WRKDIR}/freetype-2.4.7 ${BUILD_WRKSRC}/contrib/freetype
-	${MV} ${WRKDIR}/libass-0.10.0-1 ${BUILD_WRKSRC}/contrib/libass
-	${MV} ${WRKDIR}/libbluray-0.0.1-pre-213-ga869da8 \
-		${BUILD_WRKSRC}/contrib/libbluray
+	${MV} ${WRKDIR}/libav-v9.6 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v9.6
+	${MV} ${WRKDIR}/libbluray-0.2.3 ${BUILD_WRKSRC}/contrib/libbluray
 	${MV} ${WRKDIR}/libmkv-0.6.5-0-g82075ae ${BUILD_WRKSRC}/contrib/libmkv
-	${MV} ${WRKDIR}/libogg-1.3.0 ${BUILD_WRKSRC}/contrib/libogg
-	${MV} ${WRKDIR}/libtheora-1.1.0 ${BUILD_WRKSRC}/contrib/libtheora
-	${MV} ${WRKDIR}/aotuv-b6.03_20110424 ${BUILD_WRKSRC}/contrib/libvorbis
-	${MV} ${WRKDIR}/libxml2-2.7.7 ${BUILD_WRKSRC}/contrib/libxml2
 	${MV} ${WRKDIR}/mp4v2-trunk-r355 ${BUILD_WRKSRC}/contrib/mp4v2
-# Remove one patch file that does not apply cleanly
-	${RM} ${WRKSRC}/contrib/fontconfig/A00-config.patch
 # Avoid conflict with `print/harfbuzz' (also installs "hb.h")
 	${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h
 
@@ -124,15 +117,24 @@
 	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \
 		${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c
 	@${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \
-		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.0.1-pre-213-ga869da8/configure.ac
+		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.2.3/configure.ac
 	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-		${WRKSRC}/contrib/libass/module.defs \
 		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
 	@${REINPLACE_CMD} -e 's|libdvdcss\.so\.2|libdvdcss.so|' \
 		${BUILD_WRKSRC}/contrib/libdvdread/libdvdread/src/dvd_input.c
 	@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e '/#include/s|hb\.h|hb-of-handbrake.h|'
+	@${REINPLACE_CMD} -e "s|ToolProbe( 'GCC.gcc',   'gcc',|ToolProbe( 'GCC.gcc',   '${CC}',|" \
+		${WRKSRC}/make/configure.py 
+	@${REINPLACE_CMD} -e 's|avcodec avformat avutil avresample|avformat avcodec avresample avutil|' \
+		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs 
+.if empty(ICONV_LIB)	
+	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/test/module.defs
+	@${REINPLACE_CMD} -e 's|LIBHB.GCC.l += iconv|LIBHB.GCC.l += |' ${WRKSRC}/libhb/module.defs
+.endif
+	${TR} -d '\r' < ${WRKSRC}/contrib/mpeg2dec/A02-gwluserdata.patch > ${WRKDIR}/A02-gwluserdata.patch
+	${MV} ${WRKDIR}/A02-gwluserdata.patch ${WRKSRC}/contrib/mpeg2dec/
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin
Index: distinfo
===================================================================
--- distinfo	(revision 342361)
+++ distinfo	(working copy)
@@ -1,5 +1,5 @@
-SHA256 (handbrake/HandBrake-0.9.8.tar.bz2) = dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798
-SIZE (handbrake/HandBrake-0.9.8.tar.bz2) = 3156964
+SHA256 (handbrake/HandBrake-0.9.9.tar.bz2) = a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3
+SIZE (handbrake/HandBrake-0.9.9.tar.bz2) = 9315199
 SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
 SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
 SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
@@ -6,18 +6,12 @@
 SIZE (handbrake/faac-1.28.tar.gz) = 678891
 SHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
 SIZE (handbrake/faad2-2.7.tar.gz) = 1137407
-SHA256 (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497
-SIZE (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = 4242565
-SHA256 (handbrake/fontconfig-2.8.0.tar.gz) = fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
-SIZE (handbrake/fontconfig-2.8.0.tar.gz) = 1548409
-SHA256 (handbrake/freetype-2.4.7.tar.bz2) = ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77
-SIZE (handbrake/freetype-2.4.7.tar.bz2) = 1490543
+SHA256 (handbrake/libav-v9.6.tar.bz2) = ea41941866fb64d7e363684a4705574f65786bd9eb0fe1f796dee4c0d459aa52
+SIZE (handbrake/libav-v9.6.tar.bz2) = 4672723
 SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
 SIZE (handbrake/lame-3.98.tar.gz) = 1411318
-SHA256 (handbrake/libass-0.10.0-1.tar.gz) = a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867
-SIZE (handbrake/libass-0.10.0-1.tar.gz) = 745314
-SHA256 (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76
-SIZE (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 241927
+SHA256 (handbrake/libbluray-0.2.3.tar.bz2) = 2c65cfb02aeec31721f9ea65ee2c085a9bfe163e99dd01b52ccb3f53ba205eea
+SIZE (handbrake/libbluray-0.2.3.tar.bz2) = 465239
 SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
 SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
 SHA256 (handbrake/libdvdnav-svn1168.tar.gz) = 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7
@@ -26,19 +20,9 @@
 SIZE (handbrake/libdvdread-svn1168.tar.gz) = 946033
 SHA256 (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97
 SIZE (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 32742
-SHA256 (handbrake/libogg-1.3.0.tar.gz) = a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780
-SIZE (handbrake/libogg-1.3.0.tar.gz) = 425144
-SHA256 (handbrake/libsamplerate-0.1.4.tar.gz) = 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75
-SIZE (handbrake/libsamplerate-0.1.4.tar.gz) = 4259244
-SHA256 (handbrake/libtheora-1.1.0.tar.bz2) = 74be9fe9f85d18c45bdcbb018cebf12c74e2234aeecb4d4c4cb92d80bdd287e2
-SIZE (handbrake/libtheora-1.1.0.tar.bz2) = 1785634
-SHA256 (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd
-SIZE (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 1250659
-SHA256 (handbrake/libxml2-2.7.7.tar.gz) = af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68
-SIZE (handbrake/libxml2-2.7.7.tar.gz) = 4868502
 SHA256 (handbrake/mp4v2-trunk-r355.tar.bz2) = 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f
 SIZE (handbrake/mp4v2-trunk-r355.tar.bz2) = 475488
 SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
 SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
-SHA256 (handbrake/x264-r2146-bcd41db.tar.gz) = 7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1
-SIZE (handbrake/x264-r2146-bcd41db.tar.gz) = 656089
+SHA256 (handbrake/x264-r2273-b3065e6.tar.gz) = 956c82c9318740ef3744cf6e752fb6181be0716273e2e8976306624f0864a815
+SIZE (handbrake/x264-r2273-b3065e6.tar.gz) = 681489
Index: files/patch-contrib_fontconfig_module.defs
===================================================================
--- files/patch-contrib_fontconfig_module.defs	(revision 342361)
+++ files/patch-contrib_fontconfig_module.defs	(working copy)
@@ -1,11 +0,0 @@
---- ./contrib/fontconfig/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
-+++ ./contrib/fontconfig/module.defs	2011-05-24 05:50:46.060808283 -0400
-@@ -19,6 +19,8 @@
-     FONTCONFIG.config_archoption  = --with-arch=i386
- else ifeq ($(BUILD.system),linux)
-     FONTCONFIG.cc_archoption      = 
-+else ifeq ($(BUILD.system),freebsd)
-+    FONTCONFIG.cc_archoption      = 
- else
-     FONTCONFIG.cc_archoption      = -arch $(FONTCONFIG.GCC.archs)
-     FONTCONFIG.config_archoption  = --with-arch=$(FONTCONFIG.GCC.archs)
Index: files/patch-contrib_freetype_module.defs
===================================================================
--- files/patch-contrib_freetype_module.defs	(revision 342361)
+++ files/patch-contrib_freetype_module.defs	(working copy)
@@ -1,8 +0,0 @@
---- ./contrib/freetype/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
-+++ ./contrib/freetype/module.defs	2011-05-24 05:50:46.062809316 -0400
-@@ -3,3 +3,5 @@
- 
- FREETYPE.FETCH.url = http://download.m0k.org/handbrake/contrib/freetype-2.3.9.tar.gz
- FREETYPE.EXTRACT.tarbase = freetype-2.3.9
-+FREETYPE.CONFIGURE.env.GNUMAKE = GNUMAKE="gmake"
-+FREETYPE.CONFIGURE.env.args += !GNUMAKE
Index: files/patch-contrib_libass_module.defs
===================================================================
--- files/patch-contrib_libass_module.defs	(revision 342361)
+++ files/patch-contrib_libass_module.defs	(working copy)
@@ -1,14 +0,0 @@
---- ./contrib/libass/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
-+++ ./contrib/libass/module.defs	2011-05-24 05:50:46.096807667 -0400
-@@ -7,9 +7,9 @@
- # Disable as many external dependencies as I can get away with
- # and tell configure where to find our version of freetype
- LIBASS.CONFIGURE.extra = \
--    --disable-png --disable-enca \
-+    --disable-png --disable-enca --disable-harfbuzz \
-     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
--    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
-+    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2 -I/usr/local/include" \
-     FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
-     FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
- 
Index: files/patch-test_module.defs
===================================================================
--- files/patch-test_module.defs	(revision 342361)
+++ files/patch-test_module.defs	(working copy)
@@ -1,23 +1,12 @@
---- ./test/module.defs.orig	2010-09-28 18:10:49.000000000 -0400
-+++ ./test/module.defs	2011-05-24 05:50:46.097808812 -0400
-@@ -10,8 +10,8 @@
- TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
- 
- TEST.libs = $(LIBHB.a) $(foreach n, \
--        a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
--        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
-+        a52 ass avformat avcodec avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
-+        samplerate swscale theora vorbis vorbisenc ogg x264 xml2 bluray, \
-         $(CONTRIB.build/)lib/lib$(n).a )
- 
- TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
-@@ -50,6 +50,9 @@
+--- ./test/module.defs.orig	2014-02-02 01:43:20.388459727 +0100
++++ ./test/module.defs	2014-02-02 01:50:43.545619545 +0100
+@@ -42,6 +42,9 @@
      TEST.GCC.l += iconv
  else ifeq ($(BUILD.system),linux)
      TEST.GCC.l += pthread dl m
 +else ifeq ($(BUILD.system),freebsd)
-+	TEST.GCC.l += pthread iconv
-+	TEST.GCC.L += /usr/local/lib
++    TEST.GCC.l += pthread iconv
++    TEST.GCC.L += /usr/local/lib
  else ifeq ($(BUILD.system),solaris)
-     TEST.GCC.l += pthread nsl socket
+     TEST.GCC.l += pthread nsl socket iconv
  else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dmarion 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Feb 2 19:50:09 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: "Sergey V. Dyatko" <sergey.dyatko@gmail.com>
To: bug-followup@FreeBSD.org, arjan@liralab.it
Cc:  
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Mon, 3 Feb 2014 10:57:12 +0300

 Hi,
 
 * files/patch-contrib_fontconfig_module.defs and
 files/patch-contrib_libass_module.defs should be removed.
 * PORTREVISION=    must be removed
 
 after that 0.9.9 _build_ fine on 11-current, but
 
 [tiger@tiger]~%HandBrake
 Segmentation fault (core dumped)
 
 [tiger@tiger]~%gdb `which
 HandBrake` /var/core/1001/14055.HandBrake.core GNU gdb 6.1.1 [FreeBSD]
 Copyright 2004 Free Software Foundation, Inc.
 GDB is free software, covered by the GNU General Public License, and
 you are welcome to change it and/or distribute copies of it under
 certain conditions. Type "show copying" to see the conditions.
 There is absolutely no warranty for GDB.  Type "show warranty" for
 details. This GDB was configured as "amd64-marcel-freebsd"...(no
 debugging symbols found)... Core was generated by `HandBrake'.
 Program terminated with signal 11, Segmentation fault.
 Reading symbols from /usr/local/lib/libvorbisenc.so.2...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libvorbisenc.so.2 Reading symbols
 from /usr/local/lib/libvorbis.so.4...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libvorbis.so.4 Reading
 symbols from /usr/local/lib/libsamplerate.so.1...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libsamplerate.so.1
 Reading symbols from /usr/local/lib/libtheoraenc.so.1...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libtheoraenc.so.1 Reading symbols
 from /usr/local/lib/libogg.so.8...(no debugging symbols found)...done.
 Loaded symbols for /usr/local/lib/libogg.so.8 Reading symbols
 from /usr/local/lib/libtheoradec.so.1...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libtheoradec.so.1
 Reading symbols from /usr/local/lib/libass.so.5...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libass.so.5 Reading
 symbols from /usr/local/lib/libfribidi.so.3...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libfribidi.so.3
 Reading symbols from /usr/local/lib/libenca.so.5...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libenca.so.5
 Reading symbols from /usr/local/lib/libxml2.so.5...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libxml2.so.5
 Reading symbols from /usr/lib/liblzma.so.5...(no debugging symbols
 found)...done. Loaded symbols for /usr/lib/liblzma.so.5
 Reading symbols from /usr/local/lib/libgtk-x11-2.0.so.0...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libgtk-x11-2.0.so.0 Reading symbols
 from /usr/local/lib/libgdk-x11-2.0.so.0...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libgdk-x11-2.0.so.0
 Reading symbols from /usr/local/lib/libpangocairo-1.0.so.0...(no
 debugging symbols found)...done. Loaded symbols
 for /usr/local/lib/libpangocairo-1.0.so.0 Reading symbols
 from /usr/local/lib/libharfbuzz.so.0...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libharfbuzz.so.0
 Reading symbols from /usr/local/lib/libgraphite2.so.3...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libgraphite2.so.3 Reading symbols
 from /usr/local/lib/libXinerama.so.1...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libXinerama.so.1
 Reading symbols from /usr/local/lib/libXi.so.6...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libXi.so.6 Reading
 symbols from /usr/local/lib/libXrandr.so.2...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libXrandr.so.2 Reading
 symbols from /usr/local/lib/libXext.so.6...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libXext.so.6 Reading
 symbols from /usr/local/lib/libXcursor.so.1...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libXcursor.so.1
 Reading symbols from /usr/local/lib/libXcomposite.so.1...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libXcomposite.so.1 Reading symbols
 from /usr/local/lib/libXdamage.so.1...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libXdamage.so.1
 Reading symbols from /usr/local/lib/libXfixes.so.3...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libXfixes.so.3
 Reading symbols from /usr/local/lib/libatk-1.0.so.0...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libatk-1.0.so.0 Reading symbols
 from /usr/local/lib/libcairo.so.2...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libcairo.so.2 Reading
 symbols from /usr/local/lib/libpixman-1.so.30...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libpixman-1.so.30
 Reading symbols from /usr/local/lib/libxcb-shm.so.0...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libxcb-shm.so.0 Reading symbols
 from /usr/local/lib/libxcb-render.so.0...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libxcb-render.so.0
 Reading symbols from /usr/local/lib/libXrender.so.1...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libXrender.so.1
 Reading symbols from /usr/local/lib/libX11.so.6...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libX11.so.6
 Reading symbols from /usr/local/lib/libxcb.so.2...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libxcb.so.2
 Reading symbols from /usr/local/lib/libXau.so.6...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libXau.so.6
 Reading symbols from /usr/local/lib/libXdmcp.so.6...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libXdmcp.so.6
 Reading symbols from /usr/local/lib/libpthread-stubs.so.0...(no
 debugging symbols found)...done. Loaded symbols
 for /usr/local/lib/libpthread-stubs.so.0 Reading symbols
 from /usr/lib/librpcsvc.so.5...(no debugging symbols found)...done.
 Loaded symbols for /usr/lib/librpcsvc.so.5 Reading symbols
 from /usr/local/lib/libpangoft2-1.0.so.0...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libpangoft2-1.0.so.0
 Reading symbols from /usr/local/lib/libpango-1.0.so.0...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libpango-1.0.so.0 Reading symbols
 from /usr/local/lib/libfontconfig.so.1...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libfontconfig.so.1
 Reading symbols from /usr/local/lib/libexpat.so.6...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libexpat.so.6
 Reading symbols from /usr/local/lib/libfreetype.so.9...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libfreetype.so.9 Reading symbols
 from /usr/lib/libbz2.so.4...(no debugging symbols found)...done. Loaded
 symbols for /usr/lib/libbz2.so.4 Reading symbols
 from /usr/local/lib/libgthread-2.0.so.0...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libgthread-2.0.so.0
 Reading symbols from /usr/local/lib/libnotify.so.4...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libnotify.so.4
 Reading symbols from /usr/local/lib/libgdk_pixbuf-2.0.so.0...(no
 debugging symbols found)...done. Loaded symbols
 for /usr/local/lib/libgdk_pixbuf-2.0.so.0 Reading symbols
 from /usr/local/lib/libpng15.so.15...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libpng15.so.15 Reading
 symbols from /usr/local/lib/libdbus-glib-1.so.2...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libdbus-glib-1.so.2
 Reading symbols from /usr/local/lib/libgio-2.0.so.0...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libgio-2.0.so.0 Reading symbols
 from /usr/local/lib/libgmodule-2.0.so.0...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libgmodule-2.0.so.0
 Reading symbols from /lib/libz.so.6...(no debugging symbols
 found)...done. Loaded symbols for /lib/libz.so.6
 Reading symbols from /usr/local/lib/libdbus-1.so.3...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libdbus-1.so.3
 Reading symbols from /lib/libthr.so.3...(no debugging symbols
 found)...done. Loaded symbols for /lib/libthr.so.3
 Reading symbols from /usr/local/lib/libgobject-2.0.so.0...(no debugging
 symbols found)...done. Loaded symbols
 for /usr/local/lib/libgobject-2.0.so.0 Reading symbols
 from /usr/local/lib/libffi.so.6...(no debugging symbols found)...done.
 Loaded symbols for /usr/local/lib/libffi.so.6 Reading symbols
 from /usr/local/lib/libglib-2.0.so.0...(no debugging symbols
 found)...done. Loaded symbols for /usr/local/lib/libglib-2.0.so.0
 Reading symbols from /usr/local/lib/libpcre.so.3...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libpcre.so.3
 Reading symbols from /usr/local/lib/libintl.so.9...(no debugging
 symbols found)...done. Loaded symbols for /usr/local/lib/libintl.so.9
 Reading symbols from /usr/local/lib/gcc46/libstdc++.so.6...done. Loaded
 symbols for /usr/local/lib/gcc46/libstdc++.so.6 Reading symbols
 from /lib/libm.so.5...done. Loaded symbols for /lib/libm.so.5
 Reading symbols from /usr/local/lib/gcc46/libgcc_s.so.1...done.
 Loaded symbols for /usr/local/lib/gcc46/libgcc_s.so.1
 Reading symbols from /lib/libc.so.7...done.
 Loaded symbols for /lib/libc.so.7
 Reading symbols from /usr/lib/libc++.so.1...done.
 Loaded symbols for /usr/lib/libc++.so.1
 Reading symbols from /lib/libcxxrt.so.1...done.
 Loaded symbols for /lib/libcxxrt.so.1
 Reading symbols from /libexec/ld-elf.so.1...done.
 Loaded symbols for /libexec/ld-elf.so.1
 #0  0x0000000000000000 in ?? ()
 [New Thread 36806400 (LWP 101043/HandBrake)]
 (gdb) bt
 #0  0x0000000000000000 in ?? ()
 #1  0x00000000354d8072 in __dynamic_cast (src_ptr=0x35713760,
 src_type=0x35709c10, dst_type=0x35709940, src2dst=0)
 at ../../.././../gcc-4.6.4/libstdc++-v3/libsupc++/dyncast.cc:61 #2
 0x00000000354ab100 in std::has_facet<std::ctype<char> >
 (__loc=@0x357132b8) at locale_classes.tcc:234 #3  0x000000003549fff4 in
 std::basic_ios<char, std::char_traits<char> >::_M_cache_locale
 ( this=0x357131e8, __loc=@0x357132b8) at basic_ios.tcc:160 #4
 0x00000000354a0098 in std::basic_ios<char, std::char_traits<char>
 >::init (this=0x357131e8, __sb=0x35712ac0) at basic_ios.tcc:133 #5
 >0x00000000354879dd in Init (this=<value optimized out>) at ostream:85
 #6  0x0000000000452a30 in main ()
 
 
 -- 
 wbr, tiger

From: "Sergey V. Dyatko" <sergey.dyatko@gmail.com>
To: "Arjan Gijsberts" <arjan@liralab.it>
Cc: <bug-followup@FreeBSD.org>
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Wed, 5 Feb 2014 09:11:05 +0300

 On Mon, 3 Feb 2014 12:20:40 +0100
 "Arjan Gijsberts" <arjan@liralab.it> wrote:
 
 > Hi,
 > 
 > > * files/patch-contrib_fontconfig_module.defs and files/patch-
 > > contrib_libass_module.defs should be removed.
 > > * PORTREVISION=    must be removed
 > 
 > Thanks for the tips. I svn rm'ed those files thinking the patch would
 > take care of it. Only later I saw the notice to advertize deletions
 > explicitly.
 > 
 > > after that 0.9.9 _build_ fine on 11-current, but
 > > 
 > > [tiger@tiger]~%HandBrake
 > > Segmentation fault (core dumped)
 > > 
 > > [tiger@tiger]~%gdb `which
 > [snap]
 > > #6  0x0000000000452a30 in main ()
 > 
 > Unfortunately, I do not have a 11-current or X11 system here to test.
 > Does HandBrakeCLI run fine instead?
 >  
 >  
 
 yes, I can convert  VIDEO_TS folder to mkv with HandBrakeCLI 0.9.9
 
 
 -- 
 wbr, tiger

From: Ryan Losh <ryanlosh@gmail.com>
To: bug-followup@FreeBSD.org, arjan@liralab.it
Cc:  
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Wed, 05 Feb 2014 14:32:35 -0600

 Hello:
 
 I'm trying to build handbrake on my FreeBSD 10.0-RELEASE #2 r261501 
 system.  I've updated the ports tree with portsnap fetch update.  I've 
 applied the patch from this CR to handbrake.  Seems like I had to rm the 
 empty patch files, and then handbrake built just fine.  Problem is that 
 it dumps core:
 
 $ HandbrakeCLI
 Segmentation fault (core dumped)
 
 $ gdb HandBrakeCLI HandBrakeCLI.core
 GNU gdb 6.1.1 [FreeBSD]
 Copyright 2004 Free Software Foundation, Inc.
 GDB is free software, covered by the GNU General Public License, and you are
 welcome to change it and/or distribute copies of it under certain 
 conditions.
 Type "show copying" to see the conditions.
 There is absolutely no warranty for GDB.  Type "show warranty" for details.
 This GDB was configured as "amd64-marcel-freebsd"...(no debugging 
 symbols found)...
 Core was generated by `HandBrakeCLI'.
 Program terminated with signal 11, Segmentation fault.
 Reading symbols from /usr/local/lib/libass.so.5...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/local/lib/libass.so.5
 Reading symbols from /usr/local/lib/libfontconfig.so.1...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libfontconfig.so.1
 Reading symbols from /usr/local/lib/libfreetype.so.9...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libfreetype.so.9
 Reading symbols from /usr/local/lib/libfribidi.so.3...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libfribidi.so.3
 Reading symbols from /usr/local/lib/libogg.so.8...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/local/lib/libogg.so.8
 Reading symbols from /usr/local/lib/libsamplerate.so.1...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libsamplerate.so.1
 Reading symbols from /usr/local/lib/libtheoraenc.so.1...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libtheoraenc.so.1
 Reading symbols from /usr/local/lib/libtheoradec.so.1...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libtheoradec.so.1
 Reading symbols from /usr/local/lib/libvorbis.so.4...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libvorbis.so.4
 Reading symbols from /usr/local/lib/libvorbisenc.so.2...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libvorbisenc.so.2
 Reading symbols from /usr/local/lib/libxml2.so.5...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/local/lib/libxml2.so.5
 Reading symbols from /usr/lib/libbz2.so.4...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/lib/libbz2.so.4
 Reading symbols from /lib/libz.so.6...(no debugging symbols found)...done.
 Loaded symbols for /lib/libz.so.6
 Reading symbols from /lib/libthr.so.3...(no debugging symbols found)...done.
 Loaded symbols for /lib/libthr.so.3
 Reading symbols from /usr/local/lib/gcc48/libstdc++.so.6...Error while 
 reading shared library symbols:
 Dwarf Error: wrong version in compilation unit header (is 4, should be 
 2) [in module /usr/local/lib/gcc48/libstdc++.so.6]
 Reading symbols from /lib/libm.so.5...(no debugging symbols found)...done.
 Loaded symbols for /lib/libm.so.5
 Reading symbols from /usr/local/lib/gcc48/libgcc_s.so.1...Error while 
 reading shared library symbols:
 Dwarf Error: wrong version in compilation unit header (is 4, should be 
 2) [in module /usr/local/lib/gcc48/libgcc_s.so.1]
 Reading symbols from /lib/libc.so.7...(no debugging symbols found)...done.
 Loaded symbols for /lib/libc.so.7
 Reading symbols from /usr/local/lib/libharfbuzz.so.0...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libharfbuzz.so.0
 Reading symbols from /usr/local/lib/libenca.so.5...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/local/lib/libenca.so.5
 Reading symbols from /usr/local/lib/libexpat.so.6...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libexpat.so.6
 Reading symbols from /usr/lib/liblzma.so.5...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/lib/liblzma.so.5
 Reading symbols from /usr/local/lib/libglib-2.0.so.0...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libglib-2.0.so.0
 Reading symbols from /usr/local/lib/libpcre.so.3...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/local/lib/libpcre.so.3
 Reading symbols from /usr/local/lib/libintl.so.9...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/local/lib/libintl.so.9
 Reading symbols from /usr/local/lib/libgraphite2.so.3...(no debugging 
 symbols found)...done.
 Loaded symbols for /usr/local/lib/libgraphite2.so.3
 Reading symbols from /usr/lib/libc++.so.1...(no debugging symbols 
 found)...done.
 Loaded symbols for /usr/lib/libc++.so.1
 Reading symbols from /lib/libcxxrt.so.1...(no debugging symbols 
 found)...done.
 Loaded symbols for /lib/libcxxrt.so.1
 Reading symbols from /libexec/ld-elf.so.1...(no debugging symbols 
 found)...done.
 Loaded symbols for /libexec/ld-elf.so.1
 #0  0x0000000000000000 in ?? ()
 [New Thread 805c06400 (LWP 100350/HandBrakeCLI)]
 (gdb) where
 #0  0x0000000000000000 in ?? ()
 #1  0x0000000803288cef in ?? () from /usr/local/lib/gcc48/libstdc++.so.6
 #2  0x0000000803534200 in ?? () from /usr/local/lib/gcc48/libstdc++.so.6
 #3  0x00007fffffffcb70 in ?? ()
 #4  0x0000000000000000 in ?? ()
 
 Not sure if this provides what you need...Let me know if I can be of 
 more help...
 
 Ryan Losh
 RyanLosh@gmail.com

From: "Arjan Gijsberts" <arjangijsberts@gmail.com>
To: <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Sat, 8 Feb 2014 01:08:36 +0100

 This is a multipart message in MIME format.
 
 ------=_NextPart_000_0720_01CF246A.4C634060
 Content-Type: text/plain;
 	charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 Thanks for the info, the patch was indeed flaky. Over at Arch people suggest
 that handbrake has problems with gcc 4.8, but the patch had other problems
 with gcc/libc++ as well.
 
 Attached an updated patch that now allows compiling handbrake with clang as
 well. I have tested HandBrake and HandBrakeCLI on FreeBSD 10.0 with base
 clang and lang/gcc46, and only HandBrakeCLi on FreeBSD 9.2 with base gcc.
 
 The patch is w.r.t. SVN head and you need to delete these empty files after
 patching:
 files/patch-contrib_freetype_module.defs files/patch-test_module.defs
 files/patch-libhb_module.defs
 files/patch-contrib_fontconfig_module.defs
 files/patch-contrib_libass_module.defs
 
 Note that I am not fond of the LDFLAGS line, but could not figure out a
 nicer way to do it. Credits to commit r289739 for the mp4v2 patch, commit
 r340847 for pointing to the libc++ issue, and bompopo's handbrake-devel port
 on redports for some patches and Makefile lines.
 
 Best,
 
 Arjan
 
 ------=_NextPart_000_0720_01CF246A.4C634060
 Content-Type: text/plain;
 	name="patch.txt"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="patch.txt"
 
 Index: Makefile=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- Makefile	(revision 342917)=0A=
 +++ Makefile	(working copy)=0A=
 @@ -1,9 +1,8 @@=0A=
 -# Created by: Andrew Thompson <andy@fud.org.nz>=0A=
 +\# Created by: Andrew Thompson <andy@fud.org.nz>=0A=
  # $FreeBSD$=0A=
  =0A=
  PORTNAME=3D	handbrake=0A=
 -PORTVERSION=3D	0.9.8=0A=
 -PORTREVISION=3D	2=0A=
 +PORTVERSION=3D	0.9.9=0A=
  CATEGORIES=3D	multimedia=0A=
  MASTER_SITES=3D	SF/${PORTNAME}/${PORTVERSION} \=0A=
  		http://download.handbrake.fr/handbrake/contrib/:contrib=0A=
 @@ -11,24 +10,16 @@=0A=
  		a52dec-0.7.4.tar.gz:contrib \=0A=
  		faac-1.28.tar.gz:contrib \=0A=
  		faad2-2.7.tar.gz:contrib \=0A=
 -		ffmpeg-v0.7-1696-gcae4f4b.tar.bz2:contrib \=0A=
 -		fontconfig-2.8.0.tar.gz:contrib \=0A=
 -		freetype-2.4.7.tar.bz2:contrib \=0A=
 +		libav-v9.6.tar.bz2:contrib \=0A=
  		lame-3.98.tar.gz:contrib \=0A=
 -		libass-0.10.0-1.tar.gz:contrib \=0A=
 -		libbluray-0.0.1-pre-213-ga869da8.tar.gz:contrib \=0A=
 +		libbluray-0.2.3.tar.bz2:contrib \=0A=
  		libdca-r81-strapped.tar.gz:contrib \=0A=
  		libdvdnav-svn1168.tar.gz:contrib \=0A=
  		libdvdread-svn1168.tar.gz:contrib \=0A=
  		libmkv-0.6.5-0-g82075ae.tar.gz:contrib \=0A=
 -		libogg-1.3.0.tar.gz:contrib \=0A=
 -		libsamplerate-0.1.4.tar.gz:contrib \=0A=
 -		libtheora-1.1.0.tar.bz2:contrib \=0A=
 -		libvorbis-aotuv_b6.03.tar.bz2:contrib \=0A=
 -		libxml2-2.7.7.tar.gz:contrib \=0A=
  		mp4v2-trunk-r355.tar.bz2:contrib \=0A=
  		mpeg2dec-0.5.1.tar.gz:contrib \=0A=
 -		x264-r2146-bcd41db.tar.gz:contrib=0A=
 +		x264-r2273-b3065e6.tar.gz:contrib=0A=
  DIST_SUBDIR=3D	${PORTNAME}=0A=
  =0A=
  MAINTAINER=3D	dmarion@FreeBSD.org=0A=
 @@ -37,10 +28,21 @@=0A=
  LICENSE=3D	GPLv2=0A=
  =0A=
  BUILD_DEPENDS=3D	yasm:${PORTSDIR}/devel/yasm=0A=
 -LIB_DEPENDS=3D	libfribidi.so:${PORTSDIR}/converters/fribidi=0A=
 +LIB_DEPENDS=3D	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \=0A=
 +		libfreetype.so:${PORTSDIR}/print/freetype2 \=0A=
 +		libfribidi.so:${PORTSDIR}/converters/fribidi \=0A=
 +		libxml2.so:${PORTSDIR}/textproc/libxml2 \=0A=
 +		libass.so:${PORTSDIR}/multimedia/libass \=0A=
 +		libogg.so:${PORTSDIR}/audio/libogg \=0A=
 +		libvorbis.so:${PORTSDIR}/audio/libvorbis \=0A=
 +		libvorbisenc.so:${PORTSDIR}/audio/libvorbis \=0A=
 +		libtheoradec.so:${PORTSDIR}/multimedia/libtheora \=0A=
 +		libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \=0A=
 +		libsamplerate.so:${PORTSDIR}/audio/libsamplerate=0A=
 +		=0A=
  RUN_DEPENDS=3D	=
 ${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss=0A=
  =0A=
 -USES=3D		gmake pkgconfig=0A=
 +USES=3D		gmake pkgconfig iconv compiler:features=0A=
  USE_AUTOTOOLS=3D	libtool aclocal=0A=
  LIBTOOLFILES=3D	configure=0A=
  USE_PYTHON_BUILD=3D	yes=0A=
 @@ -85,6 +87,9 @@=0A=
  CONFIGURE_ARGS+=3D	--disable-gtk=0A=
  .endif=0A=
  =0A=
 +# Add libc++ or libstdc++ to the linker flags when supported by the =
 compiler=0A=
 +LDFLAGS+=3D	${COMPILER_FEATURES:Mlibc++:S/lib/-l/} =
 ${COMPILER_FEATURES:Mlibstdc++:S/lib/-l/}=0A=
 +=0A=
  run-autotools-aclocal:=0A=
  	@${DO_NADA}=0A=
  =0A=
 @@ -92,47 +97,61 @@=0A=
  # considered good in FreeBSD.  Instead, we will prepare everything =
 manually.=0A=
  post-extract: .SILENT=0A=
  # Unversioned directories can be copied in a loop=0A=
 -.for d in a52dec lame libdca libdvdnav libdvdread libsamplerate =
 mpeg2dec x264=0A=
 +.for d in a52dec lame libdca libdvdnav libdvdread mpeg2dec x264=0A=
  	${MKDIR} ${BUILD_WRKSRC}/contrib/${d}=0A=
  	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}=0A=
  .endfor=0A=
  # Others had to be processed one by one due to irregular (versioned) =
 names=0A=
 -	cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg fontconfig \=0A=
 -		freetype libass libbluray libmkv libogg libtheora libvorbis \=0A=
 -		libxml2 mp4v2=0A=
 +	cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg libbluray =
 libmkv mp4v2=0A=
  	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac=0A=
  	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2=0A=
 -	${MV} ${WRKDIR}/ffmpeg-v0.7-1696-gcae4f4b \=0A=
 -		${BUILD_WRKSRC}/contrib/ffmpeg=0A=
 -	${MV} ${WRKDIR}/fontconfig-2.8.0 ${BUILD_WRKSRC}/contrib/fontconfig=0A=
 -	${MV} ${WRKDIR}/freetype-2.4.7 ${BUILD_WRKSRC}/contrib/freetype=0A=
 -	${MV} ${WRKDIR}/libass-0.10.0-1 ${BUILD_WRKSRC}/contrib/libass=0A=
 -	${MV} ${WRKDIR}/libbluray-0.0.1-pre-213-ga869da8 \=0A=
 -		${BUILD_WRKSRC}/contrib/libbluray=0A=
 +	${MV} ${WRKDIR}/libav-v9.6 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v9.6=0A=
 +	${MV} ${WRKDIR}/libbluray-0.2.3 ${BUILD_WRKSRC}/contrib/libbluray=0A=
  	${MV} ${WRKDIR}/libmkv-0.6.5-0-g82075ae ${BUILD_WRKSRC}/contrib/libmkv=0A=
 -	${MV} ${WRKDIR}/libogg-1.3.0 ${BUILD_WRKSRC}/contrib/libogg=0A=
 -	${MV} ${WRKDIR}/libtheora-1.1.0 ${BUILD_WRKSRC}/contrib/libtheora=0A=
 -	${MV} ${WRKDIR}/aotuv-b6.03_20110424 ${BUILD_WRKSRC}/contrib/libvorbis=0A=
 -	${MV} ${WRKDIR}/libxml2-2.7.7 ${BUILD_WRKSRC}/contrib/libxml2=0A=
  	${MV} ${WRKDIR}/mp4v2-trunk-r355 ${BUILD_WRKSRC}/contrib/mp4v2=0A=
 -# Remove one patch file that does not apply cleanly=0A=
 -	${RM} ${WRKSRC}/contrib/fontconfig/A00-config.patch=0A=
  # Avoid conflict with `print/harfbuzz' (also installs "hb.h")=0A=
  	${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h=0A=
 +# Mark all bundled dependencies as extracted=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/a52dec/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/faac/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/faad2/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/ffmpeg/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/lame/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libdvdnav/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libdvdread/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libmkv/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/mp4v2/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/mpeg2dec/.stamp.extract=0A=
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/x264/.stamp.extract=0A=
  =0A=
  post-patch:=0A=
  	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \=0A=
  		${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c=0A=
  	@${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \=0A=
 -		=
 ${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.0.1-pre-213-ga869da8/config=
 ure.ac=0A=
 +		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.2.3/configure.ac=0A=
  	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c=0A=
 -	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \=0A=
 -		${WRKSRC}/contrib/libass/module.defs \=0A=
 -		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs=0A=
  	@${REINPLACE_CMD} -e 's|libdvdcss\.so\.2|libdvdcss.so|' \=0A=
  		${BUILD_WRKSRC}/contrib/libdvdread/libdvdread/src/dvd_input.c=0A=
  	@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \=0A=
  		${REINPLACE_CMD} -e '/#include/s|hb\.h|hb-of-handbrake.h|'=0A=
 +	@${REINPLACE_CMD} -e "s|ToolProbe( 'GCC.gcc',   'gcc',|ToolProbe( =
 'GCC.gcc',   '${CC}',|" \=0A=
 +		${WRKSRC}/make/configure.py =0A=
 +	@${REINPLACE_CMD} -e 's|avcodec avformat avutil avresample|avformat =
 avcodec avresample avutil|' \=0A=
 +		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs =0A=
 +	${TR} -d '\r' < ${WRKSRC}/contrib/mpeg2dec/A02-gwluserdata.patch > =
 ${WRKDIR}/A02-gwluserdata.patch=0A=
 +	${MV} ${WRKDIR}/A02-gwluserdata.patch ${WRKSRC}/contrib/mpeg2dec/=0A=
 +	${CP} ${FILESDIR}/P01-freebsd-clang-namespace.patch =
 ${WRKSRC}/contrib/mp4v2/=0A=
 +	${CP} ${FILESDIR}/custom.defs ${WRKSRC}/=0A=
 +	@${REINPLACE_CMD} -E \=0A=
 +		-e 's|%%REP_CC%%|${CC}|g' \=0A=
 +		-e 's|%%REP_CXX%%|${CXX}|g' \=0A=
 +		-e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \=0A=
 +		-e 's|%%REP_I%%|-I${LOCALBASE}/include|g' \=0A=
 +		-e 's|%%REP_L%%|-L${LOCALBASE}/lib|g' \=0A=
 +		-e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \=0A=
 +		${WRKSRC}/custom.defs=0A=
  =0A=
  do-install:=0A=
  	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin=0A=
 Index: distinfo=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- distinfo	(revision 342917)=0A=
 +++ distinfo	(working copy)=0A=
 @@ -1,5 +1,5 @@=0A=
 -SHA256 (handbrake/HandBrake-0.9.8.tar.bz2) =3D =
 dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798=0A=
 -SIZE (handbrake/HandBrake-0.9.8.tar.bz2) =3D 3156964=0A=
 +SHA256 (handbrake/HandBrake-0.9.9.tar.bz2) =3D =
 a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3=0A=
 +SIZE (handbrake/HandBrake-0.9.9.tar.bz2) =3D 9315199=0A=
  SHA256 (handbrake/a52dec-0.7.4.tar.gz) =3D =
 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47=0A=
  SIZE (handbrake/a52dec-0.7.4.tar.gz) =3D 242978=0A=
  SHA256 (handbrake/faac-1.28.tar.gz) =3D =
 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df=0A=
 @@ -6,18 +6,12 @@=0A=
  SIZE (handbrake/faac-1.28.tar.gz) =3D 678891=0A=
  SHA256 (handbrake/faad2-2.7.tar.gz) =3D =
 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330=0A=
  SIZE (handbrake/faad2-2.7.tar.gz) =3D 1137407=0A=
 -SHA256 (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) =3D =
 f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497=0A=
 -SIZE (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) =3D 4242565=0A=
 -SHA256 (handbrake/fontconfig-2.8.0.tar.gz) =3D =
 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335=0A=
 -SIZE (handbrake/fontconfig-2.8.0.tar.gz) =3D 1548409=0A=
 -SHA256 (handbrake/freetype-2.4.7.tar.bz2) =3D =
 ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77=0A=
 -SIZE (handbrake/freetype-2.4.7.tar.bz2) =3D 1490543=0A=
 +SHA256 (handbrake/libav-v9.6.tar.bz2) =3D =
 ea41941866fb64d7e363684a4705574f65786bd9eb0fe1f796dee4c0d459aa52=0A=
 +SIZE (handbrake/libav-v9.6.tar.bz2) =3D 4672723=0A=
  SHA256 (handbrake/lame-3.98.tar.gz) =3D =
 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686=0A=
  SIZE (handbrake/lame-3.98.tar.gz) =3D 1411318=0A=
 -SHA256 (handbrake/libass-0.10.0-1.tar.gz) =3D =
 a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867=0A=
 -SIZE (handbrake/libass-0.10.0-1.tar.gz) =3D 745314=0A=
 -SHA256 (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) =3D =
 4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76=0A=
 -SIZE (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) =3D 241927=0A=
 +SHA256 (handbrake/libbluray-0.2.3.tar.bz2) =3D =
 2c65cfb02aeec31721f9ea65ee2c085a9bfe163e99dd01b52ccb3f53ba205eea=0A=
 +SIZE (handbrake/libbluray-0.2.3.tar.bz2) =3D 465239=0A=
  SHA256 (handbrake/libdca-r81-strapped.tar.gz) =3D =
 ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1=0A=
  SIZE (handbrake/libdca-r81-strapped.tar.gz) =3D 523282=0A=
  SHA256 (handbrake/libdvdnav-svn1168.tar.gz) =3D =
 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7=0A=
 @@ -26,19 +20,9 @@=0A=
  SIZE (handbrake/libdvdread-svn1168.tar.gz) =3D 946033=0A=
  SHA256 (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) =3D =
 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97=0A=
  SIZE (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) =3D 32742=0A=
 -SHA256 (handbrake/libogg-1.3.0.tar.gz) =3D =
 a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780=0A=
 -SIZE (handbrake/libogg-1.3.0.tar.gz) =3D 425144=0A=
 -SHA256 (handbrake/libsamplerate-0.1.4.tar.gz) =3D =
 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75=0A=
 -SIZE (handbrake/libsamplerate-0.1.4.tar.gz) =3D 4259244=0A=
 -SHA256 (handbrake/libtheora-1.1.0.tar.bz2) =3D =
 74be9fe9f85d18c45bdcbb018cebf12c74e2234aeecb4d4c4cb92d80bdd287e2=0A=
 -SIZE (handbrake/libtheora-1.1.0.tar.bz2) =3D 1785634=0A=
 -SHA256 (handbrake/libvorbis-aotuv_b6.03.tar.bz2) =3D =
 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd=0A=
 -SIZE (handbrake/libvorbis-aotuv_b6.03.tar.bz2) =3D 1250659=0A=
 -SHA256 (handbrake/libxml2-2.7.7.tar.gz) =3D =
 af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68=0A=
 -SIZE (handbrake/libxml2-2.7.7.tar.gz) =3D 4868502=0A=
  SHA256 (handbrake/mp4v2-trunk-r355.tar.bz2) =3D =
 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f=0A=
  SIZE (handbrake/mp4v2-trunk-r355.tar.bz2) =3D 475488=0A=
  SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) =3D =
 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71=0A=
  SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) =3D 522405=0A=
 -SHA256 (handbrake/x264-r2146-bcd41db.tar.gz) =3D =
 7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1=0A=
 -SIZE (handbrake/x264-r2146-bcd41db.tar.gz) =3D 656089=0A=
 +SHA256 (handbrake/x264-r2273-b3065e6.tar.gz) =3D =
 956c82c9318740ef3744cf6e752fb6181be0716273e2e8976306624f0864a815=0A=
 +SIZE (handbrake/x264-r2273-b3065e6.tar.gz) =3D 681489=0A=
 Index: files/P01-freebsd-clang-namespace.patch=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/P01-freebsd-clang-namespace.patch	(revision 0)=0A=
 +++ files/P01-freebsd-clang-namespace.patch	(working copy)=0A=
 @@ -0,0 +1,117 @@=0A=
 +diff -Naur mp4v2-trunk-r355.orig/src/bmff/typebmff.cpp =
 mp4v2-trunk-r355/src/bmff/typebmff.cpp=0A=
 +--- mp4v2-trunk-r355.orig/src/bmff/typebmff.cpp	2009-05-21 =
 04:52:31.000000000 +0200=0A=
 ++++ mp4v2-trunk-r355/src/bmff/typebmff.cpp	2014-02-06 =
 04:18:15.000000000 +0100=0A=
 +@@ -23,19 +23,12 @@=0A=
 + =0A=
 + #include "impl.h"=0A=
 + =0A=
 +-// VStudio idiocy prevents defining template instanced static data=0A=
 +-// in a namespace. Workaround it by defining in global scope.=0A=
 +-// Other platforms will continue to put things in the proper namespace.=0A=
 +-#if defined( _MSC_VER )=0A=
 +-using namespace mp4v2::impl::bmff;=0A=
 +-#else=0A=
 +-namespace mp4v2 { namespace impl { namespace bmff {=0A=
 +-#endif=0A=
 ++namespace mp4v2 { namespace impl { =0A=
 + =0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 + template <>=0A=
 +-const EnumLanguageCode::Entry EnumLanguageCode::data[] =3D {=0A=
 ++const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] =3D =
 {=0A=
 +     { mp4v2::impl::bmff::ILC_AAR,  "aar",  "Afar" },=0A=
 +     { mp4v2::impl::bmff::ILC_ABK,  "abk",  "Abkhazian" },=0A=
 +     { mp4v2::impl::bmff::ILC_ACE,  "ace",  "Achinese" },=0A=
 +@@ -526,9 +519,7 @@=0A=
 + =0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 +-#if defined( _MSC_VER )=0A=
 +-namespace mp4v2 { namespace impl { namespace bmff {=0A=
 +-#endif=0A=
 ++namespace bmff {=0A=
 + =0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 +diff -Naur mp4v2-trunk-r355.orig/src/itmf/type.cpp =
 mp4v2-trunk-r355/src/itmf/type.cpp=0A=
 +--- mp4v2-trunk-r355.orig/src/itmf/type.cpp	2009-05-21 =
 04:52:29.000000000 +0200=0A=
 ++++ mp4v2-trunk-r355/src/itmf/type.cpp	2014-02-06 04:18:19.000000000 =
 +0100=0A=
 +@@ -24,19 +24,12 @@=0A=
 + =0A=
 + #include "impl.h"=0A=
 + =0A=
 +-// VStudio idiocy prevents defining template instanced static data=0A=
 +-// in a namespace. Workaround it by defining in global scope.=0A=
 +-// Other platforms will continue to put things in the proper namespace.=0A=
 +-#if defined( _MSC_VER )=0A=
 +-using namespace mp4v2::impl::itmf;=0A=
 +-#else=0A=
 +-namespace mp4v2 { namespace impl { namespace itmf {=0A=
 +-#endif=0A=
 ++namespace mp4v2 { namespace impl {=0A=
 + =0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 + template <>=0A=
 +-const EnumBasicType::Entry EnumBasicType::data[] =3D {=0A=
 ++const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] =3D {=0A=
 +     { mp4v2::impl::itmf::BT_IMPLICIT,  "implicit",  "implicit" },=0A=
 +     { mp4v2::impl::itmf::BT_UTF8,      "utf8",      "UTF-8" },=0A=
 +     { mp4v2::impl::itmf::BT_UTF16,     "utf16",     "UTF-16" },=0A=
 +@@ -64,7 +57,7 @@=0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 + template <>=0A=
 +-const EnumGenreType::Entry EnumGenreType::data[] =3D {=0A=
 ++const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] =3D {=0A=
 +     { mp4v2::impl::itmf::GENRE_BLUES,             "blues",             =
 "Blues" },=0A=
 +     { mp4v2::impl::itmf::GENRE_CLASSIC_ROCK,      "classicrock",       =
 "Classic Rock" },=0A=
 +     { mp4v2::impl::itmf::GENRE_COUNTRY,           "country",           =
 "Country" },=0A=
 +@@ -200,7 +193,7 @@=0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 + template <>=0A=
 +-const EnumStikType::Entry EnumStikType::data[] =3D {=0A=
 ++const itmf::EnumStikType::Entry itmf::EnumStikType::data[] =3D {=0A=
 +     { mp4v2::impl::itmf::STIK_OLD_MOVIE,    "oldmovie",    "Movie" },=0A=
 +     { mp4v2::impl::itmf::STIK_NORMAL,       "normal",      "Normal" },=0A=
 +     { mp4v2::impl::itmf::STIK_AUDIOBOOK,    "audiobook",   "Audio =
 Book" },=0A=
 +@@ -216,7 +209,7 @@=0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 + template <>=0A=
 +-const EnumAccountType::Entry EnumAccountType::data[] =3D {=0A=
 ++const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] =3D {=0A=
 +     { mp4v2::impl::itmf::AT_ITUNES,  "itunes",   "iTunes" },=0A=
 +     { mp4v2::impl::itmf::AT_AOL,     "aol",      "AOL" },=0A=
 + =0A=
 +@@ -226,7 +219,7 @@=0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 + template <>=0A=
 +-const EnumCountryCode::Entry EnumCountryCode::data[] =3D {=0A=
 ++const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] =3D {=0A=
 +     { mp4v2::impl::itmf::CC_USA,  "usa",   "United States" },=0A=
 +     { mp4v2::impl::itmf::CC_USA,  "fra",   "France" },=0A=
 +     { mp4v2::impl::itmf::CC_DEU,  "ger",   "Germany" },=0A=
 +@@ -256,7 +249,7 @@=0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 + template <>=0A=
 +-const EnumContentRating::Entry EnumContentRating::data[] =3D {=0A=
 ++const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] =
 =3D {=0A=
 +     { mp4v2::impl::itmf::CR_NONE,      "none",       "None" },=0A=
 +     { mp4v2::impl::itmf::CR_CLEAN,     "clean",      "Clean" },=0A=
 +     { mp4v2::impl::itmf::CR_EXPLICIT,  "explicit",   "Explicit" },=0A=
 +@@ -266,9 +259,7 @@=0A=
 + =0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 +-#if defined( _MSC_VER )=0A=
 +-namespace mp4v2 { namespace impl { namespace itmf {=0A=
 +-#endif=0A=
 ++namespace itmf {=0A=
 + =0A=
 + =
 /////////////////////////////////////////////////////////////////////////=
 //////=0A=
 + =0A=
 =0A=
 Property changes on: files/P01-freebsd-clang-namespace.patch=0A=
 ___________________________________________________________________=0A=
 Added: svn:mime-type=0A=
 ## -0,0 +1 ##=0A=
 +text/plain=0A=
 \ No newline at end of property=0A=
 Added: svn:eol-style=0A=
 ## -0,0 +1 ##=0A=
 +native=0A=
 \ No newline at end of property=0A=
 Index: files/custom.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/custom.defs	(revision 0)=0A=
 +++ files/custom.defs	(working copy)=0A=
 @@ -0,0 +1,16 @@=0A=
 +########################################################################=
 ########=0A=
 +# for Generic GCC custom setting=0A=
 +=0A=
 +GCC.gcc         =3D %%REP_CC%%=0A=
 +GCC.gxx         =3D %%REP_CXX%%=0A=
 +GCC.archs       =3D %%REP_ARCHS%%=0A=
 +GCC.args.I     +=3D %%REP_I%%=0A=
 +GCC.args.L     +=3D %%REP_L%%=0A=
 +=0A=
 +=0A=
 +########################################################################=
 ########=0A=
 +# for CLI custom setting=0A=
 +=0A=
 +LIBHB.GCC.D +=3D SYS_FREEBSD=0A=
 +TEST.GCC.l +=3D pthread m %%REP_ICONV%%=0A=
 +=0A=
 =0A=
 Property changes on: files/custom.defs=0A=
 ___________________________________________________________________=0A=
 Added: svn:mime-type=0A=
 ## -0,0 +1 ##=0A=
 +text/plain=0A=
 \ No newline at end of property=0A=
 Added: svn:eol-style=0A=
 ## -0,0 +1 ##=0A=
 +native=0A=
 \ No newline at end of property=0A=
 Index: files/patch-contrib_fontconfig_module.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/patch-contrib_fontconfig_module.defs	(revision 342917)=0A=
 +++ files/patch-contrib_fontconfig_module.defs	(working copy)=0A=
 @@ -1,11 +0,0 @@=0A=
 ---- ./contrib/fontconfig/module.defs.orig	2010-09-28 18:10:49.000000000 =
 -0400=0A=
 -+++ ./contrib/fontconfig/module.defs	2011-05-24 05:50:46.060808283 -0400=0A=
 -@@ -19,6 +19,8 @@=0A=
 -     FONTCONFIG.config_archoption  =3D --with-arch=3Di386=0A=
 - else ifeq ($(BUILD.system),linux)=0A=
 -     FONTCONFIG.cc_archoption      =3D =0A=
 -+else ifeq ($(BUILD.system),freebsd)=0A=
 -+    FONTCONFIG.cc_archoption      =3D =0A=
 - else=0A=
 -     FONTCONFIG.cc_archoption      =3D -arch $(FONTCONFIG.GCC.archs)=0A=
 -     FONTCONFIG.config_archoption  =3D =
 --with-arch=3D$(FONTCONFIG.GCC.archs)=0A=
 Index: files/patch-contrib_freetype_module.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/patch-contrib_freetype_module.defs	(revision 342917)=0A=
 +++ files/patch-contrib_freetype_module.defs	(working copy)=0A=
 @@ -1,8 +0,0 @@=0A=
 ---- ./contrib/freetype/module.defs.orig	2010-09-28 18:10:49.000000000 =
 -0400=0A=
 -+++ ./contrib/freetype/module.defs	2011-05-24 05:50:46.062809316 -0400=0A=
 -@@ -3,3 +3,5 @@=0A=
 - =0A=
 - FREETYPE.FETCH.url =3D =
 http://download.m0k.org/handbrake/contrib/freetype-2.3.9.tar.gz=0A=
 - FREETYPE.EXTRACT.tarbase =3D freetype-2.3.9=0A=
 -+FREETYPE.CONFIGURE.env.GNUMAKE =3D GNUMAKE=3D"gmake"=0A=
 -+FREETYPE.CONFIGURE.env.args +=3D !GNUMAKE=0A=
 Index: files/patch-contrib_libass_module.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/patch-contrib_libass_module.defs	(revision 342917)=0A=
 +++ files/patch-contrib_libass_module.defs	(working copy)=0A=
 @@ -1,14 +0,0 @@=0A=
 ---- ./contrib/libass/module.defs.orig	2010-09-28 18:10:49.000000000 =
 -0400=0A=
 -+++ ./contrib/libass/module.defs	2011-05-24 05:50:46.096807667 -0400=0A=
 -@@ -7,9 +7,9 @@=0A=
 - # Disable as many external dependencies as I can get away with=0A=
 - # and tell configure where to find our version of freetype=0A=
 - LIBASS.CONFIGURE.extra =3D \=0A=
 --    --disable-png --disable-enca \=0A=
 -+    --disable-png --disable-enca --disable-harfbuzz \=0A=
 -     FREETYPE_LIBS=3D"-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib =
 -lfreetype" \=0A=
 --    FREETYPE_CFLAGS=3D"-I$(call =
 fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \=0A=
 -+    FREETYPE_CFLAGS=3D"-I$(call =
 fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2 -I/usr/local/include" \=0A=
 -     FONTCONFIG_LIBS=3D"-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib =
 -lfontconfig" \=0A=
 -     FONTCONFIG_CFLAGS=3D"-I$(call =
 fn.ABSOLUTE,$(CONTRIB.build/))include"=0A=
 - =0A=
 Index: files/patch-libhb_module.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/patch-libhb_module.defs	(revision 342917)=0A=
 +++ files/patch-libhb_module.defs	(working copy)=0A=
 @@ -1,12 +0,0 @@=0A=
 ---- ./libhb/module.defs.orig	2010-10-23 13:21:56.000000000 -0400=0A=
 -+++ ./libhb/module.defs	2011-05-24 05:50:46.097808812 -0400=0A=
 -@@ -47,6 +47,9 @@=0A=
 -     LIBHB.c +=3D $(wildcard $(LIBHB.src/)platform/macosx/*.c)=0A=
 - else ifeq ($(BUILD.system),linux)=0A=
 -     LIBHB.GCC.D +=3D SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=3D64=0A=
 -+else ifeq ($(BUILD.system),freebsd)=0A=
 -+    LIBHB.GCC.D +=3D SYS_FREEBSD=0A=
 -+    LIBHB.GCC.I +=3D /usr/local/include=0A=
 - else ifeq ($(BUILD.system),mingw)=0A=
 -     LIBHB.GCC.D +=3D SYS_MINGW PTW32_STATIC_LIB=0A=
 - 	LIBHB.GCC.args.extra.dylib++ +=3D -Wl,--enable-auto-import -static=0A=
 Index: files/patch-make_include_contrib.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/patch-make_include_contrib.defs	(revision 342917)=0A=
 +++ files/patch-make_include_contrib.defs	(working copy)=0A=
 @@ -1,22 +1,44 @@=0A=
 ---- ./make/include/contrib.defs.orig	2010-04-25 17:15:43.000000000 -0400=0A=
 -+++ ./make/include/contrib.defs	2011-05-24 05:50:46.071806770 -0400=0A=
 -@@ -28,7 +28,7 @@=0A=
 -     $(1).FETCH.url    =3D FETCH_IS_UNDEFINED=0A=
 -     $(1).FETCH.target =3D $$($(1).FETCH.tar)=0A=
 -     define $(1).FETCH=0A=
 --        $$(call FETCH,$$@,$$($(1).FETCH.url))=0A=
 -+#        $$(call FETCH,$$@,$$($(1).FETCH.url))=0A=
 -     endef=0A=
 +--- make/include/contrib.defs.orig	2011-08-26 21:35:18.802615405 +0900=0A=
 ++++ make/include/contrib.defs	2011-08-26 21:35:24.468798054 +0900=0A=
 +@@ -204,26 +204,26 @@=0A=
 + ##=0A=
 + ## target: fetch=0A=
 + ##=0A=
 +-$($(1).name).fetch: $$($(1).FETCH.target)=0A=
 +-=0A=
 +-$$($(1).FETCH.target): | $$(dir $$($(1).FETCH.target))=0A=
 +-	$$($(1).FETCH)=0A=
 ++#$($(1).name).fetch: $$($(1).FETCH.target)=0A=
 ++#=0A=
 ++#$$($(1).FETCH.target): | $$(dir $$($(1).FETCH.target))=0A=
 ++#	$$($(1).FETCH)=0A=
   =0A=
 -     ##=0A=
 -@@ -38,8 +38,8 @@=0A=
 -     $(1).EXTRACT.dir/    =3D $$($(1).build/)$$($(1).EXTRACT.tarbase)/=0A=
 -     $(1).EXTRACT.target  =3D $$($(1).build/).stamp.extract=0A=
 -     define $(1).EXTRACT=0A=
 --        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)=0A=
 --        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)=0A=
 -+#        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)=0A=
 -+#        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)=0A=
 -         $$(TOUCH.exe) $$@=0A=
 -     endef=0A=
 + ##=0A=
 + ## target: extract=0A=
 + ## must touch dir after extraction because old timestamp is restored =
 via tar.=0A=
 + ##=0A=
 +-$($(1).name).extract: $$($(1).EXTRACT.target)=0A=
 +-=0A=
 +-$$($(1).EXTRACT.target): | $$(dir $$($(1).EXTRACT.target))=0A=
 +-$$($(1).EXTRACT.target): $$($(1).FETCH.target)=0A=
 +-	$$($(1).EXTRACT)=0A=
 +-=0A=
 +-$($(1).name).extract.touch:=0A=
 +-	$$(TOUCH.exe) $$($(1).EXTRACT.target)=0A=
 +-=0A=
 +-$($(1).name).extract.untouch:=0A=
 +-	$$(RM.exe) -f $$($(1).EXTRACT.target)=0A=
 ++#$($(1).name).extract: $$($(1).EXTRACT.target)=0A=
 ++#=0A=
 ++#$$($(1).EXTRACT.target): | $$(dir $$($(1).EXTRACT.target))=0A=
 ++#$$($(1).EXTRACT.target): $$($(1).FETCH.target)=0A=
 ++#	$$($(1).EXTRACT)=0A=
 ++#=0A=
 ++#$($(1).name).extract.touch:=0A=
 ++#	$$(TOUCH.exe) $$($(1).EXTRACT.target)=0A=
 ++#=0A=
 ++#$($(1).name).extract.untouch:=0A=
 ++#	$$(RM.exe) -f $$($(1).EXTRACT.target)=0A=
   =0A=
 + ##=0A=
 + ## target: patch=0A=
 Index: files/patch-make_include_gcc.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/patch-make_include_gcc.defs	(revision 0)=0A=
 +++ files/patch-make_include_gcc.defs	(working copy)=0A=
 @@ -0,0 +1,20 @@=0A=
 +--- make/include/gcc.defs.orig	2011-08-22 15:08:08.322100000 +0900=0A=
 ++++ make/include/gcc.defs	2011-10-15 20:34:17.737925255 +0900=0A=
 +@@ -47,7 +47,7 @@=0A=
 + GCC.args.ML        =3D -fmessage-length=3D0=0A=
 + GCC.args.H         =3D -H=0A=
 + GCC.args.W         =3D -W$(1)=0A=
 +-GCC.args.archs     =3D -arch $(1)=0A=
 ++GCC.args.archs     =3D -march=3D$(1)=0A=
 + GCC.args.sysroot   =3D --sysroot=3D$(1)=0A=
 + GCC.args.ldsysroot =3D -syslibroot $(1)=0A=
 + GCC.args.minver    =3D -mmacosx-version-min=3D$(1)=0A=
 +@@ -85,7 +85,7 @@=0A=
 + =0A=
 + define import.GCC=0A=
 +     $(1).GCC.gcc =3D $$(GCC.gcc)=0A=
 +-    $(1).GCC.gxx =3D $$(dir $$($(1).GCC.gcc))$$(subst =
 gcc,g++,$$(notdir $$($(1).GCC.gcc)))=0A=
 ++    $(1).GCC.gxx =3D $$(if $$(filter ./,$$(dir =
 $$($(1).GCC.gcc))),,$$(dir $$($(1).GCC.gcc)))$$(subst gcc,g++,$$(notdir =
 $$($(1).GCC.gcc)))=0A=
 + =0A=
 +     $(1).GCC.pipe    =3D $$(GCC.pipe)=0A=
 +     $(1).GCC.strip   =3D $$(if $$(filter none,$$($(1).GCC.g)),1)=0A=
 =0A=
 Property changes on: files/patch-make_include_gcc.defs=0A=
 ___________________________________________________________________=0A=
 Added: svn:mime-type=0A=
 ## -0,0 +1 ##=0A=
 +text/plain=0A=
 \ No newline at end of property=0A=
 Added: fbsd:nokeywords=0A=
 ## -0,0 +1 ##=0A=
 +yes=0A=
 \ No newline at end of property=0A=
 Added: svn:eol-style=0A=
 ## -0,0 +1 ##=0A=
 +native=0A=
 \ No newline at end of property=0A=
 Index: files/patch-test_module.defs=0A=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
 --- files/patch-test_module.defs	(revision 342917)=0A=
 +++ files/patch-test_module.defs	(working copy)=0A=
 @@ -1,23 +0,0 @@=0A=
 ---- ./test/module.defs.orig	2010-09-28 18:10:49.000000000 -0400=0A=
 -+++ ./test/module.defs	2011-05-24 05:50:46.097808812 -0400=0A=
 -@@ -10,8 +10,8 @@=0A=
 - TEST.exe =3D $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)=0A=
 - =0A=
 - TEST.libs =3D $(LIBHB.a) $(foreach n, \=0A=
 --        a52 ass avcodec avformat avutil dca dvdnav dvdread faac =
 fontconfig freetype mkv mpeg2 mp3lame mp4v2 \=0A=
 --        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 =
 bluray, \=0A=
 -+        a52 ass avformat avcodec avutil dca dvdnav dvdread faac =
 fontconfig freetype mkv mpeg2 mp3lame mp4v2 \=0A=
 -+        samplerate swscale theora vorbis vorbisenc ogg x264 xml2 =
 bluray, \=0A=
 -         $(CONTRIB.build/)lib/lib$(n).a )=0A=
 - =0A=
 - TEST.install.exe =3D $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))=0A=
 -@@ -50,6 +50,9 @@=0A=
 -     TEST.GCC.l +=3D iconv=0A=
 - else ifeq ($(BUILD.system),linux)=0A=
 -     TEST.GCC.l +=3D pthread dl m=0A=
 -+else ifeq ($(BUILD.system),freebsd)=0A=
 -+	TEST.GCC.l +=3D pthread iconv=0A=
 -+	TEST.GCC.L +=3D /usr/local/lib=0A=
 - else ifeq ($(BUILD.system),solaris)=0A=
 -     TEST.GCC.l +=3D pthread nsl socket=0A=
 - else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))=0A=
 
 ------=_NextPart_000_0720_01CF246A.4C634060--
 
Responsible-Changed-From-To: dmarion->freebsd-ports-bugs 
Responsible-Changed-By: dmarion 
Responsible-Changed-When: Sat Feb 8 23:46:44 UTC 2014 
Responsible-Changed-Why:  
not maintainer anymore 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186387 
Responsible-Changed-From-To: freebsd-ports-bugs->riggs 
Responsible-Changed-By: riggs 
Responsible-Changed-When: Sun Feb 9 15:32:24 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

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

From: Matthias Andree <mandree@FreeBSD.org>
To: arjan@liralab.it, riggs@freebsd.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Tue, 11 Feb 2014 09:49:36 +0100

 Well, you _MUST_ make sure that the Standard C++ library matches the
 default of the SYSTEM, not the default of the COMPILER, so as to match
 what other C++-based libraries link against.
 
 I. e. 8.x and 9.x MUST use libstdc++, 10.x and 11.x MUST use libc++.
 No ifs and buts.
 
 We've recently fixed Rawtherapee, which you can use for reference of how
 you can detect what the default libc++ is, and how to link at it.  It is
 a bit ugly.  Further information is in
 <http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186240>.
 
 Note that if your glib is still 2.36.3_1 (rather than _2 or newer), you
 also need the patch from
 <http://people.freebsd.org/~kwm/glib-iconv-hell.diff> to ensure glib20
 uses a sane iconv() implementation.
 BSD's libc-based iconv() is insufficient if some port uses, for
 instance, wchar_t.

From: Matthias Andree <mandree@FreeBSD.org>
To: bug-followup@FreeBSD.org, arjan@liralab.it, nox@freebsd.org
Cc: riggs@freebsd.org
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Tue, 11 Feb 2014 09:57:44 +0100

 Greetings,
 
 I have checked the referenced avidemux2 commit from
 <http://svnweb.freebsd.org/ports/head/multimedia/avidemux2/Makefile.common?sortby=rev&r1=340847&r2=340846&pathrev=340847>
 about the libc++ addition, and looking at my own notes in PR186240 it
 seems that it is lacking.
 
 > The crucial points were:
 > 
 > - a build dependency on libc++
 > - compiler flags -nostdinc++ -isystem $LOCALBASE/include/c++/v1
 > - linker flags -L$LOCALBASE/lib/c++
 
 it would seem that the libc++ build depends and the compiler flags need
 to be added on pre-10 systems, too.
 
 Best regards
 Matthias

From: Thomas Zander <riggs@freebsd.org>
To: Matthias Andree <mandree@freebsd.org>
Cc: arjan@liralab.it, bug-followup@freebsd.org
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Tue, 11 Feb 2014 21:26:23 +0100

 On 11 February 2014 09:49, Matthias Andree <mandree@freebsd.org> wrote:
 
 > Well, you _MUST_ make sure that the Standard C++ library matches the
 > default of the SYSTEM, not the default of the COMPILER, so as to match
 > what other C++-based libraries link against.
 > I. e. 8.x and 9.x MUST use libstdc++, 10.x and 11.x MUST use libc++.
 > No ifs and buts.
 
 If that is the case (no ifs and buts), wouldn't this work:
 .if ${OSVERSION} >= 1000000
 LDFLAGS+= -lc++
 .else
 LDFLAGS+= -lstdc++
 .endif
 
 Best
 Riggs

From: Matthias Andree <mandree@FreeBSD.org>
To: Thomas Zander <riggs@freebsd.org>
Cc: arjan@liralab.it, bug-followup@freebsd.org
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Tue, 11 Feb 2014 23:06:38 +0100

 Am 11.02.2014 21:26, schrieb Thomas Zander:
 > On 11 February 2014 09:49, Matthias Andree <mandree@freebsd.org> wrote:
 > 
 >> Well, you _MUST_ make sure that the Standard C++ library matches the
 >> default of the SYSTEM, not the default of the COMPILER, so as to match
 >> what other C++-based libraries link against.
 >> I. e. 8.x and 9.x MUST use libstdc++, 10.x and 11.x MUST use libc++.
 >> No ifs and buts.
 > 
 > If that is the case (no ifs and buts), wouldn't this work:
 > .if ${OSVERSION} >= 1000000
 > LDFLAGS+= -lc++
 > .else
 > LDFLAGS+= -lstdc++
 > .endif
 
 The actual OSVERSION that made the switch to clang/libc++ is later,
 1000024 or 1000054 or something, so it's better to set USES=compiler but
 not USE_GCC or thereabouts before .include <bsd.pre.port.mk>, and query
 the results and set USE_GCC and LDFLAGS after bsd.pre.port.mk.
 
 If you must continue using OSVERSION, I think using 1000100 (which is
 when releng/10.0 branched) should be safe now, users using a 1000000 <=
 version < 1000100 should have upgraded these days.
 

From: Thomas Zander <riggs@freebsd.org>
To: Matthias Andree <mandree@freebsd.org>, bug-followup@freebsd.org, 
	Thierry Thomas <thierry@freebsd.org>
Cc: arjan@liralab.it, =?ISO-8859-1?Q?Philippe_Aud=E9oud?= <jadawin@freebsd.org>
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Wed, 12 Feb 2014 21:37:00 +0100

 --047d7b5db9c4e753c304f23b8882
 Content-Type: text/plain; charset=ISO-8859-1
 
 On 11 February 2014 23:06, Matthias Andree <mandree@freebsd.org> wrote:
 > Am 11.02.2014 21:26, schrieb Thomas Zander:
 >> On 11 February 2014 09:49, Matthias Andree <mandree@freebsd.org> wrote:
 >>
 >>> Well, you _MUST_ make sure that the Standard C++ library matches the
 >>> default of the SYSTEM, not the default of the COMPILER, so as to match
 >>> what other C++-based libraries link against.
 >>> I. e. 8.x and 9.x MUST use libstdc++, 10.x and 11.x MUST use libc++.
 >>> No ifs and buts.
 >>
 >> If that is the case (no ifs and buts), wouldn't this work:
 >> .if ${OSVERSION} >= 1000000
 >> LDFLAGS+= -lc++
 >> .else
 >> LDFLAGS+= -lstdc++
 >> .endif
 >
 > The actual OSVERSION that made the switch to clang/libc++ is later,
 > 1000024 or 1000054 or something, so it's better to set USES=compiler but
 > not USE_GCC or thereabouts before .include <bsd.pre.port.mk>, and query
 > the results and set USE_GCC and LDFLAGS after bsd.pre.port.mk.
 >
 > If you must continue using OSVERSION, I think using 1000100 (which is
 > when releng/10.0 branched) should be safe now, users using a 1000000 <=
 > version < 1000100 should have upgraded these days.
 
 Actually, it makes more sense to do the test for OSVERSION instead of
 compiler features. We are not trying to get openmp in there. We are
 simply setting the proper C++ LDFLAGS, which are, as you correctly
 stated, determined whether we are building on OSVERSION before/after
 1000054.
 
 I would like to go ahead and commit attached revision of the patch.
 
 Best regards
 Riggs
 
 --047d7b5db9c4e753c304f23b8882
 Content-Type: text/plain; charset=US-ASCII; name="handbrake.diff.txt"
 Content-Disposition: attachment; filename="handbrake.diff.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hrl242a90
 
 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE1ha2VmaWxlCShyZXZpc2lvbiAzNDM0MzIp
 CisrKyBNYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMiw4ICsyLDcgQEAKICMgJEZyZWVCU0Qk
 CiAKIFBPUlROQU1FPQloYW5kYnJha2UKLVBPUlRWRVJTSU9OPQkwLjkuOAotUE9SVFJFVklTSU9O
 PQkyCitQT1JUVkVSU0lPTj0JMC45LjkKIENBVEVHT1JJRVM9CW11bHRpbWVkaWEKIE1BU1RFUl9T
 SVRFUz0JU0YvJHtQT1JUTkFNRX0vJHtQT1JUVkVSU0lPTn0gXAogCQlodHRwOi8vZG93bmxvYWQu
 aGFuZGJyYWtlLmZyL2hhbmRicmFrZS9jb250cmliLzpjb250cmliCkBAIC0xMSwyNCArMTAsMTYg
 QEAKIAkJYTUyZGVjLTAuNy40LnRhci5nejpjb250cmliIFwKIAkJZmFhYy0xLjI4LnRhci5nejpj
 b250cmliIFwKIAkJZmFhZDItMi43LnRhci5nejpjb250cmliIFwKLQkJZmZtcGVnLXYwLjctMTY5
 Ni1nY2FlNGY0Yi50YXIuYnoyOmNvbnRyaWIgXAotCQlmb250Y29uZmlnLTIuOC4wLnRhci5nejpj
 b250cmliIFwKLQkJZnJlZXR5cGUtMi40LjcudGFyLmJ6Mjpjb250cmliIFwKKwkJbGliYXYtdjku
 Ni50YXIuYnoyOmNvbnRyaWIgXAogCQlsYW1lLTMuOTgudGFyLmd6OmNvbnRyaWIgXAotCQlsaWJh
 c3MtMC4xMC4wLTEudGFyLmd6OmNvbnRyaWIgXAotCQlsaWJibHVyYXktMC4wLjEtcHJlLTIxMy1n
 YTg2OWRhOC50YXIuZ3o6Y29udHJpYiBcCisJCWxpYmJsdXJheS0wLjIuMy50YXIuYnoyOmNvbnRy
 aWIgXAogCQlsaWJkY2EtcjgxLXN0cmFwcGVkLnRhci5nejpjb250cmliIFwKIAkJbGliZHZkbmF2
 LXN2bjExNjgudGFyLmd6OmNvbnRyaWIgXAogCQlsaWJkdmRyZWFkLXN2bjExNjgudGFyLmd6OmNv
 bnRyaWIgXAogCQlsaWJta3YtMC42LjUtMC1nODIwNzVhZS50YXIuZ3o6Y29udHJpYiBcCi0JCWxp
 Ym9nZy0xLjMuMC50YXIuZ3o6Y29udHJpYiBcCi0JCWxpYnNhbXBsZXJhdGUtMC4xLjQudGFyLmd6
 OmNvbnRyaWIgXAotCQlsaWJ0aGVvcmEtMS4xLjAudGFyLmJ6Mjpjb250cmliIFwKLQkJbGlidm9y
 YmlzLWFvdHV2X2I2LjAzLnRhci5iejI6Y29udHJpYiBcCi0JCWxpYnhtbDItMi43LjcudGFyLmd6
 OmNvbnRyaWIgXAogCQltcDR2Mi10cnVuay1yMzU1LnRhci5iejI6Y29udHJpYiBcCiAJCW1wZWcy
 ZGVjLTAuNS4xLnRhci5nejpjb250cmliIFwKLQkJeDI2NC1yMjE0Ni1iY2Q0MWRiLnRhci5nejpj
 b250cmliCisJCXgyNjQtcjIyNzMtYjMwNjVlNi50YXIuZ3o6Y29udHJpYgogRElTVF9TVUJESVI9
 CSR7UE9SVE5BTUV9CiAKIE1BSU5UQUlORVI9CXBvcnRzQEZyZWVCU0Qub3JnCkBAIC0zNywxMCAr
 MjgsMjAgQEAKIExJQ0VOU0U9CUdQTHYyCiAKIEJVSUxEX0RFUEVORFM9CXlhc206JHtQT1JUU0RJ
 Un0vZGV2ZWwveWFzbQotTElCX0RFUEVORFM9CWxpYmZyaWJpZGkuc286JHtQT1JUU0RJUn0vY29u
 dmVydGVycy9mcmliaWRpCitMSUJfREVQRU5EUz0JbGliZm9udGNvbmZpZy5zbzoke1BPUlRTRElS
 fS94MTEtZm9udHMvZm9udGNvbmZpZyBcCisJCWxpYmZyZWV0eXBlLnNvOiR7UE9SVFNESVJ9L3By
 aW50L2ZyZWV0eXBlMiBcCisJCWxpYmZyaWJpZGkuc286JHtQT1JUU0RJUn0vY29udmVydGVycy9m
 cmliaWRpIFwKKwkJbGlieG1sMi5zbzoke1BPUlRTRElSfS90ZXh0cHJvYy9saWJ4bWwyIFwKKwkJ
 bGliYXNzLnNvOiR7UE9SVFNESVJ9L211bHRpbWVkaWEvbGliYXNzIFwKKwkJbGlib2dnLnNvOiR7
 UE9SVFNESVJ9L2F1ZGlvL2xpYm9nZyBcCisJCWxpYnZvcmJpcy5zbzoke1BPUlRTRElSfS9hdWRp
 by9saWJ2b3JiaXMgXAorCQlsaWJ2b3JiaXNlbmMuc286JHtQT1JUU0RJUn0vYXVkaW8vbGlidm9y
 YmlzIFwKKwkJbGlidGhlb3JhZGVjLnNvOiR7UE9SVFNESVJ9L211bHRpbWVkaWEvbGlidGhlb3Jh
 IFwKKwkJbGlidGhlb3JhZW5jLnNvOiR7UE9SVFNESVJ9L211bHRpbWVkaWEvbGlidGhlb3JhIFwK
 KwkJbGlic2FtcGxlcmF0ZS5zbzoke1BPUlRTRElSfS9hdWRpby9saWJzYW1wbGVyYXRlCiBSVU5f
 REVQRU5EUz0JJHtMT0NBTEJBU0V9L2xpYi9saWJkdmRjc3Muc286JHtQT1JUU0RJUn0vbXVsdGlt
 ZWRpYS9saWJkdmRjc3MKIAotVVNFUz0JCWdtYWtlIHBrZ2NvbmZpZworVVNFUz0JCWdtYWtlIHBr
 Z2NvbmZpZyBpY29udgogVVNFX0FVVE9UT09MUz0JbGlidG9vbCBhY2xvY2FsCiBMSUJUT09MRklM
 RVM9CWNvbmZpZ3VyZQogVVNFX1BZVEhPTl9CVUlMRD0JeWVzCkBAIC02Myw3ICs2NCw2IEBACiBY
 MTFfREVTQz0JQnVpbGQgR1RLKzIgYmFzZWQgR1VJIHByb2dyYW0KIE9QVElPTlNfREVGQVVMVD0J
 WDExCiAKLU5PX1NUQUdFPQl5ZXMKIC5pbmNsdWRlIDxic2QucG9ydC5wcmUubWs+CiAKICMgUmVj
 ZW50IEdOVSBiaW51dGlscyBhcmUgcmVxdWlyZWQgdG8gaGFuZGxlIGlubGluZSBTU1NFMyBhc20g
 KGluIHgyNjQpLCBhbmQKQEAgLTg1LDYgKzg1LDEzIEBACiBDT05GSUdVUkVfQVJHUys9CS0tZGlz
 YWJsZS1ndGsKIC5lbmRpZgogCisjIEVuZm9yY2UgbGlua2luZyB0byB0aGUgc3lzdGVtIGMrKyBz
 dGFuZGFyZCBsaWIKKy5pZiAke09TVkVSU0lPTn0gPj0gMTAwMDA1NAorTERGTEFHUys9CS1sYysr
 CisuZWxzZQorTERGTEFHUys9CS1sc3RkYysrCisuZW5kaWYKKwogcnVuLWF1dG90b29scy1hY2xv
 Y2FsOgogCUAke0RPX05BREF9CiAKQEAgLTkyLDUyICs5OSw2NCBAQAogIyBjb25zaWRlcmVkIGdv
 b2QgaW4gRnJlZUJTRC4gIEluc3RlYWQsIHdlIHdpbGwgcHJlcGFyZSBldmVyeXRoaW5nIG1hbnVh
 bGx5LgogcG9zdC1leHRyYWN0OiAuU0lMRU5UCiAjIFVudmVyc2lvbmVkIGRpcmVjdG9yaWVzIGNh
 biBiZSBjb3BpZWQgaW4gYSBsb29wCi0uZm9yIGQgaW4gYTUyZGVjIGxhbWUgbGliZGNhIGxpYmR2
 ZG5hdiBsaWJkdmRyZWFkIGxpYnNhbXBsZXJhdGUgbXBlZzJkZWMgeDI2NAorLmZvciBkIGluIGE1
 MmRlYyBsYW1lIGxpYmRjYSBsaWJkdmRuYXYgbGliZHZkcmVhZCBtcGVnMmRlYyB4MjY0CiAJJHtN
 S0RJUn0gJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvJHtkfQogCSR7TVZ9ICR7V1JLRElSfS8ke2R9
 ICR7QlVJTERfV1JLU1JDfS9jb250cmliLyR7ZH0KIC5lbmRmb3IKICMgT3RoZXJzIGhhZCB0byBi
 ZSBwcm9jZXNzZWQgb25lIGJ5IG9uZSBkdWUgdG8gaXJyZWd1bGFyICh2ZXJzaW9uZWQpIG5hbWVz
 Ci0JY2QgJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIgJiYgJHtNS0RJUn0gZmFhYyBmYWFkMiBmZm1w
 ZWcgZm9udGNvbmZpZyBcCi0JCWZyZWV0eXBlIGxpYmFzcyBsaWJibHVyYXkgbGlibWt2IGxpYm9n
 ZyBsaWJ0aGVvcmEgbGlidm9yYmlzIFwKLQkJbGlieG1sMiBtcDR2MgorCWNkICR7QlVJTERfV1JL
 U1JDfS9jb250cmliICYmICR7TUtESVJ9IGZhYWMgZmFhZDIgZmZtcGVnIGxpYmJsdXJheSBsaWJt
 a3YgbXA0djIKIAkke01WfSAke1dSS0RJUn0vZmFhYy0xLjI4ICR7QlVJTERfV1JLU1JDfS9jb250
 cmliL2ZhYWMKIAkke01WfSAke1dSS0RJUn0vZmFhZDItMi43ICR7QlVJTERfV1JLU1JDfS9jb250
 cmliL2ZhYWQyCi0JJHtNVn0gJHtXUktESVJ9L2ZmbXBlZy12MC43LTE2OTYtZ2NhZTRmNGIgXAot
 CQkke0JVSUxEX1dSS1NSQ30vY29udHJpYi9mZm1wZWcKLQkke01WfSAke1dSS0RJUn0vZm9udGNv
 bmZpZy0yLjguMCAke0JVSUxEX1dSS1NSQ30vY29udHJpYi9mb250Y29uZmlnCi0JJHtNVn0gJHtX
 UktESVJ9L2ZyZWV0eXBlLTIuNC43ICR7QlVJTERfV1JLU1JDfS9jb250cmliL2ZyZWV0eXBlCi0J
 JHtNVn0gJHtXUktESVJ9L2xpYmFzcy0wLjEwLjAtMSAke0JVSUxEX1dSS1NSQ30vY29udHJpYi9s
 aWJhc3MKLQkke01WfSAke1dSS0RJUn0vbGliYmx1cmF5LTAuMC4xLXByZS0yMTMtZ2E4NjlkYTgg
 XAotCQkke0JVSUxEX1dSS1NSQ30vY29udHJpYi9saWJibHVyYXkKKwkke01WfSAke1dSS0RJUn0v
 bGliYXYtdjkuNiAke0JVSUxEX1dSS1NSQ30vY29udHJpYi9mZm1wZWcvbGliYXYtdjkuNgorCSR7
 TVZ9ICR7V1JLRElSfS9saWJibHVyYXktMC4yLjMgJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvbGli
 Ymx1cmF5CiAJJHtNVn0gJHtXUktESVJ9L2xpYm1rdi0wLjYuNS0wLWc4MjA3NWFlICR7QlVJTERf
 V1JLU1JDfS9jb250cmliL2xpYm1rdgotCSR7TVZ9ICR7V1JLRElSfS9saWJvZ2ctMS4zLjAgJHtC
 VUlMRF9XUktTUkN9L2NvbnRyaWIvbGlib2dnCi0JJHtNVn0gJHtXUktESVJ9L2xpYnRoZW9yYS0x
 LjEuMCAke0JVSUxEX1dSS1NSQ30vY29udHJpYi9saWJ0aGVvcmEKLQkke01WfSAke1dSS0RJUn0v
 YW90dXYtYjYuMDNfMjAxMTA0MjQgJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvbGlidm9yYmlzCi0J
 JHtNVn0gJHtXUktESVJ9L2xpYnhtbDItMi43LjcgJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvbGli
 eG1sMgogCSR7TVZ9ICR7V1JLRElSfS9tcDR2Mi10cnVuay1yMzU1ICR7QlVJTERfV1JLU1JDfS9j
 b250cmliL21wNHYyCi0jIFJlbW92ZSBvbmUgcGF0Y2ggZmlsZSB0aGF0IGRvZXMgbm90IGFwcGx5
 IGNsZWFubHkKLQkke1JNfSAke1dSS1NSQ30vY29udHJpYi9mb250Y29uZmlnL0EwMC1jb25maWcu
 cGF0Y2gKICMgQXZvaWQgY29uZmxpY3Qgd2l0aCBgcHJpbnQvaGFyZmJ1enonIChhbHNvIGluc3Rh
 bGxzICJoYi5oIikKIAkke01WfSAke1dSS1NSQ30vbGliaGIvaGIuaCAke1dSS1NSQ30vbGliaGIv
 aGItb2YtaGFuZGJyYWtlLmgKKyMgTWFyayBhbGwgYnVuZGxlZCBkZXBlbmRlbmNpZXMgYXMgZXh0
 cmFjdGVkCisJJHtUT1VDSH0gJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvYTUyZGVjLy5zdGFtcC5l
 eHRyYWN0CisJJHtUT1VDSH0gJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvZmFhYy8uc3RhbXAuZXh0
 cmFjdAorCSR7VE9VQ0h9ICR7QlVJTERfV1JLU1JDfS9jb250cmliL2ZhYWQyLy5zdGFtcC5leHRy
 YWN0CisJJHtUT1VDSH0gJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvZmZtcGVnLy5zdGFtcC5leHRy
 YWN0CisJJHtUT1VDSH0gJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvbGFtZS8uc3RhbXAuZXh0cmFj
 dAorCSR7VE9VQ0h9ICR7QlVJTERfV1JLU1JDfS9jb250cmliL2xpYmJsdXJheS8uc3RhbXAuZXh0
 cmFjdAorCSR7VE9VQ0h9ICR7QlVJTERfV1JLU1JDfS9jb250cmliL2xpYmRjYS8uc3RhbXAuZXh0
 cmFjdAorCSR7VE9VQ0h9ICR7QlVJTERfV1JLU1JDfS9jb250cmliL2xpYmR2ZG5hdi8uc3RhbXAu
 ZXh0cmFjdAorCSR7VE9VQ0h9ICR7QlVJTERfV1JLU1JDfS9jb250cmliL2xpYmR2ZHJlYWQvLnN0
 YW1wLmV4dHJhY3QKKwkke1RPVUNIfSAke0JVSUxEX1dSS1NSQ30vY29udHJpYi9saWJta3YvLnN0
 YW1wLmV4dHJhY3QKKwkke1RPVUNIfSAke0JVSUxEX1dSS1NSQ30vY29udHJpYi9tcDR2Mi8uc3Rh
 bXAuZXh0cmFjdAorCSR7VE9VQ0h9ICR7QlVJTERfV1JLU1JDfS9jb250cmliL21wZWcyZGVjLy5z
 dGFtcC5leHRyYWN0CisJJHtUT1VDSH0gJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIveDI2NC8uc3Rh
 bXAuZXh0cmFjdAogCiBwb3N0LXBhdGNoOgogCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfG1hY2hp
 bmUvc291bmRjYXJkfHN5cy9zb3VuZGNhcmR8JyBcCiAJCSR7QlVJTERfV1JLU1JDfS9jb250cmli
 L2E1MmRlYy9hNTJkZWMvbGliYW8vYXVkaW9fb3V0X29zcy5jCiAJQCR7UkVJTlBMQUNFX0NNRH0g
 LWUgJ3N8LWxkbHwtbGN8IDsgc3xcW2RsXF18W2NdfCcgXAotCQkke0JVSUxEX1dSS1NSQ30vY29u
 dHJpYi9saWJibHVyYXkvbGliYmx1cmF5LTAuMC4xLXByZS0yMTMtZ2E4NjlkYTgvY29uZmlndXJl
 LmFjCisJCSR7QlVJTERfV1JLU1JDfS9jb250cmliL2xpYmJsdXJheS9saWJibHVyYXktMC4yLjMv
 Y29uZmlndXJlLmFjCiAJQCR7UkVJTlBMQUNFX0NNRH0gLWUgJ3N8PG1hbGxvY3w8c3RkbGlifCcg
 JHtXUktTUkN9L2xpYmhiL2ZpZm8uYwotCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfC91c3IvbG9j
 YWx8JHtMT0NBTEJBU0V9fCcgXAotCQkke1dSS1NSQ30vY29udHJpYi9saWJhc3MvbW9kdWxlLmRl
 ZnMgXAotCQkke1dSS1NSQ30vbGliaGIvbW9kdWxlLmRlZnMgJHtXUktTUkN9L3Rlc3QvbW9kdWxl
 LmRlZnMKIAlAJHtSRUlOUExBQ0VfQ01EfSAtZSAnc3xsaWJkdmRjc3NcLnNvXC4yfGxpYmR2ZGNz
 cy5zb3wnIFwKIAkJJHtCVUlMRF9XUktTUkN9L2NvbnRyaWIvbGliZHZkcmVhZC9saWJkdmRyZWFk
 L3NyYy9kdmRfaW5wdXQuYwogCUAke0ZJTkR9ICR7V1JLU1JDfSAtdHlwZSBmIC1uYW1lICcqLltj
 aF0nIC1wcmludDAgfCAke1hBUkdTfSAtMCBcCiAJCSR7UkVJTlBMQUNFX0NNRH0gLWUgJy8jaW5j
 bHVkZS9zfGhiXC5ofGhiLW9mLWhhbmRicmFrZS5ofCcKKwlAJHtSRUlOUExBQ0VfQ01EfSAtZSAi
 c3xUb29sUHJvYmUoICdHQ0MuZ2NjJywgICAnZ2NjJyx8VG9vbFByb2JlKCAnR0NDLmdjYycsICAg
 JyR7Q0N9Jyx8IiBcCisJCSR7V1JLU1JDfS9tYWtlL2NvbmZpZ3VyZS5weQorCUAke1JFSU5QTEFD
 RV9DTUR9IC1lICdzfGF2Y29kZWMgYXZmb3JtYXQgYXZ1dGlsIGF2cmVzYW1wbGV8YXZmb3JtYXQg
 YXZjb2RlYyBhdnJlc2FtcGxlIGF2dXRpbHwnIFwKKwkJJHtXUktTUkN9L2xpYmhiL21vZHVsZS5k
 ZWZzICR7V1JLU1JDfS90ZXN0L21vZHVsZS5kZWZzCisJJHtUUn0gLWQgJ1xyJyA8ICR7V1JLU1JD
 fS9jb250cmliL21wZWcyZGVjL0EwMi1nd2x1c2VyZGF0YS5wYXRjaCA+ICR7V1JLRElSfS9BMDIt
 Z3dsdXNlcmRhdGEucGF0Y2gKKwkke01WfSAke1dSS0RJUn0vQTAyLWd3bHVzZXJkYXRhLnBhdGNo
 ICR7V1JLU1JDfS9jb250cmliL21wZWcyZGVjLworCUAke1JFSU5QTEFDRV9DTUR9IC1FIFwKKwkJ
 LWUgJ3N8JSVSRVBfQ0MlJXwke0NDfXxnJyBcCisJCS1lICdzfCUlUkVQX0NYWCUlfCR7Q1hYfXxn
 JyBcCisJCS1lICdzfCUlUkVQX0FSQ0hTJSV8JHtDUFVUWVBFfXxnJyBcCisJCS1lICdzfCUlUkVQ
 X0klJXwtSSR7TE9DQUxCQVNFfS9pbmNsdWRlfGcnIFwKKwkJLWUgJ3N8JSVSRVBfTCUlfC1MJHtM
 T0NBTEJBU0V9L2xpYnxnJyBcCisJCS1lICdzfCUlUkVQX0lDT05WJSV8JHtJQ09OVl9MSUI6Uy8t
 bC8vfXxnJyBcCisJCSR7V1JLU1JDfS9jdXN0b20uZGVmcwogCiBkby1pbnN0YWxsOgotCSR7SU5T
 VEFMTF9QUk9HUkFNfSAke0JVSUxEX1dSS1NSQ30vSGFuZEJyYWtlQ0xJICR7UFJFRklYfS9iaW4K
 Kwkke0lOU1RBTExfUFJPR1JBTX0gJHtCVUlMRF9XUktTUkN9L0hhbmRCcmFrZUNMSSAke1NUQUdF
 RElSfSR7UFJFRklYfS9iaW4KIC5pZiAke1BPUlRfT1BUSU9OUzpNWDExfQotCSR7SU5TVEFMTF9Q
 Uk9HUkFNfSAke0JVSUxEX1dSS1NSQ30vZ3RrL3NyYy9naGIgJHtQUkVGSVh9L2Jpbi9IYW5kQnJh
 a2UKKwkke0lOU1RBTExfUFJPR1JBTX0gJHtCVUlMRF9XUktTUkN9L2d0ay9zcmMvZ2hiICR7U1RB
 R0VESVJ9JHtQUkVGSVh9L2Jpbi9IYW5kQnJha2UKIC5lbmRpZgogCiAuaW5jbHVkZSA8YnNkLnBv
 cnQucG9zdC5taz4KSW5kZXg6IGRpc3RpbmZvCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGRpc3RpbmZvCShyZXZp
 c2lvbiAzNDM0MzIpCisrKyBkaXN0aW5mbwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK
 LVNIQTI1NiAoaGFuZGJyYWtlL0hhbmRCcmFrZS0wLjkuOC50YXIuYnoyKSA9IGRiYTc1YTlmZjc3
 MmU0MTljMDFkNzU1MzJjMWJmMGQ3MjUzZTczZDdlYWQxODRlZWU3NTVjZDRjMTMzZGM3OTgKLVNJ
 WkUgKGhhbmRicmFrZS9IYW5kQnJha2UtMC45LjgudGFyLmJ6MikgPSAzMTU2OTY0CitTSEEyNTYg
 KGhhbmRicmFrZS9IYW5kQnJha2UtMC45LjkudGFyLmJ6MikgPSBhNzFkZDc3NDEwNGNkYTAwY2Zi
 NTFhODEzNTUwMzUxZDYzODI1Mzc5MWYyZjQxOWQwNGE2NmYzMTU4YTgzNWIzCitTSVpFIChoYW5k
 YnJha2UvSGFuZEJyYWtlLTAuOS45LnRhci5iejIpID0gOTMxNTE5OQogU0hBMjU2IChoYW5kYnJh
 a2UvYTUyZGVjLTAuNy40LnRhci5neikgPSA1NDk4MWFiMDhmYzA5YTY3NWI5OTI0MzcyY2YwY2Nh
 NWFhNTM2M2I5MThjNGMxOTA2NWMyZDQwZTI4NThiZTQ3CiBTSVpFIChoYW5kYnJha2UvYTUyZGVj
 LTAuNy40LnRhci5neikgPSAyNDI5NzgKIFNIQTI1NiAoaGFuZGJyYWtlL2ZhYWMtMS4yOC50YXIu
 Z3opID0gYzUxNDExOTlmNGNmYjE3ZDc0OWMzNmJhOGNmZTRiMjVmODM4ZGE2N2MyMmYwZmVjNDAy
 MjhiNmI5YzNkMTlkZgpAQCAtNiwxOCArNiwxMiBAQAogU0laRSAoaGFuZGJyYWtlL2ZhYWMtMS4y
 OC50YXIuZ3opID0gNjc4ODkxCiBTSEEyNTYgKGhhbmRicmFrZS9mYWFkMi0yLjcudGFyLmd6KSA9
 IGVlMjZlZDFlMTc3YzBjZDhmYTg0NThhNDgxYjE0YTBiMjRjYTBiNTE0NjhjOGI0YzhiNjc2ZmQz
 Y2VjY2QzMzAKIFNJWkUgKGhhbmRicmFrZS9mYWFkMi0yLjcudGFyLmd6KSA9IDExMzc0MDcKLVNI
 QTI1NiAoaGFuZGJyYWtlL2ZmbXBlZy12MC43LTE2OTYtZ2NhZTRmNGIudGFyLmJ6MikgPSBmMzli
 MmVhOGY0N2RiOWM4NGM5YmIwOTE3MDczMTJjZDE5YjkyN2Q4ZjRhOTU3YzIwMjIyYWRkMWE1ZGQy
 NDk3Ci1TSVpFIChoYW5kYnJha2UvZmZtcGVnLXYwLjctMTY5Ni1nY2FlNGY0Yi50YXIuYnoyKSA9
 IDQyNDI1NjUKLVNIQTI1NiAoaGFuZGJyYWtlL2ZvbnRjb25maWctMi44LjAudGFyLmd6KSA9IGZh
 MmExYzZlZWE2NTRkOWZjZTdhNGIxMjIwZjEwYzk5Y2RlYzg0OGRjY2FmMTYyNWMwMWYwNzZiMzEz
 ODIzMzUKLVNJWkUgKGhhbmRicmFrZS9mb250Y29uZmlnLTIuOC4wLnRhci5neikgPSAxNTQ4NDA5
 Ci1TSEEyNTYgKGhhbmRicmFrZS9mcmVldHlwZS0yLjQuNy50YXIuYnoyKSA9IGJhMjI2MjA0Nzk5
 NTQ1ODIzNzEyODYyNjhlZjc1ZTZlOTMyYzAyNzBlZTY3ZDY3OTdiYmYzZWQ5ZDMxYTVkNzcKLVNJ
 WkUgKGhhbmRicmFrZS9mcmVldHlwZS0yLjQuNy50YXIuYnoyKSA9IDE0OTA1NDMKK1NIQTI1NiAo
 aGFuZGJyYWtlL2xpYmF2LXY5LjYudGFyLmJ6MikgPSBlYTQxOTQxODY2ZmI2NGQ3ZTM2MzY4NGE0
 NzA1NTc0ZjY1Nzg2YmQ5ZWIwZmUxZjc5NmRlZTRjMGQ0NTlhYTUyCitTSVpFIChoYW5kYnJha2Uv
 bGliYXYtdjkuNi50YXIuYnoyKSA9IDQ2NzI3MjMKIFNIQTI1NiAoaGFuZGJyYWtlL2xhbWUtMy45
 OC50YXIuZ3opID0gNDAyMzVlODRkZmU0NzYwYWQzZjM1MjU5MGE2NGI3YmRhMTUwMmEzODZjOTdk
 MDYyMjlkZjM1NjQyNmUzNzY4NgogU0laRSAoaGFuZGJyYWtlL2xhbWUtMy45OC50YXIuZ3opID0g
 MTQxMTMxOAotU0hBMjU2IChoYW5kYnJha2UvbGliYXNzLTAuMTAuMC0xLnRhci5neikgPSBhMGM2
 NTJmNGE1YzFiZmQ1OGNkNDdmZjYyN2ZmZjJkZmJkNDcxYjQwZjc2NWFhOTZmZDFiMjUxYzAwNThi
 ODY3Ci1TSVpFIChoYW5kYnJha2UvbGliYXNzLTAuMTAuMC0xLnRhci5neikgPSA3NDUzMTQKLVNI
 QTI1NiAoaGFuZGJyYWtlL2xpYmJsdXJheS0wLjAuMS1wcmUtMjEzLWdhODY5ZGE4LnRhci5neikg
 PSA0YWE3MTI3MjAxYTVkM2Q0MTQ4ZDk5YzM3Yzc3MDFlZGU2ZTA3MDc0NTZkYWNjOGE1OTQ2NGRj
 NjhlMjMxYjc2Ci1TSVpFIChoYW5kYnJha2UvbGliYmx1cmF5LTAuMC4xLXByZS0yMTMtZ2E4Njlk
 YTgudGFyLmd6KSA9IDI0MTkyNworU0hBMjU2IChoYW5kYnJha2UvbGliYmx1cmF5LTAuMi4zLnRh
 ci5iejIpID0gMmM2NWNmYjAyYWVlYzMxNzIxZjllYTY1ZWUyYzA4NWE5YmZlMTYzZTk5ZGQwMWI1
 MmNjYjNmNTNiYTIwNWVlYQorU0laRSAoaGFuZGJyYWtlL2xpYmJsdXJheS0wLjIuMy50YXIuYnoy
 KSA9IDQ2NTIzOQogU0hBMjU2IChoYW5kYnJha2UvbGliZGNhLXI4MS1zdHJhcHBlZC50YXIuZ3op
 ID0gYWIyNTE5YWY2YzJmMTI0MTFhMmJkNjc0YjgzNjE1YWY5YjBkNWZiMDlmMjhhZDVkYWI3MTRl
 YTFiZmFiOWRmMQogU0laRSAoaGFuZGJyYWtlL2xpYmRjYS1yODEtc3RyYXBwZWQudGFyLmd6KSA9
 IDUyMzI4MgogU0hBMjU2IChoYW5kYnJha2UvbGliZHZkbmF2LXN2bjExNjgudGFyLmd6KSA9IDdj
 ZjRmZjZhYjBiNWQzZGIzYzMwMGZjM2NkYjI0ZTFhZDU5ZjIyZGQ5MDM1MmRmMDc1YTYwNGJjNjk4
 ZDAxYzcKQEAgLTI2LDE5ICsyMCw5IEBACiBTSVpFIChoYW5kYnJha2UvbGliZHZkcmVhZC1zdm4x
 MTY4LnRhci5neikgPSA5NDYwMzMKIFNIQTI1NiAoaGFuZGJyYWtlL2xpYm1rdi0wLjYuNS0wLWc4
 MjA3NWFlLnRhci5neikgPSA3MzE0YTI5NmM2OGY0MmI4MjYxNjQwNzRhOTZlMjQ3ZTUyZDhlZjky
 ODdjMjFlYmM1ZmUxYmY5ZTczNjQzZTk3CiBTSVpFIChoYW5kYnJha2UvbGlibWt2LTAuNi41LTAt
 ZzgyMDc1YWUudGFyLmd6KSA9IDMyNzQyCi1TSEEyNTYgKGhhbmRicmFrZS9saWJvZ2ctMS4zLjAu
 dGFyLmd6KSA9IGE4ZGU4MDc2MzEwMTQ2MTU1NDlkMjM1NmZkMzY2NDE4MzNiODI4ODIyMWNlYTIx
 NGY4YTcyNzUwZWZlOTM3ODAKLVNJWkUgKGhhbmRicmFrZS9saWJvZ2ctMS4zLjAudGFyLmd6KSA9
 IDQyNTE0NAotU0hBMjU2IChoYW5kYnJha2UvbGlic2FtcGxlcmF0ZS0wLjEuNC50YXIuZ3opID0g
 NGI0YWYzZWNhZWUwNWM4ODc1YTliMTEzYzZhMmY4MTZmMDZmMjgzZmI4ODI5MTRlNTdiMjFjMGIw
 OGI2N2I3NQotU0laRSAoaGFuZGJyYWtlL2xpYnNhbXBsZXJhdGUtMC4xLjQudGFyLmd6KSA9IDQy
 NTkyNDQKLVNIQTI1NiAoaGFuZGJyYWtlL2xpYnRoZW9yYS0xLjEuMC50YXIuYnoyKSA9IDc0YmU5
 ZmU5Zjg1ZDE4YzQ1YmRjYmIwMThjZWJmMTJjNzRlMjIzNGFlZWNiNGQ0YzRjYjkyZDgwYmRkMjg3
 ZTIKLVNJWkUgKGhhbmRicmFrZS9saWJ0aGVvcmEtMS4xLjAudGFyLmJ6MikgPSAxNzg1NjM0Ci1T
 SEEyNTYgKGhhbmRicmFrZS9saWJ2b3JiaXMtYW90dXZfYjYuMDMudGFyLmJ6MikgPSA5NTQ1NTQy
 MGYwN2U0YjNhYmRmMzJiZGE5ZjU5MjFlOWVkM2YxYWZkYzM3MzkwOThkYzA5MDE1MGE0MmZkN2Zk
 Ci1TSVpFIChoYW5kYnJha2UvbGlidm9yYmlzLWFvdHV2X2I2LjAzLnRhci5iejIpID0gMTI1MDY1
 OQotU0hBMjU2IChoYW5kYnJha2UvbGlieG1sMi0yLjcuNy50YXIuZ3opID0gYWY1Yjc4MTQxOGJh
 NGZmZjU1NmZhNDNjNTAwODY2NThlYThhMmYzMTkwOWMyYjYyNWMyY2U5MTNhMWQ5ZWI2OAotU0la
 RSAoaGFuZGJyYWtlL2xpYnhtbDItMi43LjcudGFyLmd6KSA9IDQ4Njg1MDIKIFNIQTI1NiAoaGFu
 ZGJyYWtlL21wNHYyLXRydW5rLXIzNTUudGFyLmJ6MikgPSA1YjdkNGU2MmRmNTA2YjEyNDY0NjNk
 YTgyY2MyZjAyNDE1ZWI0NjJlNmNjZDU4NDhmOThmNWNkY2ZjMWYzZDRmCiBTSVpFIChoYW5kYnJh
 a2UvbXA0djItdHJ1bmstcjM1NS50YXIuYnoyKSA9IDQ3NTQ4OAogU0hBMjU2IChoYW5kYnJha2Uv
 bXBlZzJkZWMtMC41LjEudGFyLmd6KSA9IDE2MTUzOTA2MWFhODk4NjQ5NjhhNTE1MGVkNmM2YTAy
 OGE4MzBjNDg2OGY3ZGQ3YzUwMDczMmJhZWY0N2ZiNzEKIFNJWkUgKGhhbmRicmFrZS9tcGVnMmRl
 Yy0wLjUuMS50YXIuZ3opID0gNTIyNDA1Ci1TSEEyNTYgKGhhbmRicmFrZS94MjY0LXIyMTQ2LWJj
 ZDQxZGIudGFyLmd6KSA9IDdiM2QwYWQzMDk0MjZhZDQ5ZmYyMWRmNGQyZWU1NTUzYjU3NjliYzJi
 ZjJiN2FlNTBmMzdmNWZjNzJkMTkwYjEKLVNJWkUgKGhhbmRicmFrZS94MjY0LXIyMTQ2LWJjZDQx
 ZGIudGFyLmd6KSA9IDY1NjA4OQorU0hBMjU2IChoYW5kYnJha2UveDI2NC1yMjI3My1iMzA2NWU2
 LnRhci5neikgPSA5NTZjODJjOTMxODc0MGVmMzc0NGNmNmU3NTJmYjYxODFiZTA3MTYyNzNlMmU4
 OTc2MzA2NjI0ZjA4NjRhODE1CitTSVpFIChoYW5kYnJha2UveDI2NC1yMjI3My1iMzA2NWU2LnRh
 ci5neikgPSA2ODE0ODkKSW5kZXg6IGZpbGVzL3BhdGNoLWNvbnRyaWItZmZtcGVnLUEwNC14ODYt
 YXNtLWgucGF0Y2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PQotLS0gZmlsZXMvcGF0Y2gtY29udHJpYi1mZm1wZWctQTA0
 LXg4Ni1hc20taC5wYXRjaAkocmV2aXNpb24gMCkKKysrIGZpbGVzL3BhdGNoLWNvbnRyaWItZmZt
 cGVnLUEwNC14ODYtYXNtLWgucGF0Y2gJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxNCBAQAor
 LS0tIC9kZXYvbnVsbAkyMDE0LTAyLTA5IDIwOjU1OjAwLjAwMDAwMDAwMCArMDEwMAorKysrIGNv
 bnRyaWIvZmZtcGVnL0EwNC14ODYtYXNtLWgucGF0Y2gJMjAxNC0wMi0wOSAyMDo1NTowOS41NDg4
 MDc5NTkgKzAxMDAKK0BAIC0wLDAgKzEsMTEgQEAKKystLS0gYS9saWJhdnV0aWwveDg2L2FzbS5o
 CTIwMTQtMDItMDkgMjA6Mzg6NDYuOTY0ODc1MDAwICswMTAwCisrKysrIGIvbGliYXZ1dGlsL3g4
 Ni9hc20uaAkyMDE0LTAyLTA5IDIwOjQ0OjU3LjkyODg0OTQxNyArMDEwMAorK0BAIC02OCw3ICs2
 OCw3IEBACisrIHR5cGVkZWYgaW50IHg4Nl9yZWc7CisrICNlbmRpZgorKyAKKystI2RlZmluZSBI
 QVZFXzdSRUdTIChBUkNIX1g4Nl82NCB8fCAoSEFWRV9FQlhfQVZBSUxBQkxFICYmIEhBVkVfRUJQ
 X0FWQUlMQUJMRSkpCisrKyNkZWZpbmUgSEFWRV83UkVHUyAoQVJDSF9YODZfNjQpCisrICNkZWZp
 bmUgSEFWRV82UkVHUyAoQVJDSF9YODZfNjQgfHwgKEhBVkVfRUJYX0FWQUlMQUJMRSB8fCBIQVZF
 X0VCUF9BVkFJTEFCTEUpKQorKyAKKysgI2lmIEFSQ0hfWDg2XzY0ICYmIGRlZmluZWQoUElDKQoK
 UHJvcGVydHkgY2hhbmdlcyBvbjogZmlsZXMvcGF0Y2gtY29udHJpYi1mZm1wZWctQTA0LXg4Ni1h
 c20taC5wYXRjaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
 X19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBmYnNkOm5va2V5d29yZHMKIyMgLTAsMCArMSAj
 IworeWVzClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKQWRkZWQ6IHN2bjplb2wtc3R5
 bGUKIyMgLTAsMCArMSAjIworbmF0aXZlClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgcHJvcGVydHkK
 QWRkZWQ6IHN2bjptaW1lLXR5cGUKIyMgLTAsMCArMSAjIwordGV4dC9wbGFpbgpcIE5vIG5ld2xp
 bmUgYXQgZW5kIG9mIHByb3BlcnR5CkluZGV4OiBmaWxlcy9wYXRjaC1jb250cmliLW1wNHYyLVAw
 MS1mcmVlYnNkLWNsYW5nLW5hbWVzcGFjZS5wYXRjaAo9PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBmaWxlcy9wYXRj
 aC1jb250cmliLW1wNHYyLVAwMS1mcmVlYnNkLWNsYW5nLW5hbWVzcGFjZS5wYXRjaAkocmV2aXNp
 b24gMCkKKysrIGZpbGVzL3BhdGNoLWNvbnRyaWItbXA0djItUDAxLWZyZWVic2QtY2xhbmctbmFt
 ZXNwYWNlLnBhdGNoCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTIwIEBACistLS0gL2Rldi9u
 dWxsCTIwMTQtMDItMDkgMTc6MDA6MDAuMDAwMDAwMDAwICswMTAwCisrKysgY29udHJpYi9tcDR2
 Mi9QMDEtZnJlZWJzZC1jbGFuZy1uYW1lc3BhY2UucGF0Y2gJMjAxNC0wMi0wOSAxNjo1Mjo1OS4x
 MjQ4MDg3ODggKzAxMDAKK0BAIC0wLDAgKzEsMTE3IEBACisrZGlmZiAtTmF1ciBtcDR2Mi10cnVu
 ay1yMzU1Lm9yaWcvc3JjL2JtZmYvdHlwZWJtZmYuY3BwIG1wNHYyLXRydW5rLXIzNTUvc3JjL2Jt
 ZmYvdHlwZWJtZmYuY3BwCisrLS0tIG1wNHYyLXRydW5rLXIzNTUub3JpZy9zcmMvYm1mZi90eXBl
 Ym1mZi5jcHAJMjAwOS0wNS0yMSAwNDo1MjozMS4wMDAwMDAwMDAgKzAyMDAKKysrKysgbXA0djIt
 dHJ1bmstcjM1NS9zcmMvYm1mZi90eXBlYm1mZi5jcHAJMjAxNC0wMi0wNiAwNDoxODoxNS4wMDAw
 MDAwMDAgKzAxMDAKKytAQCAtMjMsMTkgKzIzLDEyIEBACisrIAorKyAjaW5jbHVkZSAiaW1wbC5o
 IgorKyAKKystLy8gVlN0dWRpbyBpZGlvY3kgcHJldmVudHMgZGVmaW5pbmcgdGVtcGxhdGUgaW5z
 dGFuY2VkIHN0YXRpYyBkYXRhCisrLS8vIGluIGEgbmFtZXNwYWNlLiBXb3JrYXJvdW5kIGl0IGJ5
 IGRlZmluaW5nIGluIGdsb2JhbCBzY29wZS4KKystLy8gT3RoZXIgcGxhdGZvcm1zIHdpbGwgY29u
 dGludWUgdG8gcHV0IHRoaW5ncyBpbiB0aGUgcHJvcGVyIG5hbWVzcGFjZS4KKystI2lmIGRlZmlu
 ZWQoIF9NU0NfVkVSICkKKystdXNpbmcgbmFtZXNwYWNlIG1wNHYyOjppbXBsOjpibWZmOworKy0j
 ZWxzZQorKy1uYW1lc3BhY2UgbXA0djIgeyBuYW1lc3BhY2UgaW1wbCB7IG5hbWVzcGFjZSBibWZm
 IHsKKystI2VuZGlmCisrK25hbWVzcGFjZSBtcDR2MiB7IG5hbWVzcGFjZSBpbXBsIHsgCisrIAor
 KyAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisrIAorKyB0ZW1wbGF0ZSA8PgorKy1jb25zdCBFbnVt
 TGFuZ3VhZ2VDb2RlOjpFbnRyeSBFbnVtTGFuZ3VhZ2VDb2RlOjpkYXRhW10gPSB7CisrK2NvbnN0
 IGJtZmY6OkVudW1MYW5ndWFnZUNvZGU6OkVudHJ5IGJtZmY6OkVudW1MYW5ndWFnZUNvZGU6OmRh
 dGFbXSA9IHsKKysgICAgIHsgbXA0djI6OmltcGw6OmJtZmY6OklMQ19BQVIsICAiYWFyIiwgICJB
 ZmFyIiB9LAorKyAgICAgeyBtcDR2Mjo6aW1wbDo6Ym1mZjo6SUxDX0FCSywgICJhYmsiLCAgIkFi
 a2hhemlhbiIgfSwKKysgICAgIHsgbXA0djI6OmltcGw6OmJtZmY6OklMQ19BQ0UsICAiYWNlIiwg
 ICJBY2hpbmVzZSIgfSwKKytAQCAtNTI2LDkgKzUxOSw3IEBACisrIAorKyAvLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vCisrIAorKy0jaWYgZGVmaW5lZCggX01TQ19WRVIgKQorKy1uYW1lc3BhY2UgbXA0
 djIgeyBuYW1lc3BhY2UgaW1wbCB7IG5hbWVzcGFjZSBibWZmIHsKKystI2VuZGlmCisrK25hbWVz
 cGFjZSBibWZmIHsKKysgCisrIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKysgCisrZGlmZiAtTmF1
 ciBtcDR2Mi10cnVuay1yMzU1Lm9yaWcvc3JjL2l0bWYvdHlwZS5jcHAgbXA0djItdHJ1bmstcjM1
 NS9zcmMvaXRtZi90eXBlLmNwcAorKy0tLSBtcDR2Mi10cnVuay1yMzU1Lm9yaWcvc3JjL2l0bWYv
 dHlwZS5jcHAJMjAwOS0wNS0yMSAwNDo1MjoyOS4wMDAwMDAwMDAgKzAyMDAKKysrKysgbXA0djIt
 dHJ1bmstcjM1NS9zcmMvaXRtZi90eXBlLmNwcAkyMDE0LTAyLTA2IDA0OjE4OjE5LjAwMDAwMDAw
 MCArMDEwMAorK0BAIC0yNCwxOSArMjQsMTIgQEAKKysgCisrICNpbmNsdWRlICJpbXBsLmgiCisr
 IAorKy0vLyBWU3R1ZGlvIGlkaW9jeSBwcmV2ZW50cyBkZWZpbmluZyB0ZW1wbGF0ZSBpbnN0YW5j
 ZWQgc3RhdGljIGRhdGEKKystLy8gaW4gYSBuYW1lc3BhY2UuIFdvcmthcm91bmQgaXQgYnkgZGVm
 aW5pbmcgaW4gZ2xvYmFsIHNjb3BlLgorKy0vLyBPdGhlciBwbGF0Zm9ybXMgd2lsbCBjb250aW51
 ZSB0byBwdXQgdGhpbmdzIGluIHRoZSBwcm9wZXIgbmFtZXNwYWNlLgorKy0jaWYgZGVmaW5lZCgg
 X01TQ19WRVIgKQorKy11c2luZyBuYW1lc3BhY2UgbXA0djI6OmltcGw6Oml0bWY7CisrLSNlbHNl
 CisrLW5hbWVzcGFjZSBtcDR2MiB7IG5hbWVzcGFjZSBpbXBsIHsgbmFtZXNwYWNlIGl0bWYgewor
 Ky0jZW5kaWYKKysrbmFtZXNwYWNlIG1wNHYyIHsgbmFtZXNwYWNlIGltcGwgeworKyAKKysgLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLworKyAKKysgdGVtcGxhdGUgPD4KKystY29uc3QgRW51bUJhc2lj
 VHlwZTo6RW50cnkgRW51bUJhc2ljVHlwZTo6ZGF0YVtdID0geworKytjb25zdCBpdG1mOjpFbnVt
 QmFzaWNUeXBlOjpFbnRyeSBpdG1mOjpFbnVtQmFzaWNUeXBlOjpkYXRhW10gPSB7CisrICAgICB7
 IG1wNHYyOjppbXBsOjppdG1mOjpCVF9JTVBMSUNJVCwgICJpbXBsaWNpdCIsICAiaW1wbGljaXQi
 IH0sCisrICAgICB7IG1wNHYyOjppbXBsOjppdG1mOjpCVF9VVEY4LCAgICAgICJ1dGY4IiwgICAg
 ICAiVVRGLTgiIH0sCisrICAgICB7IG1wNHYyOjppbXBsOjppdG1mOjpCVF9VVEYxNiwgICAgICJ1
 dGYxNiIsICAgICAiVVRGLTE2IiB9LAorK0BAIC02NCw3ICs1Nyw3IEBACisrIC8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8KKysgCisrIHRlbXBsYXRlIDw+CisrLWNvbnN0IEVudW1HZW5yZVR5cGU6OkVu
 dHJ5IEVudW1HZW5yZVR5cGU6OmRhdGFbXSA9IHsKKysrY29uc3QgaXRtZjo6RW51bUdlbnJlVHlw
 ZTo6RW50cnkgaXRtZjo6RW51bUdlbnJlVHlwZTo6ZGF0YVtdID0geworKyAgICAgeyBtcDR2Mjo6
 aW1wbDo6aXRtZjo6R0VOUkVfQkxVRVMsICAgICAgICAgICAgICJibHVlcyIsICAgICAgICAgICAg
 ICJCbHVlcyIgfSwKKysgICAgIHsgbXA0djI6OmltcGw6Oml0bWY6OkdFTlJFX0NMQVNTSUNfUk9D
 SywgICAgICAiY2xhc3NpY3JvY2siLCAgICAgICAiQ2xhc3NpYyBSb2NrIiB9LAorKyAgICAgeyBt
 cDR2Mjo6aW1wbDo6aXRtZjo6R0VOUkVfQ09VTlRSWSwgICAgICAgICAgICJjb3VudHJ5IiwgICAg
 ICAgICAgICJDb3VudHJ5IiB9LAorK0BAIC0yMDAsNyArMTkzLDcgQEAKKysgLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLworKyAKKysgdGVtcGxhdGUgPD4KKystY29uc3QgRW51bVN0aWtUeXBlOjpFbnRy
 eSBFbnVtU3Rpa1R5cGU6OmRhdGFbXSA9IHsKKysrY29uc3QgaXRtZjo6RW51bVN0aWtUeXBlOjpF
 bnRyeSBpdG1mOjpFbnVtU3Rpa1R5cGU6OmRhdGFbXSA9IHsKKysgICAgIHsgbXA0djI6OmltcGw6
 Oml0bWY6OlNUSUtfT0xEX01PVklFLCAgICAib2xkbW92aWUiLCAgICAiTW92aWUiIH0sCisrICAg
 ICB7IG1wNHYyOjppbXBsOjppdG1mOjpTVElLX05PUk1BTCwgICAgICAgIm5vcm1hbCIsICAgICAg
 Ik5vcm1hbCIgfSwKKysgICAgIHsgbXA0djI6OmltcGw6Oml0bWY6OlNUSUtfQVVESU9CT09LLCAg
 ICAiYXVkaW9ib29rIiwgICAiQXVkaW8gQm9vayIgfSwKKytAQCAtMjE2LDcgKzIwOSw3IEBACisr
 IC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKysgCisrIHRlbXBsYXRlIDw+CisrLWNvbnN0IEVudW1B
 Y2NvdW50VHlwZTo6RW50cnkgRW51bUFjY291bnRUeXBlOjpkYXRhW10gPSB7CisrK2NvbnN0IGl0
 bWY6OkVudW1BY2NvdW50VHlwZTo6RW50cnkgaXRtZjo6RW51bUFjY291bnRUeXBlOjpkYXRhW10g
 PSB7CisrICAgICB7IG1wNHYyOjppbXBsOjppdG1mOjpBVF9JVFVORVMsICAiaXR1bmVzIiwgICAi
 aVR1bmVzIiB9LAorKyAgICAgeyBtcDR2Mjo6aW1wbDo6aXRtZjo6QVRfQU9MLCAgICAgImFvbCIs
 ICAgICAgIkFPTCIgfSwKKysgCisrQEAgLTIyNiw3ICsyMTksNyBAQAorKyAvLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vCisrIAorKyB0ZW1wbGF0ZSA8PgorKy1jb25zdCBFbnVtQ291bnRyeUNvZGU6OkVu
 dHJ5IEVudW1Db3VudHJ5Q29kZTo6ZGF0YVtdID0geworKytjb25zdCBpdG1mOjpFbnVtQ291bnRy
 eUNvZGU6OkVudHJ5IGl0bWY6OkVudW1Db3VudHJ5Q29kZTo6ZGF0YVtdID0geworKyAgICAgeyBt
 cDR2Mjo6aW1wbDo6aXRtZjo6Q0NfVVNBLCAgInVzYSIsICAgIlVuaXRlZCBTdGF0ZXMiIH0sCisr
 ICAgICB7IG1wNHYyOjppbXBsOjppdG1mOjpDQ19VU0EsICAiZnJhIiwgICAiRnJhbmNlIiB9LAor
 KyAgICAgeyBtcDR2Mjo6aW1wbDo6aXRtZjo6Q0NfREVVLCAgImdlciIsICAgIkdlcm1hbnkiIH0s
 CisrQEAgLTI1Niw3ICsyNDksNyBAQAorKyAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisrIAorKyB0
 ZW1wbGF0ZSA8PgorKy1jb25zdCBFbnVtQ29udGVudFJhdGluZzo6RW50cnkgRW51bUNvbnRlbnRS
 YXRpbmc6OmRhdGFbXSA9IHsKKysrY29uc3QgaXRtZjo6RW51bUNvbnRlbnRSYXRpbmc6OkVudHJ5
 IGl0bWY6OkVudW1Db250ZW50UmF0aW5nOjpkYXRhW10gPSB7CisrICAgICB7IG1wNHYyOjppbXBs
 OjppdG1mOjpDUl9OT05FLCAgICAgICJub25lIiwgICAgICAgIk5vbmUiIH0sCisrICAgICB7IG1w
 NHYyOjppbXBsOjppdG1mOjpDUl9DTEVBTiwgICAgICJjbGVhbiIsICAgICAgIkNsZWFuIiB9LAor
 KyAgICAgeyBtcDR2Mjo6aW1wbDo6aXRtZjo6Q1JfRVhQTElDSVQsICAiZXhwbGljaXQiLCAgICJF
 eHBsaWNpdCIgfSwKKytAQCAtMjY2LDkgKzI1OSw3IEBACisrIAorKyAvLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vCisrIAorKy0jaWYgZGVmaW5lZCggX01TQ19WRVIgKQorKy1uYW1lc3BhY2UgbXA0djIg
 eyBuYW1lc3BhY2UgaW1wbCB7IG5hbWVzcGFjZSBpdG1mIHsKKystI2VuZGlmCisrK25hbWVzcGFj
 ZSBpdG1mIHsKKysgCisrIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
 Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKysgCgpQcm9wZXJ0eSBjaGFu
 Z2VzIG9uOiBmaWxlcy9wYXRjaC1jb250cmliLW1wNHYyLVAwMS1mcmVlYnNkLWNsYW5nLW5hbWVz
 cGFjZS5wYXRjaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
 X19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiMjIC0wLDAgKzEgIyMK
 K3RleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpBZGRlZDogZmJzZDpu
 b2tleXdvcmRzCiMjIC0wLDAgKzEgIyMKK3llcwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3Bl
 cnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAgKzEgIyMKK25hdGl2ZQpcIE5vIG5ld2xp
 bmUgYXQgZW5kIG9mIHByb3BlcnR5CkluZGV4OiBmaWxlcy9wYXRjaC1jb250cmliX2ZvbnRjb25m
 aWdfbW9kdWxlLmRlZnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZmlsZXMvcGF0Y2gtY29udHJpYl9mb250Y29u
 ZmlnX21vZHVsZS5kZWZzCShyZXZpc2lvbiAzNDM0MzIpCisrKyBmaWxlcy9wYXRjaC1jb250cmli
 X2ZvbnRjb25maWdfbW9kdWxlLmRlZnMJKHdvcmtpbmcgY29weSkKQEAgLTEsMTEgKzAsMCBAQAot
 LS0tIC4vY29udHJpYi9mb250Y29uZmlnL21vZHVsZS5kZWZzLm9yaWcJMjAxMC0wOS0yOCAxODox
 MDo0OS4wMDAwMDAwMDAgLTA0MDAKLSsrKyAuL2NvbnRyaWIvZm9udGNvbmZpZy9tb2R1bGUuZGVm
 cwkyMDExLTA1LTI0IDA1OjUwOjQ2LjA2MDgwODI4MyAtMDQwMAotQEAgLTE5LDYgKzE5LDggQEAK
 LSAgICAgRk9OVENPTkZJRy5jb25maWdfYXJjaG9wdGlvbiAgPSAtLXdpdGgtYXJjaD1pMzg2Ci0g
 ZWxzZSBpZmVxICgkKEJVSUxELnN5c3RlbSksbGludXgpCi0gICAgIEZPTlRDT05GSUcuY2NfYXJj
 aG9wdGlvbiAgICAgID0gCi0rZWxzZSBpZmVxICgkKEJVSUxELnN5c3RlbSksZnJlZWJzZCkKLSsg
 ICAgRk9OVENPTkZJRy5jY19hcmNob3B0aW9uICAgICAgPSAKLSBlbHNlCi0gICAgIEZPTlRDT05G
 SUcuY2NfYXJjaG9wdGlvbiAgICAgID0gLWFyY2ggJChGT05UQ09ORklHLkdDQy5hcmNocykKLSAg
 ICAgRk9OVENPTkZJRy5jb25maWdfYXJjaG9wdGlvbiAgPSAtLXdpdGgtYXJjaD0kKEZPTlRDT05G
 SUcuR0NDLmFyY2hzKQpJbmRleDogZmlsZXMvcGF0Y2gtY29udHJpYl9mcmVldHlwZV9tb2R1bGUu
 ZGVmcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09Ci0tLSBmaWxlcy9wYXRjaC1jb250cmliX2ZyZWV0eXBlX21vZHVsZS5k
 ZWZzCShyZXZpc2lvbiAzNDM0MzIpCisrKyBmaWxlcy9wYXRjaC1jb250cmliX2ZyZWV0eXBlX21v
 ZHVsZS5kZWZzCSh3b3JraW5nIGNvcHkpCkBAIC0xLDggKzAsMCBAQAotLS0tIC4vY29udHJpYi9m
 cmVldHlwZS9tb2R1bGUuZGVmcy5vcmlnCTIwMTAtMDktMjggMTg6MTA6NDkuMDAwMDAwMDAwIC0w
 NDAwCi0rKysgLi9jb250cmliL2ZyZWV0eXBlL21vZHVsZS5kZWZzCTIwMTEtMDUtMjQgMDU6NTA6
 NDYuMDYyODA5MzE2IC0wNDAwCi1AQCAtMywzICszLDUgQEAKLSAKLSBGUkVFVFlQRS5GRVRDSC51
 cmwgPSBodHRwOi8vZG93bmxvYWQubTBrLm9yZy9oYW5kYnJha2UvY29udHJpYi9mcmVldHlwZS0y
 LjMuOS50YXIuZ3oKLSBGUkVFVFlQRS5FWFRSQUNULnRhcmJhc2UgPSBmcmVldHlwZS0yLjMuOQot
 K0ZSRUVUWVBFLkNPTkZJR1VSRS5lbnYuR05VTUFLRSA9IEdOVU1BS0U9ImdtYWtlIgotK0ZSRUVU
 WVBFLkNPTkZJR1VSRS5lbnYuYXJncyArPSAhR05VTUFLRQpJbmRleDogZmlsZXMvcGF0Y2gtY29u
 dHJpYl9saWJhc3NfbW9kdWxlLmRlZnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZmlsZXMvcGF0Y2gtY29udHJp
 Yl9saWJhc3NfbW9kdWxlLmRlZnMJKHJldmlzaW9uIDM0MzQzMikKKysrIGZpbGVzL3BhdGNoLWNv
 bnRyaWJfbGliYXNzX21vZHVsZS5kZWZzCSh3b3JraW5nIGNvcHkpCkBAIC0xLDE0ICswLDAgQEAK
 LS0tLSAuL2NvbnRyaWIvbGliYXNzL21vZHVsZS5kZWZzLm9yaWcJMjAxMC0wOS0yOCAxODoxMDo0
 OS4wMDAwMDAwMDAgLTA0MDAKLSsrKyAuL2NvbnRyaWIvbGliYXNzL21vZHVsZS5kZWZzCTIwMTEt
 MDUtMjQgMDU6NTA6NDYuMDk2ODA3NjY3IC0wNDAwCi1AQCAtNyw5ICs3LDkgQEAKLSAjIERpc2Fi
 bGUgYXMgbWFueSBleHRlcm5hbCBkZXBlbmRlbmNpZXMgYXMgSSBjYW4gZ2V0IGF3YXkgd2l0aAot
 ICMgYW5kIHRlbGwgY29uZmlndXJlIHdoZXJlIHRvIGZpbmQgb3VyIHZlcnNpb24gb2YgZnJlZXR5
 cGUKLSBMSUJBU1MuQ09ORklHVVJFLmV4dHJhID0gXAotLSAgICAtLWRpc2FibGUtcG5nIC0tZGlz
 YWJsZS1lbmNhIFwKLSsgICAgLS1kaXNhYmxlLXBuZyAtLWRpc2FibGUtZW5jYSAtLWRpc2FibGUt
 aGFyZmJ1enogXAotICAgICBGUkVFVFlQRV9MSUJTPSItTCQoY2FsbCBmbi5BQlNPTFVURSwkKENP
 TlRSSUIuYnVpbGQvKSlsaWIgLWxmcmVldHlwZSIgXAotLSAgICBGUkVFVFlQRV9DRkxBR1M9Ii1J
 JChjYWxsIGZuLkFCU09MVVRFLCQoQ09OVFJJQi5idWlsZC8pKWluY2x1ZGUvZnJlZXR5cGUyIiBc
 Ci0rICAgIEZSRUVUWVBFX0NGTEFHUz0iLUkkKGNhbGwgZm4uQUJTT0xVVEUsJChDT05UUklCLmJ1
 aWxkLykpaW5jbHVkZS9mcmVldHlwZTIgLUkvdXNyL2xvY2FsL2luY2x1ZGUiIFwKLSAgICAgRk9O
 VENPTkZJR19MSUJTPSItTCQoY2FsbCBmbi5BQlNPTFVURSwkKENPTlRSSUIuYnVpbGQvKSlsaWIg
 LWxmb250Y29uZmlnIiBcCi0gICAgIEZPTlRDT05GSUdfQ0ZMQUdTPSItSSQoY2FsbCBmbi5BQlNP
 TFVURSwkKENPTlRSSUIuYnVpbGQvKSlpbmNsdWRlIgotIApJbmRleDogZmlsZXMvcGF0Y2gtY3Vz
 dG9tLmRlZnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PQotLS0gZmlsZXMvcGF0Y2gtY3VzdG9tLmRlZnMJKHJldmlzaW9u
 IDApCisrKyBmaWxlcy9wYXRjaC1jdXN0b20uZGVmcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx
 LDE5IEBACistLS0gL2Rldi9udWxsCTIwMTQtMDItMDkgMTc6MDA6MDAuMDAwMDAwMDAwICswMTAw
 CisrKysgY3VzdG9tLmRlZnMJMjAxNC0wMi0wOSAxNjo1Mjo1OS4xMjU4MDg1MTkgKzAxMDAKK0BA
 IC0wLDAgKzEsMTYgQEAKKysjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
 IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworKyMgZm9yIEdlbmVyaWMg
 R0NDIGN1c3RvbSBzZXR0aW5nCisrCisrR0NDLmdjYyAgICAgICAgID0gJSVSRVBfQ0MlJQorK0dD
 Qy5neHggICAgICAgICA9ICUlUkVQX0NYWCUlCisrR0NDLmFyY2hzICAgICAgID0gJSVSRVBfQVJD
 SFMlJQorK0dDQy5hcmdzLkkgICAgICs9ICUlUkVQX0klJQorK0dDQy5hcmdzLkwgICAgICs9ICUl
 UkVQX0wlJQorKworKworKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
 IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCisrIyBmb3IgQ0xJIGN1c3Rv
 bSBzZXR0aW5nCisrCisrTElCSEIuR0NDLkQgKz0gU1lTX0ZSRUVCU0QKKytURVNULkdDQy5sICs9
 IHB0aHJlYWQgbSAlJVJFUF9JQ09OViUlCisrCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBmaWxlcy9w
 YXRjaC1jdXN0b20uZGVmcwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
 X19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiMjIC0wLDAg
 KzEgIyMKK3RleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpBZGRlZDog
 ZmJzZDpub2tleXdvcmRzCiMjIC0wLDAgKzEgIyMKK3llcwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m
 IHByb3BlcnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAgKzEgIyMKK25hdGl2ZQpcIE5v
 IG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkluZGV4OiBmaWxlcy9wYXRjaC1saWJoYl9tb2R1
 bGUuZGVmcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09Ci0tLSBmaWxlcy9wYXRjaC1saWJoYl9tb2R1bGUuZGVmcwkocmV2
 aXNpb24gMzQzNDMyKQorKysgZmlsZXMvcGF0Y2gtbGliaGJfbW9kdWxlLmRlZnMJKHdvcmtpbmcg
 Y29weSkKQEAgLTEsMTIgKzAsMCBAQAotLS0tIC4vbGliaGIvbW9kdWxlLmRlZnMub3JpZwkyMDEw
 LTEwLTIzIDEzOjIxOjU2LjAwMDAwMDAwMCAtMDQwMAotKysrIC4vbGliaGIvbW9kdWxlLmRlZnMJ
 MjAxMS0wNS0yNCAwNTo1MDo0Ni4wOTc4MDg4MTIgLTA0MDAKLUBAIC00Nyw2ICs0Nyw5IEBACi0g
 ICAgIExJQkhCLmMgKz0gJCh3aWxkY2FyZCAkKExJQkhCLnNyYy8pcGxhdGZvcm0vbWFjb3N4Lyou
 YykKLSBlbHNlIGlmZXEgKCQoQlVJTEQuc3lzdGVtKSxsaW51eCkKLSAgICAgTElCSEIuR0NDLkQg
 Kz0gU1lTX0xJTlVYIF9MQVJHRUZJTEVfU09VUkNFIF9GSUxFX09GRlNFVF9CSVRTPTY0Ci0rZWxz
 ZSBpZmVxICgkKEJVSUxELnN5c3RlbSksZnJlZWJzZCkKLSsgICAgTElCSEIuR0NDLkQgKz0gU1lT
 X0ZSRUVCU0QKLSsgICAgTElCSEIuR0NDLkkgKz0gL3Vzci9sb2NhbC9pbmNsdWRlCi0gZWxzZSBp
 ZmVxICgkKEJVSUxELnN5c3RlbSksbWluZ3cpCi0gICAgIExJQkhCLkdDQy5EICs9IFNZU19NSU5H
 VyBQVFczMl9TVEFUSUNfTElCCi0gCUxJQkhCLkdDQy5hcmdzLmV4dHJhLmR5bGliKysgKz0gLVds
 LC0tZW5hYmxlLWF1dG8taW1wb3J0IC1zdGF0aWMKSW5kZXg6IGZpbGVzL3BhdGNoLW1ha2VfaW5j
 bHVkZV9jb250cmliLmRlZnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZmlsZXMvcGF0Y2gtbWFrZV9pbmNsdWRl
 X2NvbnRyaWIuZGVmcwkocmV2aXNpb24gMzQzNDMyKQorKysgZmlsZXMvcGF0Y2gtbWFrZV9pbmNs
 dWRlX2NvbnRyaWIuZGVmcwkod29ya2luZyBjb3B5KQpAQCAtMSwyMiArMSw0NCBAQAotLS0tIC4v
 bWFrZS9pbmNsdWRlL2NvbnRyaWIuZGVmcy5vcmlnCTIwMTAtMDQtMjUgMTc6MTU6NDMuMDAwMDAw
 MDAwIC0wNDAwCi0rKysgLi9tYWtlL2luY2x1ZGUvY29udHJpYi5kZWZzCTIwMTEtMDUtMjQgMDU6
 NTA6NDYuMDcxODA2NzcwIC0wNDAwCi1AQCAtMjgsNyArMjgsNyBAQAotICAgICAkKDEpLkZFVENI
 LnVybCAgICA9IEZFVENIX0lTX1VOREVGSU5FRAotICAgICAkKDEpLkZFVENILnRhcmdldCA9ICQk
 KCQoMSkuRkVUQ0gudGFyKQotICAgICBkZWZpbmUgJCgxKS5GRVRDSAotLSAgICAgICAgJCQoY2Fs
 bCBGRVRDSCwkJEAsJCQoJCgxKS5GRVRDSC51cmwpKQotKyMgICAgICAgICQkKGNhbGwgRkVUQ0gs
 JCRALCQkKCQoMSkuRkVUQ0gudXJsKSkKLSAgICAgZW5kZWYKKy0tLSBtYWtlL2luY2x1ZGUvY29u
 dHJpYi5kZWZzLm9yaWcJMjAxMS0wOC0yNiAyMTozNToxOC44MDI2MTU0MDUgKzA5MDAKKysrKyBt
 YWtlL2luY2x1ZGUvY29udHJpYi5kZWZzCTIwMTEtMDgtMjYgMjE6MzU6MjQuNDY4Nzk4MDU0ICsw
 OTAwCitAQCAtMjA0LDI2ICsyMDQsMjYgQEAKKyAjIworICMjIHRhcmdldDogZmV0Y2gKKyAjIwor
 LSQoJCgxKS5uYW1lKS5mZXRjaDogJCQoJCgxKS5GRVRDSC50YXJnZXQpCistCistJCQoJCgxKS5G
 RVRDSC50YXJnZXQpOiB8ICQkKGRpciAkJCgkKDEpLkZFVENILnRhcmdldCkpCistCSQkKCQoMSku
 RkVUQ0gpCisrIyQoJCgxKS5uYW1lKS5mZXRjaDogJCQoJCgxKS5GRVRDSC50YXJnZXQpCisrIwor
 KyMkJCgkKDEpLkZFVENILnRhcmdldCk6IHwgJCQoZGlyICQkKCQoMSkuRkVUQ0gudGFyZ2V0KSkK
 KysjCSQkKCQoMSkuRkVUQ0gpCiAgCi0gICAgICMjCi1AQCAtMzgsOCArMzgsOCBAQAotICAgICAk
 KDEpLkVYVFJBQ1QuZGlyLyAgICA9ICQkKCQoMSkuYnVpbGQvKSQkKCQoMSkuRVhUUkFDVC50YXJi
 YXNlKS8KLSAgICAgJCgxKS5FWFRSQUNULnRhcmdldCAgPSAkJCgkKDEpLmJ1aWxkLykuc3RhbXAu
 ZXh0cmFjdAotICAgICBkZWZpbmUgJCgxKS5FWFRSQUNUCi0tICAgICAgICAkJChSTS5leGUpIC1m
 ciAkJCgkKDEpLkVYVFJBQ1QuZGlyLykKLS0gICAgICAgICQkKFRBUi5leGUpIHhmQyAkJCgkKDEp
 LkZFVENILnRhcikgJCQoJCgxKS5idWlsZC8pCi0rIyAgICAgICAgJCQoUk0uZXhlKSAtZnIgJCQo
 JCgxKS5FWFRSQUNULmRpci8pCi0rIyAgICAgICAgJCQoVEFSLmV4ZSkgeGZDICQkKCQoMSkuRkVU
 Q0gudGFyKSAkJCgkKDEpLmJ1aWxkLykKLSAgICAgICAgICQkKFRPVUNILmV4ZSkgJCRACi0gICAg
 IGVuZGVmCisgIyMKKyAjIyB0YXJnZXQ6IGV4dHJhY3QKKyAjIyBtdXN0IHRvdWNoIGRpciBhZnRl
 ciBleHRyYWN0aW9uIGJlY2F1c2Ugb2xkIHRpbWVzdGFtcCBpcyByZXN0b3JlZCB2aWEgdGFyLgor
 ICMjCistJCgkKDEpLm5hbWUpLmV4dHJhY3Q6ICQkKCQoMSkuRVhUUkFDVC50YXJnZXQpCistCist
 JCQoJCgxKS5FWFRSQUNULnRhcmdldCk6IHwgJCQoZGlyICQkKCQoMSkuRVhUUkFDVC50YXJnZXQp
 KQorLSQkKCQoMSkuRVhUUkFDVC50YXJnZXQpOiAkJCgkKDEpLkZFVENILnRhcmdldCkKKy0JJCQo
 JCgxKS5FWFRSQUNUKQorLQorLSQoJCgxKS5uYW1lKS5leHRyYWN0LnRvdWNoOgorLQkkJChUT1VD
 SC5leGUpICQkKCQoMSkuRVhUUkFDVC50YXJnZXQpCistCistJCgkKDEpLm5hbWUpLmV4dHJhY3Qu
 dW50b3VjaDoKKy0JJCQoUk0uZXhlKSAtZiAkJCgkKDEpLkVYVFJBQ1QudGFyZ2V0KQorKyMkKCQo
 MSkubmFtZSkuZXh0cmFjdDogJCQoJCgxKS5FWFRSQUNULnRhcmdldCkKKysjCisrIyQkKCQoMSku
 RVhUUkFDVC50YXJnZXQpOiB8ICQkKGRpciAkJCgkKDEpLkVYVFJBQ1QudGFyZ2V0KSkKKysjJCQo
 JCgxKS5FWFRSQUNULnRhcmdldCk6ICQkKCQoMSkuRkVUQ0gudGFyZ2V0KQorKyMJJCQoJCgxKS5F
 WFRSQUNUKQorKyMKKysjJCgkKDEpLm5hbWUpLmV4dHJhY3QudG91Y2g6CisrIwkkJChUT1VDSC5l
 eGUpICQkKCQoMSkuRVhUUkFDVC50YXJnZXQpCisrIworKyMkKCQoMSkubmFtZSkuZXh0cmFjdC51
 bnRvdWNoOgorKyMJJCQoUk0uZXhlKSAtZiAkJCgkKDEpLkVYVFJBQ1QudGFyZ2V0KQogIAorICMj
 CisgIyMgdGFyZ2V0OiBwYXRjaApJbmRleDogZmlsZXMvcGF0Y2gtbWFrZV9pbmNsdWRlX2djYy5k
 ZWZzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT0KLS0tIGZpbGVzL3BhdGNoLW1ha2VfaW5jbHVkZV9nY2MuZGVmcwkocmV2
 aXNpb24gMCkKKysrIGZpbGVzL3BhdGNoLW1ha2VfaW5jbHVkZV9nY2MuZGVmcwkod29ya2luZyBj
 b3B5KQpAQCAtMCwwICsxLDIwIEBACistLS0gbWFrZS9pbmNsdWRlL2djYy5kZWZzLm9yaWcJMjAx
 MS0wOC0yMiAxNTowODowOC4zMjIxMDAwMDAgKzA5MDAKKysrKyBtYWtlL2luY2x1ZGUvZ2NjLmRl
 ZnMJMjAxMS0xMC0xNSAyMDozNDoxNy43Mzc5MjUyNTUgKzA5MDAKK0BAIC00Nyw3ICs0Nyw3IEBA
 CisgR0NDLmFyZ3MuTUwgICAgICAgID0gLWZtZXNzYWdlLWxlbmd0aD0wCisgR0NDLmFyZ3MuSCAg
 ICAgICAgID0gLUgKKyBHQ0MuYXJncy5XICAgICAgICAgPSAtVyQoMSkKKy1HQ0MuYXJncy5hcmNo
 cyAgICAgPSAtYXJjaCAkKDEpCisrR0NDLmFyZ3MuYXJjaHMgICAgID0gLW1hcmNoPSQoMSkKKyBH
 Q0MuYXJncy5zeXNyb290ICAgPSAtLXN5c3Jvb3Q9JCgxKQorIEdDQy5hcmdzLmxkc3lzcm9vdCA9
 IC1zeXNsaWJyb290ICQoMSkKKyBHQ0MuYXJncy5taW52ZXIgICAgPSAtbW1hY29zeC12ZXJzaW9u
 LW1pbj0kKDEpCitAQCAtODUsNyArODUsNyBAQAorIAorIGRlZmluZSBpbXBvcnQuR0NDCisgICAg
 ICQoMSkuR0NDLmdjYyA9ICQkKEdDQy5nY2MpCistICAgICQoMSkuR0NDLmd4eCA9ICQkKGRpciAk
 JCgkKDEpLkdDQy5nY2MpKSQkKHN1YnN0IGdjYyxnKyssJCQobm90ZGlyICQkKCQoMSkuR0NDLmdj
 YykpKQorKyAgICAkKDEpLkdDQy5neHggPSAkJChpZiAkJChmaWx0ZXIgLi8sJCQoZGlyICQkKCQo
 MSkuR0NDLmdjYykpKSwsJCQoZGlyICQkKCQoMSkuR0NDLmdjYykpKSQkKHN1YnN0IGdjYyxnKyss
 JCQobm90ZGlyICQkKCQoMSkuR0NDLmdjYykpKQorIAorICAgICAkKDEpLkdDQy5waXBlICAgID0g
 JCQoR0NDLnBpcGUpCisgICAgICQoMSkuR0NDLnN0cmlwICAgPSAkJChpZiAkJChmaWx0ZXIgbm9u
 ZSwkJCgkKDEpLkdDQy5nKSksMSkKClByb3BlcnR5IGNoYW5nZXMgb246IGZpbGVzL3BhdGNoLW1h
 a2VfaW5jbHVkZV9nY2MuZGVmcwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
 X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiMjIC0w
 LDAgKzEgIyMKK3RleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpBZGRl
 ZDogZmJzZDpub2tleXdvcmRzCiMjIC0wLDAgKzEgIyMKK3llcwpcIE5vIG5ld2xpbmUgYXQgZW5k
 IG9mIHByb3BlcnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAgKzEgIyMKK25hdGl2ZQpc
 IE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkluZGV4OiBmaWxlcy9wYXRjaC10ZXN0X21v
 ZHVsZS5kZWZzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT0KLS0tIGZpbGVzL3BhdGNoLXRlc3RfbW9kdWxlLmRlZnMJKHJl
 dmlzaW9uIDM0MzQzMikKKysrIGZpbGVzL3BhdGNoLXRlc3RfbW9kdWxlLmRlZnMJKHdvcmtpbmcg
 Y29weSkKQEAgLTEsMjMgKzAsMCBAQAotLS0tIC4vdGVzdC9tb2R1bGUuZGVmcy5vcmlnCTIwMTAt
 MDktMjggMTg6MTA6NDkuMDAwMDAwMDAwIC0wNDAwCi0rKysgLi90ZXN0L21vZHVsZS5kZWZzCTIw
 MTEtMDUtMjQgMDU6NTA6NDYuMDk3ODA4ODEyIC0wNDAwCi1AQCAtMTAsOCArMTAsOCBAQAotIFRF
 U1QuZXhlID0gJChCVUlMRC8pJChjYWxsIFRBUkdFVC5leGUsJChIQi5uYW1lKUNMSSkKLSAKLSBU
 RVNULmxpYnMgPSAkKExJQkhCLmEpICQoZm9yZWFjaCBuLCBcCi0tICAgICAgICBhNTIgYXNzIGF2
 Y29kZWMgYXZmb3JtYXQgYXZ1dGlsIGRjYSBkdmRuYXYgZHZkcmVhZCBmYWFjIGZvbnRjb25maWcg
 ZnJlZXR5cGUgbWt2IG1wZWcyIG1wM2xhbWUgbXA0djIgXAotLSAgICAgICAgb2dnIHNhbXBsZXJh
 dGUgc3dzY2FsZSB0aGVvcmEgdm9yYmlzIHZvcmJpc2VuYyB4MjY0IHhtbDIgYmx1cmF5LCBcCi0r
 ICAgICAgICBhNTIgYXNzIGF2Zm9ybWF0IGF2Y29kZWMgYXZ1dGlsIGRjYSBkdmRuYXYgZHZkcmVh
 ZCBmYWFjIGZvbnRjb25maWcgZnJlZXR5cGUgbWt2IG1wZWcyIG1wM2xhbWUgbXA0djIgXAotKyAg
 ICAgICAgc2FtcGxlcmF0ZSBzd3NjYWxlIHRoZW9yYSB2b3JiaXMgdm9yYmlzZW5jIG9nZyB4MjY0
 IHhtbDIgYmx1cmF5LCBcCi0gICAgICAgICAkKENPTlRSSUIuYnVpbGQvKWxpYi9saWIkKG4pLmEg
 KQotIAotIFRFU1QuaW5zdGFsbC5leGUgPSAkKERFU1RESVIpJChQUkVGSVgvKWJpbi8kKG5vdGRp
 ciAkKFRFU1QuZXhlKSkKLUBAIC01MCw2ICs1MCw5IEBACi0gICAgIFRFU1QuR0NDLmwgKz0gaWNv
 bnYKLSBlbHNlIGlmZXEgKCQoQlVJTEQuc3lzdGVtKSxsaW51eCkKLSAgICAgVEVTVC5HQ0MubCAr
 PSBwdGhyZWFkIGRsIG0KLStlbHNlIGlmZXEgKCQoQlVJTEQuc3lzdGVtKSxmcmVlYnNkKQotKwlU
 RVNULkdDQy5sICs9IHB0aHJlYWQgaWNvbnYKLSsJVEVTVC5HQ0MuTCArPSAvdXNyL2xvY2FsL2xp
 YgotIGVsc2UgaWZlcSAoJChCVUlMRC5zeXN0ZW0pLHNvbGFyaXMpCi0gICAgIFRFU1QuR0NDLmwg
 Kz0gcHRocmVhZCBuc2wgc29ja2V0Ci0gZWxzZSBpZmVxICgxLW1pbmd3LCQoQlVJTEQuY3Jvc3Mp
 LSQoQlVJTEQuc3lzdGVtKSkK
 --047d7b5db9c4e753c304f23b8882--

From: Matthias Andree <mandree@FreeBSD.org>
To: Thomas Zander <riggs@freebsd.org>, bug-followup@freebsd.org, 
 Thierry Thomas <thierry@freebsd.org>
Cc: arjan@liralab.it, =?ISO-8859-1?Q?Philippe_Aud=E9oud?=
 <jadawin@freebsd.org>
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Thu, 13 Feb 2014 08:17:32 +0100

 Am 12.02.2014 21:37, schrieb Thomas Zander:
 > On 11 February 2014 23:06, Matthias Andree <mandree@freebsd.org> wrote:
 >> Am 11.02.2014 21:26, schrieb Thomas Zander:
 >>> On 11 February 2014 09:49, Matthias Andree <mandree@freebsd.org> wrote:
 >>>
 >>>> Well, you _MUST_ make sure that the Standard C++ library matches the
 >>>> default of the SYSTEM, not the default of the COMPILER, so as to match
 >>>> what other C++-based libraries link against.
 >>>> I. e. 8.x and 9.x MUST use libstdc++, 10.x and 11.x MUST use libc++.
 >>>> No ifs and buts.
 >>>
 >>> If that is the case (no ifs and buts), wouldn't this work:
 >>> .if ${OSVERSION} >= 1000000
 >>> LDFLAGS+= -lc++
 >>> .else
 >>> LDFLAGS+= -lstdc++
 >>> .endif
 >>
 >> The actual OSVERSION that made the switch to clang/libc++ is later,
 >> 1000024 or 1000054 or something, so it's better to set USES=compiler but
 >> not USE_GCC or thereabouts before .include <bsd.pre.port.mk>, and query
 >> the results and set USE_GCC and LDFLAGS after bsd.pre.port.mk.
 >>
 >> If you must continue using OSVERSION, I think using 1000100 (which is
 >> when releng/10.0 branched) should be safe now, users using a 1000000 <=
 >> version < 1000100 should have upgraded these days.
 > 
 > Actually, it makes more sense to do the test for OSVERSION instead of
 > compiler features. We are not trying to get openmp in there. We are
 > simply setting the proper C++ LDFLAGS, which are, as you correctly
 > stated, determined whether we are building on OSVERSION before/after
 > 1000054.
 > 
 > I would like to go ahead and commit attached revision of the patch.
 
 I think for clang the idiom would be -stdlib=libc++ instead.
 
 And: do we have to state the library explicitly in LDFLAGS?
 

From: Thomas Zander <riggs@freebsd.org>
To: Matthias Andree <mandree@freebsd.org>
Cc: bug-followup@freebsd.org, Thierry Thomas <thierry@freebsd.org>, arjan@liralab.it, 
	=?ISO-8859-1?Q?Philippe_Aud=E9oud?= <jadawin@freebsd.org>
Subject: Re: ports/186387: Update port multimedia/handbrake to 0.9.9
Date: Thu, 13 Feb 2014 09:34:44 +0100

 On 13 February 2014 08:17, Matthias Andree <mandree@freebsd.org> wrote:
 
 [snip]
 
 >> I would like to go ahead and commit attached revision of the patch.
 >
 > I think for clang the idiom would be -stdlib=libc++ instead.
 >
 > And: do we have to state the library explicitly in LDFLAGS?
 
 There is certainly more than one way to solve this. If you propose a
 change to the patch such that it solves it more elegant or generally
 better, I'll be happy to take a look at it and test it. But until then
 I stand by my proposal. It solves the problem, I got successful builds
 in all my jails and it allows us to have a working up-to-date
 handbrake in our tree.
 
 Best regards
 Riggs

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186387: commit references a PR
Date: Fri, 14 Feb 2014 20:00:23 +0000 (UTC)

 Author: riggs
 Date: Fri Feb 14 20:00:13 2014
 New Revision: 344308
 URL: http://svnweb.freebsd.org/changeset/ports/344308
 QAT: https://qat.redports.org/buildarchive/r344308/
 
 Log:
   - Update port to upstream release 0.9.9
   - Stagify
   - USES cleanups
   
   PR:		ports/186387
   Submitted by:	Arjan Gijsberts <arjan@liralab.it>
   Approved by:	jadawin (co-mentor)
 
 Added:
   head/multimedia/handbrake/files/patch-contrib-ffmpeg-A04-x86-asm-h.patch   (contents, props changed)
   head/multimedia/handbrake/files/patch-contrib-mp4v2-P01-freebsd-clang-namespace.patch   (contents, props changed)
   head/multimedia/handbrake/files/patch-custom.defs   (contents, props changed)
   head/multimedia/handbrake/files/patch-make_include_gcc.defs   (contents, props changed)
 Deleted:
   head/multimedia/handbrake/files/patch-contrib_fontconfig_module.defs
   head/multimedia/handbrake/files/patch-contrib_freetype_module.defs
   head/multimedia/handbrake/files/patch-contrib_libass_module.defs
   head/multimedia/handbrake/files/patch-libhb_module.defs
   head/multimedia/handbrake/files/patch-test_module.defs
 Modified:
   head/multimedia/handbrake/Makefile
   head/multimedia/handbrake/distinfo
   head/multimedia/handbrake/files/patch-make_include_contrib.defs
 
 Modified: head/multimedia/handbrake/Makefile
 ==============================================================================
 --- head/multimedia/handbrake/Makefile	Fri Feb 14 19:56:52 2014	(r344307)
 +++ head/multimedia/handbrake/Makefile	Fri Feb 14 20:00:13 2014	(r344308)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	handbrake
 -PORTVERSION=	0.9.8
 -PORTREVISION=	2
 +PORTVERSION=	0.9.9
  CATEGORIES=	multimedia
  MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION} \
  		http://download.handbrake.fr/handbrake/contrib/:contrib
 @@ -11,24 +10,16 @@ DISTFILES=	HandBrake-${PORTVERSION}.tar.
  		a52dec-0.7.4.tar.gz:contrib \
  		faac-1.28.tar.gz:contrib \
  		faad2-2.7.tar.gz:contrib \
 -		ffmpeg-v0.7-1696-gcae4f4b.tar.bz2:contrib \
 -		fontconfig-2.8.0.tar.gz:contrib \
 -		freetype-2.4.7.tar.bz2:contrib \
 +		libav-v9.6.tar.bz2:contrib \
  		lame-3.98.tar.gz:contrib \
 -		libass-0.10.0-1.tar.gz:contrib \
 -		libbluray-0.0.1-pre-213-ga869da8.tar.gz:contrib \
 +		libbluray-0.2.3.tar.bz2:contrib \
  		libdca-r81-strapped.tar.gz:contrib \
  		libdvdnav-svn1168.tar.gz:contrib \
  		libdvdread-svn1168.tar.gz:contrib \
  		libmkv-0.6.5-0-g82075ae.tar.gz:contrib \
 -		libogg-1.3.0.tar.gz:contrib \
 -		libsamplerate-0.1.4.tar.gz:contrib \
 -		libtheora-1.1.0.tar.bz2:contrib \
 -		libvorbis-aotuv_b6.03.tar.bz2:contrib \
 -		libxml2-2.7.7.tar.gz:contrib \
  		mp4v2-trunk-r355.tar.bz2:contrib \
  		mpeg2dec-0.5.1.tar.gz:contrib \
 -		x264-r2146-bcd41db.tar.gz:contrib
 +		x264-r2273-b3065e6.tar.gz:contrib
  DIST_SUBDIR=	${PORTNAME}
  
  MAINTAINER=	ports@FreeBSD.org
 @@ -37,10 +28,20 @@ COMMENT=	Versatile DVD ripper and video 
  LICENSE=	GPLv2
  
  BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 -LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
 +LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 +		libfreetype.so:${PORTSDIR}/print/freetype2 \
 +		libfribidi.so:${PORTSDIR}/converters/fribidi \
 +		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 +		libass.so:${PORTSDIR}/multimedia/libass \
 +		libogg.so:${PORTSDIR}/audio/libogg \
 +		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 +		libvorbisenc.so:${PORTSDIR}/audio/libvorbis \
 +		libtheoradec.so:${PORTSDIR}/multimedia/libtheora \
 +		libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \
 +		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
  RUN_DEPENDS=	${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
  
 -USES=		gmake pkgconfig
 +USES=		gmake pkgconfig iconv
  USE_AUTOTOOLS=	libtool aclocal
  LIBTOOLFILES=	configure
  USE_PYTHON_BUILD=	yes
 @@ -63,7 +64,6 @@ OPTIONS_DEFINE=	X11
  X11_DESC=	Build GTK+2 based GUI program
  OPTIONS_DEFAULT=	X11
  
 -NO_STAGE=	yes
  .include <bsd.port.pre.mk>
  
  # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
 @@ -85,6 +85,13 @@ PLIST_FILES+=	bin/HandBrake
  CONFIGURE_ARGS+=	--disable-gtk
  .endif
  
 +# Enforce linking to the system c++ standard lib
 +.if ${OSVERSION} >= 1000054
 +LDFLAGS+=	-lc++
 +.else
 +LDFLAGS+=	-lstdc++
 +.endif
 +
  run-autotools-aclocal:
  	@${DO_NADA}
  
 @@ -92,52 +99,64 @@ run-autotools-aclocal:
  # considered good in FreeBSD.  Instead, we will prepare everything manually.
  post-extract: .SILENT
  # Unversioned directories can be copied in a loop
 -.for d in a52dec lame libdca libdvdnav libdvdread libsamplerate mpeg2dec x264
 +.for d in a52dec lame libdca libdvdnav libdvdread mpeg2dec x264
  	${MKDIR} ${BUILD_WRKSRC}/contrib/${d}
  	${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d}
  .endfor
  # Others had to be processed one by one due to irregular (versioned) names
 -	cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg fontconfig \
 -		freetype libass libbluray libmkv libogg libtheora libvorbis \
 -		libxml2 mp4v2
 +	cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg libbluray libmkv mp4v2
  	${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac
  	${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2
 -	${MV} ${WRKDIR}/ffmpeg-v0.7-1696-gcae4f4b \
 -		${BUILD_WRKSRC}/contrib/ffmpeg
 -	${MV} ${WRKDIR}/fontconfig-2.8.0 ${BUILD_WRKSRC}/contrib/fontconfig
 -	${MV} ${WRKDIR}/freetype-2.4.7 ${BUILD_WRKSRC}/contrib/freetype
 -	${MV} ${WRKDIR}/libass-0.10.0-1 ${BUILD_WRKSRC}/contrib/libass
 -	${MV} ${WRKDIR}/libbluray-0.0.1-pre-213-ga869da8 \
 -		${BUILD_WRKSRC}/contrib/libbluray
 +	${MV} ${WRKDIR}/libav-v9.6 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v9.6
 +	${MV} ${WRKDIR}/libbluray-0.2.3 ${BUILD_WRKSRC}/contrib/libbluray
  	${MV} ${WRKDIR}/libmkv-0.6.5-0-g82075ae ${BUILD_WRKSRC}/contrib/libmkv
 -	${MV} ${WRKDIR}/libogg-1.3.0 ${BUILD_WRKSRC}/contrib/libogg
 -	${MV} ${WRKDIR}/libtheora-1.1.0 ${BUILD_WRKSRC}/contrib/libtheora
 -	${MV} ${WRKDIR}/aotuv-b6.03_20110424 ${BUILD_WRKSRC}/contrib/libvorbis
 -	${MV} ${WRKDIR}/libxml2-2.7.7 ${BUILD_WRKSRC}/contrib/libxml2
  	${MV} ${WRKDIR}/mp4v2-trunk-r355 ${BUILD_WRKSRC}/contrib/mp4v2
 -# Remove one patch file that does not apply cleanly
 -	${RM} ${WRKSRC}/contrib/fontconfig/A00-config.patch
  # Avoid conflict with `print/harfbuzz' (also installs "hb.h")
  	${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h
 +# Mark all bundled dependencies as extracted
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/a52dec/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/faac/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/faad2/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/ffmpeg/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/lame/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libdvdnav/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libdvdread/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/libmkv/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/mp4v2/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/mpeg2dec/.stamp.extract
 +	${TOUCH} ${BUILD_WRKSRC}/contrib/x264/.stamp.extract
  
  post-patch:
  	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \
  		${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c
  	@${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]|' \
 -		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.0.1-pre-213-ga869da8/configure.ac
 +		${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.2.3/configure.ac
  	@${REINPLACE_CMD} -e 's|<malloc|<stdlib|' ${WRKSRC}/libhb/fifo.c
 -	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 -		${WRKSRC}/contrib/libass/module.defs \
 -		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
  	@${REINPLACE_CMD} -e 's|libdvdcss\.so\.2|libdvdcss.so|' \
  		${BUILD_WRKSRC}/contrib/libdvdread/libdvdread/src/dvd_input.c
  	@${FIND} ${WRKSRC} -type f -name '*.[ch]' -print0 | ${XARGS} -0 \
  		${REINPLACE_CMD} -e '/#include/s|hb\.h|hb-of-handbrake.h|'
 +	@${REINPLACE_CMD} -e "s|ToolProbe( 'GCC.gcc',   'gcc',|ToolProbe( 'GCC.gcc',   '${CC}',|" \
 +		${WRKSRC}/make/configure.py
 +	@${REINPLACE_CMD} -e 's|avcodec avformat avutil avresample|avformat avcodec avresample avutil|' \
 +		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
 +	${TR} -d '\r' < ${WRKSRC}/contrib/mpeg2dec/A02-gwluserdata.patch > ${WRKDIR}/A02-gwluserdata.patch
 +	${MV} ${WRKDIR}/A02-gwluserdata.patch ${WRKSRC}/contrib/mpeg2dec/
 +	@${REINPLACE_CMD} -E \
 +		-e 's|%%REP_CC%%|${CC}|g' \
 +		-e 's|%%REP_CXX%%|${CXX}|g' \
 +		-e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \
 +		-e 's|%%REP_I%%|-I${LOCALBASE}/include|g' \
 +		-e 's|%%REP_L%%|-L${LOCALBASE}/lib|g' \
 +		-e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \
 +		${WRKSRC}/custom.defs
  
  do-install:
 -	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin
 +	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${STAGEDIR}${PREFIX}/bin
  .if ${PORT_OPTIONS:MX11}
 -	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${PREFIX}/bin/HandBrake
 +	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${STAGEDIR}${PREFIX}/bin/HandBrake
  .endif
  
  .include <bsd.port.post.mk>
 
 Modified: head/multimedia/handbrake/distinfo
 ==============================================================================
 --- head/multimedia/handbrake/distinfo	Fri Feb 14 19:56:52 2014	(r344307)
 +++ head/multimedia/handbrake/distinfo	Fri Feb 14 20:00:13 2014	(r344308)
 @@ -1,23 +1,17 @@
 -SHA256 (handbrake/HandBrake-0.9.8.tar.bz2) = dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798
 -SIZE (handbrake/HandBrake-0.9.8.tar.bz2) = 3156964
 +SHA256 (handbrake/HandBrake-0.9.9.tar.bz2) = a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3
 +SIZE (handbrake/HandBrake-0.9.9.tar.bz2) = 9315199
  SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47
  SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978
  SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
  SIZE (handbrake/faac-1.28.tar.gz) = 678891
  SHA256 (handbrake/faad2-2.7.tar.gz) = ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
  SIZE (handbrake/faad2-2.7.tar.gz) = 1137407
 -SHA256 (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497
 -SIZE (handbrake/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2) = 4242565
 -SHA256 (handbrake/fontconfig-2.8.0.tar.gz) = fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
 -SIZE (handbrake/fontconfig-2.8.0.tar.gz) = 1548409
 -SHA256 (handbrake/freetype-2.4.7.tar.bz2) = ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77
 -SIZE (handbrake/freetype-2.4.7.tar.bz2) = 1490543
 +SHA256 (handbrake/libav-v9.6.tar.bz2) = ea41941866fb64d7e363684a4705574f65786bd9eb0fe1f796dee4c0d459aa52
 +SIZE (handbrake/libav-v9.6.tar.bz2) = 4672723
  SHA256 (handbrake/lame-3.98.tar.gz) = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
  SIZE (handbrake/lame-3.98.tar.gz) = 1411318
 -SHA256 (handbrake/libass-0.10.0-1.tar.gz) = a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867
 -SIZE (handbrake/libass-0.10.0-1.tar.gz) = 745314
 -SHA256 (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76
 -SIZE (handbrake/libbluray-0.0.1-pre-213-ga869da8.tar.gz) = 241927
 +SHA256 (handbrake/libbluray-0.2.3.tar.bz2) = 2c65cfb02aeec31721f9ea65ee2c085a9bfe163e99dd01b52ccb3f53ba205eea
 +SIZE (handbrake/libbluray-0.2.3.tar.bz2) = 465239
  SHA256 (handbrake/libdca-r81-strapped.tar.gz) = ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1
  SIZE (handbrake/libdca-r81-strapped.tar.gz) = 523282
  SHA256 (handbrake/libdvdnav-svn1168.tar.gz) = 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7
 @@ -26,19 +20,9 @@ SHA256 (handbrake/libdvdread-svn1168.tar
  SIZE (handbrake/libdvdread-svn1168.tar.gz) = 946033
  SHA256 (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97
  SIZE (handbrake/libmkv-0.6.5-0-g82075ae.tar.gz) = 32742
 -SHA256 (handbrake/libogg-1.3.0.tar.gz) = a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780
 -SIZE (handbrake/libogg-1.3.0.tar.gz) = 425144
 -SHA256 (handbrake/libsamplerate-0.1.4.tar.gz) = 4b4af3ecaee05c8875a9b113c6a2f816f06f283fb882914e57b21c0b08b67b75
 -SIZE (handbrake/libsamplerate-0.1.4.tar.gz) = 4259244
 -SHA256 (handbrake/libtheora-1.1.0.tar.bz2) = 74be9fe9f85d18c45bdcbb018cebf12c74e2234aeecb4d4c4cb92d80bdd287e2
 -SIZE (handbrake/libtheora-1.1.0.tar.bz2) = 1785634
 -SHA256 (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd
 -SIZE (handbrake/libvorbis-aotuv_b6.03.tar.bz2) = 1250659
 -SHA256 (handbrake/libxml2-2.7.7.tar.gz) = af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68
 -SIZE (handbrake/libxml2-2.7.7.tar.gz) = 4868502
  SHA256 (handbrake/mp4v2-trunk-r355.tar.bz2) = 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f
  SIZE (handbrake/mp4v2-trunk-r355.tar.bz2) = 475488
  SHA256 (handbrake/mpeg2dec-0.5.1.tar.gz) = 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71
  SIZE (handbrake/mpeg2dec-0.5.1.tar.gz) = 522405
 -SHA256 (handbrake/x264-r2146-bcd41db.tar.gz) = 7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1
 -SIZE (handbrake/x264-r2146-bcd41db.tar.gz) = 656089
 +SHA256 (handbrake/x264-r2273-b3065e6.tar.gz) = 956c82c9318740ef3744cf6e752fb6181be0716273e2e8976306624f0864a815
 +SIZE (handbrake/x264-r2273-b3065e6.tar.gz) = 681489
 
 Added: head/multimedia/handbrake/files/patch-contrib-ffmpeg-A04-x86-asm-h.patch
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-contrib-ffmpeg-A04-x86-asm-h.patch	Fri Feb 14 20:00:13 2014	(r344308)
 @@ -0,0 +1,14 @@
 +--- /dev/null	2014-02-09 20:55:00.000000000 +0100
 ++++ contrib/ffmpeg/A04-x86-asm-h.patch	2014-02-09 20:55:09.548807959 +0100
 +@@ -0,0 +1,11 @@
 ++--- a/libavutil/x86/asm.h	2014-02-09 20:38:46.964875000 +0100
 +++++ b/libavutil/x86/asm.h	2014-02-09 20:44:57.928849417 +0100
 ++@@ -68,7 +68,7 @@
 ++ typedef int x86_reg;
 ++ #endif
 ++ 
 ++-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
 +++#define HAVE_7REGS (ARCH_X86_64)
 ++ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
 ++ 
 ++ #if ARCH_X86_64 && defined(PIC)
 
 Added: head/multimedia/handbrake/files/patch-contrib-mp4v2-P01-freebsd-clang-namespace.patch
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-contrib-mp4v2-P01-freebsd-clang-namespace.patch	Fri Feb 14 20:00:13 2014	(r344308)
 @@ -0,0 +1,120 @@
 +--- /dev/null	2014-02-09 17:00:00.000000000 +0100
 ++++ contrib/mp4v2/P01-freebsd-clang-namespace.patch	2014-02-09 16:52:59.124808788 +0100
 +@@ -0,0 +1,117 @@
 ++diff -Naur mp4v2-trunk-r355.orig/src/bmff/typebmff.cpp mp4v2-trunk-r355/src/bmff/typebmff.cpp
 ++--- mp4v2-trunk-r355.orig/src/bmff/typebmff.cpp	2009-05-21 04:52:31.000000000 +0200
 +++++ mp4v2-trunk-r355/src/bmff/typebmff.cpp	2014-02-06 04:18:15.000000000 +0100
 ++@@ -23,19 +23,12 @@
 ++ 
 ++ #include "impl.h"
 ++ 
 ++-// VStudio idiocy prevents defining template instanced static data
 ++-// in a namespace. Workaround it by defining in global scope.
 ++-// Other platforms will continue to put things in the proper namespace.
 ++-#if defined( _MSC_VER )
 ++-using namespace mp4v2::impl::bmff;
 ++-#else
 ++-namespace mp4v2 { namespace impl { namespace bmff {
 ++-#endif
 +++namespace mp4v2 { namespace impl { 
 ++ 
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++ template <>
 ++-const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
 +++const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
 ++     { mp4v2::impl::bmff::ILC_AAR,  "aar",  "Afar" },
 ++     { mp4v2::impl::bmff::ILC_ABK,  "abk",  "Abkhazian" },
 ++     { mp4v2::impl::bmff::ILC_ACE,  "ace",  "Achinese" },
 ++@@ -526,9 +519,7 @@
 ++ 
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++-#if defined( _MSC_VER )
 ++-namespace mp4v2 { namespace impl { namespace bmff {
 ++-#endif
 +++namespace bmff {
 ++ 
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++diff -Naur mp4v2-trunk-r355.orig/src/itmf/type.cpp mp4v2-trunk-r355/src/itmf/type.cpp
 ++--- mp4v2-trunk-r355.orig/src/itmf/type.cpp	2009-05-21 04:52:29.000000000 +0200
 +++++ mp4v2-trunk-r355/src/itmf/type.cpp	2014-02-06 04:18:19.000000000 +0100
 ++@@ -24,19 +24,12 @@
 ++ 
 ++ #include "impl.h"
 ++ 
 ++-// VStudio idiocy prevents defining template instanced static data
 ++-// in a namespace. Workaround it by defining in global scope.
 ++-// Other platforms will continue to put things in the proper namespace.
 ++-#if defined( _MSC_VER )
 ++-using namespace mp4v2::impl::itmf;
 ++-#else
 ++-namespace mp4v2 { namespace impl { namespace itmf {
 ++-#endif
 +++namespace mp4v2 { namespace impl {
 ++ 
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++ template <>
 ++-const EnumBasicType::Entry EnumBasicType::data[] = {
 +++const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
 ++     { mp4v2::impl::itmf::BT_IMPLICIT,  "implicit",  "implicit" },
 ++     { mp4v2::impl::itmf::BT_UTF8,      "utf8",      "UTF-8" },
 ++     { mp4v2::impl::itmf::BT_UTF16,     "utf16",     "UTF-16" },
 ++@@ -64,7 +57,7 @@
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++ template <>
 ++-const EnumGenreType::Entry EnumGenreType::data[] = {
 +++const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
 ++     { mp4v2::impl::itmf::GENRE_BLUES,             "blues",             "Blues" },
 ++     { mp4v2::impl::itmf::GENRE_CLASSIC_ROCK,      "classicrock",       "Classic Rock" },
 ++     { mp4v2::impl::itmf::GENRE_COUNTRY,           "country",           "Country" },
 ++@@ -200,7 +193,7 @@
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++ template <>
 ++-const EnumStikType::Entry EnumStikType::data[] = {
 +++const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
 ++     { mp4v2::impl::itmf::STIK_OLD_MOVIE,    "oldmovie",    "Movie" },
 ++     { mp4v2::impl::itmf::STIK_NORMAL,       "normal",      "Normal" },
 ++     { mp4v2::impl::itmf::STIK_AUDIOBOOK,    "audiobook",   "Audio Book" },
 ++@@ -216,7 +209,7 @@
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++ template <>
 ++-const EnumAccountType::Entry EnumAccountType::data[] = {
 +++const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
 ++     { mp4v2::impl::itmf::AT_ITUNES,  "itunes",   "iTunes" },
 ++     { mp4v2::impl::itmf::AT_AOL,     "aol",      "AOL" },
 ++ 
 ++@@ -226,7 +219,7 @@
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++ template <>
 ++-const EnumCountryCode::Entry EnumCountryCode::data[] = {
 +++const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
 ++     { mp4v2::impl::itmf::CC_USA,  "usa",   "United States" },
 ++     { mp4v2::impl::itmf::CC_USA,  "fra",   "France" },
 ++     { mp4v2::impl::itmf::CC_DEU,  "ger",   "Germany" },
 ++@@ -256,7 +249,7 @@
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++ template <>
 ++-const EnumContentRating::Entry EnumContentRating::data[] = {
 +++const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
 ++     { mp4v2::impl::itmf::CR_NONE,      "none",       "None" },
 ++     { mp4v2::impl::itmf::CR_CLEAN,     "clean",      "Clean" },
 ++     { mp4v2::impl::itmf::CR_EXPLICIT,  "explicit",   "Explicit" },
 ++@@ -266,9 +259,7 @@
 ++ 
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 ++-#if defined( _MSC_VER )
 ++-namespace mp4v2 { namespace impl { namespace itmf {
 ++-#endif
 +++namespace itmf {
 ++ 
 ++ ///////////////////////////////////////////////////////////////////////////////
 ++ 
 
 Added: head/multimedia/handbrake/files/patch-custom.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-custom.defs	Fri Feb 14 20:00:13 2014	(r344308)
 @@ -0,0 +1,19 @@
 +--- /dev/null	2014-02-09 17:00:00.000000000 +0100
 ++++ custom.defs	2014-02-09 16:52:59.125808519 +0100
 +@@ -0,0 +1,16 @@
 ++################################################################################
 ++# for Generic GCC custom setting
 ++
 ++GCC.gcc         = %%REP_CC%%
 ++GCC.gxx         = %%REP_CXX%%
 ++GCC.archs       = %%REP_ARCHS%%
 ++GCC.args.I     += %%REP_I%%
 ++GCC.args.L     += %%REP_L%%
 ++
 ++
 ++################################################################################
 ++# for CLI custom setting
 ++
 ++LIBHB.GCC.D += SYS_FREEBSD
 ++TEST.GCC.l += pthread m %%REP_ICONV%%
 ++
 
 Modified: head/multimedia/handbrake/files/patch-make_include_contrib.defs
 ==============================================================================
 --- head/multimedia/handbrake/files/patch-make_include_contrib.defs	Fri Feb 14 19:56:52 2014	(r344307)
 +++ head/multimedia/handbrake/files/patch-make_include_contrib.defs	Fri Feb 14 20:00:13 2014	(r344308)
 @@ -1,22 +1,44 @@
 ---- ./make/include/contrib.defs.orig	2010-04-25 17:15:43.000000000 -0400
 -+++ ./make/include/contrib.defs	2011-05-24 05:50:46.071806770 -0400
 -@@ -28,7 +28,7 @@
 -     $(1).FETCH.url    = FETCH_IS_UNDEFINED
 -     $(1).FETCH.target = $$($(1).FETCH.tar)
 -     define $(1).FETCH
 --        $$(call FETCH,$$@,$$($(1).FETCH.url))
 -+#        $$(call FETCH,$$@,$$($(1).FETCH.url))
 -     endef
 +--- make/include/contrib.defs.orig	2011-08-26 21:35:18.802615405 +0900
 ++++ make/include/contrib.defs	2011-08-26 21:35:24.468798054 +0900
 +@@ -204,26 +204,26 @@
 + ##
 + ## target: fetch
 + ##
 +-$($(1).name).fetch: $$($(1).FETCH.target)
 +-
 +-$$($(1).FETCH.target): | $$(dir $$($(1).FETCH.target))
 +-	$$($(1).FETCH)
 ++#$($(1).name).fetch: $$($(1).FETCH.target)
 ++#
 ++#$$($(1).FETCH.target): | $$(dir $$($(1).FETCH.target))
 ++#	$$($(1).FETCH)
   
 -     ##
 -@@ -38,8 +38,8 @@
 -     $(1).EXTRACT.dir/    = $$($(1).build/)$$($(1).EXTRACT.tarbase)/
 -     $(1).EXTRACT.target  = $$($(1).build/).stamp.extract
 -     define $(1).EXTRACT
 --        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)
 --        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)
 -+#        $$(RM.exe) -fr $$($(1).EXTRACT.dir/)
 -+#        $$(TAR.exe) xfC $$($(1).FETCH.tar) $$($(1).build/)
 -         $$(TOUCH.exe) $$@
 -     endef
 + ##
 + ## target: extract
 + ## must touch dir after extraction because old timestamp is restored via tar.
 + ##
 +-$($(1).name).extract: $$($(1).EXTRACT.target)
 +-
 +-$$($(1).EXTRACT.target): | $$(dir $$($(1).EXTRACT.target))
 +-$$($(1).EXTRACT.target): $$($(1).FETCH.target)
 +-	$$($(1).EXTRACT)
 +-
 +-$($(1).name).extract.touch:
 +-	$$(TOUCH.exe) $$($(1).EXTRACT.target)
 +-
 +-$($(1).name).extract.untouch:
 +-	$$(RM.exe) -f $$($(1).EXTRACT.target)
 ++#$($(1).name).extract: $$($(1).EXTRACT.target)
 ++#
 ++#$$($(1).EXTRACT.target): | $$(dir $$($(1).EXTRACT.target))
 ++#$$($(1).EXTRACT.target): $$($(1).FETCH.target)
 ++#	$$($(1).EXTRACT)
 ++#
 ++#$($(1).name).extract.touch:
 ++#	$$(TOUCH.exe) $$($(1).EXTRACT.target)
 ++#
 ++#$($(1).name).extract.untouch:
 ++#	$$(RM.exe) -f $$($(1).EXTRACT.target)
   
 + ##
 + ## target: patch
 
 Added: head/multimedia/handbrake/files/patch-make_include_gcc.defs
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/handbrake/files/patch-make_include_gcc.defs	Fri Feb 14 20:00:13 2014	(r344308)
 @@ -0,0 +1,20 @@
 +--- make/include/gcc.defs.orig	2011-08-22 15:08:08.322100000 +0900
 ++++ make/include/gcc.defs	2011-10-15 20:34:17.737925255 +0900
 +@@ -47,7 +47,7 @@
 + GCC.args.ML        = -fmessage-length=0
 + GCC.args.H         = -H
 + GCC.args.W         = -W$(1)
 +-GCC.args.archs     = -arch $(1)
 ++GCC.args.archs     = -march=$(1)
 + GCC.args.sysroot   = --sysroot=$(1)
 + GCC.args.ldsysroot = -syslibroot $(1)
 + GCC.args.minver    = -mmacosx-version-min=$(1)
 +@@ -85,7 +85,7 @@
 + 
 + define import.GCC
 +     $(1).GCC.gcc = $$(GCC.gcc)
 +-    $(1).GCC.gxx = $$(dir $$($(1).GCC.gcc))$$(subst gcc,g++,$$(notdir $$($(1).GCC.gcc)))
 ++    $(1).GCC.gxx = $$(if $$(filter ./,$$(dir $$($(1).GCC.gcc))),,$$(dir $$($(1).GCC.gcc)))$$(subst gcc,g++,$$(notdir $$($(1).GCC.gcc)))
 + 
 +     $(1).GCC.pipe    = $$(GCC.pipe)
 +     $(1).GCC.strip   = $$(if $$(filter none,$$($(1).GCC.g)),1)
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: riggs 
State-Changed-When: Fri Feb 14 20:13:02 UTC 2014 
State-Changed-Why:  
Committed a revised version that has been tested and accepted (via 
personal mail) by submitter and reviewer (jadawin@). Thanks! 

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