Update to 2.1.2:

Version 2.1.2
(December 29, 2008)

  * Removed "See --manual" from --version output
  * Added support for evisortv
    - http://code.google.com/p/clive/issues/detail?id=4
  * Fixed: reused incorrectly last http error code for remaining urls in queue
  * Fixed: progressbar reported 100% even if error had occurred (e.g. http/403)

Version 2.1.1
(December 19, 2008)

  * Fixed "Requested range was not delivered by the server (http/33)" w/ -c
    - this would occur with a batch of URLs while using the --continue option,
    e.g. if the first file was continued, the following page fetches exited
    with the above error
  * Added --savebatch option
  * Added --overwrite option
  * Replaced the buggy progressbar with a "lazy man's progressbar"
  * Fixed "print() on closed filehandle STDOUT" with --grep+delete
  * Fixed progressbar display with --continue

Version 2.1.0
(December 10, 2008)

 NOTE: Changed license GPL3 => ISC/OpenBSD.

  * Added --modversion option
  * Replaced Term::Progressbar with a built-in thermometer progressbar
  * Removed --progress=bar:nominor support due to above changes
  * Added liveleakcom support
    - http://code.google.com/p/clive/issues/detail?id=3

Version 2.0.0
(December 2, 2008)

   * Fixed gvideo/mp4 support (http/404 even if the extraction link existed)
   * Changed "found redirect" message
   * Changed --play, --rencode status messages to use file basename

Version 2.0beta4
(November 22, 2008)

   * Removed metacafe support until fixed (see known issues)
   * Changed Youtube login to report if there were "too many login failures"
   * Fixed Youtube login support: reported failures incorrectly as OK
   * Added support clivepass(1) utility (http://code.google.com/p/clive-utils)
   * Added support for metacafe and sevenload embed URL translation

version 2.0beta3
(November 1, 2008)

  * Fixed pasting from clipboard containing multiple URLs
  * Fixed page fetch progress glitch that occured with 1+ batches
  * Added --agent option
  * Added --proxy option
  * Added --savedir option
  * Added --cclass option
  * Added --filename-format option
  * Added --show-format option
  * Added --youtube-user and --youtube-pass options
  * Added --emit-xml option
  * Added --progress=[none|bar|dot]
  * Replaced --noprogress with --progress=none
  * Added avg. transfer rate notification
  * Fixed filename printing for existing output files (e.g. output.flv.1)
  * Added --play option
  * Fixed metacafe support (error: failed to extract videoCDNURL)
  * Added --rencode option

Version 2.0beta2
(October 15, 2008)

  * clive now ignores input lines that start with the '#' character
  * Added support for CLIVE_CONFIGDIR environment variable
  * Ported lastfm video support from 1.x
  * --version now displays XML::Simple
  * Changed "= Play:" to "=> Playing ..."
  * Playing occurs now subsequently after going over the URL batch

Version 2.0beta1
(September 23, 2008)

A complete overhaul and rewrite of 1.x.

  * Users are expected to use the --continue/-c option to resume transfers
  * Configuration file format (=> INI), path was changed (=> ~/.config/clive)
  * All extractions now assume flv as the default download format
  * Users are expected to understand when/how use the --format/-f option
  * Reading input from multiple sources is possible (e.g. % clive -x URL URL)
  * Added: --grep: used to grep and recall cached URL entries
  * Added: --background and --output=logfile, --append=logfile options
  * Many old cmdline and config options were removed due to new design
  * Improved GoogleVideo support: handles redirects to other hosts
  * Pager is used where needed (e.g. --show/-s)
  * Changed default output file naming format to "%n-(%i)-[%d].%s"
  * Removed: guba (deadweight), myvideo (borked), dmotion (bitches @ anon users)

3 files changed, 25 insertions, 89 deletions

diff --git a/net/clive/Makefile b/net/clive/Makefile
index 9c5323cd22c..0446352340a 100644
--- a/net/clive/Makefile
+++ b/net/clive/Makefile
@@ -1,32 +1,34 @@
-# $NetBSD: Makefile,v 1.14 2008/10/16 21:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/01/08 16:08:57 wiz Exp $
 #
 
-DISTNAME=	clive-1.0.2
+DISTNAME=	clive-2.1.2
 CATEGORIES=	net multimedia www
-MASTER_SITES=	http://download.gna.org/clive/1.0.x/ \
-		${MASTER_SITE_SOURCEFORGE:=clive/}
+MASTER_SITES=	http://clive.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://clive.sourceforge.net/
 COMMENT=	Command line video extraction tool for user-uploaded video hosts
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+DEPENDS+=	p5-BerkeleyDB>=0.34:../../databases/p5-BerkeleyDB
+DEPENDS+=	p5-Clipboard>=0.09:../../x11/p5-Clipboard
+DEPENDS+=	p5-Config-Tiny>=2.12:../../devel/p5-Config-Tiny
+DEPENDS+=	p5-Digest-SHA-[0-9]*:../../security/p5-Digest-SHA
+DEPENDS+=	p5-Expect>=1.21:../../devel/p5-Expect
+DEPENDS+=	p5-HTML-Parser>=2.37:../../www/p5-HTML-Parser
+DEPENDS+=	p5-IO-Pager>=0.05:../../devel/p5-IO-Pager
+DEPENDS+=	p5-URI>=1.37:../../www/p5-URI
+DEPENDS+=	p5-WWW-Curl>=4.05:../../www/p5-WWW-Curl
+DEPENDS+=	p5-XML-Simple>=2.18:../../textproc/p5-XML-Simple
 
-DEPENDS+=	${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
-DEPENDS+=	${PYPKGPREFIX}-newt>=0.51:../../devel/py-newt
-DEPENDS+=	${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto
-DEPENDS+=	${PYPKGPREFIX}-feedparser>=4.1:../../textproc/py-feedparser
-DEPENDS+=	urlgrabber>=3.1.0:../../www/urlgrabber
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c # configure script
-PY_PATCHPLIST=			yes
+do-build:
+	cd ${WRKSRC} && ${PERL5} genman
 
-REPLACE_INTERPRETER+=	env_python
-REPLACE.env_python.old=	/usr/bin/env python
-REPLACE.env_python.new= ${PYTHONBIN}
-REPLACE_FILES.env_python=	src/scripts/clive
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/clive ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/clive.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/clive/PLIST b/net/clive/PLIST
index db056a84976..2fe5b2c0eaa 100644
--- a/net/clive/PLIST
+++ b/net/clive/PLIST
@@ -1,69 +1,3 @@
-@comment $NetBSD: PLIST,v 1.8 2008/09/06 14:28:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/01/08 16:08:57 wiz Exp $
 bin/clive
-bin/clive-passwd
-${PYSITELIB}/clive/__init__.py
-${PYSITELIB}/clive/__init__.pyc
-${PYSITELIB}/clive/__init__.pyo
-${PYSITELIB}/clive/cache.py
-${PYSITELIB}/clive/cache.pyc
-${PYSITELIB}/clive/cache.pyo
-${PYSITELIB}/clive/config.py
-${PYSITELIB}/clive/config.pyc
-${PYSITELIB}/clive/config.pyo
-${PYSITELIB}/clive/console.py
-${PYSITELIB}/clive/console.pyc
-${PYSITELIB}/clive/console.pyo
-${PYSITELIB}/clive/error.py
-${PYSITELIB}/clive/error.pyc
-${PYSITELIB}/clive/error.pyo
-${PYSITELIB}/clive/login.py
-${PYSITELIB}/clive/login.pyc
-${PYSITELIB}/clive/login.pyo
-${PYSITELIB}/clive/main.py
-${PYSITELIB}/clive/main.pyc
-${PYSITELIB}/clive/main.pyo
-${PYSITELIB}/clive/modules.py
-${PYSITELIB}/clive/modules.pyc
-${PYSITELIB}/clive/modules.pyo
-${PYSITELIB}/clive/nomad.py
-${PYSITELIB}/clive/nomad.pyc
-${PYSITELIB}/clive/nomad.pyo
-${PYSITELIB}/clive/opts.py
-${PYSITELIB}/clive/opts.pyc
-${PYSITELIB}/clive/opts.pyo
-${PYSITELIB}/clive/parse.py
-${PYSITELIB}/clive/parse.pyc
-${PYSITELIB}/clive/parse.pyo
-${PYSITELIB}/clive/passwd.py
-${PYSITELIB}/clive/passwd.pyc
-${PYSITELIB}/clive/passwd.pyo
-${PYSITELIB}/clive/path.py
-${PYSITELIB}/clive/path.pyc
-${PYSITELIB}/clive/path.pyo
-${PYSITELIB}/clive/progress.py
-${PYSITELIB}/clive/progress.pyc
-${PYSITELIB}/clive/progress.pyo
-${PYSITELIB}/clive/recall.py
-${PYSITELIB}/clive/recall.pyc
-${PYSITELIB}/clive/recall.pyo
-${PYSITELIB}/clive/rss.py
-${PYSITELIB}/clive/rss.pyc
-${PYSITELIB}/clive/rss.pyo
-${PYSITELIB}/clive/scan.py
-${PYSITELIB}/clive/scan.pyc
-${PYSITELIB}/clive/scan.pyo
-${PYSITELIB}/clive/singleton.py
-${PYSITELIB}/clive/singleton.pyc
-${PYSITELIB}/clive/singleton.pyo
-${PYSITELIB}/clive/unicode.py
-${PYSITELIB}/clive/unicode.pyc
-${PYSITELIB}/clive/unicode.pyo
-${PYSITELIB}/clive/update.py
-${PYSITELIB}/clive/update.pyc
-${PYSITELIB}/clive/update.pyo
-${PYSITELIB}/clive/util.py
-${PYSITELIB}/clive/util.pyc
-${PYSITELIB}/clive/util.pyo
 man/man1/clive.1
-man/man1/clive-passwd.1
-@dirrm ${PYSITELIB}/clive
diff --git a/net/clive/distinfo b/net/clive/distinfo
index 17f5400f079..5074ec8d304 100644
--- a/net/clive/distinfo
+++ b/net/clive/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2008/10/16 21:45:39 wiz Exp $
+$NetBSD: distinfo,v 1.12 2009/01/08 16:08:57 wiz Exp $
 
-SHA1 (clive-1.0.2.tar.bz2) = 6ea6760ea3c4eeb7693f4a48acc41cd57160cdea
-RMD160 (clive-1.0.2.tar.bz2) = 37e138cc78058fb325aedab681a1832ad3d95b81
-Size (clive-1.0.2.tar.bz2) = 106102 bytes
+SHA1 (clive-2.1.2.tar.bz2) = 9b2d5698b2a48e804e645f64978c8f9a21599222
+RMD160 (clive-2.1.2.tar.bz2) = 51b6ea762aced82cb09db8ccd802e75ecea60048
+Size (clive-2.1.2.tar.bz2) = 27338 bytes