Update to 0.4.7:

v0.4.7  (2012-07-18) / Toni Gundogdu

Adam Sampson:
  - dailymotion.lua: Make urlback pattern more liberal [8eded85]
brunorex:
  - Add support for justin.tv and twitch.tv (#99) [86baf5d]
Mikhail Gusarov:
  - tvrain.lua: Adjust for new URL scheme on the site [7bf1682]
Till Maas:
  - Support spiegel.de with SEO URLs [6afe8e9]
Toni Gundogdu:
  - FIX: gaskrank.lua: stream URL, ID patterns [78817b8]
  - FIX: gaskrank.lua: title pattern [52c6f6d]
  - FIX: tvrain.lua: Change how media ID is parsed [7dfbc1e]
  - FIX: vimeo.lua:115: no match: qualities (#106) [d7182ac]
  - youtube.lua: Rewrite YouTube.choose_default [aec0afa]

      Change how youtube.lua chooses the 'default' format for
      YouTube media URLs:
        - Either whichever is of 480p is found first
        - Or whatever YouTube returns as the first format

      The script previously defaulted to the lowest quality.

 15 files changed, 118 insertions(+), 44 deletions(-)


v0.4.6 (2012-06-10) / Toni Gundogdu

Mikhail Gusarov:
  - 1tvru.lua: Add support for 1tv.ru [82e3151]
  - tvrain.lua: Add support for tvrain.ru [730720d]
Mort Gerald:
  - pornhub.lua: Media ID can be hexadecimal [82b78df]
Toni Gundogdu:
  - FIX: collegehumor.lua: title pattern [3825171]
  - FIX: ted.lua: Media stream URL pattern [2fc90bf]
  - FIX: xhamster.lua: server response code 404 [6f3e8bd]
Raphaël Droz:
  - publicsenat.lua: Update support [f329cde]
  - senat.lua: Add support for senat.fr [5cf4540]

 15 files changed, 317 insertions(+), 33 deletions(-)


v0.4.5 (2012-05-30) / Toni Gundogdu

Bastien Nocera:
  - Added 101greatgoals.lua [efc2cdf]
  - dailymotion: Fix overeager ID fetching [0223bd8]
  - FIX: sapo.lua: ID, media stream URL and title [84cb67d]
PaulK:
  - Added canalplus.lua [ed6877d]
  - Added support for empflix.com (NSFW website) [cb2de3c]
Toni Gundogdu:
  - Add website/redtube.lua [694ff91]
  - FIX: pornhub.lua: media title, stream URL parsing [1867d4f]
  - FIX: theonion.lua [70dfaab]
  - FIX: videobash.lua: media URL parsing [471e73d]
  - FIX: vimeo.lua (#97) [4f811dd]
  - blip.lua: Mark as FIXME [888a3ed]
  - keezmovies.lua: Mark as FIXME [4337407]
  - pluzz.lua, francetelevisions.lua: Mark as FIXME [5b9cfc6]
  - Lower AC_PREREQ to 2.67 [d1ac468]
  - Remove funnyhub.lua: Videos no more [?] [3dae8bd]
  - Remove google.lua: video.google.com is no more [8f38fe6]
  - website/sapo.lua: Parse thumbnail_url [d8cfb16]

 46 files changed, 740 insertions(+), 411 deletions(-)


v0.4.4 (2012-03-23) / Toni Gundogdu

Toni Gundogdu:
  - Rewrite scripts using "foo:match" instead of "foo:find"
  - FIX: clipfish.lua: Use new config URL [bb8bf4c]
  - FIX: dailymotion.lua: Issue with some videos (#92) [325b20e]
      - Thanks to David Pugnasse for the fix
  - FIX: Lua-5.2: Use gmatch instead of gfind (#89) [b5ae4e1]
  - FIX: Lua-5.2: Use the # operator instead (#89) [04f0284]
  - FIX: youtube.lua: Allow embed URLs w/ params (#90) [386aae2]
  - FIXME: bikeradar.lua [6d64461]


v0.4.3 (2012-03-01) / Toni Gundogdu

Anonymous:
  - Add tcmag.lua [5f8d188]
  - FIX: xhamster.lua (HTTP/403) [2bd53fd]

Bastien Nocera:
  - Add special-case suffix for audio/mpeg [ca784e3]
  - FIX: soundcloud.lua: Multi-byte char handling [82d1818]

mutantmonkey:
  - Add IMDb support (#88) [7198600]

PaulK:
  - Add support for pornhub.com (NSFW) [968143b]
  - Add support for tnaflix.com (NSFW) [d34caf1]
  - FIX: youjizz [b60401e]

Toni Gundogdu:
  - Add videa.hu support (#84, Bastien) [ab56c38]
  - FIX: liveleak.lua: attempt to index field 'path' (nil) [4919605]
  - FIX: mgnetwork.lua: return duration in msec [b34fef6]
  - FIX: videobash.lua: media URL pattern [8072eac]
  - guardian.lua: Parse from JSON instead (#83) [019f38e]
  - liveleak.lua: Support embedded URLs [fdd223a]
  - Mark globo.lua as FIXME [26f48f5]
  - Mark tube8.lua as FIXME [de13a39]
  - Remove buzzhumor.lua [a568afc]
  - Remove megavideo.lua [dc08e00]
  - soundcloud.lua: Rework title parsing [53204fd]
  - tcmag.lua: Make query_formats work with external content [f5cbd0d]
  - ted.lua: Support the "default" format only [2caf52b]


0.4.2  Tue Nov 29 2011  Toni Gundogdu
Changes:
    - Add mgnetwork.lua, mutantmonkey <mutantmonkey@mutantmonkey.in> (#78)
    - Remove foundrymusic.lua
Fixes:
    - tube8.lua: media URL parsing, Tomas Janousek <tomi@nomi.cz> (#80)
    - Multiple: potential "attempt to index ... (a nil value)"
    - dailymotion.lua: no match: video plugin params
    - videobash.lua: media URL parsing (#81)

4 files changed, 20 insertions, 37 deletions

diff --git a/net/libquvi-scripts/Makefile b/net/libquvi-scripts/Makefile
index 55ef2987993..04293b7d761 100644
--- a/net/libquvi-scripts/Makefile
+++ b/net/libquvi-scripts/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2012/03/15 16:01:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/31 00:41:33 wiz Exp $
 #
 
-DISTNAME=	libquvi-scripts-0.4.2
-PKGREVISION=	1
+DISTNAME=	libquvi-scripts-0.4.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quvi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/libquvi-scripts/PLIST b/net/libquvi-scripts/PLIST
index d36f790cffe..f053f201e3f 100644
--- a/net/libquvi-scripts/PLIST
+++ b/net/libquvi-scripts/PLIST
@@ -1,56 +1,58 @@
-@comment $NetBSD: PLIST,v 1.2 2011/12/05 19:34:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/07/31 00:41:33 wiz Exp $
 lib/pkgconfig/libquvi-scripts.pc
 man/man7/libquvi-scripts.7
 share/libquvi-scripts/lua/README
 share/libquvi-scripts/lua/util/charset.lua
 share/libquvi-scripts/lua/util/content_type.lua
 share/libquvi-scripts/lua/util/trim.lua
+share/libquvi-scripts/lua/website/101greatgoals.lua
+share/libquvi-scripts/lua/website/1tvru.lua
 share/libquvi-scripts/lua/website/README
 share/libquvi-scripts/lua/website/academicearth.lua
 share/libquvi-scripts/lua/website/arte.lua
 share/libquvi-scripts/lua/website/audioboo.lua
-share/libquvi-scripts/lua/website/bikeradar.lua
-share/libquvi-scripts/lua/website/blip.lua
 share/libquvi-scripts/lua/website/bloomberg.lua
 share/libquvi-scripts/lua/website/break.lua
-share/libquvi-scripts/lua/website/buzzhumor.lua
+share/libquvi-scripts/lua/website/canalplus.lua
 share/libquvi-scripts/lua/website/cbsnews.lua
 share/libquvi-scripts/lua/website/charlierose.lua
 share/libquvi-scripts/lua/website/clipfish.lua
 share/libquvi-scripts/lua/website/collegehumor.lua
 share/libquvi-scripts/lua/website/dailymotion.lua
+share/libquvi-scripts/lua/website/empflix.lua
 share/libquvi-scripts/lua/website/foxnews.lua
-share/libquvi-scripts/lua/website/francetelevisions.lua
-share/libquvi-scripts/lua/website/funnyhub.lua
 share/libquvi-scripts/lua/website/funnyordie.lua
 share/libquvi-scripts/lua/website/gaskrank.lua
-share/libquvi-scripts/lua/website/globo.lua
 share/libquvi-scripts/lua/website/golem.lua
-share/libquvi-scripts/lua/website/google.lua
 share/libquvi-scripts/lua/website/guardian.lua
-share/libquvi-scripts/lua/website/keezmovies.lua
+share/libquvi-scripts/lua/website/imdb.lua
+share/libquvi-scripts/lua/website/justintv.lua
 share/libquvi-scripts/lua/website/liveleak.lua
-share/libquvi-scripts/lua/website/megavideo.lua
 share/libquvi-scripts/lua/website/metacafe.lua
 share/libquvi-scripts/lua/website/mgnetwork.lua
-share/libquvi-scripts/lua/website/pluzz.lua
+share/libquvi-scripts/lua/website/pornhub.lua
 share/libquvi-scripts/lua/website/publicsenat.lua
 share/libquvi-scripts/lua/website/quvi/bit.lua
 share/libquvi-scripts/lua/website/quvi/const.lua
 share/libquvi-scripts/lua/website/quvi/url.lua
 share/libquvi-scripts/lua/website/quvi/util.lua
+share/libquvi-scripts/lua/website/redtube.lua
 share/libquvi-scripts/lua/website/sapo.lua
+share/libquvi-scripts/lua/website/senat.lua
 share/libquvi-scripts/lua/website/sevenload.lua
 share/libquvi-scripts/lua/website/soundcloud.lua
 share/libquvi-scripts/lua/website/spankwire.lua
 share/libquvi-scripts/lua/website/spiegel.lua
 share/libquvi-scripts/lua/website/tagtele.lua
+share/libquvi-scripts/lua/website/tcmag.lua
 share/libquvi-scripts/lua/website/ted.lua
 share/libquvi-scripts/lua/website/theonion.lua
 share/libquvi-scripts/lua/website/tmunderground.lua
+share/libquvi-scripts/lua/website/tnaflix.lua
 share/libquvi-scripts/lua/website/totallynsfw.lua
-share/libquvi-scripts/lua/website/tube8.lua
 share/libquvi-scripts/lua/website/tvlux.lua
+share/libquvi-scripts/lua/website/tvrain.lua
+share/libquvi-scripts/lua/website/videa.lua
 share/libquvi-scripts/lua/website/videobash.lua
 share/libquvi-scripts/lua/website/vimeo.lua
 share/libquvi-scripts/lua/website/xhamster.lua
diff --git a/net/libquvi-scripts/distinfo b/net/libquvi-scripts/distinfo
index e757021adc6..fc06d21703d 100644
--- a/net/libquvi-scripts/distinfo
+++ b/net/libquvi-scripts/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/03/15 16:01:47 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/07/31 00:41:33 wiz Exp $
 
-SHA1 (libquvi-scripts-0.4.2.tar.bz2) = a2109327f629f513a57d10efbf825d129d8fef8f
-RMD160 (libquvi-scripts-0.4.2.tar.bz2) = b58d24f4ac19f3e2851b5157016f4f19eb56a010
-Size (libquvi-scripts-0.4.2.tar.bz2) = 100302 bytes
-SHA1 (patch-share_lua_website_youtube.lua) = 6cdb6176eb7f5a50ae7037fb033db9f697915e59
+SHA1 (libquvi-scripts-0.4.7.tar.bz2) = 57c6ffa797ee52e21aac88510d7795eba0da9f45
+RMD160 (libquvi-scripts-0.4.7.tar.bz2) = bc4a1ba9f6dc48376ab4d773b935d0d72176eef2
+Size (libquvi-scripts-0.4.7.tar.bz2) = 109304 bytes
diff --git a/net/libquvi-scripts/patches/patch-share_lua_website_youtube.lua b/net/libquvi-scripts/patches/patch-share_lua_website_youtube.lua
deleted file mode 100644
index 8d2c1400363..00000000000
--- a/net/libquvi-scripts/patches/patch-share_lua_website_youtube.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-share_lua_website_youtube.lua,v 1.1 2012/03/15 16:01:47 wiz Exp $
-
-Fix some youtube URLs.
-From upstream:
-http://sourceforge.net/mailarchive/message.php?msg_id=28987218
-
---- share/lua/website/youtube.lua.orig	2011-11-29 14:37:43.000000000 +0000
-+++ share/lua/website/youtube.lua
-@@ -81,7 +81,7 @@ function YouTube.normalize(s)
-         local p = {'/embed/([-_%w]+)', '/%w/([-_%w]+)', '/([-_%w]+)'}
-         for _,v in pairs(p) do
-             local m = t.path:match(v)
--            if m and not t.query then
-+            if m and #m == 11 then
-                 t.query = 'v=' .. m
-                 t.path  = '/watch'
-             end