Update to 0.4.10:

Version 0.4.10                                       [2008-04-21]
=================================================================
+new !fix ~change -remove | focus: Major bugfixes

+ newt library
    The library, which is written in C and depends on the libslang, is now
    part of the clive distribution. For more details, see the README file.

+ configure: --with-newt[=yes/no] (default:yes)
    If disabled:
        - python newt module will not be built
        - The --rss feature will be disabled

+ Prerequisite: libslang >= 2.0
    The newt library depends on this library.

+ Google Video: mp4 support
    clive will now attempt to download mp4 format from the host by
    default. --low-quality option can be used to override this. Falls
    back to flv if the mp4 link is not found.

    Example:
        mp4: Video: h264, yuv420p, 320x240, 29.97 fps(r)
        mp4: Audio: mpeg4aac, 48000 Hz, stereo

        flv: Video: flv, yuv420p, 320x240, 29.75 fps(r)
        flv: Audio: mp3, 22050 Hz, mono, 64 kb/s

+ Google Video: Partial support for continuing transfers
    Continuing partially downloaded files is now possible for the mp4 transfers
    introduced in this release.

    As with Youtube/FLV, continuing GoogleVideo/FLV files still fails.

~ Program start options stdout
    clive now prints out the bundled newt version (if any).

! Cache: --low-quality
    Caching should now work properly with the --low-quality option. If the
    cache entry was previously recorded using different video quality, the
    video page is re-visited and the cache is updated.

    A new column 'cache_lowq' was added to the 'cache' sqlite table.
    Should the upgrade from a previous version fail, remove the existing
    ~/.clive/cache file.

! Bug #11523: Google video extraction fails
    Affected versions: clive < 0.4.10

! Various typos
    Mostly in the manual page.

- Prerequisite: python-newt module
    The module is now part of the distribution.

4 files changed, 33 insertions, 10 deletions

diff --git a/net/clive/Makefile b/net/clive/Makefile
index d3722eaf75f..3b2f2ca19a0 100644
--- a/net/clive/Makefile
+++ b/net/clive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/04/13 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/22 23:05:49 wiz Exp $
 #
 
-DISTNAME=	clive-0.4.9
+DISTNAME=	clive-0.4.10
 CATEGORIES=	net multimedia www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clive/} \
 		http://dl.gna.org/clive/0.4/src/
@@ -11,8 +11,6 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://clive.sourceforge.net/
 COMMENT=	Command line video extraction tool for user-uploaded video hosts
 
-DEPENDS+=	${PYPKGPREFIX}-newt-[0-9]*:../../devel/py-newt
-
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
@@ -22,7 +20,8 @@ REPLACE_INTERPRETER+=	env_python
 REPLACE.env_python.old=	/usr/bin/env python
 REPLACE.env_python.new= ${PYTHONBIN}
 REPLACE_FILES.env_python=	src/clive/feedparser/feedparser.py
-REPLACE_FILES.env_python+=	src/scripts/clive run-tests.py run.py
+REPLACE_FILES.env_python+=	src/scripts/clive
 
+.include "../../devel/libslang/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/clive/PLIST b/net/clive/PLIST
index 5fc1c7ad985..c055f1b59cc 100644
--- a/net/clive/PLIST
+++ b/net/clive/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/04/13 09:58:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/22 23:05:49 wiz Exp $
 bin/clive
 ${PYSITELIB}/clive/__init__.py
 ${PYSITELIB}/clive/__init__.pyc
@@ -27,6 +27,15 @@ ${PYSITELIB}/clive/login.pyo
 ${PYSITELIB}/clive/main.py
 ${PYSITELIB}/clive/main.pyc
 ${PYSITELIB}/clive/main.pyo
+${PYSITELIB}/clive/newt/__init__.py
+${PYSITELIB}/clive/newt/__init__.pyc
+${PYSITELIB}/clive/newt/__init__.pyo
+${PYSITELIB}/clive/newt/_snackmodule.a
+${PYSITELIB}/clive/newt/_snackmodule.la
+${PYSITELIB}/clive/newt/_snackmodule.so
+${PYSITELIB}/clive/newt/snack.py
+${PYSITELIB}/clive/newt/snack.pyc
+${PYSITELIB}/clive/newt/snack.pyo
 ${PYSITELIB}/clive/nomad.py
 ${PYSITELIB}/clive/nomad.pyc
 ${PYSITELIB}/clive/nomad.pyo
@@ -68,5 +77,6 @@ ${PYSITELIB}/clive/urlgrabber/sslfactory.pyc
 ${PYSITELIB}/clive/urlgrabber/sslfactory.pyo
 man/man1/clive.1
 @dirrm ${PYSITELIB}/clive/urlgrabber
+@dirrm ${PYSITELIB}/clive/newt
 @dirrm ${PYSITELIB}/clive/feedparser
 @dirrm ${PYSITELIB}/clive
diff --git a/net/clive/distinfo b/net/clive/distinfo
index 1854a15f5dd..8823af72781 100644
--- a/net/clive/distinfo
+++ b/net/clive/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/04/13 09:58:48 wiz Exp $
+$NetBSD: distinfo,v 1.3 2008/04/22 23:05:49 wiz Exp $
 
-SHA1 (clive-0.4.9.tar.bz2) = c3f71798a866bf64c68dba31faaccb2681535e2b
-RMD160 (clive-0.4.9.tar.bz2) = 369be7a7549c2195ea5390445cefec2ff9942537
-Size (clive-0.4.9.tar.bz2) = 163823 bytes
+SHA1 (clive-0.4.10.tar.bz2) = 6acc117a6120962be6a7b5226cb0e5c4e8c07846
+RMD160 (clive-0.4.10.tar.bz2) = fef8726ab4ec7128e18901a3cec6c4245fc73fba
+Size (clive-0.4.10.tar.bz2) = 403052 bytes
+SHA1 (patch-aa) = b307903a321bb8d93b75dbf39812e43a82743cef
diff --git a/net/clive/patches/patch-aa b/net/clive/patches/patch-aa
new file mode 100644
index 00000000000..51fc1681e7b
--- /dev/null
+++ b/net/clive/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2008/04/22 23:05:49 wiz Exp $
+
+--- configure.orig	2008-04-22 23:01:36.000000000 +0000
++++ configure
+@@ -21698,7 +21698,7 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" 
+   fi
+ 
+ 
+-if  test x"$with_newt" == "xyes" ; then
++if  test x"$with_newt" = "xyes" ; then
+     SPEC_FILE=$srcdir/src/clive/newt/newt.spec
+     NEWT_VERSION=$(awk '/^Version: / {print $2}' $SPEC_FILE)
+