4 files changed, 39 insertions, 133 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 38a4a06add9b..b369b42451cb 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,86 +6,56 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	1.0.2
-#PORTREVISION=	0
-#PORTEPOCH=	0
+PORTVERSION=	2.1.5
+PORTREVISION=	0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://download.gna.org/clive/1.0.x/ \
+MASTER_SITES=	GOOGLE_CODE \
 		SF
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Video extraction utility for YouTube, GoogleVideo, and others
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:${PORTSDIR}/www/py-urlgrabber
+RUN_DEPENDS=	p5-BerkeleyDB>=0.36:${PORTSDIR}/databases/p5-BerkeleyDB \
+		p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \
+		p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA \
+		p5-HTML-Parser>=3.59:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-WWW-Curl>=4.05:${PORTSDIR}/www/p5-WWW-Curl \
+		p5-XML-Simple>=2.18:${PORTSDIR}/textproc/p5-XML-Simple
 
-# deskutils/ljclive (same executable/manpage/distfile name)
-CONFLICTS=	clive-[0-9]*
+# deskutils/ljclive, multimedia/clive1 (same executable/manpage/distfile name)
+CONFLICTS=	*clive-[0-1]*
 
-GNU_CONFIGURE=	yes
+NO_BUILD=	yes
+
+OPTIONS=	PASTE "Paste URLs from clipboard" off \
+		CLIVEPASS "Enable login passwords" off \
+		SHOW "Show cache entries" off
 
 USE_BZIP2=	yes
-# not compatible with 3.0
-USE_PYTHON=	2.4-2.6
+USE_PERL5=	2.5.8+
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
 
 .if !defined(NO_INSTALL_MANPAGES)
-MAN1=	${PORTNAME}.1 ${PORTNAME}-passwd.1
-.else
-CONFIGURE_ARGS=	--with-doc=no
+MAN1=	${PORTNAME}.1
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1/
 .endif
 
-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 \
-		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
-
-.if defined(WITH_MPLAYER)
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
-.endif
-
-.if defined(WITH_NEWT)
-RUN_DEPENDS+=	newt${PYTHON_PKGNAMESUFFIX}>=0.51.0_4:${PORTSDIR}/devel/newt
-.endif
-
-.if defined(WITH_PYCRYPTO)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0.1_1:${PORTSDIR}/security/py-pycrypto
-.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
+.if defined(WITH_PASTE)
+RUN_DEPENDS+=	p5-Clipboard>=0.09:${PORTSDIR}/x11/p5-Clipboard
 .endif
 
-.if defined(WITH_XCLIP)
-RUN_DEPENDS+=	xclip:${PORTSDIR}/x11/xclip
+.if defined(WITH_SHOW)
+RUN_DEPENDS+=	p5-IO-Pager-0.06:${PORTSDIR}/devel/p5-IO-Pager
 .endif
 
-.if defined(WITH_XINE)
-RUN_DEPENDS+=	xine:${PORTSDIR}/multimedia/xine
+.if defined(WITH_CLIVEPASS)
+RUN_DEPENDS+=	p5-Expect>=1.21:${PORTSDIR}/lang/p5-Expect
 .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 7f22d84a0582..d46e412e3e69 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (clive/clive-2.1.5.tar.bz2) = 66ff6adc1664c75d58ce25e4c322c2cb
+SHA256 (clive/clive-2.1.5.tar.bz2) = 388bc32bf505ca29f994da71282eebedf7043e7c293809e2fd9394d641c48b89
+SIZE (clive/clive-2.1.5.tar.bz2) = 27739
diff --git a/multimedia/clive/pkg-descr b/multimedia/clive/pkg-descr
index 9d8f02bc3028..ddd042b0b87e 100644
--- a/multimedia/clive/pkg-descr
+++ b/multimedia/clive/pkg-descr
@@ -1,7 +1,8 @@
-clive is a command line tool for extracting videos from Youtube,
-Google Video, Dailymotion, Guba (free), Stage6, Metacafe, LastFm,
-Sevenload websites.
-clive is written in Python and is cross-platform.
+clive is a portable Perl command line tool for extracting videos 
+from Youtube, Google Video, Break, LiveLeak, LastFm, EvisorTV,
+and Sevenload websites.  clive may be used in a non-interactive
+fashion -- this allows the user to start an extraction and disconnect
+from the system, letting clive finish the work.
 
 Main features:
 
@@ -12,8 +13,7 @@ Main features:
     - Chaining with ffmpeg for subsequent re-encoding
     - URL caching; re-fetch video page only when necessary
     - Gzip compressed video page data transfers
-    - Integration with X clipboard (with xclip)
-    - RSS/Atom parsing with video selection interface
+    - Integration with X clipboard
     - Continue partially downloaded files
     - Recall last URL batch
     - Supports UNIX pipes
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
index 76589d464ddd..99e25ca6e4c3 100644
--- a/multimedia/clive/pkg-plist
+++ b/multimedia/clive/pkg-plist
@@ -1,66 +1,2 @@
+@comment $FreeBSD$
 bin/clive
-bin/clive-passwd
-%%PYTHON_SITELIBDIR%%/clive/__init__.py
-%%PYTHON_SITELIBDIR%%/clive/__init__.pyc
-%%PYTHON_SITELIBDIR%%/clive/__init__.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/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
-%%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
-%%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/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
-%%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/rss.py
-%%PYTHON_SITELIBDIR%%/clive/rss.pyc
-%%PYTHON_SITELIBDIR%%/clive/rss.pyo
-%%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
-%%PYTHON_SITELIBDIR%%/clive/update.py
-%%PYTHON_SITELIBDIR%%/clive/update.pyc
-%%PYTHON_SITELIBDIR%%/clive/update.pyo
-%%PYTHON_SITELIBDIR%%/clive/util.py
-%%PYTHON_SITELIBDIR%%/clive/util.pyc
-%%PYTHON_SITELIBDIR%%/clive/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/clive