8 files changed, 84 insertions, 62 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index a5808a278b96..14f70fc08c0b 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.4.6
+PORTVERSION=	0.4.7
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -17,25 +17,25 @@ 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]*
 
+GNU_CONFIGURE=	yes
+
+USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
 
 .if !defined(NO_INSTALL_MANPAGES)
 MAN1=	${PORTNAME}.1
-MANCOMPRESSED=	yes
 .else
-MAKE_ENV=	NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES}
+CONFIGURE_ARGS=	--with-doc=no
 .endif
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
+		SQLITE3 "Install sqlite3 for caching visited URLs" off \
 		VLC	"Install vlc as video player" off \
-		XCLIP	"Install xclip (read URLs from clipboard)" on
+		XCLIP	"Install xclip (read URLs from clipboard)" off
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.pre.mk>
@@ -48,6 +48,10 @@ RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
+.if defined(WITH_SQLITE3)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.5.2_1:${PORTSDIR}/databases/py-sqlite3
+.endif
+
 .if defined(WITH_VLC)
 RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 .endif
diff --git a/multimedia/clive/distinfo b/multimedia/clive/distinfo
index bf6cb9715e43..6b8dbaad2a6b 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.4.6.tar.gz) = c77e912d831e57af2b424811337b62ba
-SHA256 (clive/clive-0.4.6.tar.gz) = 77722773a7150f8135a517666953350e31222a30060e25a75114040137d392d2
-SIZE (clive/clive-0.4.6.tar.gz) = 62910
+MD5 (clive/clive-0.4.7.tar.bz2) = 878bb12d6730453c4eda2bc0f026b90a
+SHA256 (clive/clive-0.4.7.tar.bz2) = e098d118cfa107b3ccda9542d2104a3c6e4736e660a8de108fbd361560acc1f2
+SIZE (clive/clive-0.4.7.tar.bz2) = 130559
diff --git a/multimedia/clive/files/patch-setup.py b/multimedia/clive/files/patch-setup.py
deleted file mode 100644
index 2ef7786c977d..000000000000
--- a/multimedia/clive/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py	2008-01-25 04:37:50.000000000 +0100
-+++ setup.py.port	2008-02-03 11:40:03.000000000 +0100
-@@ -59,7 +59,10 @@
- 
- manpage = 'man/clive.1'
- manpage_gz = manpage + '.gz'
--data_files = [ ('man/man1', [manpage_gz]) ]
-+if not os.environ.has_key('NO_INSTALL_MANPAGES'):
-+	data_files = [ ('man/man1', [manpage_gz]) ]
-+else:
-+	data_files = []
- 
- setup_args = dict(
- 	name = 'clive',
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
index f5575bd6b0a6..cce5f5249560 100644
--- a/multimedia/clive/pkg-plist
+++ b/multimedia/clive/pkg-plist
@@ -1,20 +1,19 @@
-@comment $FreeBSD$
 bin/clive
 %%PYTHON_SITELIBDIR%%/clive/__init__.py
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyc
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyo
-%%PYTHON_SITELIBDIR%%/clive/configure.py
-%%PYTHON_SITELIBDIR%%/clive/configure.pyc
-%%PYTHON_SITELIBDIR%%/clive/configure.pyo
+%%PYTHON_SITELIBDIR%%/clive/cache.py
+%%PYTHON_SITELIBDIR%%/clive/cache.pyc
+%%PYTHON_SITELIBDIR%%/clive/cache.pyo
+%%PYTHON_SITELIBDIR%%/clive/config.py
+%%PYTHON_SITELIBDIR%%/clive/config.pyc
+%%PYTHON_SITELIBDIR%%/clive/config.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/main.py
 %%PYTHON_SITELIBDIR%%/clive/main.pyc
 %%PYTHON_SITELIBDIR%%/clive/main.pyo
@@ -27,10 +26,32 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/parse.py
 %%PYTHON_SITELIBDIR%%/clive/parse.pyc
 %%PYTHON_SITELIBDIR%%/clive/parse.pyo
+%%PYTHON_SITELIBDIR%%/clive/path.py
+%%PYTHON_SITELIBDIR%%/clive/path.pyc
+%%PYTHON_SITELIBDIR%%/clive/path.pyo
 %%PYTHON_SITELIBDIR%%/clive/progress.py
 %%PYTHON_SITELIBDIR%%/clive/progress.pyc
 %%PYTHON_SITELIBDIR%%/clive/progress.pyo
+%%PYTHON_SITELIBDIR%%/clive/recall.py
+%%PYTHON_SITELIBDIR%%/clive/recall.pyc
+%%PYTHON_SITELIBDIR%%/clive/recall.pyo
 %%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
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index a5808a278b96..14f70fc08c0b 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.4.6
+PORTVERSION=	0.4.7
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -17,25 +17,25 @@ 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]*
 
+GNU_CONFIGURE=	yes
+
+USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
 
 .if !defined(NO_INSTALL_MANPAGES)
 MAN1=	${PORTNAME}.1
-MANCOMPRESSED=	yes
 .else
-MAKE_ENV=	NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES}
+CONFIGURE_ARGS=	--with-doc=no
 .endif
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
+		SQLITE3 "Install sqlite3 for caching visited URLs" off \
 		VLC	"Install vlc as video player" off \
-		XCLIP	"Install xclip (read URLs from clipboard)" on
+		XCLIP	"Install xclip (read URLs from clipboard)" off
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.pre.mk>
@@ -48,6 +48,10 @@ RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
+.if defined(WITH_SQLITE3)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.5.2_1:${PORTSDIR}/databases/py-sqlite3
+.endif
+
 .if defined(WITH_VLC)
 RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 .endif
diff --git a/multimedia/clive1/distinfo b/multimedia/clive1/distinfo
index bf6cb9715e43..6b8dbaad2a6b 100644
--- a/multimedia/clive1/distinfo
+++ b/multimedia/clive1/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.4.6.tar.gz) = c77e912d831e57af2b424811337b62ba
-SHA256 (clive/clive-0.4.6.tar.gz) = 77722773a7150f8135a517666953350e31222a30060e25a75114040137d392d2
-SIZE (clive/clive-0.4.6.tar.gz) = 62910
+MD5 (clive/clive-0.4.7.tar.bz2) = 878bb12d6730453c4eda2bc0f026b90a
+SHA256 (clive/clive-0.4.7.tar.bz2) = e098d118cfa107b3ccda9542d2104a3c6e4736e660a8de108fbd361560acc1f2
+SIZE (clive/clive-0.4.7.tar.bz2) = 130559
diff --git a/multimedia/clive1/files/patch-setup.py b/multimedia/clive1/files/patch-setup.py
deleted file mode 100644
index 2ef7786c977d..000000000000
--- a/multimedia/clive1/files/patch-setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup.py	2008-01-25 04:37:50.000000000 +0100
-+++ setup.py.port	2008-02-03 11:40:03.000000000 +0100
-@@ -59,7 +59,10 @@
- 
- manpage = 'man/clive.1'
- manpage_gz = manpage + '.gz'
--data_files = [ ('man/man1', [manpage_gz]) ]
-+if not os.environ.has_key('NO_INSTALL_MANPAGES'):
-+	data_files = [ ('man/man1', [manpage_gz]) ]
-+else:
-+	data_files = []
- 
- setup_args = dict(
- 	name = 'clive',
diff --git a/multimedia/clive1/pkg-plist b/multimedia/clive1/pkg-plist
index f5575bd6b0a6..cce5f5249560 100644
--- a/multimedia/clive1/pkg-plist
+++ b/multimedia/clive1/pkg-plist
@@ -1,20 +1,19 @@
-@comment $FreeBSD$
 bin/clive
 %%PYTHON_SITELIBDIR%%/clive/__init__.py
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyc
 %%PYTHON_SITELIBDIR%%/clive/__init__.pyo
-%%PYTHON_SITELIBDIR%%/clive/configure.py
-%%PYTHON_SITELIBDIR%%/clive/configure.pyc
-%%PYTHON_SITELIBDIR%%/clive/configure.pyo
+%%PYTHON_SITELIBDIR%%/clive/cache.py
+%%PYTHON_SITELIBDIR%%/clive/cache.pyc
+%%PYTHON_SITELIBDIR%%/clive/cache.pyo
+%%PYTHON_SITELIBDIR%%/clive/config.py
+%%PYTHON_SITELIBDIR%%/clive/config.pyc
+%%PYTHON_SITELIBDIR%%/clive/config.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/main.py
 %%PYTHON_SITELIBDIR%%/clive/main.pyc
 %%PYTHON_SITELIBDIR%%/clive/main.pyo
@@ -27,10 +26,32 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/parse.py
 %%PYTHON_SITELIBDIR%%/clive/parse.pyc
 %%PYTHON_SITELIBDIR%%/clive/parse.pyo
+%%PYTHON_SITELIBDIR%%/clive/path.py
+%%PYTHON_SITELIBDIR%%/clive/path.pyc
+%%PYTHON_SITELIBDIR%%/clive/path.pyo
 %%PYTHON_SITELIBDIR%%/clive/progress.py
 %%PYTHON_SITELIBDIR%%/clive/progress.pyc
 %%PYTHON_SITELIBDIR%%/clive/progress.pyo
+%%PYTHON_SITELIBDIR%%/clive/recall.py
+%%PYTHON_SITELIBDIR%%/clive/recall.pyc
+%%PYTHON_SITELIBDIR%%/clive/recall.pyo
 %%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