- Update to 1.0.2

- Add WITH_FEEDPARSER, and WITH_XINE options
- Fix the python command on the shebang lines
- Fix WWW site
- Remove MyVideo from the supported video sites
- Set USE_PYTHON to 2.4-2.6 (the program is not compatible with 3.0)

PR:		ports/128362
Submitted by:	bc <bf2006a at yahoo dotcom>

4 files changed, 28 insertions, 10 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index af9e626de26..38a4a06add9 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.2
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nivit@FreeBSD.org
-COMMENT=	Video extraction utility for YouTube and Google Video
+COMMENT=	Video extraction utility for YouTube, GoogleVideo, and others
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:${PORTSDIR}/www/py-urlgrabber
 
@@ -26,7 +26,8 @@ CONFLICTS=	clive-[0-9]*
 GNU_CONFIGURE=	yes
 
 USE_BZIP2=	yes
-USE_PYTHON=	yes
+# not compatible with 3.0
+USE_PYTHON=	2.4-2.6
 
 .if !defined(NO_INSTALL_MANPAGES)
 MAN1=	${PORTNAME}.1 ${PORTNAME}-passwd.1
@@ -34,17 +35,23 @@ MAN1=	${PORTNAME}.1 ${PORTNAME}-passwd.1
 CONFIGURE_ARGS=	--with-doc=no
 .endif
 
-OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
+OPTIONS=	FEEDPARSER	"Enable feed parsing" off \
+		FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" 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
+		XCLIP	"Install xclip (read URLs from clipboard)" off \
+		XINE	"Install xine as video player" off
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_FEEDPARSER)
+RUN_DEPENDS+=	${PKGNAMEPREFIX}feedparser>=4.1_2:${PORTSDIR}/textproc/py-feedparser
+.endif
+
 .if defined(WITH_FFMPEG)
 RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 .endif
@@ -73,4 +80,12 @@ RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 RUN_DEPENDS+=	xclip:${PORTSDIR}/x11/xclip
 .endif
 
+.if defined(WITH_XINE)
+RUN_DEPENDS+=	xine:${PORTSDIR}/multimedia/xine
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
+	${WRKSRC}/src/scripts/clive ${WRKSRC}/src/scripts/clive-passwd
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/clive/distinfo b/multimedia/clive/distinfo
index 50d57712f96..7f22d84a058 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (clive/clive-1.0.2.tar.bz2) = ff617c65ba447bf2f3ef050d02a93dd3
+SHA256 (clive/clive-1.0.2.tar.bz2) = 9dedf4d509c83c21988af6ba1fa5b2b889d3c8f0920036dfc91a7b8f0b2ca699
+SIZE (clive/clive-1.0.2.tar.bz2) = 106102
diff --git a/multimedia/clive/pkg-descr b/multimedia/clive/pkg-descr
index 7292b8f6f15..9d8f02bc302 100644
--- a/multimedia/clive/pkg-descr
+++ b/multimedia/clive/pkg-descr
@@ -1,6 +1,6 @@
 clive is a command line tool for extracting videos from Youtube,
 Google Video, Dailymotion, Guba (free), Stage6, Metacafe, LastFm,
-Sevenload, and MyVideo.(de|ch|at|nl|be) websites.
+Sevenload websites.
 clive is written in Python and is cross-platform.
 
 Main features:
@@ -19,4 +19,4 @@ Main features:
     - Supports UNIX pipes
     - URL batch support
 
-WWW:	http://home.gna.org/clive/
+WWW:	http://clive.sourceforge.net/
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
index 3cde5673d94..76589d464dd 100644
--- a/multimedia/clive/pkg-plist
+++ b/multimedia/clive/pkg-plist
@@ -51,6 +51,9 @@ bin/clive-passwd
 %%PYTHON_SITELIBDIR%%/clive/scan.py
 %%PYTHON_SITELIBDIR%%/clive/scan.pyc
 %%PYTHON_SITELIBDIR%%/clive/scan.pyo
+%%PYTHON_SITELIBDIR%%/clive/singleton.py
+%%PYTHON_SITELIBDIR%%/clive/singleton.pyc
+%%PYTHON_SITELIBDIR%%/clive/singleton.pyo
 %%PYTHON_SITELIBDIR%%/clive/unicode.py
 %%PYTHON_SITELIBDIR%%/clive/unicode.pyc
 %%PYTHON_SITELIBDIR%%/clive/unicode.pyo