3 files changed, 17 insertions, 55 deletions

diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile
index 05bb489b3661..99bb9b94fe3a 100644
--- a/multimedia/clive/Makefile
+++ b/multimedia/clive/Makefile
@@ -6,44 +6,38 @@
 #
 
 PORTNAME=	clive
-PORTVERSION=	2.2.26
+PORTVERSION=	2.3.2
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}/2.2
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}
 
 MAINTAINER=	geekounet@poildetroll.net
 COMMENT=	Command line video extraction tool for YouTube and others
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-HTML-Parser>=3.59:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-WWW-Curl>=4.05:${PORTSDIR}/www/p5-WWW-Curl \
-		p5-Class-Singleton>=1.4:${PORTSDIR}/devel/p5-Class-Singleton \
-		p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-URI>=1.39:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
+		p5-JSON-XS>=2.30:${PORTSDIR}/converters/p5-JSON-XS
+RUN_DEPENDS=	p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
+		p5-JSON-XS>=2.30:${PORTSDIR}/converters/p5-JSON-XS \
+		quvi>=0.2.16.1:${PORTSDIR}/multimedia/quvi
+
+TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
 
 # deskutils/ljclive, multimedia/clive1 (same executable/manpage/distfile name)
 CONFLICTS=	clive-[0-1]* ljclive-[0-9]*
 
-OPTIONS=	CACHE	 "With video page cache" off \
-		SIGWINCH "With resizing progressbar" on
+PERL_CONFIGURE=	yes
 
 MAN1=		clive.1
-
-PERL_CONFIGURE=	yes
+PLIST_FILES=	bin/clive \
+		%%SITE_PERL%%/%%PERL_ARCH%%/auto/clive/.packlist
+PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/clive
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501000
-RUN_DEPENDS+=	p5-Digest-SHA>=5.47:${PORTSDIR}/security/p5-Digest-SHA
-.endif
-
-.if defined(WITH_CACHE)
-RUN_DEPENDS+=	p5-BerkeleyDB>=0.36:${PORTSDIR}/databases/p5-BerkeleyDB
-.endif
-
-.if defined(WITH_SIGWINCH)
-RUN_DEPENDS+=	p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS+=	p5-version>=0.77:${PORTSDIR}/devel/p5-version
+RUN_DEPENDS+=	p5-version>=0.77:${PORTSDIR}/devel/p5-version
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/clive/distinfo b/multimedia/clive/distinfo
index a2fba43322bc..07549edacdea 100644
--- a/multimedia/clive/distinfo
+++ b/multimedia/clive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clive-2.2.26.tar.gz) = fea2437325017da8eb5e96b7dc57a57a95fe9ca2bfaeee924a5264f553628c26
-SIZE (clive-2.2.26.tar.gz) = 56268
+SHA256 (clive-2.3.2.tar.gz) = 51d7e9109a39034685f77b4205bb7d1ff18bf11ba4cdedc2e674bee61624962e
+SIZE (clive-2.3.2.tar.gz) = 28232
diff --git a/multimedia/clive/pkg-plist b/multimedia/clive/pkg-plist
deleted file mode 100644
index aae0e664ebf0..000000000000
--- a/multimedia/clive/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $FreeBSD$
-bin/clive
-%%SITE_PERL%%/clive/App.pm
-%%SITE_PERL%%/clive/Cache.pm
-%%SITE_PERL%%/clive/Compat.pm
-%%SITE_PERL%%/clive/Config.pm
-%%SITE_PERL%%/clive/Curl.pm
-%%SITE_PERL%%/clive/Error.pm
-%%SITE_PERL%%/clive/Exec.pm
-%%SITE_PERL%%/clive/Host/Break.pm
-%%SITE_PERL%%/clive/Host/Buzzhumor.pm
-%%SITE_PERL%%/clive/Host/Clipfish.pm
-%%SITE_PERL%%/clive/Host/Dailymotion.pm
-%%SITE_PERL%%/clive/Host/Funnyhub.pm
-%%SITE_PERL%%/clive/Host/Gaskrank.pm
-%%SITE_PERL%%/clive/Host/Golem.pm
-%%SITE_PERL%%/clive/Host/Google.pm
-%%SITE_PERL%%/clive/Host/Liveleak.pm
-%%SITE_PERL%%/clive/Host/Sevenload.pm
-%%SITE_PERL%%/clive/Host/Spiegel.pm
-%%SITE_PERL%%/clive/Host/Vimeo.pm
-%%SITE_PERL%%/clive/Host/Youtube.pm
-%%SITE_PERL%%/clive/HostFactory.pm
-%%SITE_PERL%%/clive/Log.pm
-%%SITE_PERL%%/clive/Progress/Bar.pm
-%%SITE_PERL%%/clive/Util.pm
-%%SITE_PERL%%/clive/Video.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/clive/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/clive
-@dirrmtry %%SITE_PERL%%/clive/Host
-@dirrmtry %%SITE_PERL%%/clive/Progress
-@dirrmtry %%SITE_PERL%%/clive