- Update to 0.4.12

- Add option WITH_NEWT (use devel/newt or bundled module)
- Add other main features of the program in pkg-descr
- Remove option WITH_RSSATOM

8 files changed, 76 insertions, 52 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 7964474d6f21..6bab04999daf 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.4.11
+PORTVERSION=	0.4.12
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -34,7 +34,7 @@ CONFIGURE_ARGS=	--with-doc=no
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
-		RSSATOM "Enable extraction videos from RSS/Atom feeds" on \
+		NEWT	"Use devel/newt instead of bundled module" off \
 		SQLITE3 "Install sqlite3 for caching visited URLs" off \
 		VLC	"Install vlc as video player" off \
 		XCLIP	"Install xclip (read URLs from clipboard)" off
@@ -50,6 +50,17 @@ RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
+.if defined(WITH_NEWT)
+PLIST_SUB+=	OPTNEWT="@comment "
+CONFIGURE_ARGS+=	--with-newt=no
+LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
+RUN_DEPENDS+=	newt${PYTHON_PKGNAMESUFFIX}>=0.51.0_4:${PORTSDIR}/devel/newt
+.else
+PLIST_SUB+=	OPTNEWT=""
+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} $${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS} -L${PYTHON_LIBDIR}" SLANG_LIBS="-lncurses -lslang"
+.endif
+
 .if defined(WITH_SQLITE3)
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.5.2_1:${PORTSDIR}/databases/py-sqlite3
 .endif
@@ -62,13 +73,4 @@ RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 RUN_DEPENDS+=	xclip:${PORTSDIR}/x11/xclip
 .endif
 
-.if defined(WITH_RSSATOM)
-PLIST_SUB+=	OPTRSSATOM=""
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} $${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS} -L${PYTHON_LIBDIR}" SLANG_LIBS="-lncurses -lslang"
-.else
-PLIST_SUB+=	OPTRSSATOM="@comment "
-CONFIGURE_ARGS+=	--with-newt=no
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/clive/distinfo b/multimedia/clive/distinfo
index 9b6d9e3462b0..90cc45294c07 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.4.11.tar.bz2) = dc483bd1dfd9e1192b97995b0a2a2146
-SHA256 (clive/clive-0.4.11.tar.bz2) = 06f0ad3f856df93485e7482a7095856b23533b36b3508a37dadc825c8049a155
-SIZE (clive/clive-0.4.11.tar.bz2) = 405065
+MD5 (clive/clive-0.4.12.tar.bz2) = 0a68ed57c9fd40fdc057f9978d8bed65
+SHA256 (clive/clive-0.4.12.tar.bz2) = f214ec467f322a5ac99008041b7d0914a8fdf1b3986c7946ca2200fcd1b89d53
+SIZE (clive/clive-0.4.12.tar.bz2) = 405179
diff --git a/multimedia/clive/pkg-descr b/multimedia/clive/pkg-descr
index edc3b69577c3..1572b02c2e8b 100644
--- a/multimedia/clive/pkg-descr
+++ b/multimedia/clive/pkg-descr
@@ -4,8 +4,18 @@ websites. clive is written in Python and is cross-platform.
 
 Main features:
 
-    - Video extraction
-    - Integration and re-encoding with 'ffmpeg'
-    - Player integration with a 3rd party software
+    - Proxy support; option and http_proxy environment setting
+    - Youtube log-in support with flagged-content override
+    - High/low-quality support where applicable (e.g. Youtube)
+    - Chaining with a 3rd party player software for playing
+    - 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
+    - Continue partially downloaded files
+    - Recall last URL batch
+    - Supports UNIX pipes
+    - URL batch support
 
 WWW:	http://home.gna.org/clive/
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
index f44264e28816..430fe6977f0e 100644
--- a/multimedia/clive/pkg-plist
+++ b/multimedia/clive/pkg-plist
@@ -27,15 +27,15 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/main.py
 %%PYTHON_SITELIBDIR%%/clive/main.pyc
 %%PYTHON_SITELIBDIR%%/clive/main.pyo
-%%PYTHON_SITELIBDIR%%/clive/newt/__init__.py
-%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyc
-%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyo
-%%OPTRSSATOM%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.a
-%%OPTRSSATOM%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.la
-%%OPTRSSATOM%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.so
-%%PYTHON_SITELIBDIR%%/clive/newt/snack.py
-%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyc
-%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyo
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.py
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyc
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyo
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.a
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.la
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.so
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.py
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyc
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyo
 %%PYTHON_SITELIBDIR%%/clive/nomad.py
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyc
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyo
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index 7964474d6f21..6bab04999daf 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	0.4.11
+PORTVERSION=	0.4.12
 #PORTREVISION=	0
 #PORTEPOCH=	0
 CATEGORIES=	multimedia
@@ -34,7 +34,7 @@ CONFIGURE_ARGS=	--with-doc=no
 
 OPTIONS=	FFMPEG	"Install ffmpeg for re-encoding" off \
 		MPLAYER	"Install mplayer as video player" off \
-		RSSATOM "Enable extraction videos from RSS/Atom feeds" on \
+		NEWT	"Use devel/newt instead of bundled module" off \
 		SQLITE3 "Install sqlite3 for caching visited URLs" off \
 		VLC	"Install vlc as video player" off \
 		XCLIP	"Install xclip (read URLs from clipboard)" off
@@ -50,6 +50,17 @@ RUN_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
+.if defined(WITH_NEWT)
+PLIST_SUB+=	OPTNEWT="@comment "
+CONFIGURE_ARGS+=	--with-newt=no
+LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
+RUN_DEPENDS+=	newt${PYTHON_PKGNAMESUFFIX}>=0.51.0_4:${PORTSDIR}/devel/newt
+.else
+PLIST_SUB+=	OPTNEWT=""
+LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} $${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS} -L${PYTHON_LIBDIR}" SLANG_LIBS="-lncurses -lslang"
+.endif
+
 .if defined(WITH_SQLITE3)
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.5.2_1:${PORTSDIR}/databases/py-sqlite3
 .endif
@@ -62,13 +73,4 @@ RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 RUN_DEPENDS+=	xclip:${PORTSDIR}/x11/xclip
 .endif
 
-.if defined(WITH_RSSATOM)
-PLIST_SUB+=	OPTRSSATOM=""
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR} $${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib $${LDFLAGS} -L${PYTHON_LIBDIR}" SLANG_LIBS="-lncurses -lslang"
-.else
-PLIST_SUB+=	OPTRSSATOM="@comment "
-CONFIGURE_ARGS+=	--with-newt=no
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/clive1/distinfo b/multimedia/clive1/distinfo
index 9b6d9e3462b0..90cc45294c07 100644
--- a/multimedia/clive1/distinfo
+++ b/multimedia/clive1/distinfo
@@ -1,3 +1,3 @@
-MD5 (clive/clive-0.4.11.tar.bz2) = dc483bd1dfd9e1192b97995b0a2a2146
-SHA256 (clive/clive-0.4.11.tar.bz2) = 06f0ad3f856df93485e7482a7095856b23533b36b3508a37dadc825c8049a155
-SIZE (clive/clive-0.4.11.tar.bz2) = 405065
+MD5 (clive/clive-0.4.12.tar.bz2) = 0a68ed57c9fd40fdc057f9978d8bed65
+SHA256 (clive/clive-0.4.12.tar.bz2) = f214ec467f322a5ac99008041b7d0914a8fdf1b3986c7946ca2200fcd1b89d53
+SIZE (clive/clive-0.4.12.tar.bz2) = 405179
diff --git a/multimedia/clive1/pkg-descr b/multimedia/clive1/pkg-descr
index edc3b69577c3..1572b02c2e8b 100644
--- a/multimedia/clive1/pkg-descr
+++ b/multimedia/clive1/pkg-descr
@@ -4,8 +4,18 @@ websites. clive is written in Python and is cross-platform.
 
 Main features:
 
-    - Video extraction
-    - Integration and re-encoding with 'ffmpeg'
-    - Player integration with a 3rd party software
+    - Proxy support; option and http_proxy environment setting
+    - Youtube log-in support with flagged-content override
+    - High/low-quality support where applicable (e.g. Youtube)
+    - Chaining with a 3rd party player software for playing
+    - 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
+    - Continue partially downloaded files
+    - Recall last URL batch
+    - Supports UNIX pipes
+    - URL batch support
 
 WWW:	http://home.gna.org/clive/
diff --git a/multimedia/clive1/pkg-plist b/multimedia/clive1/pkg-plist
index f44264e28816..430fe6977f0e 100644
--- a/multimedia/clive1/pkg-plist
+++ b/multimedia/clive1/pkg-plist
@@ -27,15 +27,15 @@ bin/clive
 %%PYTHON_SITELIBDIR%%/clive/main.py
 %%PYTHON_SITELIBDIR%%/clive/main.pyc
 %%PYTHON_SITELIBDIR%%/clive/main.pyo
-%%PYTHON_SITELIBDIR%%/clive/newt/__init__.py
-%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyc
-%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyo
-%%OPTRSSATOM%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.a
-%%OPTRSSATOM%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.la
-%%OPTRSSATOM%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.so
-%%PYTHON_SITELIBDIR%%/clive/newt/snack.py
-%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyc
-%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyo
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.py
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyc
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/__init__.pyo
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.a
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.la
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/_snackmodule.so
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.py
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyc
+%%OPTNEWT%%%%PYTHON_SITELIBDIR%%/clive/newt/snack.pyo
 %%PYTHON_SITELIBDIR%%/clive/nomad.py
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyc
 %%PYTHON_SITELIBDIR%%/clive/nomad.pyo