3 files changed, 24 insertions, 48 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 2587be26d52c..af9e626de26f 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.4.19
+PORTVERSION=	1.0.0
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://download.gna.org/clive/0.4/src/ \
+MASTER_SITES=	http://download.gna.org/clive/1.0.x/ \
 		SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
@@ -18,6 +18,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Video extraction utility for YouTube and Google Video
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:${PORTSDIR}/www/py-urlgrabber
+
 # deskutils/ljclive (same executable/manpage/distfile name)
 CONFLICTS=	clive-[0-9]*
 
@@ -27,14 +29,15 @@ USE_BZIP2=	yes
 USE_PYTHON=	yes
 
 .if !defined(NO_INSTALL_MANPAGES)
-MAN1=	${PORTNAME}.1
+MAN1=	${PORTNAME}.1 ${PORTNAME}-passwd.1
 .else
 CONFIGURE_ARGS=	--with-doc=no
 .endif
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
-		NEWT	"Use devel/newt instead of bundled module" off \
+		NEWT	"Install devel/newt (support for a simple GUI)" off \
+		PYCRYPTO	"Install pycrypto to encrypt login password" off \
 		SQLITE3 "Install sqlite3 for caching visited URLs" off \
 		VLC	"Install vlc as video player" off \
 		XCLIP	"Install xclip (read URLs from clipboard)" off
@@ -51,14 +54,11 @@ RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
 .if defined(WITH_NEWT)
-PLIST_SUB+=	OPTNEWT="@comment "
-CONFIGURE_ARGS+=	--with-installed-newt=yes
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 RUN_DEPENDS+=	newt${PYTHON_PKGNAMESUFFIX}>=0.51.0_4:${PORTSDIR}/devel/newt
-.else
-PLIST_SUB+=	OPTNEWT=""
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} $${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS} -L${PYTHON_LIBDIR}" SLANG_LIBS="-lncurses -lslang"
+.endif
+
+.if defined(WITH_PYCRYPTO)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0.1_1:${PORTSDIR}/security/py-pycrypto
 .endif
 
 .if defined(WITH_SQLITE3)
diff --git a/multimedia/clive/distinfo b/multimedia/clive/distinfo
index 112bfdd063b7..50d57712f965 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.4.19.tar.bz2) = b7cce85b06179a4d92e2aa90af46468a
-SHA256 (clive/clive-0.4.19.tar.bz2) = a800d2868903feb562be053289ea7a245aabacb169af75211b1c4fa6e4d48420
-SIZE (clive/clive-0.4.19.tar.bz2) = 419287
+MD5 (clive/clive-1.0.0.tar.bz2) = 7658c00f514f9d3e22de0a246e0879f9
+SHA256 (clive/clive-1.0.0.tar.bz2) = 6e27955ebea26a0fbce5564c583e3d429ae0df2e794c1ee30f502bc7361c23c6
+SIZE (clive/clive-1.0.0.tar.bz2) = 104575
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
index 51b1ba3e99ad..3cde5673d949 100644
--- a/multimedia/clive/pkg-plist
+++ b/multimedia/clive/pkg-plist
@@ -1,5 +1,5 @@
-@comment $FreeBSD$
 bin/clive
+bin/clive-passwd
 %%PYTHON_SITELIBDIR%%/clive/__init__.py
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyc
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyo
@@ -15,27 +15,15 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/error.py
 %%PYTHON_SITELIBDIR%%/clive/error.pyc
 %%PYTHON_SITELIBDIR%%/clive/error.pyo
-%%PYTHON_SITELIBDIR%%/clive/feedparser/__init__.py
-%%PYTHON_SITELIBDIR%%/clive/feedparser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/clive/feedparser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/clive/feedparser/feedparser.py
-%%PYTHON_SITELIBDIR%%/clive/feedparser/feedparser.pyc
-%%PYTHON_SITELIBDIR%%/clive/feedparser/feedparser.pyo
 %%PYTHON_SITELIBDIR%%/clive/login.py
 %%PYTHON_SITELIBDIR%%/clive/login.pyc
 %%PYTHON_SITELIBDIR%%/clive/login.pyo
 %%PYTHON_SITELIBDIR%%/clive/main.py
 %%PYTHON_SITELIBDIR%%/clive/main.pyc
 %%PYTHON_SITELIBDIR%%/clive/main.pyo
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.py
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyc
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyo
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.a
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.la
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.so
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.py
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyc
-%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyo
+%%PYTHON_SITELIBDIR%%/clive/modules.py
+%%PYTHON_SITELIBDIR%%/clive/modules.pyc
+%%PYTHON_SITELIBDIR%%/clive/modules.pyo
 %%PYTHON_SITELIBDIR%%/clive/nomad.py
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyc
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyo
@@ -45,6 +33,9 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/parse.py
 %%PYTHON_SITELIBDIR%%/clive/parse.pyc
 %%PYTHON_SITELIBDIR%%/clive/parse.pyo
+%%PYTHON_SITELIBDIR%%/clive/passwd.py
+%%PYTHON_SITELIBDIR%%/clive/passwd.pyc
+%%PYTHON_SITELIBDIR%%/clive/passwd.pyo
 %%PYTHON_SITELIBDIR%%/clive/path.py
 %%PYTHON_SITELIBDIR%%/clive/path.pyc
 %%PYTHON_SITELIBDIR%%/clive/path.pyo
@@ -66,22 +57,7 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/update.py
 %%PYTHON_SITELIBDIR%%/clive/update.pyc
 %%PYTHON_SITELIBDIR%%/clive/update.pyo
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/__init__.py
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/__init__.pyo
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/byterange.py
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/byterange.pyc
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/byterange.pyo
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/grabber.py
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/grabber.pyc
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/grabber.pyo
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/keepalive.py
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/keepalive.pyc
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/keepalive.pyo
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/sslfactory.py
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/sslfactory.pyc
-%%PYTHON_SITELIBDIR%%/clive/urlgrabber/sslfactory.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/clive/urlgrabber
-@dirrm %%PYTHON_SITELIBDIR%%/clive/newt
-@dirrm %%PYTHON_SITELIBDIR%%/clive/feedparser
+%%PYTHON_SITELIBDIR%%/clive/util.py
+%%PYTHON_SITELIBDIR%%/clive/util.pyc
+%%PYTHON_SITELIBDIR%%/clive/util.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/clive