- Update to 3.0.9

- Change license GPLv3 to ART20 GPLv3
- Change dependencies according to Build.PL,
  and add net/p5-Socket
- Add DOCS Option
- Add CLI to defualt Options
- Support STAGEDIR and add OPTIONS_SUB
- Remove obsolete REINPLACE_CMD after changes Build.PL
- Break lines around 80 characters
- Symlink the icon and Desktop entry file

Reviewed by:	horia

3 files changed, 68 insertions, 69 deletions

diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile
index a7ba40d8064d..4a80276b11f9 100644
--- a/multimedia/gtk-youtube-viewer/Makefile
+++ b/multimedia/gtk-youtube-viewer/Makefile
@@ -2,35 +2,45 @@
 # $FreeBSD$
 
 PORTNAME=	gtk-youtube-viewer
-PORTVERSION=	3.0.7
-PORTREVISION=	2
+PORTVERSION=	3.0.9
 CATEGORIES=	multimedia perl5
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	GTK Search and play YouTube videos streaming in MPlayer
 
-LICENSE=	GPLv3
+LICENSE=	ART20 GPLv3
+LICENSE_COMB=	dual
 
 # According to Build.PL
-BUILD_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+BUILD_DEPENDS=	p5-Test-More-UTF8>=0:${PORTSDIR}/devel/p5-Test-More-UTF8 \
+		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
+		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
 		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp \
+		p5-Text-CharWidth>=0:${PORTSDIR}/textproc/p5-Text-CharWidth \
+		p5-threads>=0:${PORTSDIR}/devel/p5-threads \
+		p5-Thread-Queue>=0:${PORTSDIR}/devel/p5-Thread-Queue \
 		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast
+		p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast \
+		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
+		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
+		p5-File-Path>=0:${PORTSDIR}/devel/p5-File-Path \
+		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
+		p5-Term-UI>=0:${PORTSDIR}/devel/p5-Term-UI \
+		p5-Text-ParseWords>=0:${PORTSDIR}/textproc/p5-Text-ParseWords \
+		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap  \
+		p5-Socket>=0:${PORTSDIR}/net/p5-Socket
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		mplayer:${PORTSDIR}/multimedia/mplayer
-TEST_DEPENDS=	p5-Test-More-UTF8>=0:${PORTSDIR}/devel/p5-Test-More-UTF8
 
 CONFLICTS=	youtube-viewer-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	trizen
 GH_PROJECT=	youtube-viewer
-GH_COMMIT=	c26d9a7
+GH_COMMIT=	116eb3f
 
 WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/WWW-YoutubeViewer
 
@@ -38,63 +48,43 @@ CONFIGURE_ARGS+=${DATADIR}
 USES=		perl5
 USE_PERL5=	5.16+ patch modbuild
 
-MAN3=		WWW::YoutubeViewer::RegularExpressions.3 \
-		WWW::YoutubeViewer.3 \
-		WWW::YoutubeViewer::Itags.3 \
-		WWW::YoutubeViewer::Utils.3 \
-		WWW::YoutubeViewer::GetCaption.3 \
-		WWW::YoutubeViewer::ParseXML.3
-
 PORTDOCS=	Changes README
 
-OPTIONS_DEFINE=	GCAP
+OPTIONS_DEFINE=	DOCS GCAP
 
 OPTIONS_MULTI=	USER_INTERFACE
 OPTIONS_MULTI_USER_INTERFACE=	CLI GTK2
 
-OPTIONS_DEFAULT=	GTK2 GCAP
+OPTIONS_DEFAULT=	CLI GCAP GTK2
 
 CLI_DESC=	Enable CLI version
 GCAP_DESC=	Enable YouTube captions support
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MCLI}
-MAN1=		youtube-viewer.1
-PLIST_SUB+=	CLI=""
-.else
-PLIST_SUB+=	CLI="@comment "
-.endif
+GCAP_RUN_DEPENDS=	${LOCALBASE}/bin/gcap:${PORTSDIR}/multimedia/gcap
+GTK2_BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+			p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir
+GTK2_RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+			p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir
 
-.if ${PORT_OPTIONS:MGTK2}
-BUILD_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-RUN_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-CONFIGURE_ARGS+=--gtk-youtube-viewer
-PLIST_SUB+=	GTK2=""
-.else
-PLIST_SUB+=	GTK2="@comment "
-.endif
+.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MGCAP}
-RUN_DEPENDS+=	${LOCALBASE}/bin/gcap:${PORTSDIR}/multimedia/gcap
+.if ${PORT_OPTIONS:MGTK2}
+CONFIGURE_ARGS+=-gtk-youtube-viewer
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -n '1,/create_build_script()/p' \
-			${WRKSRC}/Build.PL
-	@${REINPLACE_CMD} \
-		-e 's|5.016|0|' \
-			${WRKSRC}/Build.PL
+	@${REINPLACE_CMD} -e 's|5.016|0|' ${WRKSRC}/Build.PL
 	@cd ${WRKSRC}/bin && ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		gtk-youtube-viewer youtube-viewer
 .if ${PERL_LEVEL} <= 501600
 	@${CP} ${FILESDIR}/yv_5.16_to_5.10.pl ${WRKSRC}
 	@${CP} ${WRKSRC}/bin/youtube-viewer ${WRKSRC}/bin/youtube-viewer-2patch
 	@${PERL} \
-	${WRKSRC}/yv_5.16_to_5.10.pl ${WRKSRC}/bin/youtube-viewer-2patch > ${WRKSRC}/bin/youtube-viewer
+	${WRKSRC}/yv_5.16_to_5.10.pl ${WRKSRC}/bin/youtube-viewer-2patch > \
+		${WRKSRC}/bin/youtube-viewer
 	@${RM} ${WRKSRC}/bin/youtube-viewer-2patch
 .endif
 
@@ -107,17 +97,16 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MGTK2}
-	${INSTALL_DATA} ${WRKSRC}/share/gtk-youtube-viewer.desktop ${PREFIX}/share/applications
-	@${MKDIR} ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/share/gtk-youtube-viewer.glade ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/share/gtk-youtube-viewer-icons/* ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/share/icons/gtk-youtube-viewer.png ${PREFIX}/share/pixmaps
+	${LN} -sf \
+	${SITE_PERL}${PERL_ARCH}/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.desktop \
+		${STAGEDIR}${DESKTOPDIR}
+	${LN} -sf \
+	${SITE_PERL}${PERL_ARCH}/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 regression-test: build
 	cd ${WRKSRC} && ${PERL} ./Build test
diff --git a/multimedia/gtk-youtube-viewer/distinfo b/multimedia/gtk-youtube-viewer/distinfo
index b8bab871242b..a9a72fecbb50 100644
--- a/multimedia/gtk-youtube-viewer/distinfo
+++ b/multimedia/gtk-youtube-viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-youtube-viewer-3.0.7.tar.gz) = 3a7aea5ef93d8d7015295771047172fea588b9135a1707585df253a6ed52f1dc
-SIZE (gtk-youtube-viewer-3.0.7.tar.gz) = 116915
+SHA256 (gtk-youtube-viewer-3.0.9.tar.gz) = c3ae4f5e05671c8e80073000871d7ed2a4795e08bce7f0fc17fe94cf2d3336c8
+SIZE (gtk-youtube-viewer-3.0.9.tar.gz) = 116144
diff --git a/multimedia/gtk-youtube-viewer/pkg-plist b/multimedia/gtk-youtube-viewer/pkg-plist
index 4fc4a763e884..4725f527dc24 100644
--- a/multimedia/gtk-youtube-viewer/pkg-plist
+++ b/multimedia/gtk-youtube-viewer/pkg-plist
@@ -1,22 +1,32 @@
 %%GTK2%%bin/gtk-youtube-viewer
 %%CLI%%bin/youtube-viewer
+%%PERL5_MAN3%%/WWW::YoutubeViewer.3.gz
+%%PERL5_MAN3%%/WWW::YoutubeViewer::AuthToken.3.gz
+%%PERL5_MAN3%%/WWW::YoutubeViewer::ConfigData.3.gz
+%%PERL5_MAN3%%/WWW::YoutubeViewer::GetCaption.3.gz
+%%PERL5_MAN3%%/WWW::YoutubeViewer::Itags.3.gz
+%%PERL5_MAN3%%/WWW::YoutubeViewer::ParseXML.3.gz
+%%PERL5_MAN3%%/WWW::YoutubeViewer::RegularExpressions.3.gz
+%%PERL5_MAN3%%/WWW::YoutubeViewer::Utils.3.gz
 %%SITE_PERL%%/WWW/YoutubeViewer.pm
+%%SITE_PERL%%/WWW/YoutubeViewer/AuthToken.pm
+%%SITE_PERL%%/WWW/YoutubeViewer/ConfigData.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/GetCaption.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/Itags.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/ParseXML.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/RegularExpressions.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/Utils.pm
-%%GTK2%%%%SITE_PERL%%/mach/auto/WWW/YoutubeViewer/.packlist
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.desktop
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.glade
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.png
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/default_thumb.jpg
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/feed_icon.png
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/gtk-youtube-viewer.png
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/spinner.gif
+%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/user.png
+%%CLI%%man/man1/youtube-viewer.1.gz
 %%GTK2%%share/applications/gtk-youtube-viewer.desktop
-%%GTK2%%%%DATADIR%%/gtk-youtube-viewer.glade
-%%GTK2%%%%DATADIR%%/icons/default_thumb.jpg
-%%GTK2%%%%DATADIR%%/icons/donate.png
-%%GTK2%%%%DATADIR%%/icons/feed_icon.png
-%%GTK2%%%%DATADIR%%/icons/gtk-youtube-viewer.png
-%%GTK2%%%%DATADIR%%/icons/spinner.gif
-%%GTK2%%%%DATADIR%%/icons/user.png
 %%GTK2%%share/pixmaps/gtk-youtube-viewer.png
-%%GTK2%%@dirrm %%DATADIR%%/icons
-%%GTK2%%@dirrm %%DATADIR%%
-%%GTK2%%@dirrm %%SITE_PERL%%/mach/auto/WWW/YoutubeViewer
+%%GTK2%%@dirrm %%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons
+%%GTK2%%@dirrm %%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer
 @dirrm %%SITE_PERL%%/WWW/YoutubeViewer