10 files changed, 84 insertions, 74 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 2f0194a4494e..317c4fed3b42 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.2.1
+PORTVERSION=	0.4.0
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -18,6 +18,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Video extraction utility for YouTube and Google Video
 
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:${PORTSDIR}/www/py-urlgrabber
+
 # deskutils/ljclive (same executable/manpage/distfile name)
 CONFLICTS=	clive-[0-9]*
 
@@ -29,12 +31,10 @@ MANCOMPRESSED=	yes
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
-		VLC	"Install vlc as video player" off
+		VLC	"Install vlc as video player" off \
+		XCLIP	"Install xclip (read URLs from clipboard)" on
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FFMPEG)
@@ -49,4 +49,8 @@ RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 .endif
 
+.if defined(WITH_XCLIP)
+RUN_DEPENDS+=	xclip:${PORTSDIR}/x11/xclip
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/clive/distinfo b/multimedia/clive/distinfo
index bb4ea3333c8c..2477df1322b7 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.2.1.tar.gz) = 6ba51c2a4f9748079409da39fe5f6b96
-SHA256 (clive/clive-0.2.1.tar.gz) = 02cde2b6c1b245affeef5f6f1452ce56a3cc538697f5860bc506be074c2161aa
-SIZE (clive/clive-0.2.1.tar.gz) = 39103
+MD5 (clive/clive-0.4.0.tar.gz) = 89578b595046f1f730a9a77e5d8c550b
+SHA256 (clive/clive-0.4.0.tar.gz) = fe9af0a9ca44b20faecca01a1ed2a2011a8d9ea8c5849581117136a3ea1dfed7
+SIZE (clive/clive-0.4.0.tar.gz) = 37669
diff --git a/multimedia/clive/pkg-descr b/multimedia/clive/pkg-descr
index 08e7122080e4..13fa009cc32a 100644
--- a/multimedia/clive/pkg-descr
+++ b/multimedia/clive/pkg-descr
@@ -1,6 +1,11 @@
-clive is a command line program that extracts videos from YouTube and
-Google Video websites. It supports embedded video extraction, and can
-be used with ffmpeg to re-encode the extracted videos to different
-video formats (avi, mpeg, flv). 
+clive is a command line tool for extracting videos from Youtube,
+Google Video, Dailymotion, Guba (free) and Stage6 websites.
+clive is written in Python and is cross-platform.
+
+Main features:
+
+    - Video extraction
+    - Integration and re-encoding with 'ffmpeg'
+    - Player integration with a 3rd party software
 
 WWW:	http://home.gna.org/clive/
diff --git a/multimedia/clive/pkg-message b/multimedia/clive/pkg-message
deleted file mode 100644
index 4c10c48e411e..000000000000
--- a/multimedia/clive/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-=====================================================
-
-The Newt User Interface requires the port devel/newt.
-Please, install or reinstall it manually (setting the
-knob WITH_PYTHON=yes).
-
-=====================================================
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
index f46d16cdf21a..4bbd1ac04956 100644
--- a/multimedia/clive/pkg-plist
+++ b/multimedia/clive/pkg-plist
@@ -3,28 +3,31 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/__init__.py
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyc
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyo
-%%PYTHON_SITELIBDIR%%/clive/cli.py
-%%PYTHON_SITELIBDIR%%/clive/cli.pyc
-%%PYTHON_SITELIBDIR%%/clive/cli.pyo
-%%PYTHON_SITELIBDIR%%/clive/login.py
-%%PYTHON_SITELIBDIR%%/clive/login.pyc
-%%PYTHON_SITELIBDIR%%/clive/login.pyo
-%%PYTHON_SITELIBDIR%%/clive/net.py
-%%PYTHON_SITELIBDIR%%/clive/net.pyc
-%%PYTHON_SITELIBDIR%%/clive/net.pyo
-%%PYTHON_SITELIBDIR%%/clive/newt.py
-%%PYTHON_SITELIBDIR%%/clive/newt.pyc
-%%PYTHON_SITELIBDIR%%/clive/newt.pyo
+%%PYTHON_SITELIBDIR%%/clive/configure.py
+%%PYTHON_SITELIBDIR%%/clive/configure.pyc
+%%PYTHON_SITELIBDIR%%/clive/configure.pyo
+%%PYTHON_SITELIBDIR%%/clive/console.py
+%%PYTHON_SITELIBDIR%%/clive/console.pyc
+%%PYTHON_SITELIBDIR%%/clive/console.pyo
+%%PYTHON_SITELIBDIR%%/clive/error.py
+%%PYTHON_SITELIBDIR%%/clive/error.pyc
+%%PYTHON_SITELIBDIR%%/clive/error.pyo
+%%PYTHON_SITELIBDIR%%/clive/history.py
+%%PYTHON_SITELIBDIR%%/clive/history.pyc
+%%PYTHON_SITELIBDIR%%/clive/history.pyo
+%%PYTHON_SITELIBDIR%%/clive/nomad.py
+%%PYTHON_SITELIBDIR%%/clive/nomad.pyc
+%%PYTHON_SITELIBDIR%%/clive/nomad.pyo
 %%PYTHON_SITELIBDIR%%/clive/opts.py
 %%PYTHON_SITELIBDIR%%/clive/opts.pyc
 %%PYTHON_SITELIBDIR%%/clive/opts.pyo
 %%PYTHON_SITELIBDIR%%/clive/parse.py
 %%PYTHON_SITELIBDIR%%/clive/parse.pyc
 %%PYTHON_SITELIBDIR%%/clive/parse.pyo
-%%PYTHON_SITELIBDIR%%/clive/util.py
-%%PYTHON_SITELIBDIR%%/clive/util.pyc
-%%PYTHON_SITELIBDIR%%/clive/util.pyo
-%%PYTHON_SITELIBDIR%%/clive/version.py
-%%PYTHON_SITELIBDIR%%/clive/version.pyc
-%%PYTHON_SITELIBDIR%%/clive/version.pyo
+%%PYTHON_SITELIBDIR%%/clive/progress.py
+%%PYTHON_SITELIBDIR%%/clive/progress.pyc
+%%PYTHON_SITELIBDIR%%/clive/progress.pyo
+%%PYTHON_SITELIBDIR%%/clive/update.py
+%%PYTHON_SITELIBDIR%%/clive/update.pyc
+%%PYTHON_SITELIBDIR%%/clive/update.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/clive
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index 2f0194a4494e..317c4fed3b42 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.2.1
+PORTVERSION=	0.4.0
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -18,6 +18,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Video extraction utility for YouTube and Google Video
 
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:${PORTSDIR}/www/py-urlgrabber
+
 # deskutils/ljclive (same executable/manpage/distfile name)
 CONFLICTS=	clive-[0-9]*
 
@@ -29,12 +31,10 @@ MANCOMPRESSED=	yes
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
-		VLC	"Install vlc as video player" off
+		VLC	"Install vlc as video player" off \
+		XCLIP	"Install xclip (read URLs from clipboard)" on
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FFMPEG)
@@ -49,4 +49,8 @@ RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 .endif
 
+.if defined(WITH_XCLIP)
+RUN_DEPENDS+=	xclip:${PORTSDIR}/x11/xclip
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/clive1/distinfo b/multimedia/clive1/distinfo
index bb4ea3333c8c..2477df1322b7 100644
--- a/multimedia/clive1/distinfo
+++ b/multimedia/clive1/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.2.1.tar.gz) = 6ba51c2a4f9748079409da39fe5f6b96
-SHA256 (clive/clive-0.2.1.tar.gz) = 02cde2b6c1b245affeef5f6f1452ce56a3cc538697f5860bc506be074c2161aa
-SIZE (clive/clive-0.2.1.tar.gz) = 39103
+MD5 (clive/clive-0.4.0.tar.gz) = 89578b595046f1f730a9a77e5d8c550b
+SHA256 (clive/clive-0.4.0.tar.gz) = fe9af0a9ca44b20faecca01a1ed2a2011a8d9ea8c5849581117136a3ea1dfed7
+SIZE (clive/clive-0.4.0.tar.gz) = 37669
diff --git a/multimedia/clive1/pkg-descr b/multimedia/clive1/pkg-descr
index 08e7122080e4..13fa009cc32a 100644
--- a/multimedia/clive1/pkg-descr
+++ b/multimedia/clive1/pkg-descr
@@ -1,6 +1,11 @@
-clive is a command line program that extracts videos from YouTube and
-Google Video websites. It supports embedded video extraction, and can
-be used with ffmpeg to re-encode the extracted videos to different
-video formats (avi, mpeg, flv). 
+clive is a command line tool for extracting videos from Youtube,
+Google Video, Dailymotion, Guba (free) and Stage6 websites.
+clive is written in Python and is cross-platform.
+
+Main features:
+
+    - Video extraction
+    - Integration and re-encoding with 'ffmpeg'
+    - Player integration with a 3rd party software
 
 WWW:	http://home.gna.org/clive/
diff --git a/multimedia/clive1/pkg-message b/multimedia/clive1/pkg-message
deleted file mode 100644
index 4c10c48e411e..000000000000
--- a/multimedia/clive1/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-=====================================================
-
-The Newt User Interface requires the port devel/newt.
-Please, install or reinstall it manually (setting the
-knob WITH_PYTHON=yes).
-
-=====================================================
diff --git a/multimedia/clive1/pkg-plist b/multimedia/clive1/pkg-plist
index f46d16cdf21a..4bbd1ac04956 100644
--- a/multimedia/clive1/pkg-plist
+++ b/multimedia/clive1/pkg-plist
@@ -3,28 +3,31 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/__init__.py
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyc
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyo
-%%PYTHON_SITELIBDIR%%/clive/cli.py
-%%PYTHON_SITELIBDIR%%/clive/cli.pyc
-%%PYTHON_SITELIBDIR%%/clive/cli.pyo
-%%PYTHON_SITELIBDIR%%/clive/login.py
-%%PYTHON_SITELIBDIR%%/clive/login.pyc
-%%PYTHON_SITELIBDIR%%/clive/login.pyo
-%%PYTHON_SITELIBDIR%%/clive/net.py
-%%PYTHON_SITELIBDIR%%/clive/net.pyc
-%%PYTHON_SITELIBDIR%%/clive/net.pyo
-%%PYTHON_SITELIBDIR%%/clive/newt.py
-%%PYTHON_SITELIBDIR%%/clive/newt.pyc
-%%PYTHON_SITELIBDIR%%/clive/newt.pyo
+%%PYTHON_SITELIBDIR%%/clive/configure.py
+%%PYTHON_SITELIBDIR%%/clive/configure.pyc
+%%PYTHON_SITELIBDIR%%/clive/configure.pyo
+%%PYTHON_SITELIBDIR%%/clive/console.py
+%%PYTHON_SITELIBDIR%%/clive/console.pyc
+%%PYTHON_SITELIBDIR%%/clive/console.pyo
+%%PYTHON_SITELIBDIR%%/clive/error.py
+%%PYTHON_SITELIBDIR%%/clive/error.pyc
+%%PYTHON_SITELIBDIR%%/clive/error.pyo
+%%PYTHON_SITELIBDIR%%/clive/history.py
+%%PYTHON_SITELIBDIR%%/clive/history.pyc
+%%PYTHON_SITELIBDIR%%/clive/history.pyo
+%%PYTHON_SITELIBDIR%%/clive/nomad.py
+%%PYTHON_SITELIBDIR%%/clive/nomad.pyc
+%%PYTHON_SITELIBDIR%%/clive/nomad.pyo
 %%PYTHON_SITELIBDIR%%/clive/opts.py
 %%PYTHON_SITELIBDIR%%/clive/opts.pyc
 %%PYTHON_SITELIBDIR%%/clive/opts.pyo
 %%PYTHON_SITELIBDIR%%/clive/parse.py
 %%PYTHON_SITELIBDIR%%/clive/parse.pyc
 %%PYTHON_SITELIBDIR%%/clive/parse.pyo
-%%PYTHON_SITELIBDIR%%/clive/util.py
-%%PYTHON_SITELIBDIR%%/clive/util.pyc
-%%PYTHON_SITELIBDIR%%/clive/util.pyo
-%%PYTHON_SITELIBDIR%%/clive/version.py
-%%PYTHON_SITELIBDIR%%/clive/version.pyc
-%%PYTHON_SITELIBDIR%%/clive/version.pyo
+%%PYTHON_SITELIBDIR%%/clive/progress.py
+%%PYTHON_SITELIBDIR%%/clive/progress.pyc
+%%PYTHON_SITELIBDIR%%/clive/progress.pyo
+%%PYTHON_SITELIBDIR%%/clive/update.py
+%%PYTHON_SITELIBDIR%%/clive/update.pyc
+%%PYTHON_SITELIBDIR%%/clive/update.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/clive