- Update to 0.4.0

- Update pkg-descr

Changes:	http://repo.or.cz/w/quvi-tool.git/blob_plain/HEAD:/NEWS
		http://sourceforge.net/mailarchive/forum.php?thread_name=20111005195602.001f888f%40gmail.com&forum_name=quvi-announce

4 files changed, 15 insertions, 120 deletions

diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index 4f35aae8ad9a..6c8685bd7037 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -6,43 +6,25 @@
 #
 
 PORTNAME=	quvi
-PORTVERSION=	0.2.19
+PORTVERSION=	0.4.0
 CATEGORIES=	multimedia devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}/ \
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}/${PORTNAME}/ \
 		GOOGLE_CODE
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Query video library for Youtube like websites
+COMMENT=	Command line tool for parsing flash media stream URLs
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	libquvi>=${PORTVERSION}:${PORTSDIR}/multimedia/libquvi
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	libquvi>=${PORTVERSION}:${PORTSDIR}/multimedia/libquvi
 
-OPTIONS=	NSFW "Enable adult website support" off
-
-CPPFLAGS+=	-I${WRKSRC}/include -I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
-USE_ICONV=	yes
-USE_LDCONFIG=	yes
-USE_LUA=	yes
+USE_GNOME=	pkgconfig
 USE_XZ=		yes
 
 MAN1=		quvi.1
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NSFW)
-CONFIGURE_ARGS+=--enable-nsfw
-PLIST_SUB+=	NSFW=""
-.else
-PLIST_SUB+=	NSFW="@comment "
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/doc/nd/ && ${COPYTREE_SHARE} . ${DOCSDIR}/
-.endif
+PLIST_FILES=	bin/quvi
 
 .include <bsd.port.mk>
diff --git a/multimedia/quvi/distinfo b/multimedia/quvi/distinfo
index 6def917c08bf..73a9d6b2c9ee 100644
--- a/multimedia/quvi/distinfo
+++ b/multimedia/quvi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (quvi-0.2.19.tar.xz) = 48bcdf2d58a7df8acd8c0562d3f485b2892902eb982a9d8eb279b273e722daeb
-SIZE (quvi-0.2.19.tar.xz) = 363120
+SHA256 (quvi-0.4.0.tar.xz) = 6979614bf96a50d8fac27b5f35e98f8f8c59f7f4212bcc3aec7d4cccb27e0f4e
+SIZE (quvi-0.4.0.tar.xz) = 110296
diff --git a/multimedia/quvi/pkg-descr b/multimedia/quvi/pkg-descr
index 8853712ca976..b5dfd27839b5 100644
--- a/multimedia/quvi/pkg-descr
+++ b/multimedia/quvi/pkg-descr
@@ -1,12 +1,10 @@
-quvi is a command line tool for parsing video download links.
-It supports Youtube and other similar video websites.
+quvi is a command line tool for parsing flash media stream URLs. It supports
+many websites including YouTube and Dailymotion.
 
-libquvi is a library for parsing video download links with
-C API. It is written in C and intended to be a cross-platform
-library.
+Starting from 0.4.0, the quvi distribution has split into libquvi-scripts,
+libquvi and quvi.
 
-This project started as a cclive spin-off after receiving
-a request for a cclive library.
+git repo: http://repo.or.cz/w/quvi-tool.git
 
 WWW: http://quvi.sourceforge.net/
-     http://quvi.googlecode.com/
+WWW: http://quvi.googlecode.com/
diff --git a/multimedia/quvi/pkg-plist b/multimedia/quvi/pkg-plist
deleted file mode 100644
index 00294180dac0..000000000000
--- a/multimedia/quvi/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-bin/quvi
-include/quvi/llst.h
-include/quvi/net.h
-include/quvi/quvi.h
-lib/libquvi.a
-lib/libquvi.la
-lib/libquvi.so
-lib/libquvi.so.6
-libdata/pkgconfig/libquvi.pc
-%%PORTDOCS%%%%DOCSDIR%%/About.txt
-%%PORTDOCS%%%%DOCSDIR%%/Help/Development.txt
-%%PORTDOCS%%%%DOCSDIR%%/Help/Help.txt
-%%PORTDOCS%%%%DOCSDIR%%/Help/Patches.txt
-%%PORTDOCS%%%%DOCSDIR%%/Help/Style.txt
-%%PORTDOCS%%%%DOCSDIR%%/Overviews/Formats.txt
-%%PORTDOCS%%%%DOCSDIR%%/Overviews/Overview.txt
-%%PORTDOCS%%%%DOCSDIR%%/Overviews/Overview_LinkedList.txt
-%%PORTDOCS%%%%DOCSDIR%%/Overviews/Overview_Network.txt
-%%PORTDOCS%%%%DOCSDIR%%/Webscripts/Guidelines.txt
-%%PORTDOCS%%%%DOCSDIR%%/Webscripts/Tutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/Webscripts/Webscript.txt
-%%DATADIR%%/lua/README
-%%DATADIR%%/lua/util/charset.lua
-%%DATADIR%%/lua/util/content_type.lua
-%%DATADIR%%/lua/util/trim.lua
-%%DATADIR%%/lua/website/README
-%%DATADIR%%/lua/website/academicearth.lua
-%%DATADIR%%/lua/website/audioboo.lua
-%%DATADIR%%/lua/website/arte.lua
-%%DATADIR%%/lua/website/bikeradar.lua
-%%DATADIR%%/lua/website/blip.lua
-%%DATADIR%%/lua/website/bloomberg.lua
-%%DATADIR%%/lua/website/break.lua
-%%DATADIR%%/lua/website/buzzhumor.lua
-%%DATADIR%%/lua/website/cbsnews.lua
-%%DATADIR%%/lua/website/charlierose.lua
-%%DATADIR%%/lua/website/clipfish.lua
-%%DATADIR%%/lua/website/collegehumor.lua
-%%DATADIR%%/lua/website/dailymotion.lua
-%%DATADIR%%/lua/website/foxnews.lua
-%%DATADIR%%/lua/website/francetelevisions.lua
-%%DATADIR%%/lua/website/funnyhub.lua
-%%DATADIR%%/lua/website/funnyordie.lua
-%%DATADIR%%/lua/website/gaskrank.lua
-%%DATADIR%%/lua/website/globo.lua
-%%DATADIR%%/lua/website/golem.lua
-%%DATADIR%%/lua/website/google.lua
-%%DATADIR%%/lua/website/guardian.lua
-%%DATADIR%%/lua/website/liveleak.lua
-%%DATADIR%%/lua/website/megavideo.lua
-%%DATADIR%%/lua/website/metacafe.lua
-%%DATADIR%%/lua/website/pluzz.lua
-%%DATADIR%%/lua/website/publicsenat.lua
-%%DATADIR%%/lua/website/quvi/bit.lua
-%%DATADIR%%/lua/website/quvi/const.lua
-%%DATADIR%%/lua/website/quvi/url.lua
-%%DATADIR%%/lua/website/quvi/util.lua
-%%DATADIR%%/lua/website/sapo.lua
-%%DATADIR%%/lua/website/sevenload.lua
-%%DATADIR%%/lua/website/soundcloud.lua
-%%DATADIR%%/lua/website/spiegel.lua
-%%DATADIR%%/lua/website/tagtele.lua
-%%DATADIR%%/lua/website/ted.lua
-%%DATADIR%%/lua/website/theonion.lua
-%%DATADIR%%/lua/website/tmunderground.lua
-%%DATADIR%%/lua/website/vimeo.lua
-%%DATADIR%%/lua/website/yfrog.lua
-%%DATADIR%%/lua/website/youtube.lua
-%%NSFW%%%%DATADIR%%/lua/website/keezmovies.lua
-%%NSFW%%%%DATADIR%%/lua/website/pornhub.lua
-%%NSFW%%%%DATADIR%%/lua/website/spankwire.lua
-%%NSFW%%%%DATADIR%%/lua/website/tube8.lua
-%%NSFW%%%%DATADIR%%/lua/website/xhamster.lua
-%%NSFW%%%%DATADIR%%/lua/website/xvideos.lua
-%%NSFW%%%%DATADIR%%/lua/website/youjizz.lua
-@dirrm %%DATADIR%%/lua/website/quvi
-@dirrm %%DATADIR%%/lua/website
-@dirrm %%DATADIR%%/lua/util
-@dirrm %%DATADIR%%/lua
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Webscripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Overviews
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Help
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/quvi