From nobody@FreeBSD.org  Sun Nov  4 11:30:44 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1220716A417
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  4 Nov 2007 11:30:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 0136913C4AA
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  4 Nov 2007 11:30:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4BUYCU081239
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 4 Nov 2007 11:30:34 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id lA4BUYHQ081238;
	Sun, 4 Nov 2007 11:30:34 GMT
	(envelope-from nobody)
Message-Id: <200711041130.lA4BUYHQ081238@www.freebsd.org>
Date: Sun, 4 Nov 2007 11:30:34 GMT
From: Rafal Carr <funman@videolan.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: vlc-devel port could be compiled with lua modules
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         117810
>Category:       ports
>Synopsis:       multimedia/vlc-devel port could be compiled with lua modules
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gahr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 04 11:40:02 UTC 2007
>Closed-Date:    Wed Jul 09 21:00:52 UTC 2008
>Last-Modified:  Wed Jul 09 21:00:52 UTC 2008
>Originator:     Rafal Carr
>Release:        RELENG_7
>Organization:
>Environment:
FreeBSD zod 7.0-BETA1 FreeBSD 7.0-BETA1 #0: Tue Oct 30 23:30:39 CET 2007     root@zod:/usr/obj/usr/src/sys/ZOD  i386

>Description:
multimedia/vlc-devel port has some problems:

1/ There is no way to force it to build the lua modules

2/ There is configuration options for dead options, that should be removed

3/ The skins2 option says it enables a "GTK+" interface which is not the case
>How-To-Repeat:

>Fix:
attached patch fix all problems

Patch attached with submission follows:

diff -ur vlc-devel.orig/Makefile vlc-devel/Makefile
--- vlc-devel.orig/Makefile	2007-10-30 19:58:27.000000000 +0100
+++ vlc-devel/Makefile	2007-10-30 20:41:09.000000000 +0100
@@ -35,8 +35,6 @@
 OPTIONS+=	AVAHI "Avahi (Rendezvous/Bonjour (R) ) networking" On
 OPTIONS+=	CACA "Libcaca Console Graphics Support" Off
 OPTIONS+=	ARTS "Enable arts sound support" Off
-OPTIONS+=	CORBA "Enable a Corba interface via orbit2" Off
-OPTIONS+=	DAAP "Connect to iTunes(R) music shares" On
 OPTIONS+=	DEBUG "Enable debuging support" Off
 OPTIONS+=	DTS "DTS decoder support, many DVDs use this" On
 OPTIONS+=	ESOUND "Esound Support" Off
@@ -44,8 +42,8 @@
 OPTIONS+=	FAAD "Faad audio decoder (mp4/aac) support" On
 OPTIONS+=	FLAC "Flac audio codec support" On
 OPTIONS+=	HTTPD "Streaming media control via http" On
-OPTIONS+=	LAME "Lame mp3 audio encoder support" On
 OPTIONS+=	LIVEMEDIA "Support for rstp/rtp/sdp protocols" On
+OPTIONS+=	LUA "Enable lua scripting" Off
 OPTIONS+=	MAD "Mad mp3 audio decoder support" On
 OPTIONS+=	MATROSKA "Matroska Container Format support" On
 OPTIONS+=	MPEG2 "Mpeg-2 audio/video decoder Support" On
@@ -58,7 +56,7 @@
 OPTIONS+=	SVG "SVG graphics support" Off
 OPTIONS+=	SVGALIB "SVGALIB video output" Off
 OPTIONS+=	SHOUT "Shout2 support" Off
-OPTIONS+=	SKINS "Enable GTK+ skinsned interface" Off
+OPTIONS+=	SKINS "Enable winamp skins interface" Off
 OPTIONS+=	SPEEX "Speex voice codec support" On
 OPTIONS+=	THEORA "OGG/Vorbis video codec support" On
 OPTIONS+=	TWOLAME "Twolame mpeg2 audio encoder support" On
@@ -240,13 +238,6 @@
 		--disable-cddax
 .endif
 
-.if defined(WITH_CORBA) && !defined(WITHOUT_CORBA)
-USE_GNOME+=	orbit2
-CONFIGURE_ARGS+=--enable-corba
-.else
-CONFIGURE_ARGS+=--disable-corba
-.endif
-
 .if !defined(WITHOUT_DVBPSI)
 LIB_DEPENDS+=	dvbpsi.4:${PORTSDIR}/multimedia/libdvbpsi
 CONFIGURE_ARGS+=--enable-dvbpsi \
@@ -324,6 +315,15 @@
 CONFIGURE_ARGS+=--disable-x264
 .endif
 
+.if (defined(WITH_LUA) || exists(${LOCALBASE}/lib/lua51/liblua.a)) && !defined(WITHOUT_LUA)
+USE_LUA=5.1+
+WANT_LUA_VER=5.1
+CONFIGURE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR}"
+CONFIGURE_ARGS+=--enable-lua
+.else
+CONFIGURE_ARGS+=--disable-lua
+.endif
+
 .if (defined(WITH_CACA) || exists(${LOCALBASE}/lib/libcaca.a)) && !defined(WITHOUT_CACA)
 .if !defined(WITHOUT_AALIB)
 WITH_AALIB=	yes
@@ -334,13 +334,6 @@
 CONFIGURE_ARGS+=--disable-caca
 .endif
 
-.if !defined(WITHOUT_DAAP)
-LIB_DEPENDS+=	opendaap.0:${PORTSDIR}/devel/libopendaap
-CONFIGURE_ARGS+=--enable-daap
-.else
-CONFIGURE_ARGS+=--disable-daap
-.endif
-
 .if !defined(WITHOUT_DTS)
 LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
 CONFIGURE_ARGS+=--enable-dca
@@ -359,15 +352,6 @@
 CONFIGURE_ARGS+=--disable-ggi
 .endif
 
-# Do not use lame if PACKAGE_BUILDING is defined. since
-# lame can NOT be packaged.
-.if !defined(WITHOUT_LAME) && !defined(PACKAGE_BUILDING)
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+=--enable-mp3lame
-.else
-CONFIGURE_ARGS+=--disable-mp3lame
-.endif
-
 .if !defined(WITHOUT_MATROSKA)
 LIB_DEPENDS+=	matroska.0:${PORTSDIR}/multimedia/libmatroska
 CONFIGURE_ARGS+=--enable-mkv
@@ -490,12 +474,6 @@
 CONFIGURE_ARGS+=--disable-gnutls
 .endif
 
-.if !defined(WITHOUT_SLP)
-LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
-.else
-CONFIGURE_ARGS+=--disable-slp
-.endif
-
 .if !defined(WITHOUT_SPEEX)
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=--enable-speex
diff -ur vlc-devel.orig/Makefile.inc vlc-devel/Makefile.inc
--- vlc-devel.orig/Makefile.inc	2007-10-30 19:58:27.000000000 +0100
+++ vlc-devel/Makefile.inc	2007-10-30 20:40:02.000000000 +0100
@@ -11,14 +11,11 @@
 #
 # Interface Knobs:
 #
-# WITH_CORBA
-#  Enable a Corba interface via orbit2
-#
 # WITH_NCURSES=yes
 #  Ncurses (console) interface
 #
 # WITH_SKINS
-#  This Interface supports a skinned gtk2.0 interface
+#  This Interface supports a skinned interface using winamp 2.x skins
 #  Skins can be found at http://www.videolan.org/vlc/download-skins.html
 #
 # WITHOUT_WXGTK=yes
@@ -29,9 +26,6 @@
 # WITH_ARTS=yes
 #  Arts Support
 #
-# WITHOUT_DAAP=yes
-#  Enable libopendaap to connect to iTunes(R) music shares.
-#
 # WITHOUT_DTS=yes
 #  DTS decoder Support
 #  useful for many dvds
@@ -49,11 +43,6 @@
 # WITH_FLAC=yes
 #  Flac Support
 #
-
-# WITHOUT_LAME=yes
-#  Mp3 encoder Support
-#   ** NOT DEFINED if PACKAGE_BUILDING is defined **
-#
 # WITHOUT_A52=yes
 #  liba52 audio support
 #
@@ -145,6 +134,9 @@
 #
 # Other Knobs:
 #
+# WITHOUT_LUA=yes
+#  Lua scripting: image fetching, and html parsing (youtube, dailymotion ...)
+#
 # WITHOUT_AVAHI=yes
 #  Avahi (Rendezvous/Bonjour (R) ) networking
 #
@@ -194,10 +186,6 @@
 # WITH_SSL=yes
 #  Enable TLS/SSL Support for web (httpd) interface
 #
-# WITHOUT_SLP=yes
-#  Disable SLP service discovery support
-#  * recommended if you want to stream media
-#
 # WITH_OPTIMIZED_CFLAGS=yes
 #  Compile with -O2 -ffast-math -fomit-frame-pointer
 #


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Nov 4 22:38:41 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117810 
Responsible-Changed-From-To: freebsd-multimedia->freebsd-ports-bugs  
Responsible-Changed-By: ahze 
Responsible-Changed-When: Fri May 23 23:01:37 UTC 2008 
Responsible-Changed-Why:  
Turn over to freebsd-ports-bugs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117810 
Class-Changed-From-To: sw-bug->maintainer-update 
Class-Changed-By: lippe 
Class-Changed-When: Sat Jun 21 23:23:25 UTC 2008 
Class-Changed-Why:  
Submitter is the maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117810 
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: gahr 
Responsible-Changed-When: Mon Jun 23 23:46:25 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117810 
State-Changed-From-To: open->feedback 
State-Changed-By: gahr 
State-Changed-When: Mon Jun 23 23:48:50 UTC 2008 
State-Changed-Why:  
I see that the patch was submitted a while ago.  Is it still valid (i.e. 
needed) with the current version of the port?  If so, I'll test & 
committ it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117810 
State-Changed-From-To: feedback->suspended 
State-Changed-By: gahr 
State-Changed-When: Tue Jun 24 20:44:58 UTC 2008 
State-Changed-Why:  
Maintainer has decided to wait until next vendor release and merge all 
patches currently floating around. 

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

From: "=?UTF-8?Q?Rafa=C3=ABl_Carr=C3=A9?=" <funman@videolan.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117810: multimedia/vlc-devel port could be compiled with lua modules
Date: Wed, 2 Jul 2008 13:38:06 +0200

 ------=_Part_1952_7699876.1214998686201
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: base64
 Content-Disposition: inline
 
 SGVyZSBpcyBhIGRpZmYgd2hpY2ggY29udGFpbnM6CgoxMTc4MTAgKHRoaXMgYnVnKQoxMjUxNTIg
 KGZpcmVmb3gzIGdlY2tvIHN1cHBvcnQpClVwZGF0ZSB0byB2bGMgMC45LjAtdGVzdDEKCkZlYXR1
 cmluZyB0aGUgY29tcGxldGUgcmVtb3ZhbCBvZiB3eHdpZGdldHMgaW50ZXJmYWNlCgotLSAKUmFm
 YcOrbCBDYXJyw6kK
 ------=_Part_1952_7699876.1214998686201
 Content-Type: text/x-diff; name=vlc-devel.diff
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_fi5ut61u0
 Content-Disposition: attachment; filename=vlc-devel.diff
 
 ZGlmZiAtTnJ1IHZsYy1kZXZlbC1vdXRkYXRlZC9NYWtlZmlsZSB2bGMtZGV2ZWwvTWFrZWZpbGUK
 LS0tIHZsYy1kZXZlbC1vdXRkYXRlZC9NYWtlZmlsZQkyMDA4LTA3LTAyIDEzOjMyOjM1LjAwMDAw
 MDAwMCArMDIwMAorKysgdmxjLWRldmVsL01ha2VmaWxlCTIwMDgtMDctMDIgMTM6MTc6MjQuMDAw
 MDAwMDAwICswMjAwCkBAIC05LDE3ICs5LDE2IEBACiAjCiAKIFBPUlROQU1FPQl2bGMKLURJU1RW
 RVJTSU9OPQkwLjkuMC4yMDA4MDIyMwotUE9SVFJFVklTSU9OPQk2Ci1QT1JURVBPQ0g9CTIKK0RJ
 U1RWRVJTSU9OPQkwLjkuMC10ZXN0MQorUE9SVEVQT0NIPQkzCiBDQVRFR09SSUVTPQltdWx0aW1l
 ZGlhIGF1ZGlvIGlwdjYgbmV0IHd3dwotTUFTVEVSX1NJVEVTPQlodHRwOi8vbmlnaHRsaWVzLnZp
 ZGVvbGFuLm9yZy9idWlsZC9zb3VyY2UvdHJ1bmstJHtESVNUVkVSU0lPTjpTLzAuOS4wLi8vfS0w
 MDI0LworTUFTVEVSX1NJVEVTPQlodHRwOi8vZG93bmxvYWQudmlkZW9sYW4ub3JnL3B1Yi92aWRl
 b2xhbi90ZXN0aW5nLworI01BU1RFUl9TSVRFUz0JaHR0cDovL25pZ2h0bGllcy52aWRlb2xhbi5v
 cmcvYnVpbGQvc291cmNlL3RydW5rLSR7RElTVFZFUlNJT046Uy8wLjkuMC4vL30tMDAyNC8KICNN
 QVNURVJfU0lURVM9CWh0dHA6Ly9kb3dubG9hZC52aWRlb2xhbi5vcmcvcHViL3ZpZGVvbGFuL3Zs
 Yy8ke0RJU1RWRVJTSU9OfS8gXAogIwkJaHR0cDovL2Z0cC5zbnQudXR3ZW50ZS5ubC9wdWIvc29m
 dHdhcmUvdmlkZW9sYW4vdmxjLyR7RElTVFZFUlNJT059LyBcCiAjCQlmdHA6Ly9mdHAuY3JhbnMu
 b3JnL3B1Yi92aWRlb2xhbi92bGMvJHtESVNUVkVSU0lPTn0vIFwKICMJCWZ0cDovL3ZpZGVvbGFu
 LmNzLnB1LmVkdS50dy9XaW5kb3dzL1ZpZGVvTEFOL3ZsYy8ke0RJU1RWRVJTSU9OfS8KIFBLR05B
 TUVTVUZGSVg9CS1kZXZlbAotRElTVE5BTUU9CSR7UE9SVE5BTUV9LXNuYXBzaG90LSR7RElTVFZF
 UlNJT046Uy8wLjkuMC4vL30KIAogTUFJTlRBSU5FUj0gICAgIGZ1bm1hbkB2aWRlb2xhbi5vcmcK
 IENPTU1FTlQ9CU11bHRpbWVkaWEgc3RyZWFtaW5nIHNlcnZlciBhbmQgcGxheWVyIGZvciB2YXJp
 b3VzIGF1ZGlvL3ZpZGVvIGZvcm1hdHMKQEAgLTM1LDggKzM0LDYgQEAKIE9QVElPTlMrPQlBVkFI
 SSAiQXZhaGkgKFJlbmRlenZvdXMvQm9uam91ciAoUikgKSBuZXR3b3JraW5nIiBPbgogT1BUSU9O
 Uys9CUNBQ0EgIkxpYmNhY2EgQ29uc29sZSBHcmFwaGljcyBTdXBwb3J0IiBPZmYKIE9QVElPTlMr
 PQlBUlRTICJFbmFibGUgYXJ0cyBzb3VuZCBzdXBwb3J0IiBPZmYKLU9QVElPTlMrPQlDT1JCQSAi
 RW5hYmxlIGEgQ29yYmEgaW50ZXJmYWNlIHZpYSBvcmJpdDIiIE9mZgotT1BUSU9OUys9CURBQVAg
 IkNvbm5lY3QgdG8gaVR1bmVzKFIpIG11c2ljIHNoYXJlcyIgT24KIE9QVElPTlMrPQlERUJVRyAi
 RW5hYmxlIGRlYnVnaW5nIHN1cHBvcnQiIE9mZgogT1BUSU9OUys9CURUUyAiRFRTIGRlY29kZXIg
 c3VwcG9ydCwgbWFueSBEVkRzIHVzZSB0aGlzIiBPbgogT1BUSU9OUys9CUVTT1VORCAiRXNvdW5k
 IFN1cHBvcnQiIE9mZgpAQCAtNDQsOCArNDEsOCBAQAogT1BUSU9OUys9CUZBQUQgIkZhYWQgYXVk
 aW8gZGVjb2RlciAobXA0L2FhYykgc3VwcG9ydCIgT24KIE9QVElPTlMrPQlGTEFDICJGbGFjIGF1
 ZGlvIGNvZGVjIHN1cHBvcnQiIE9uCiBPUFRJT05TKz0JSFRUUEQgIlN0cmVhbWluZyBtZWRpYSBj
 b250cm9sIHZpYSBodHRwIiBPbgotT1BUSU9OUys9CUxBTUUgIkxhbWUgbXAzIGF1ZGlvIGVuY29k
 ZXIgc3VwcG9ydCIgT24KIE9QVElPTlMrPQlMSVZFTUVESUEgIlN1cHBvcnQgZm9yIHJzdHAvcnRw
 L3NkcCBwcm90b2NvbHMiIE9uCitPUFRJT05TKz0JTFVBICJFbmFibGUgbHVhIHNjcmlwdGluZyIg
 T2ZmCiBPUFRJT05TKz0JTUFEICJNYWQgbXAzIGF1ZGlvIGRlY29kZXIgc3VwcG9ydCIgT24KIE9Q
 VElPTlMrPQlNQVRST1NLQSAiTWF0cm9za2EgQ29udGFpbmVyIEZvcm1hdCBzdXBwb3J0IiBPbgog
 T1BUSU9OUys9CU1QRUcyICJNcGVnLTIgYXVkaW8vdmlkZW8gZGVjb2RlciBTdXBwb3J0IiBPbgpA
 QCAtNTgsMjAgKzU1LDE2IEBACiBPUFRJT05TKz0JU1ZHICJTVkcgZ3JhcGhpY3Mgc3VwcG9ydCIg
 T2ZmCiBPUFRJT05TKz0JU1ZHQUxJQiAiU1ZHQUxJQiB2aWRlbyBvdXRwdXQiIE9mZgogT1BUSU9O
 Uys9CVNIT1VUICJTaG91dDIgc3VwcG9ydCIgT2ZmCi1PUFRJT05TKz0JU0tJTlMgIkVuYWJsZSBH
 VEsrIHNraW5zbmVkIGludGVyZmFjZSIgT2ZmCitPUFRJT05TKz0JU0tJTlMgIkVuYWJsZSB3aW5h
 bXAgc2tpbnMgaW50ZXJmYWNlIiBPZmYKIE9QVElPTlMrPQlTUEVFWCAiU3BlZXggdm9pY2UgY29k
 ZWMgc3VwcG9ydCIgT24KIE9QVElPTlMrPQlUSEVPUkEgIk9HRy9Wb3JiaXMgdmlkZW8gY29kZWMg
 c3VwcG9ydCIgT24KIE9QVElPTlMrPQlUV09MQU1FICJUd29sYW1lIG1wZWcyIGF1ZGlvIGVuY29k
 ZXIgc3VwcG9ydCIgT24KIE9QVElPTlMrPQlWT1JCSVMgIlZvcmJpcyBzdXBwb3J0IiBPbgogT1BU
 SU9OUys9CVdJTjMyX0NPREVDUyAid2luMzIgbXVsdGltZWRpYSBETEwncyIgT2ZmCi1PUFRJT05T
 Kz0JV1hHVEsgIld4R1RLL1d4V2lkZ2V0cyBJbnRlcmZhY2UiIE9mZgogT1BUSU9OUys9CVgyNjQg
 IkVuYWJsZSBILjI2NC9BVkMgY29kZWMgc3VwcG9ydCIgT24KIAotV1JLU1JDPQkJJHtXUktESVJ9
 LyR7UE9SVE5BTUV9LTAuOS4wLXN2bgogQ09ORkxJQ1RTPQl2bGMtWzAtOV0qCiAKLVdJVEhfVkxD
 X0RFRkFVTFRfRk9OVD89CSR7TE9DQUxCQVNFfS9saWIvWDExL2ZvbnRzL2JpdHN0cmVhbS12ZXJh
 L1ZlcmEudHRmCi0KIFVTRV9CWklQMj0JeWVzCiBVU0VfR0VUVEVYVD0JeWVzCiBVU0VfR01BS0U9
 CXllcwpAQCAtMTAxLDE0ICs5NCwxMyBAQAogCQkJLS13aXRob3V0LWR2LXJhdzEzOTQgXAogCQkJ
 LS1kaXNhYmxlLWR2CiAKLSMjIyMjIEJST0tFTiAjIyMKLUNPTkZJR1VSRV9BUkdTKz0JLS1kaXNh
 YmxlLW9wZW5nbAotCiBNQU4xPQkJdmxjLjEgXAogCQl2bGMtY29uZmlnLjEKIAogLmluY2x1ZGUg
 PGJzZC5wb3J0LnByZS5taz4KIAorV0lUSF9WTENfREVGQVVMVF9GT05UPz0JJHtMT0NBTEJBU0V9
 L2xpYi9YMTEvZm9udHMvYml0c3RyZWFtLXZlcmEvVmVyYS50dGYKKwogLmlmICR7UEVSTF9MRVZF
 TH0gPCA1MDA4MDAKIEJST0tFTj0JRG9lcyBub3QgY29tcGlsZSB3aXRoIHBlcmwgJHtQRVJMX1ZF
 UlNJT059CiAuZW5kaWYKQEAgLTE3Niw3ICsxNjgsNiBAQAogCiAuaWYgZGVmaW5lZChXSVRIX1NL
 SU5TKSAmJiAhZGVmaW5lZChXSVRIT1VUX1NLSU5TKQogQ09ORklHVVJFX0FSR1MrPS0tZW5hYmxl
 LXNraW5zMgotV0lUSF9XWEdUSz15ZXMKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9LS1kaXNhYmxl
 LXNraW5zMgogLmVuZGlmCkBAIC0xODgsMTQgKzE3OSw2IEBACiBDT05GSUdVUkVfQVJHUys9LS1k
 aXNhYmxlLWxvYWRlcgogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfV1hHVEspCi1VU0VfV1g9
 CQkyLjgKLVdYX1VOSUNPREU9CXllcwotQ09ORklHVVJFX0FSR1MrPS0tZW5hYmxlLXd4d2lkZ2V0
 cwotLmVsc2UKLUNPTkZJR1VSRV9BUkdTKz0tLWRpc2FibGUtd3h3aWRnZXRzCi0uZW5kaWYKLQog
 LmlmICFkZWZpbmVkKFdJVEhPVVRfSEFMKQogTElCX0RFUEVORFMrPQloYWwuMToke1BPUlRTRElS
 fS9zeXN1dGlscy9oYWwKIENPTkZJR1VSRV9BUkdTKz0tLWVuYWJsZS1oYWwKQEAgLTIzOSwxMyAr
 MjIyLDYgQEAKIAkJLS1kaXNhYmxlLWNkZGF4CiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9D
 T1JCQSkgJiYgIWRlZmluZWQoV0lUSE9VVF9DT1JCQSkKLVVTRV9HTk9NRSs9CW9yYml0MgotQ09O
 RklHVVJFX0FSR1MrPS0tZW5hYmxlLWNvcmJhCi0uZWxzZQotQ09ORklHVVJFX0FSR1MrPS0tZGlz
 YWJsZS1jb3JiYQotLmVuZGlmCi0KIC5pZiAhZGVmaW5lZChXSVRIT1VUX0RWQlBTSSkKIExJQl9E
 RVBFTkRTKz0JZHZicHNpLjU6JHtQT1JUU0RJUn0vbXVsdGltZWRpYS9saWJkdmJwc2kKIENPTkZJ
 R1VSRV9BUkdTKz0tLWVuYWJsZS1kdmJwc2kgXApAQCAtMzIzLDYgKzI5OSwxNSBAQAogQ09ORklH
 VVJFX0FSR1MrPS0tZGlzYWJsZS14MjY0CiAuZW5kaWYKIAorLmlmIChkZWZpbmVkKFdJVEhfTFVB
 KSB8fCBleGlzdHMoJHtMT0NBTEJBU0V9L2xpYi9sdWE1MS9saWJsdWEuYSkpICYmICFkZWZpbmVk
 KFdJVEhPVVRfTFVBKQorVVNFX0xVQT01LjErCitXQU5UX0xVQV9WRVI9NS4xCitDT05GSUdVUkVf
 RU5WPSBMVUFfQ0ZMQUdTPSItSSR7TFVBX0lOQ0RJUn0iIExVQV9MSUJTPSItTCR7TFVBX0xJQkRJ
 Un0iCitDT05GSUdVUkVfQVJHUys9LS1lbmFibGUtbHVhCisuZWxzZQorQ09ORklHVVJFX0FSR1Mr
 PS0tZGlzYWJsZS1sdWEKKy5lbmRpZgorCiAuaWYgKGRlZmluZWQoV0lUSF9DQUNBKSB8fCBleGlz
 dHMoJHtMT0NBTEJBU0V9L2xpYi9saWJjYWNhLmEpKSAmJiAhZGVmaW5lZChXSVRIT1VUX0NBQ0Ep
 CiAuaWYgIWRlZmluZWQoV0lUSE9VVF9BQUxJQikKIFdJVEhfQUFMSUI9CXllcwpAQCAtMzMzLDEz
 ICszMTgsNiBAQAogQ09ORklHVVJFX0FSR1MrPS0tZGlzYWJsZS1jYWNhCiAuZW5kaWYKIAotLmlm
 ICFkZWZpbmVkKFdJVEhPVVRfREFBUCkKLUxJQl9ERVBFTkRTKz0Jb3BlbmRhYXAuMDoke1BPUlRT
 RElSfS9kZXZlbC9saWJvcGVuZGFhcAotQ09ORklHVVJFX0FSR1MrPS0tZW5hYmxlLWRhYXAKLS5l
 bHNlCi1DT05GSUdVUkVfQVJHUys9LS1kaXNhYmxlLWRhYXAKLS5lbmRpZgotCiAuaWYgIWRlZmlu
 ZWQoV0lUSE9VVF9EVFMpCiBMSUJfREVQRU5EUys9CWRjYS4wOiR7UE9SVFNESVJ9L211bHRpbWVk
 aWEvbGliZGNhCiBDT05GSUdVUkVfQVJHUys9LS1lbmFibGUtZGNhCkBAIC0zNTgsMTUgKzMzNiw2
 IEBACiBDT05GSUdVUkVfQVJHUys9LS1kaXNhYmxlLWdnaQogLmVuZGlmCiAKLSMgRG8gbm90IHVz
 ZSBsYW1lIGlmIFBBQ0tBR0VfQlVJTERJTkcgaXMgZGVmaW5lZC4gc2luY2UKLSMgbGFtZSBjYW4g
 Tk9UIGJlIHBhY2thZ2VkLgotLmlmICFkZWZpbmVkKFdJVEhPVVRfTEFNRSkgJiYgIWRlZmluZWQo
 UEFDS0FHRV9CVUlMRElORykKLUxJQl9ERVBFTkRTKz0JbXAzbGFtZS4wOiR7UE9SVFNESVJ9L2F1
 ZGlvL2xhbWUKLUNPTkZJR1VSRV9BUkdTKz0tLWVuYWJsZS1tcDNsYW1lCi0uZWxzZQotQ09ORklH
 VVJFX0FSR1MrPS0tZGlzYWJsZS1tcDNsYW1lCi0uZW5kaWYKLQogLmlmICFkZWZpbmVkKFdJVEhP
 VVRfTUFUUk9TS0EpCiBMSUJfREVQRU5EUys9CW1hdHJvc2thLjA6JHtQT1JUU0RJUn0vbXVsdGlt
 ZWRpYS9saWJtYXRyb3NrYQogQ09ORklHVVJFX0FSR1MrPS0tZW5hYmxlLW1rdgpAQCAtMzgyLDgg
 KzM1MSwxMCBAQAogLmVuZGlmCiAKIC5pZiBkZWZpbmVkKFdJVEhfVkxDX01PWklMTEFfUExVR0lO
 KSAmJiAhZGVmaW5lZChXSVRIT1VUX1ZMQ19NT1pJTExBX1BMVUdJTikKLVVTRV9HRUNLTz0JZmly
 ZWZveCBtb3ppbGxhIHNlYW1vbmtleSBudnUKK1VTRV9HRUNLTz0gZmlyZWZveCBtb3ppbGxhIHNl
 YW1vbmtleSBudnUKIC5pbmNsdWRlICIkey5DVVJESVJ9Ly4uLy4uL3d3dy9tb3ppbGxhL2JzZC5n
 ZWNrby5tayIKK1VTRV9HRUNLTz0gZmlyZWZveDMgZmlyZWZveCBtb3ppbGxhIHNlYW1vbmtleSBu
 dnUKKy5pbmNsdWRlIDxic2QuZ2Vja28ubWs+CiBDT05GSUdVUkVfRU5WKz0JTU9aSUxMQV9DT05G
 SUc9IiR7R0VDS09fQ09ORklHfSIgXAogCQlYUElETD0iJHtYUElETH0iIFwKIAkJWFBJRExfSU5D
 TD0iJHtYUElETF9JTkNMfSIKQEAgLTQ4OSwxMiArNDYwLDYgQEAKIENPTkZJR1VSRV9BUkdTKz0t
 LWRpc2FibGUtZ251dGxzCiAuZW5kaWYKIAotLmlmICFkZWZpbmVkKFdJVEhPVVRfU0xQKQotTElC
 X0RFUEVORFMrPQlzbHAuMToke1BPUlRTRElSfS9uZXQvb3BlbnNscAotLmVsc2UKLUNPTkZJR1VS
 RV9BUkdTKz0tLWRpc2FibGUtc2xwCi0uZW5kaWYKLQogLmlmICFkZWZpbmVkKFdJVEhPVVRfU1BF
 RVgpCiBMSUJfREVQRU5EUys9CXNwZWV4LjE6JHtQT1JUU0RJUn0vYXVkaW8vc3BlZXgKIENPTkZJ
 R1VSRV9BUkdTKz0tLWVuYWJsZS1zcGVleApkaWZmIC1OcnUgdmxjLWRldmVsLW91dGRhdGVkL01h
 a2VmaWxlLmluYyB2bGMtZGV2ZWwvTWFrZWZpbGUuaW5jCi0tLSB2bGMtZGV2ZWwtb3V0ZGF0ZWQv
 TWFrZWZpbGUuaW5jCTIwMDgtMDctMDIgMTM6MzI6MzUuMDAwMDAwMDAwICswMjAwCisrKyB2bGMt
 ZGV2ZWwvTWFrZWZpbGUuaW5jCTIwMDgtMDctMDIgMTM6MTc6MjQuMDAwMDAwMDAwICswMjAwCkBA
 IC0xMSwyNyArMTEsMTggQEAKICMKICMgSW50ZXJmYWNlIEtub2JzOgogIwotIyBXSVRIX0NPUkJB
 Ci0jICBFbmFibGUgYSBDb3JiYSBpbnRlcmZhY2UgdmlhIG9yYml0MgotIwogIyBXSVRIX05DVVJT
 RVM9eWVzCiAjICBOY3Vyc2VzIChjb25zb2xlKSBpbnRlcmZhY2UKICMKICMgV0lUSF9TS0lOUwot
 IyAgVGhpcyBJbnRlcmZhY2Ugc3VwcG9ydHMgYSBza2lubmVkIGd0azIuMCBpbnRlcmZhY2UKKyMg
 IFRoaXMgSW50ZXJmYWNlIHN1cHBvcnRzIGEgc2tpbm5lZCBpbnRlcmZhY2UgdXNhYmxlIHdpdGgg
 d2luYW1wIDIueCBza2lucwogIyAgU2tpbnMgY2FuIGJlIGZvdW5kIGF0IGh0dHA6Ly93d3cudmlk
 ZW9sYW4ub3JnL3ZsYy9kb3dubG9hZC1za2lucy5odG1sCiAjCi0jIFdJVEhPVVRfV1hHVEs9eWVz
 Ci0jICBXeFdpZGdldHMgSW50ZXJmYWNlCi0jCiAjIEF1ZGlvIEtub2JzOgogIwogIyBXSVRIX0FS
 VFM9eWVzCiAjICBBcnRzIFN1cHBvcnQKICMKLSMgV0lUSE9VVF9EQUFQPXllcwotIyAgRW5hYmxl
 IGxpYm9wZW5kYWFwIHRvIGNvbm5lY3QgdG8gaVR1bmVzKFIpIG11c2ljIHNoYXJlcy4KLSMKICMg
 V0lUSE9VVF9EVFM9eWVzCiAjICBEVFMgZGVjb2RlciBTdXBwb3J0CiAjICB1c2VmdWwgZm9yIG1h
 bnkgZHZkcwpAQCAtNDksMTEgKzQwLDYgQEAKICMgV0lUSF9GTEFDPXllcwogIyAgRmxhYyBTdXBw
 b3J0CiAjCi0KLSMgV0lUSE9VVF9MQU1FPXllcwotIyAgTXAzIGVuY29kZXIgU3VwcG9ydAotIyAg
 ICoqIE5PVCBERUZJTkVEIGlmIFBBQ0tBR0VfQlVJTERJTkcgaXMgZGVmaW5lZCAqKgotIwogIyBX
 SVRIT1VUX0E1Mj15ZXMKICMgIGxpYmE1MiBhdWRpbyBzdXBwb3J0CiAjCkBAIC0xNDUsNiArMTMx
 LDkgQEAKICMKICMgT3RoZXIgS25vYnM6CiAjCisjIFdJVEhPVVRfTFVBPXllcworIyAgU3VwcG9y
 dCBmb3IgbHVhIHNjcmlwdGluZyAoaW50ZXJmYWNlcywgSFRNTCBwYXJzZXJzIGZvciB2aWRlbyB3
 ZWJzaXRlcy4uLikKKyMKICMgV0lUSE9VVF9BVkFIST15ZXMKICMgIEF2YWhpIChSZW5kZXp2b3Vz
 L0JvbmpvdXIgKFIpICkgbmV0d29ya2luZwogIwpAQCAtMTk0LDEwICsxODMsNiBAQAogIyBXSVRI
 X1NTTD15ZXMKICMgIEVuYWJsZSBUTFMvU1NMIFN1cHBvcnQgZm9yIHdlYiAoaHR0cGQpIGludGVy
 ZmFjZQogIwotIyBXSVRIT1VUX1NMUD15ZXMKLSMgIERpc2FibGUgU0xQIHNlcnZpY2UgZGlzY292
 ZXJ5IHN1cHBvcnQKLSMgICogcmVjb21tZW5kZWQgaWYgeW91IHdhbnQgdG8gc3RyZWFtIG1lZGlh
 Ci0jCiAjIFdJVEhfT1BUSU1JWkVEX0NGTEFHUz15ZXMKICMgIENvbXBpbGUgd2l0aCAtTzIgLWZm
 YXN0LW1hdGggLWZvbWl0LWZyYW1lLXBvaW50ZXIKICMKQEAgLTIyNiw2ICsyMTEsOCBAQAogIwog
 CiBwb3N0LXBhdGNoOgorIyBEbyBub3QgYXNzdW1lIExPQ0FMQkFTRSBpcyAvdXNyL2xvY2FsCisJ
 QCR7UkVJTlBMQUNFX0NNRH0gLWUgJ3N8L3Vzci9sb2NhbHwke0xPQ0FMQkFTRX18ZycgJHtXUktT
 UkN9L2NvbmZpZ3VyZQogIyBTdWJ0aXRsZSBkZWZhdWx0IGZvbnQKIAlAJHtSRUlOUExBQ0VfQ01E
 fSAtZSBcCiAJJ3N8L3Vzci9zaGFyZS9mb250cy90cnVldHlwZS9mcmVlZm9udC9GcmVlU2VyaWZC
 b2xkLnR0Znwke1dJVEhfVkxDX0RFRkFVTFRfRk9OVH18JyBcCkBAIC0yMzksNDMgKzIyNiwzMCBA
 QAogCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfGxyaW50fHJpbnR8JyBcCiAJCSR7V1JLU1JDfS9t
 b2R1bGVzL2d1aS9za2luczIvY29udHJvbHMvY3RybF9saXN0LmNwcAogLmVuZGlmCi0jIHMvTGlu
 dXgvRnJlZUJTRC8KLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAnc3xMaW51eHxGcmVlQlNEfCcgXAot
 CQkke1dSS1NSQ30vcG8vKgotCUAke1JNfSAtZiAke1dSS1NSQ30vcG8vKi5iYWsKLQlAJHtSRUlO
 UExBQ0VfQ01EfSAtZSAnc3xMaW51eCBPU1N8RnJlZUJTRCBPU1N8JyBcCi0JCSR7V1JLU1JDfS9t
 b2R1bGVzL2F1ZGlvX291dHB1dC9vc3MuYwotCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzLy1scHRo
 cmVhZC8ke1BUSFJFQURfTElCU30vJyBcCi0JCS1lICdzLy1sY19yLyR7UFRIUkVBRF9MSUJTfS8n
 IFwKLQkJLWUgJ3N8LW1jcHU9cGVudGl1bXByb3x8OyBzfC1sZGx8fCcgXAotCQkke1dSS1NSQ30v
 Y29uZmlndXJlICR7V1JLU1JDfS9saWJzL2xvYWRlci9NYWtlZmlsZS5pbgogIyBjZHJvbS9kdmQg
 c3VwcG9ydAogCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfC9kZXYvY2Ryb218JHtERUZBVUxUX0NE
 Uk9NX0RFVklDRX18OyBcCiAJCXN8L2Rldi9kdmR8JHtERUZBVUxUX0RWRF9ERVZJQ0V9fCcgXAog
 CQkke1dSS1NSQ30vaW5jbHVkZS92bGNfY29uZmlnLmgKKyMgYmluYXJ5IGRlY29kZXJzCiAJQCR7
 UkVJTlBMQUNFX0NNRH0gLWUgJ3N8LURXSU4zMl9QQVRIPVxcIlxcInwtRFdJTjMyX1BBVEg9XFwi
 JHtMT0NBTEJBU0V9L2xpYi93aW4zMlxcInwnIFwKIAkJJHtXUktTUkN9L2xpYnMvbG9hZGVyL01h
 a2VmaWxlLmluCiAJQCR7UkVJTlBMQUNFX0NNRH0gLWUgJ3N8L3Vzci9saWIvd2luMzJ8JHtMT0NB
 TEJBU0V9L2xpYi93aW4zMnwnIFwKIAkJJHtXUktTUkN9L2xpYnMvbG9hZGVyL21vZHVsZS5jCiAK
 LXByZS1idWlsZDoKLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAnc3wvaW50bC9saWJpbnRsLmF8JHtX
 UktTUkN9L2ludGwvbGliaW50bC5hfCcgXAotCQkke1dSS1NSQ30vdmxjLWNvbmZpZwotCiBwcmUt
 aW5zdGFsbDogYnVpbGQKIAkke1JNfSAtcmYgJHtQTElTVH0gJHtGQUtFRElSfQogCSR7TUtESVJ9
 ICR7RkFLRURJUn0KIAkke1RPVUNIfSAtZiAke1BMSVNUfQogCSR7RUNIT19DTUR9ICJzaGFyZS9h
 cHBsaWNhdGlvbnMvdmxjLmRlc2t0b3AiID4+ICR7UExJU1R9CisuaWYgIWRlZmluZWQoV0lUSE9V
 VF9RVDQpCisJJHtFQ0hPX0NNRH0gInNoYXJlL3BpeG1hcHMvcXZsYy5wbmciID4+ICR7UExJU1R9
 CisJJHtFQ0hPX0NNRH0gInNoYXJlL2FwcGxpY2F0aW9ucy9xdmxjLmRlc2t0b3AiID4+ICR7UExJ
 U1R9CisuZW5kaWYKIC5pZiBkZWZpbmVkKFdJVEhfU0tJTlMpICYmICFkZWZpbmVkKFdJVEhPVVRf
 U0tJTlMpCiAJJHtFQ0hPX0NNRH0gInNoYXJlL3BpeG1hcHMvZ3ZsYy5wbmciID4+ICR7UExJU1R9
 CiAJJHtFQ0hPX0NNRH0gInNoYXJlL2FwcGxpY2F0aW9ucy9zdmxjLmRlc2t0b3AiID4+ICR7UExJ
 U1R9CiAuZW5kaWYKLS5pZiAhZGVmaW5lZChXSVRIT1VUX1dYR1RLKQotCSR7RUNIT19DTUR9ICJz
 aGFyZS9waXhtYXBzL3d4dmxjLnBuZyIgPj4gJHtQTElTVH0KLQkke0VDSE9fQ01EfSAic2hhcmUv
 YXBwbGljYXRpb25zL3d4dmxjLmRlc2t0b3AiID4+ICR7UExJU1R9Ci0uZW5kaWYKLS5pZiAhZGVm
 aW5lZChXSVRIT1VUX1dYR1RLKSB8fCBkZWZpbmVkKFdJVEhfU0tJTlMpIHx8ICFkZWZpbmVkKFdJ
 VEhPVVRfUVQpCisuaWYgZGVmaW5lZChXSVRIX1NLSU5TKSB8fCAhZGVmaW5lZChXSVRIT1VUX1FU
 KQogCSR7RUNIT19DTUR9ICJAdW5leGVjICR7Uk1ESVJ9ICVEL3NoYXJlL2FwcGxpY2F0aW9ucyAy
 Pi9kZXYvbnVsbCB8fCAke1RSVUV9IiA+PiAke1BMSVNUfQogLmVuZGlmCiAJY2QgJHtXUktTUkN9
 ICYmICR7U0VURU5WfSAke01BS0VfRU5WfSAke0dNQUtFfSAke01BS0VfRkxBR1N9IFwKQEAgLTMz
 NywxOSArMzExLDE5IEBACiAuZW5kaWYKIAkke0lOU1RBTExfTUFOfSAke1dSS1NSQ30vZG9jL3Zs
 Yy4xICR7TUFOUFJFRklYfS9tYW4vbWFuMS8KIAkke0lOU1RBTExfTUFOfSAke1dSS1NSQ30vZG9j
 L3ZsYy1jb25maWcuMSAke01BTlBSRUZJWH0vbWFuL21hbjEvCi0uaWYgZGVmaW5lZChXSVRIX1NL
 SU5TKSB8fCAhZGVmaW5lZChXSVRIT1VUX1dYR1RLKQorLmlmIChkZWZpbmVkKFdJVEhfU0tJTlMp
 ICYmIGRlZmluZWQoV0lUSE9VVF9TS0lOUykpIHx8ICFkZWZpbmVkKFdJVEhPVVRfUVQ0KQogCWlm
 IFsgISAtZCAke1BSRUZJWH0vc2hhcmUvYXBwbGljYXRpb25zIF07IHRoZW4gXAogCQkke01LRElS
 fSAke1BSRUZJWH0vc2hhcmUvYXBwbGljYXRpb25zIDsgXAogCWZpCiAJaWYgWyAhIC1kICR7UFJF
 RklYfS9zaGFyZS9waXhtYXBzIF07IHRoZW4gXAogCQkke01LRElSfSAke1BSRUZJWH0vc2hhcmUv
 cGl4bWFwcyA7IFwKIAlmaQorLmlmICFkZWZpbmVkKFdJVEhPVVRfUVQ0KQorCSR7SU5TVEFMTF9E
 QVRBfSAke0ZJTEVTRElSfS9xdmxjLmRlc2t0b3AgJHtQUkVGSVh9L3NoYXJlL2FwcGxpY2F0aW9u
 cworCSR7SU5TVEFMTF9EQVRBfSAke0ZBS0VESVJ9L3NoYXJlL3ZsYy92bGM0OHg0OC5wbmcgJHtQ
 UkVGSVh9L3NoYXJlL3BpeG1hcHMvcXZsYy5wbmcKKy5lbmRpZgogLmlmIGRlZmluZWQoV0lUSF9T
 S0lOUykgJiYgIWRlZmluZWQoV0lUSE9VVF9TS0lOUykKIAkke0lOU1RBTExfREFUQX0gJHtGSUxF
 U0RJUn0vc3ZsYy5kZXNrdG9wICR7UFJFRklYfS9zaGFyZS9hcHBsaWNhdGlvbnMKIAkke0lOU1RB
 TExfREFUQX0gJHtGQUtFRElSfS9zaGFyZS92bGMvdmxjNDh4NDgucG5nICR7UFJFRklYfS9zaGFy
 ZS9waXhtYXBzL2d2bGMucG5nCiAuZW5kaWYKLS5pZiAhZGVmaW5lZChXSVRIT1VUX1dYR1RLKQot
 CSR7SU5TVEFMTF9EQVRBfSAke0ZJTEVTRElSfS93eHZsYy5kZXNrdG9wICR7UFJFRklYfS9zaGFy
 ZS9hcHBsaWNhdGlvbnMKLQkke0lOU1RBTExfREFUQX0gJHtGQUtFRElSfS9zaGFyZS92bGMvdmxj
 NDh4NDgucG5nICR7UFJFRklYfS9zaGFyZS9waXhtYXBzL3d4dmxjLnBuZwotLmVuZGlmCiAuZW5k
 aWYKZGlmZiAtTnJ1IHZsYy1kZXZlbC1vdXRkYXRlZC9kaXN0aW5mbyB2bGMtZGV2ZWwvZGlzdGlu
 Zm8KLS0tIHZsYy1kZXZlbC1vdXRkYXRlZC9kaXN0aW5mbwkyMDA4LTA3LTAyIDEzOjMyOjM1LjAw
 MDAwMDAwMCArMDIwMAorKysgdmxjLWRldmVsL2Rpc3RpbmZvCTIwMDgtMDctMDIgMTM6MTc6MjQu
 MDAwMDAwMDAwICswMjAwCkBAIC0xLDMgKzEsMyBAQAotTUQ1ICh2bGMtc25hcHNob3QtMjAwODAy
 MjMudGFyLmJ6MikgPSBlYjk4ODg5MjFhZTJmNmZkN2EyYjJiNjQwMmM2ZTFkNwotU0hBMjU2ICh2
 bGMtc25hcHNob3QtMjAwODAyMjMudGFyLmJ6MikgPSBiODYyMzNkODhkYzYzNzk4ZmQ5NzhlYWQ2
 NGIwZDVlOWY5YzJmYTE1ZjUxODFkZjE0N2Y3YjFmMGJjMTkxZTk1Ci1TSVpFICh2bGMtc25hcHNo
 b3QtMjAwODAyMjMudGFyLmJ6MikgPSAxMzQ0NjkzNgorTUQ1ICh2bGMtMC45LjAtdGVzdDEudGFy
 LmJ6MikgPSA3MzhhYTg2NjkxZTVkOTMyNzNkNmU3MTNhZGNlZWIyMQorU0hBMjU2ICh2bGMtMC45
 LjAtdGVzdDEudGFyLmJ6MikgPSAwYzU5ZTkyZDAzZjkxMjZiMDU5MjM4YWM5NjVkZDVmMDExYzAx
 YTI2YjY0YjBmOTliYWJlZTYzMDczOGYzNDZhCitTSVpFICh2bGMtMC45LjAtdGVzdDEudGFyLmJ6
 MikgPSAxNTUyMTgwNwpkaWZmIC1OcnUgdmxjLWRldmVsLW91dGRhdGVkL2ZpbGVzL3BhdGNoLWNv
 bmZpZ3VyZSB2bGMtZGV2ZWwvZmlsZXMvcGF0Y2gtY29uZmlndXJlCi0tLSB2bGMtZGV2ZWwtb3V0
 ZGF0ZWQvZmlsZXMvcGF0Y2gtY29uZmlndXJlCTIwMDgtMDctMDIgMTM6MzI6MzUuMDAwMDAwMDAw
 ICswMjAwCisrKyB2bGMtZGV2ZWwvZmlsZXMvcGF0Y2gtY29uZmlndXJlCTIwMDgtMDctMDIgMTM6
 MTc6MjQuMDAwMDAwMDAwICswMjAwCkBAIC0xLDU1ICsxLDExIEBACi0tLS0gY29uZmlndXJlLm9y
 aWcJU2F0IEp1biAgMiAxODowMTo1MCAyMDA3Ci0rKysgY29uZmlndXJlCVN1biBKdW4gIDMgMTY6
 MjA6MDMgMjAwNwotQEAgLTI0OTksOCArMjQ5OSw3IEBACi0gZG9uZQotIGlmIHRlc3QgLXogIiRh
 Y19hdXhfZGlyIjsgdGhlbgotICAgeyB7IGVjaG8gIiRhc19tZTokTElORU5POiBlcnJvcjogY2Fu
 bm90IGZpbmQgaW5zdGFsbC1zaCBvciBpbnN0YWxsLnNoIGluIGF1dG90b29scyBcIiRzcmNkaXJc
 Ii9hdXRvdG9vbHMiID4mNQotLWVjaG8gIiRhc19tZTogZXJyb3I6IGNhbm5vdCBmaW5kIGluc3Rh
 bGwtc2ggb3IgaW5zdGFsbC5zaCBpbiBhdXRvdG9vbHMgXCIkc3JjZGlyXCIvYXV0b3Rvb2xzIiA+
 JjI7fQotLSAgIHsgKGV4aXQgMSk7IGV4aXQgMTsgfTsgfQotK2VjaG8gIiRhc19tZTogZXJyb3I6
 IGNhbm5vdCBmaW5kIGluc3RhbGwtc2ggb3IgaW5zdGFsbC5zaCBpbiBhdXRvdG9vbHMgXCIkc3Jj
 ZGlyXCIvYXV0b3Rvb2xzIiA+JjI7fSB9Ci0gZmkKKy0tLSBjb25maWd1cmUub3JpZwkyMDA4LTA3
 LTAyIDEzOjE2OjE2LjAwMDAwMDAwMCArMDIwMAorKysrIGNvbmZpZ3VyZQkyMDA4LTA3LTAyIDEz
 OjE2OjQ4LjAwMDAwMDAwMCArMDIwMAorQEAgLTczODczLDcgKzczODczLDcgQEAKICAKLSAjIFRo
 ZXNlIHRocmVlIHZhcmlhYmxlcyBhcmUgdW5kb2N1bWVudGVkIGFuZCB1bnN1cHBvcnRlZCwKLUBA
 IC00MjMzNiw4ICs0MjMzNSw3IEBACi0gICAgICAgICBpZiB0ZXN0IC1uICIke2VuYWJsZV9kdn0i
 Ci0gICAgICAgICB0aGVuCi0gICAgICAgICAgIHsgeyBlY2hvICIkYXNfbWU6JExJTkVOTzogZXJy
 b3I6IGNhbm5vdCBmaW5kIGxpYnJhdzEzOTQgaGVhZGVycyIgPiY1Ci0tZWNobyAiJGFzX21lOiBl
 cnJvcjogY2Fubm90IGZpbmQgbGlicmF3MTM5NCBoZWFkZXJzIiA+JjI7fQotLSAgIHsgKGV4aXQg
 MSk7IGV4aXQgMTsgfTsgfQotK2VjaG8gIiRhc19tZTogZXJyb3I6IGNhbm5vdCBmaW5kIGxpYnJh
 dzEzOTQgaGVhZGVycyIgPiYyO30gO30KLSAgICAgICAgIGZpCisgVkxDX0NPTkZJRz0idG9wX2J1
 aWxkZGlyPVwiXCQodG9wX2J1aWxkZGlyKVwiIFwkKHRvcF9idWlsZGRpcikvdmxjLWNvbmZpZyIK
 ICAKLSBmaQotQEAgLTQyMzU2LDggKzQyMzU0LDcgQEAKLSAgICAgICAgICAgICB7IGVjaG8gIiRh
 c19tZTokTElORU5POiByZXN1bHQ6IG5vIiA+JjUKLSBlY2hvICIke0VDSE9fVH1ubyIgPiY2OyB9
 Ci0gICAgICAgeyB7IGVjaG8gIiRhc19tZTokTElORU5POiBlcnJvcjogY2Fubm90IGNkIHRvICR7
 cmVhbF9kdl9yYXcxMzk0X3RyZWV9IiA+JjUKLS1lY2hvICIkYXNfbWU6IGVycm9yOiBjYW5ub3Qg
 Y2QgdG8gJHtyZWFsX2R2X3JhdzEzOTRfdHJlZX0iID4mMjt9Ci0tICAgeyAoZXhpdCAxKTsgZXhp
 dCAxOyB9OyB9Ci0rZWNobyAiJGFzX21lOiBlcnJvcjogY2Fubm90IGNkIHRvICR7cmVhbF9kdl9y
 YXcxMzk0X3RyZWV9IiA+JjI7fSA7fQotICAgICBmaQotICAgICBpZiB0ZXN0IC1mICIke3JlYWxf
 ZHZfcmF3MTM5NF90cmVlfS9zcmMvLmxpYnMvbGlicmF3MTM5NC5hIgotICAgICB0aGVuCi1AQCAt
 NDI1NzYsOCArNDI1NzMsNyBAQAotICAgICAgICAgaWYgdGVzdCAtbiAiJHtlbmFibGVfZHZ9Igot
 ICAgICAgICAgdGhlbgotICAgICAgICAgICB7IHsgZWNobyAiJGFzX21lOiRMSU5FTk86IGVycm9y
 OiBjYW5ub3QgZmluZCBsaWJhdmMxMzk0IGhlYWRlcnMiID4mNQotLWVjaG8gIiRhc19tZTogZXJy
 b3I6IGNhbm5vdCBmaW5kIGxpYmF2YzEzOTQgaGVhZGVycyIgPiYyO30KLS0gICB7IChleGl0IDEp
 OyBleGl0IDE7IH07IH0KLStlY2hvICIkYXNfbWU6IGVycm9yOiBjYW5ub3QgZmluZCBsaWJhdmMx
 Mzk0IGhlYWRlcnMiID4mMjt9IDsgfQotICAgICAgICAgZmkKKy1DUFBGTEFHU19zYXZlPSIke0NQ
 UEZMQUdTX3NhdmV9IC1JXCQodG9wX3NyY2RpcikvaW5jbHVkZSAtSVwkKHRvcF9idWlsZGRpcikv
 aW5jbHVkZSIKKytDUFBGTEFHU19zYXZlPSItSVwkKHRvcF9zcmNkaXIpL2luY2x1ZGUgLUlcJCh0
 b3BfYnVpbGRkaXIpL2luY2x1ZGUgJHtDUFBGTEFHU19zYXZlfSIKICAKLSBmaQotQEAgLTY0MzA3
 LDEyICs2NDMwMyw2IEBACiAgCi0gICBpZiB0ZXN0ICIke1dYX0NPTkZJR30iICE9ICJubyIgLWEg
 IiR7Q1hYfSIgIT0gIiIKLSAgIHRoZW4KLS0gICAgaWYgZXhwciAyLjYuMCBcPiBgJHtXWF9DT05G
 SUd9IC0tdmVyc2lvbmAgPi9kZXYvbnVsbAotLSAgICB0aGVuCi0tICAgICAgeyB7IGVjaG8gIiRh
 c19tZTokTElORU5POiBlcnJvcjogWW91IG5lZWQgd3hXaWRnZXRzIHZlcnNpb24gMi42LjAgb3Ig
 dXB3YXJkcy4gUGxlYXNlIHVwZ3JhZGUgYW5kIHRyeSBhZ2Fpbi4iID4mNQotLWVjaG8gIiRhc19t
 ZTogZXJyb3I6IFlvdSBuZWVkIHd4V2lkZ2V0cyB2ZXJzaW9uIDIuNi4wIG9yIHVwd2FyZHMuIFBs
 ZWFzZSB1cGdyYWRlIGFuZCB0cnkgYWdhaW4uIiA+JjI7fQotLSAgIHsgKGV4aXQgMSk7IGV4aXQg
 MTsgfTsgfQotLSAgICBmaQotICAgICBhY19leHQ9Y3BwCi0gYWNfY3BwPSckQ1hYQ1BQICRDUFBG
 TEFHUycKLSBhY19jb21waWxlPSckQ1hYIC1jICRDWFhGTEFHUyAkQ1BQRkxBR1MgY29uZnRlc3Qu
 JGFjX2V4dCA+JjUnCisgICBDUFBGTEFHUz0iJHtDUFBGTEFHU19zYXZlfSIKZGlmZiAtTnJ1IHZs
 Yy1kZXZlbC1vdXRkYXRlZC9maWxlcy9wYXRjaC1tb2R1bGVzX3N0cmVhbV9vdXRfc3dpdGNoZXIu
 YyB2bGMtZGV2ZWwvZmlsZXMvcGF0Y2gtbW9kdWxlc19zdHJlYW1fb3V0X3N3aXRjaGVyLmMKLS0t
 IHZsYy1kZXZlbC1vdXRkYXRlZC9maWxlcy9wYXRjaC1tb2R1bGVzX3N0cmVhbV9vdXRfc3dpdGNo
 ZXIuYwkyMDA4LTA3LTAyIDEzOjMyOjM1LjAwMDAwMDAwMCArMDIwMAorKysgdmxjLWRldmVsL2Zp
 bGVzL3BhdGNoLW1vZHVsZXNfc3RyZWFtX291dF9zd2l0Y2hlci5jCTE5NzAtMDEtMDEgMDE6MDA6
 MDAuMDAwMDAwMDAwICswMTAwCkBAIC0xLDExICswLDAgQEAKLS0tLSBtb2R1bGVzL3N0cmVhbV9v
 dXQvc3dpdGNoZXIuYy5vcmlnCVdlZCBNYXIgMjMgMDM6NTc6MTUgMjAwNQotKysrIG1vZHVsZXMv
 c3RyZWFtX291dC9zd2l0Y2hlci5jCVdlZCBNYXIgMjMgMDM6NTc6NTAgMjAwNQotQEAgLTQ0LDcg
 KzQ0LDcgQEAKLSAjaWZkZWYgSEFWRV9QT1NUUFJPQ19QT1NUUFJPQ0VTU19ICi0gIyAgIGluY2x1
 ZGUgPHBvc3Rwcm9jL3Bvc3Rwcm9jZXNzLmg+Ci0gI2Vsc2UKLS0jICAgaW5jbHVkZSA8bGlicG9z
 dHByb2MvcG9zdHByb2Nlc3MuaD4KLSsjICAgaW5jbHVkZSA8ZmZtcGVnL3Bvc3Rwcm9jL3Bvc3Rw
 cm9jZXNzLmg+Ci0gI2VuZGlmCi0gCi0gI2RlZmluZSBTT1VUX0NGR19QUkVGSVggInNvdXQtc3dp
 dGNoZXItIgpkaWZmIC1OcnUgdmxjLWRldmVsLW91dGRhdGVkL2ZpbGVzL3BhdGNoLW1vZHVsZXNf
 dmlzdWFsaXphdGlvbl9nYWxha3Rvc19QQ00uYyB2bGMtZGV2ZWwvZmlsZXMvcGF0Y2gtbW9kdWxl
 c192aXN1YWxpemF0aW9uX2dhbGFrdG9zX1BDTS5jCi0tLSB2bGMtZGV2ZWwtb3V0ZGF0ZWQvZmls
 ZXMvcGF0Y2gtbW9kdWxlc192aXN1YWxpemF0aW9uX2dhbGFrdG9zX1BDTS5jCTIwMDgtMDctMDIg
 MTM6MzI6MzUuMDAwMDAwMDAwICswMjAwCisrKyB2bGMtZGV2ZWwvZmlsZXMvcGF0Y2gtbW9kdWxl
 c192aXN1YWxpemF0aW9uX2dhbGFrdG9zX1BDTS5jCTE5NzAtMDEtMDEgMDE6MDA6MDAuMDAwMDAw
 MDAwICswMTAwCkBAIC0xLDExICswLDAgQEAKLS0tLSBtb2R1bGVzL3Zpc3VhbGl6YXRpb24vZ2Fs
 YWt0b3MvUENNLmMub3JpZwlGcmkgTm92IDI2IDA4OjIxOjQ3IDIwMDQKLSsrKyBtb2R1bGVzL3Zp
 c3VhbGl6YXRpb24vZ2FsYWt0b3MvUENNLmMJRnJpIE5vdiAyNiAwODoyMjowNiAyMDA0Ci1AQCAt
 NzksNyArNzksNyBAQAotIC8vVGFrZXMgaW4gYSAyeDUxMiBhcnJheSBvZiBQQ00gc2FtcGxlcwot
 IC8vYW5kIHN0b3JlcyB0aGVtCi0gCi0tdm9pZCBhZGRQQ00oaW50MTZfdCBQQ01kYXRhWzJdWzUx
 Ml0pCi0rdm9pZCBhZGRQQ00oc2hvcnQgUENNZGF0YVsyXVs1MTJdKQotIHsKLSAgIGludCBpLGo7
 Ci0gICBpbnQgc2FtcGxlcz01MTI7CmRpZmYgLU5ydSB2bGMtZGV2ZWwtb3V0ZGF0ZWQvZmlsZXMv
 cXZsYy5kZXNrdG9wIHZsYy1kZXZlbC9maWxlcy9xdmxjLmRlc2t0b3AKLS0tIHZsYy1kZXZlbC1v
 dXRkYXRlZC9maWxlcy9xdmxjLmRlc2t0b3AJMTk3MC0wMS0wMSAwMTowMDowMC4wMDAwMDAwMDAg
 KzAxMDAKKysrIHZsYy1kZXZlbC9maWxlcy9xdmxjLmRlc2t0b3AJMjAwOC0wNy0wMiAxMzoxNzoy
 NC4wMDAwMDAwMDAgKzAyMDAKQEAgLTAsMCArMSwxMCBAQAorW0Rlc2t0b3AgRW50cnldCitFbmNv
 ZGluZz1VVEYtOAorTmFtZT1WaWRlb0xBTiAoUVQ0KSBNZWRpYSBQbGF5ZXIKK0NvbW1lbnQ9Vmlk
 ZW8gYW5kIEF1ZGlvIHBsYXllciBhbmQgc2VydmVyCitJY29uPXF2bGMucG5nCitFeGVjPXF2bGMK
 K1RyeUV4ZWM9cXZsYworVGVybWluYWw9ZmFsc2UKK1R5cGU9QXBwbGljYXRpb24KK0NhdGVnb3Jp
 ZXM9QXBwbGljYXRpb247QXVkaW9WaWRlbzsKZGlmZiAtTnJ1IHZsYy1kZXZlbC1vdXRkYXRlZC9m
 aWxlcy93eHZsYy5kZXNrdG9wIHZsYy1kZXZlbC9maWxlcy93eHZsYy5kZXNrdG9wCi0tLSB2bGMt
 ZGV2ZWwtb3V0ZGF0ZWQvZmlsZXMvd3h2bGMuZGVza3RvcAkyMDA4LTA3LTAyIDEzOjMyOjM1LjAw
 MDAwMDAwMCArMDIwMAorKysgdmxjLWRldmVsL2ZpbGVzL3d4dmxjLmRlc2t0b3AJMTk3MC0wMS0w
 MSAwMTowMDowMC4wMDAwMDAwMDAgKzAxMDAKQEAgLTEsMTAgKzAsMCBAQAotW0Rlc2t0b3AgRW50
 cnldCi1FbmNvZGluZz1VVEYtOAotTmFtZT1WaWRlb0xBTiAoV3hHVEspIE1lZGlhIFBsYXllcgot
 Q29tbWVudD1WaWRlbyBhbmQgQXVkaW8gcGxheWVyIGFuZCBzZXJ2ZXIKLUljb249d3h2bGMucG5n
 Ci1FeGVjPXd4dmxjCi1UcnlFeGVjPXd4dmxjCi1UZXJtaW5hbD1mYWxzZQotVHlwZT1BcHBsaWNh
 dGlvbgotQ2F0ZWdvcmllcz1BcHBsaWNhdGlvbjtBdWRpb1ZpZGVvOwpkaWZmIC1OcnUgdmxjLWRl
 dmVsLW91dGRhdGVkL3BrZy1kZXNjciB2bGMtZGV2ZWwvcGtnLWRlc2NyCi0tLSB2bGMtZGV2ZWwt
 b3V0ZGF0ZWQvcGtnLWRlc2NyCTIwMDgtMDctMDIgMTM6MzI6MzUuMDAwMDAwMDAwICswMjAwCisr
 KyB2bGMtZGV2ZWwvcGtnLWRlc2NyCTIwMDgtMDctMDIgMTM6MTc6MjQuMDAwMDAwMDAwICswMjAw
 CkBAIC0xLDUgKzEsMyBAQAotdmxjIC0tIHRoZSBWaWRlb0xBTiBDbGllbnQKLQogVkxDIG1lZGlh
 IHBsYXllciBpcyBhIGhpZ2hseSBwb3J0YWJsZSBtdWx0aW1lZGlhIHBsYXllciBmb3IgdmFyaW91
 cwogYXVkaW8gYW5kIHZpZGVvIGZvcm1hdHMgKE1QRUctMSwgTVBFRy0yLCBNUEVHLTQsIERpdlgs
 IG1wMywgb2dnLCBhbmQKIG1vcmUpIGFzIHdlbGwgYXMgRFZEJ3MsIFZDRCdzLCBhbmQgdmFyaW91
 cyBzdHJlYW1pbmcgcHJvdG9jb2xzLiBJdAo=
 ------=_Part_1952_7699876.1214998686201--

From: =?ISO-8859-1?Q?Rafa=EBl_Carr=E9?= <rcarre@m2x.nl>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117810: multimedia/vlc-devel port could be compiled with
	lua modules
Date: Wed, 02 Jul 2008 15:14:02 +0200

 --=-ODBrn2Ojdeicb3Mf49eI
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: quoted-printable
 
 Hello,
 
 This patch supersedes the previous one, it missed some bugfixes.
 Hopefully it's mailed correctly this time
 
 --=20
 Rafa=C3=ABl Carr=C3=A9 <rcarre@m2x.nl>
 
 --=-ODBrn2Ojdeicb3Mf49eI
 Content-Disposition: inline; filename=vlc-devel.diff
 Content-Type: text/x-patch; name=vlc-devel.diff; charset=utf-8
 Content-Transfer-Encoding: 7bit
 
 diff -ruN vlc-devel-orig/Makefile vlc-devel/Makefile
 --- vlc-devel-orig/Makefile	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/Makefile	2008-07-02 15:10:57.000000000 +0200
 @@ -9,19 +9,18 @@
  #
  
  PORTNAME=	vlc
 -DISTVERSION=	0.9.0.20080223
 -PORTREVISION=	6
 -PORTEPOCH=	2
 +DISTVERSION=	0.9.0-test1
 +PORTEPOCH=	3
  CATEGORIES=	multimedia audio ipv6 net www
 -MASTER_SITES=	http://nightlies.videolan.org/build/source/trunk-${DISTVERSION:S/0.9.0.//}-0024/
 +MASTER_SITES=	http://download.videolan.org/pub/videolan/testing/
 +#MASTER_SITES=	http://nightlies.videolan.org/build/source/trunk-${DISTVERSION:S/0.9.0.//}-0024/
  #MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
  #		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${DISTVERSION}/ \
  #		ftp://ftp.crans.org/pub/videolan/vlc/${DISTVERSION}/ \
  #		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${DISTVERSION}/
  PKGNAMESUFFIX=	-devel
 -DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.9.0.//}
  
 -MAINTAINER=     funman@videolan.org
 +MAINTAINER=	funman@videolan.org
  COMMENT=	Multimedia streaming server and player for various audio/video formats
  
  BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 @@ -35,8 +34,6 @@
  OPTIONS+=	AVAHI "Avahi (Rendezvous/Bonjour (R) ) networking" On
  OPTIONS+=	CACA "Libcaca Console Graphics Support" Off
  OPTIONS+=	ARTS "Enable arts sound support" Off
 -OPTIONS+=	CORBA "Enable a Corba interface via orbit2" Off
 -OPTIONS+=	DAAP "Connect to iTunes(R) music shares" On
  OPTIONS+=	DEBUG "Enable debuging support" Off
  OPTIONS+=	DTS "DTS decoder support, many DVDs use this" On
  OPTIONS+=	ESOUND "Esound Support" Off
 @@ -44,8 +41,8 @@
  OPTIONS+=	FAAD "Faad audio decoder (mp4/aac) support" On
  OPTIONS+=	FLAC "Flac audio codec support" On
  OPTIONS+=	HTTPD "Streaming media control via http" On
 -OPTIONS+=	LAME "Lame mp3 audio encoder support" On
  OPTIONS+=	LIVEMEDIA "Support for rstp/rtp/sdp protocols" On
 +OPTIONS+=	LUA "Enable lua scripting" Off
  OPTIONS+=	MAD "Mad mp3 audio decoder support" On
  OPTIONS+=	MATROSKA "Matroska Container Format support" On
  OPTIONS+=	MPEG2 "Mpeg-2 audio/video decoder Support" On
 @@ -58,20 +55,16 @@
  OPTIONS+=	SVG "SVG graphics support" Off
  OPTIONS+=	SVGALIB "SVGALIB video output" Off
  OPTIONS+=	SHOUT "Shout2 support" Off
 -OPTIONS+=	SKINS "Enable GTK+ skinsned interface" Off
 +OPTIONS+=	SKINS "Enable winamp skins interface" Off
  OPTIONS+=	SPEEX "Speex voice codec support" On
  OPTIONS+=	THEORA "OGG/Vorbis video codec support" On
  OPTIONS+=	TWOLAME "Twolame mpeg2 audio encoder support" On
  OPTIONS+=	VORBIS "Vorbis support" On
  OPTIONS+=	WIN32_CODECS "win32 multimedia DLL's" Off
 -OPTIONS+=	WXGTK "WxGTK/WxWidgets Interface" Off
  OPTIONS+=	X264 "Enable H.264/AVC codec support" On
  
 -WRKSRC=		${WRKDIR}/${PORTNAME}-0.9.0-svn
  CONFLICTS=	vlc-[0-9]*
  
 -WITH_VLC_DEFAULT_FONT?=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 -
  USE_BZIP2=	yes
  USE_GETTEXT=	yes
  USE_GMAKE=	yes
 @@ -101,14 +94,13 @@
  			--without-dv-raw1394 \
  			--disable-dv
  
 -##### BROKEN ###
 -CONFIGURE_ARGS+=	--disable-opengl
 -
  MAN1=		vlc.1 \
  		vlc-config.1
  
  .include <bsd.port.pre.mk>
  
 +WITH_VLC_DEFAULT_FONT?=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 +
  .if ${PERL_LEVEL} < 500800
  BROKEN=	Does not compile with perl ${PERL_VERSION}
  .endif
 @@ -176,7 +168,6 @@
  
  .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
  CONFIGURE_ARGS+=--enable-skins2
 -WITH_WXGTK=yes
  .else
  CONFIGURE_ARGS+=--disable-skins2
  .endif
 @@ -188,14 +179,6 @@
  CONFIGURE_ARGS+=--disable-loader
  .endif
  
 -.if defined(WITH_WXGTK)
 -USE_WX=		2.8
 -WX_UNICODE=	yes
 -CONFIGURE_ARGS+=--enable-wxwidgets
 -.else
 -CONFIGURE_ARGS+=--disable-wxwidgets
 -.endif
 -
  .if !defined(WITHOUT_HAL)
  LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
  CONFIGURE_ARGS+=--enable-hal
 @@ -239,13 +222,6 @@
  		--disable-cddax
  .endif
  
 -.if defined(WITH_CORBA) && !defined(WITHOUT_CORBA)
 -USE_GNOME+=	orbit2
 -CONFIGURE_ARGS+=--enable-corba
 -.else
 -CONFIGURE_ARGS+=--disable-corba
 -.endif
 -
  .if !defined(WITHOUT_DVBPSI)
  LIB_DEPENDS+=	dvbpsi.5:${PORTSDIR}/multimedia/libdvbpsi
  CONFIGURE_ARGS+=--enable-dvbpsi \
 @@ -323,6 +299,15 @@
  CONFIGURE_ARGS+=--disable-x264
  .endif
  
 +.if (defined(WITH_LUA) || exists(${LOCALBASE}/lib/lua51/liblua.a)) && !defined(WITHOUT_LUA)
 +USE_LUA=5.1+
 +WANT_LUA_VER=5.1
 +CONFIGURE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua"
 +CONFIGURE_ARGS+=--enable-lua
 +.else
 +CONFIGURE_ARGS+=--disable-lua
 +.endif
 +
  .if (defined(WITH_CACA) || exists(${LOCALBASE}/lib/libcaca.a)) && !defined(WITHOUT_CACA)
  .if !defined(WITHOUT_AALIB)
  WITH_AALIB=	yes
 @@ -333,13 +318,6 @@
  CONFIGURE_ARGS+=--disable-caca
  .endif
  
 -.if !defined(WITHOUT_DAAP)
 -LIB_DEPENDS+=	opendaap.0:${PORTSDIR}/devel/libopendaap
 -CONFIGURE_ARGS+=--enable-daap
 -.else
 -CONFIGURE_ARGS+=--disable-daap
 -.endif
 -
  .if !defined(WITHOUT_DTS)
  LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
  CONFIGURE_ARGS+=--enable-dca
 @@ -358,15 +336,6 @@
  CONFIGURE_ARGS+=--disable-ggi
  .endif
  
 -# Do not use lame if PACKAGE_BUILDING is defined. since
 -# lame can NOT be packaged.
 -.if !defined(WITHOUT_LAME) && !defined(PACKAGE_BUILDING)
 -LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 -CONFIGURE_ARGS+=--enable-mp3lame
 -.else
 -CONFIGURE_ARGS+=--disable-mp3lame
 -.endif
 -
  .if !defined(WITHOUT_MATROSKA)
  LIB_DEPENDS+=	matroska.0:${PORTSDIR}/multimedia/libmatroska
  CONFIGURE_ARGS+=--enable-mkv
 @@ -382,8 +351,8 @@
  .endif
  
  .if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
 -USE_GECKO=	firefox mozilla seamonkey nvu
 -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 +USE_GECKO=	firefox3 firefox mozilla seamonkey nvu
 +.include <bsd.gecko.mk>
  CONFIGURE_ENV+=	MOZILLA_CONFIG="${GECKO_CONFIG}" \
  		XPIDL="${XPIDL}" \
  		XPIDL_INCL="${XPIDL_INCL}"
 @@ -489,12 +458,6 @@
  CONFIGURE_ARGS+=--disable-gnutls
  .endif
  
 -.if !defined(WITHOUT_SLP)
 -LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 -.else
 -CONFIGURE_ARGS+=--disable-slp
 -.endif
 -
  .if !defined(WITHOUT_SPEEX)
  LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
  CONFIGURE_ARGS+=--enable-speex
 diff -ruN vlc-devel-orig/Makefile.inc vlc-devel/Makefile.inc
 --- vlc-devel-orig/Makefile.inc	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/Makefile.inc	2008-07-02 15:10:57.000000000 +0200
 @@ -11,27 +11,18 @@
  #
  # Interface Knobs:
  #
 -# WITH_CORBA
 -#  Enable a Corba interface via orbit2
 -#
  # WITH_NCURSES=yes
  #  Ncurses (console) interface
  #
  # WITH_SKINS
 -#  This Interface supports a skinned gtk2.0 interface
 +#  This Interface supports a skinned interface usable with winamp 2.x skins
  #  Skins can be found at http://www.videolan.org/vlc/download-skins.html
  #
 -# WITHOUT_WXGTK=yes
 -#  WxWidgets Interface
 -#
  # Audio Knobs:
  #
  # WITH_ARTS=yes
  #  Arts Support
  #
 -# WITHOUT_DAAP=yes
 -#  Enable libopendaap to connect to iTunes(R) music shares.
 -#
  # WITHOUT_DTS=yes
  #  DTS decoder Support
  #  useful for many dvds
 @@ -49,11 +40,6 @@
  # WITH_FLAC=yes
  #  Flac Support
  #
 -
 -# WITHOUT_LAME=yes
 -#  Mp3 encoder Support
 -#   ** NOT DEFINED if PACKAGE_BUILDING is defined **
 -#
  # WITHOUT_A52=yes
  #  liba52 audio support
  #
 @@ -145,6 +131,9 @@
  #
  # Other Knobs:
  #
 +# WITHOUT_LUA=yes
 +#  Support for lua scripting (interfaces, HTML parsers for video websites...)
 +#
  # WITHOUT_AVAHI=yes
  #  Avahi (Rendezvous/Bonjour (R) ) networking
  #
 @@ -194,10 +183,6 @@
  # WITH_SSL=yes
  #  Enable TLS/SSL Support for web (httpd) interface
  #
 -# WITHOUT_SLP=yes
 -#  Disable SLP service discovery support
 -#  * recommended if you want to stream media
 -#
  # WITH_OPTIMIZED_CFLAGS=yes
  #  Compile with -O2 -ffast-math -fomit-frame-pointer
  #
 @@ -226,6 +211,8 @@
  #
  
  post-patch:
 +# Do not assume LOCALBASE is /usr/local
 +	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
  # Subtitle default font
  	@${REINPLACE_CMD} -e \
  	's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \
 @@ -239,43 +226,30 @@
  	@${REINPLACE_CMD} -e 's|lrint|rint|' \
  		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
  .endif
 -# s/Linux/FreeBSD/
 -	@${REINPLACE_CMD} -e 's|Linux|FreeBSD|' \
 -		${WRKSRC}/po/*
 -	@${RM} -f ${WRKSRC}/po/*.bak
 -	@${REINPLACE_CMD} -e 's|Linux OSS|FreeBSD OSS|' \
 -		${WRKSRC}/modules/audio_output/oss.c
 -	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \
 -		-e 's/-lc_r/${PTHREAD_LIBS}/' \
 -		-e 's|-mcpu=pentiumpro||; s|-ldl||' \
 -		${WRKSRC}/configure ${WRKSRC}/libs/loader/Makefile.in
  # cdrom/dvd support
  	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
  		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
  		${WRKSRC}/include/vlc_config.h
 +# binary decoders
  	@${REINPLACE_CMD} -e 's|-DWIN32_PATH=\\"\\"|-DWIN32_PATH=\\"${LOCALBASE}/lib/win32\\"|' \
  		${WRKSRC}/libs/loader/Makefile.in
  	@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
  		${WRKSRC}/libs/loader/module.c
  
 -pre-build:
 -	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
 -		${WRKSRC}/vlc-config
 -
  pre-install: build
  	${RM} -rf ${PLIST} ${FAKEDIR}
  	${MKDIR} ${FAKEDIR}
  	${TOUCH} -f ${PLIST}
  	${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST}
 +.if !defined(WITHOUT_QT4)
 +	${ECHO_CMD} "share/pixmaps/qvlc.png" >> ${PLIST}
 +	${ECHO_CMD} "share/applications/qvlc.desktop" >> ${PLIST}
 +.endif
  .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
  	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
  	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
  .endif
 -.if !defined(WITHOUT_WXGTK)
 -	${ECHO_CMD} "share/pixmaps/wxvlc.png" >> ${PLIST}
 -	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
 -.endif
 -.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS) || !defined(WITHOUT_QT)
 +.if defined(WITH_SKINS) || !defined(WITHOUT_QT)
  	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
  .endif
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 @@ -320,9 +294,6 @@
  .endfor
  
  do-install:
 -	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
 -		${FAKEDIR}/bin/vlc-config
 -	@${RM} -f ${FAKEDIR}/bin/*.bak
  	cd ${FAKEDIR}/bin && ${FIND} . | \
  		${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
  	cd ${FAKEDIR}/include && ${FIND} . | \
 @@ -337,19 +308,19 @@
  .endif
  	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
  	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
 -.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
 +.if (defined(WITH_SKINS) && defined(WITHOUT_SKINS)) || !defined(WITHOUT_QT4)
  	if [ ! -d ${PREFIX}/share/applications ]; then \
  		${MKDIR} ${PREFIX}/share/applications ; \
  	fi
  	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
  		${MKDIR} ${PREFIX}/share/pixmaps ; \
  	fi
 +.if !defined(WITHOUT_QT4)
 +	${INSTALL_DATA} ${FILESDIR}/qvlc.desktop ${PREFIX}/share/applications
 +	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/qvlc.png
 +.endif
  .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
  	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
  	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
  .endif
 -.if !defined(WITHOUT_WXGTK)
 -	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
 -	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/wxvlc.png
 -.endif
  .endif
 diff -ruN vlc-devel-orig/distinfo vlc-devel/distinfo
 --- vlc-devel-orig/distinfo	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/distinfo	2008-07-02 15:10:57.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (vlc-snapshot-20080223.tar.bz2) = eb9888921ae2f6fd7a2b2b6402c6e1d7
 -SHA256 (vlc-snapshot-20080223.tar.bz2) = b86233d88dc63798fd978ead64b0d5e9f9c2fa15f5181df147f7b1f0bc191e95
 -SIZE (vlc-snapshot-20080223.tar.bz2) = 13446936
 +MD5 (vlc-0.9.0-test1.tar.bz2) = 738aa86691e5d93273d6e713adceeb21
 +SHA256 (vlc-0.9.0-test1.tar.bz2) = 0c59e92d03f9126b059238ac965dd5f011c01a26b64b0f99babee630738f346a
 +SIZE (vlc-0.9.0-test1.tar.bz2) = 15521807
 diff -ruN vlc-devel-orig/files/patch-configure vlc-devel/files/patch-configure
 --- vlc-devel-orig/files/patch-configure	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/files/patch-configure	2008-07-02 15:10:57.000000000 +0200
 @@ -1,55 +1,11 @@
 ---- configure.orig	Sat Jun  2 18:01:50 2007
 -+++ configure	Sun Jun  3 16:20:03 2007
 -@@ -2499,8 +2499,7 @@
 - done
 - if test -z "$ac_aux_dir"; then
 -   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
 --echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;}
 --   { (exit 1); exit 1; }; }
 -+echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;} }
 - fi
 +--- configure.orig	2008-07-02 13:16:16.000000000 +0200
 ++++ configure	2008-07-02 13:16:48.000000000 +0200
 +@@ -73873,7 +73873,7 @@
   
 - # These three variables are undocumented and unsupported,
 -@@ -42336,8 +42335,7 @@
 -         if test -n "${enable_dv}"
 -         then
 -           { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5
 --echo "$as_me: error: cannot find libraw1394 headers" >&2;}
 --   { (exit 1); exit 1; }; }
 -+echo "$as_me: error: cannot find libraw1394 headers" >&2;} ;}
 -         fi
 + VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
   
 - fi
 -@@ -42356,8 +42354,7 @@
 -             { echo "$as_me:$LINENO: result: no" >&5
 - echo "${ECHO_T}no" >&6; }
 -       { { echo "$as_me:$LINENO: error: cannot cd to ${real_dv_raw1394_tree}" >&5
 --echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;}
 --   { (exit 1); exit 1; }; }
 -+echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;} ;}
 -     fi
 -     if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a"
 -     then
 -@@ -42576,8 +42573,7 @@
 -         if test -n "${enable_dv}"
 -         then
 -           { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5
 --echo "$as_me: error: cannot find libavc1394 headers" >&2;}
 --   { (exit 1); exit 1; }; }
 -+echo "$as_me: error: cannot find libavc1394 headers" >&2;} ; }
 -         fi
 +-CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
 ++CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}"
   
 - fi
 -@@ -64307,12 +64303,6 @@
   
 -   if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
 -   then
 --    if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null
 --    then
 --      { { echo "$as_me:$LINENO: error: You need wxWidgets version 2.6.0 or upwards. Please upgrade and try again." >&5
 --echo "$as_me: error: You need wxWidgets version 2.6.0 or upwards. Please upgrade and try again." >&2;}
 --   { (exit 1); exit 1; }; }
 --    fi
 -     ac_ext=cpp
 - ac_cpp='$CXXCPP $CPPFLAGS'
 - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +   CPPFLAGS="${CPPFLAGS_save}"
 diff -ruN vlc-devel-orig/files/patch-modules_stream_out_switcher.c vlc-devel/files/patch-modules_stream_out_switcher.c
 --- vlc-devel-orig/files/patch-modules_stream_out_switcher.c	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/files/patch-modules_stream_out_switcher.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,11 +0,0 @@
 ---- modules/stream_out/switcher.c.orig	Wed Mar 23 03:57:15 2005
 -+++ modules/stream_out/switcher.c	Wed Mar 23 03:57:50 2005
 -@@ -44,7 +44,7 @@
 - #ifdef HAVE_POSTPROC_POSTPROCESS_H
 - #   include <postproc/postprocess.h>
 - #else
 --#   include <libpostproc/postprocess.h>
 -+#   include <ffmpeg/postproc/postprocess.h>
 - #endif
 - 
 - #define SOUT_CFG_PREFIX "sout-switcher-"
 diff -ruN vlc-devel-orig/files/patch-modules_visualization_galaktos_PCM.c vlc-devel/files/patch-modules_visualization_galaktos_PCM.c
 --- vlc-devel-orig/files/patch-modules_visualization_galaktos_PCM.c	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/files/patch-modules_visualization_galaktos_PCM.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,11 +0,0 @@
 ---- modules/visualization/galaktos/PCM.c.orig	Fri Nov 26 08:21:47 2004
 -+++ modules/visualization/galaktos/PCM.c	Fri Nov 26 08:22:06 2004
 -@@ -79,7 +79,7 @@
 - //Takes in a 2x512 array of PCM samples
 - //and stores them
 - 
 --void addPCM(int16_t PCMdata[2][512])
 -+void addPCM(short PCMdata[2][512])
 - {
 -   int i,j;
 -   int samples=512;
 diff -ruN vlc-devel-orig/files/qvlc.desktop vlc-devel/files/qvlc.desktop
 --- vlc-devel-orig/files/qvlc.desktop	1970-01-01 01:00:00.000000000 +0100
 +++ vlc-devel/files/qvlc.desktop	2008-07-02 15:10:57.000000000 +0200
 @@ -0,0 +1,10 @@
 +[Desktop Entry]
 +Encoding=UTF-8
 +Name=VideoLAN (QT4) Media Player
 +Comment=Video and Audio player and server
 +Icon=qvlc.png
 +Exec=qvlc
 +TryExec=qvlc
 +Terminal=false
 +Type=Application
 +Categories=Application;AudioVideo;
 diff -ruN vlc-devel-orig/files/wxvlc.desktop vlc-devel/files/wxvlc.desktop
 --- vlc-devel-orig/files/wxvlc.desktop	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/files/wxvlc.desktop	1970-01-01 01:00:00.000000000 +0100
 @@ -1,10 +0,0 @@
 -[Desktop Entry]
 -Encoding=UTF-8
 -Name=VideoLAN (WxGTK) Media Player
 -Comment=Video and Audio player and server
 -Icon=wxvlc.png
 -Exec=wxvlc
 -TryExec=wxvlc
 -Terminal=false
 -Type=Application
 -Categories=Application;AudioVideo;
 diff -ruN vlc-devel-orig/pkg-descr vlc-devel/pkg-descr
 --- vlc-devel-orig/pkg-descr	2008-07-02 15:11:06.000000000 +0200
 +++ vlc-devel/pkg-descr	2008-07-02 15:10:57.000000000 +0200
 @@ -1,5 +1,3 @@
 -vlc -- the VideoLAN Client
 -
  VLC media player is a highly portable multimedia player for various
  audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, and
  more) as well as DVD's, VCD's, and various streaming protocols. It
 
 --=-ODBrn2Ojdeicb3Mf49eI--
 

From: Pietro Cerutti <gahr@FreeBSD.org>
To: bug-followup@FreeBSD.org, funman@videolan.org
Cc:  
Subject: Re: ports/117810: multimedia/vlc-devel port could be compiled with
 lua modules
Date: Wed, 02 Jul 2008 15:43:54 +0200

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
 The patch doesn't apply cleanly.
 
 vlc-devel> find . -name "*.rej"
 ./files/patch-configure.rej
 ./Makefile.inc.rej
 
 could you please re-generate it?
 
 - --
 Pietro Cerutti
 gahr@FreeBSD.org
 
 PGP Public Key:
 http://gahr.ch/pgp
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (FreeBSD)
 
 iEYEAREKAAYFAkhrhhkACgkQwMJqmJVx9471GwCeKI2xQJnIL240CqyYGnE3sRrj
 G58AoKWweeIC/2HfMNoC/dA+9RshIvHZ
 =dEaz
 -----END PGP SIGNATURE-----

From: =?utf-8?B?UmFmYcOrbCBDYXJyw6k=?= <rafael.carre@gmail.com>
To: Pietro Cerutti <gahr@FreeBSD.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/117810: multimedia/vlc-devel port could be compiled with
	lua modules
Date: Wed, 2 Jul 2008 16:04:09 +0200

 On Wed, Jul 02, 2008, Pietro Cerutti wrote:
 > -----BEGIN PGP SIGNED MESSAGE-----
 > Hash: SHA512
 >
 > The patch doesn't apply cleanly.
 >
 > vlc-devel> find . -name "*.rej"
 > ./files/patch-configure.rej
 > ./Makefile.inc.rej
 
 strange because I tested it and it's fine.
 
 > could you please re-generate it?
 
 I'll sort that tomorrow ;)
 
 -- 
 Rafaël Carré

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117810: commit references a PR
Date: Wed,  9 Jul 2008 20:59:22 +0000 (UTC)

 gahr        2008-07-09 20:59:08 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/vlc-devel Makefile Makefile.inc distinfo pkg-descr 
     multimedia/vlc-devel/files patch-configure 
   Removed files:
     multimedia/vlc-devel/files patch-modules_stream_out_switcher.c 
                                patch-modules_visualization_galaktos_PCM.c 
                                wxvlc.desktop 
   Log:
   - Update to 0.9.0-test1                                         [1]
   - Fix LUA module support                                        [1]
   - Fix volume bar position problem                               [1]
   - Update GECKO support                                          [2]
   
   PR:             117810                                          [1]
                   125152                                          [2]
   Submitted by:   Rafal Carr <funman@videolan.org>              [1]
                   Naram Qashat <cyberbotx@cyberbotx.com>          [2]
   Approved by:    Rafal Carr <funman@videolan.org> (maintainer)
   
   Revision  Changes    Path
   1.204     +78 -64    ports/multimedia/vlc-devel/Makefile
   1.20      +18 -47    ports/multimedia/vlc-devel/Makefile.inc
   1.52      +3 -3      ports/multimedia/vlc-devel/distinfo
   1.18      +7 -51     ports/multimedia/vlc-devel/files/patch-configure
   1.2       +0 -11     ports/multimedia/vlc-devel/files/patch-modules_stream_out_switcher.c (dead)
   1.2       +0 -11     ports/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c (dead)
   1.5       +0 -10     ports/multimedia/vlc-devel/files/wxvlc.desktop (dead)
   1.7       +0 -2      ports/multimedia/vlc-devel/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: suspended->closed 
State-Changed-By: gahr 
State-Changed-When: Wed Jul 9 21:00:52 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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