diff -ruN --exclude=CVS /usr/ports/multimedia/quvi.orig/Makefile /usr/ports/multimedia/quvi/Makefile
--- /usr/ports/multimedia/quvi.orig/Makefile	2010-07-29 06:16:36.000000000 -0700
+++ /usr/ports/multimedia/quvi/Makefile	2010-07-29 07:30:07.000000000 -0700
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quvi
-PORTVERSION=	0.1.4
+PORTVERSION=	0.2.1
 CATEGORIES=	multimedia devel
 MASTER_SITES=	GOOGLE_CODE
 
@@ -17,10 +17,10 @@
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_LDCONFIG=	yes
-SHLIB_VER=	1
+SHLIB_VER=	2
 
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
-PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
+PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
 
 MAN1=		quvi.1
 
@@ -28,16 +28,23 @@
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 USE_ICONV=	yes
+USE_LUA=	5.1
 
+CONFIGURE_ARGS+=--with-doc=no
 CONFIGURE_ENV+=	CPPFLAGS='${CPPFLAGS} -I${WRKSRC}/include \
 		-I${LOCALBASE}/include'
 
+LICENSE=	GPLv3
+
 OPTIONS=	SMUT "Enable adult website support" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SMUT)
 CONFIGURE_ARGS+=--enable-smut
+PLIST_SUB+=	SMUT=""
+.else
+PLIST_SUB+=	SMUT="@comment "
 .endif
 
 post-patch:
diff -ruN --exclude=CVS /usr/ports/multimedia/quvi.orig/distinfo /usr/ports/multimedia/quvi/distinfo
--- /usr/ports/multimedia/quvi.orig/distinfo	2010-07-29 06:16:36.000000000 -0700
+++ /usr/ports/multimedia/quvi/distinfo	2010-07-29 06:20:08.000000000 -0700
@@ -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.orig/pkg-plist /usr/ports/multimedia/quvi/pkg-plist
--- /usr/ports/multimedia/quvi.orig/pkg-plist	2010-07-29 06:16:36.000000000 -0700
+++ /usr/ports/multimedia/quvi/pkg-plist	2010-07-29 07:33:56.000000000 -0700
@@ -1,8 +1,33 @@
 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
+share/quvi/lua/website/README
+share/quvi/lua/website/break.lua
+share/quvi/lua/website/buzzhumor.lua
+share/quvi/lua/website/clipfish.lua
+share/quvi/lua/website/dailymotion.lua
+share/quvi/lua/website/evisor.lua
+share/quvi/lua/website/funnyhub.lua
+share/quvi/lua/website/golem.lua
+share/quvi/lua/website/google.lua
+share/quvi/lua/website/liveleak.lua
+share/quvi/lua/website/myubo.lua
+share/quvi/lua/website/sevenload.lua
+share/quvi/lua/website/spiegel.lua
+share/quvi/lua/website/vimeo.lua
+share/quvi/lua/website/youtube.lua
+%%SMUT%%share/quvi/lua/website/tube8.lua
+%%SMUT%%share/quvi/lua/website/xvideos.lua
+%%SMUT%%share/quvi/lua/website/youjizz.lua
+share/quvi/lua/README
+share/quvi/lua/util/content_type.lua
+share/quvi/lua/util/charset.lua
+@dirrm include/quvi
+@dirrm share/quvi/lua/website
+@dirrm share/quvi/lua/util
+@dirrm share/quvi/lua
+@dirrm share/quvi