diff -ruN --exclude=CVS /usr/ports/multimedia/quvi/Makefile /usr/ports/sunpoet/quvi/Makefile
--- /usr/ports/multimedia/quvi/Makefile	2010-07-29 08:44:09.000000000 +0800
+++ /usr/ports/sunpoet/quvi/Makefile	2010-07-29 23:56:48.000000000 +0800
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quvi
-PORTVERSION=	0.1.4
+PORTVERSION=	0.2.1
 CATEGORIES=	multimedia devel
 MASTER_SITES=	GOOGLE_CODE
 
@@ -16,33 +16,42 @@
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
 		pcre.0:${PORTSDIR}/devel/pcre
 
-USE_LDCONFIG=	yes
-SHLIB_VER=	1
-
-MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
-PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
-
-MAN1=		quvi.1
+LICENSE=	GPLv3
 
-USE_BZIP2=	yes
+CONFIGURE_ARGS=	--enable-broken --enable-examples
+CONFIGURE_ENV=	CPPFLAGS='${CPPFLAGS} -I${WRKSRC}/include \
+		-I${LOCALBASE}/include'
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
+USE_LDCONFIG=	yes
+USE_LUA=	yes
 
-CONFIGURE_ENV+=	CPPFLAGS='${CPPFLAGS} -I${WRKSRC}/include \
-		-I${LOCALBASE}/include'
+MAN1=		quvi.1
+PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
 OPTIONS=	SMUT "Enable adult website support" off
 
+SHLIB_VER=	2
+
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=--without-doc
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SMUT)
 CONFIGURE_ARGS+=--enable-smut
+PLIST_SUB+=	SMUT=""
+.else
+PLIST_SUB+=	SMUT="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E -e \
-		's|\$$\(libdir\)/pkgconfig|\$$\(prefix\)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/install-data-am:/ s| install-docDATA||' \
+		${WRKSRC}/doc/Makefile.in
+.endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/multimedia/quvi/distinfo /usr/ports/sunpoet/quvi/distinfo
--- /usr/ports/multimedia/quvi/distinfo	2010-04-09 10:14:02.000000000 +0800
+++ /usr/ports/sunpoet/quvi/distinfo	2010-07-28 23:06:00.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (quvi-0.1.4.tar.bz2) = 976c07dcf3cab275c93f7b5bc3424b02
-SHA256 (quvi-0.1.4.tar.bz2) = 573d5eb90a83a663e7e5d17104b22689573f88be8fef158b2f3633c20f158337
-SIZE (quvi-0.1.4.tar.bz2) = 332177
+MD5 (quvi-0.2.1.tar.bz2) = a87205ff3b38ac7547fc1645ebad93ef
+SHA256 (quvi-0.2.1.tar.bz2) = e67a84599f9b962c7cee07cb3e57094ca944f8e30c979ab97f6905800234ba38
+SIZE (quvi-0.2.1.tar.bz2) = 332478
diff -ruN --exclude=CVS /usr/ports/multimedia/quvi/pkg-plist /usr/ports/sunpoet/quvi/pkg-plist
--- /usr/ports/multimedia/quvi/pkg-plist	2010-02-03 08:28:57.000000000 +0800
+++ /usr/ports/sunpoet/quvi/pkg-plist	2010-07-30 00:15:00.000000000 +0800
@@ -1,8 +1,40 @@
+@comment $FreeBSD$
 bin/quvi
 include/quvi/quvi.h
-@dirrm include/quvi
 lib/libquvi.a
 lib/libquvi.la
 lib/libquvi.so
 lib/libquvi.so.%%SHLIB_VER%%
 libdata/pkgconfig/libquvi.pc
+%%PORTDOCS%%%%DOCSDIR%%/HowtoContributeCode
+%%PORTDOCS%%%%DOCSDIR%%/HowtoGetDevelopmentCode
+%%PORTDOCS%%%%DOCSDIR%%/HowtoHelp
+%%PORTDOCS%%%%DOCSDIR%%/HowtoSubmitPatches
+%%DATADIR%%/lua/README
+%%DATADIR%%/lua/util/charset.lua
+%%DATADIR%%/lua/util/content_type.lua
+%%DATADIR%%/lua/website/README
+%%DATADIR%%/lua/website/break.lua
+%%DATADIR%%/lua/website/buzzhumor.lua
+%%DATADIR%%/lua/website/cctv.lua
+%%DATADIR%%/lua/website/clipfish.lua
+%%DATADIR%%/lua/website/dailymotion.lua
+%%DATADIR%%/lua/website/evisor.lua
+%%DATADIR%%/lua/website/funnyhub.lua
+%%DATADIR%%/lua/website/golem.lua
+%%DATADIR%%/lua/website/google.lua
+%%DATADIR%%/lua/website/liveleak.lua
+%%DATADIR%%/lua/website/myubo.lua
+%%DATADIR%%/lua/website/sevenload.lua
+%%DATADIR%%/lua/website/spiegel.lua
+%%DATADIR%%/lua/website/vimeo.lua
+%%DATADIR%%/lua/website/youtube.lua
+%%SMUT%%%%DATADIR%%/lua/website/tube8.lua
+%%SMUT%%%%DATADIR%%/lua/website/xvideos.lua
+%%SMUT%%%%DATADIR%%/lua/website/youjizz.lua
+@dirrm %%DATADIR%%/lua/website
+@dirrm %%DATADIR%%/lua/util
+@dirrm %%DATADIR%%/lua
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/quvi