ports/128362: [PATCH]multimedia/clive: update to 1.0.2; move port

[bf]

>Number:         128362
>Category:       ports
>Synopsis:       [PATCH]multimedia/clive: update to 1.0.2; move port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 25 06:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        7-STABLE i386
>Organization:
-
>Environment:
>Description:
Update to 1.0.2.  This port should be moved to multimedia/clive1 or the like to
make room for the new clive 2.0.x.  Add optional dependency on py-feedparser;
yank OPTIONS for vlc and mplayer, since clive can use almost any player via
runtime --player option or configuration files; fix WWW, comment, RUN_DEPENDS,
and shebangs for clive scripts.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN clive.orig/Makefile clive/Makefile
--- clive.orig/Makefile	2008-08-11 08:38:45.000000000 -0400
+++ clive/Makefile	2008-10-25 02:30:11.500569725 -0400
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	1.0.0
-#PORTREVISION=	0
-#PORTEPOCH=	0
+PORTVERSION=	1.0.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.gna.org/clive/1.0.x/ \
 		SF
@@ -16,9 +14,9 @@
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nivit at 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
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urlgrabber/grabber.py:${PORTSDIR}/www/py-urlgrabber
 
 # deskutils/ljclive (same executable/manpage/distfile name)
 CONFLICTS=	clive-[0-9]*
@@ -34,43 +32,42 @@
 CONFIGURE_ARGS=	--with-doc=no
 .endif
 
-OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
-		MPLAYER	"Install mplayer as video player" off \
-		NEWT	"Install devel/newt (support for a simple GUI)" off \
+OPTIONS=	FEEDPARSER	"Enable feed parsing" off \
+		FFMPEG		"Install ffmpeg for re-encoding" 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
+		SQLITE3 	"Install sqlite3 for caching visited URLs" off \
+		XCLIP		"Install xclip (read URLs from clipboard)" off
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_FFMPEG)
-RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+.if defined(WITH_FEEDPARSER)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser
 .endif
 
-.if defined(WITH_MPLAYER)
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+.if defined(WITH_FFMPEG)
+RUN_DEPENDS+=	${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 .endif
 
 .if defined(WITH_NEWT)
-RUN_DEPENDS+=	newt${PYTHON_PKGNAMESUFFIX}>=0.51.0_4:${PORTSDIR}/devel/newt
+RUN_DEPENDS+=	${LOCALBASE}/lib/libnewt.a:${PORTSDIR}/devel/newt
 .endif
 
 .if defined(WITH_PYCRYPTO)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0.1_1:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Crypto/Cipher/AES.so:${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
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 .endif
 
 .if defined(WITH_XCLIP)
-RUN_DEPENDS+=	xclip:${PORTSDIR}/x11/xclip
+RUN_DEPENDS+=	${LOCALBASE}/bin/xclip:${PORTSDIR}/x11/xclip
 .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 -ruN clive.orig/distinfo clive/distinfo
--- clive.orig/distinfo	2008-08-11 08:38:45.000000000 -0400
+++ clive/distinfo	2008-10-24 10:01:13.971259000 -0400
@@ -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 -ruN clive.orig/pkg-descr clive/pkg-descr
--- clive.orig/pkg-descr	2008-06-23 12:11:49.000000000 -0400
+++ clive/pkg-descr	2008-10-25 02:30:11.500569725 -0400
@@ -19,4 +19,4 @@
     - Supports UNIX pipes
     - URL batch support
 
-WWW:	http://home.gna.org/clive/
+WWW:	http://clive.sourceforge.net/
diff -ruN clive.orig/pkg-plist clive/pkg-plist
--- clive.orig/pkg-plist	2008-08-11 08:38:45.000000000 -0400
+++ clive/pkg-plist	2008-10-24 10:53:26.491291000 -0400
@@ -51,6 +51,9 @@
 %%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


>Release-Note:
>Audit-Trail:
>Unformatted: