- Update to 3.0.3

- Add CONFLICTS for multimedia/youtube-viewer
- Add regression-test
- Trim Makefile header
- Tab -> space in pkg-descr WWW line (and s/Linux//)

PR:		ports/172336
Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)
Feature safe:	yes

4 files changed, 75 insertions, 41 deletions

diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile
index 0e15f9b548f1..91dfc950a9b7 100644
--- a/multimedia/gtk-youtube-viewer/Makefile
+++ b/multimedia/gtk-youtube-viewer/Makefile
@@ -1,66 +1,82 @@
-# New ports collection makefile for:	gtk-youtube-viewer
-# Date created:		13 August 2012
-# Whom:			nemysis@gmx.ch
-#
+# Created by: nemysis@gmx.ch
 # $FreeBSD$
-#
 
 PORTNAME=	gtk-youtube-viewer
-PORTVERSION=	2.0.5
-CATEGORIES=	multimedia
-MASTER_SITES=	GOOGLE_CODE
-PROJECTHOST=	trizen
+PORTVERSION=	3.0.3
+CATEGORIES=	multimedia perl5
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	GTK Search and play YouTube videos streaming in MPlayer
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+BUILD_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
+		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
+		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast \
 		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		mplayer:${PORTSDIR}/multimedia/mplayer
+TEST_DEPENDS=	p5-Test-More-UTF8>=0:${PORTSDIR}/devel/p5-Test-More-UTF8
 
-OPTIONS_DEFINE=	GCAP
-GCAP_DESC=	GCAP support
+CONFLICTS=	youtube-viewer-[0-9]*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
+USE_GITHUB=	yes
+GH_ACCOUNT=	trizen
+GH_PROJECT=	youtube-viewer
+GH_COMMIT=	c4496ed
 
-USE_PERL5_RUN=	yes
-NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/WWW-YoutubeViewer
 
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png \
-		share/applications/${PORTNAME}.desktop
-PLIST_DIRSTRY=	share/applications
+PERL_MODBUILD=	yes
 
-PORTDATA=	*
+MAN1=		youtube-viewer.1
+MAN3=		WWW::YoutubeViewer.3
+
+PORTDOCS=	Changes README
+
+OPTIONS_DEFINE=	GTK2 GCAP
+OPTIONS_DEFAULT=GTK2 GCAP
+GCAP_DESC=	Enable YouTube captions support
 
 .include <bsd.port.options.mk>
 
+.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
+
 .if ${PORT_OPTIONS:MGCAP}
 RUN_DEPENDS+=	${LOCALBASE}/bin/gcap:${PORTSDIR}/multimedia/gcap
 .endif
 
 post-patch:
-	@(cd ${WRKSRC} && ${REINPLACE_CMD} -e "s|#!/usr/bin/perl|#!${PERL}|g" gtk-youtube-viewer.pl \
-		youtube-viewer && ${REINPLACE_CMD} -e "s|/usr/share/|${PREFIX}/share/|g" gtk-youtube-viewer)
+	cd ${WRKSRC} && ${REINPLACE_CMD} -n '1,/create_build_script()/p' \
+		Build.PL
+	cd ${WRKSRC}/bin && ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
+		gtk-youtube-viewer youtube-viewer
 
-do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/youtube-viewer ${DATADIR}
+post-install:
+.if ${PORT_OPTIONS:MGTK2}
+	${MKDIR} ${PREFIX}/share/applications
+	${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
+.endif
 
-# Data
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "icons lib" ${DATADIR})
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pl ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.glade ${DATADIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
-# Pixmaps and Desktop
-	${INSTALL_DATA} ${WRKSRC}/icons/${PORTNAME}.png ${PREFIX}/share/pixmaps/
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications/
+regression-test: build
+	cd ${WRKSRC} && ${PERL} ./Build test
 
 .include <bsd.port.mk>
diff --git a/multimedia/gtk-youtube-viewer/distinfo b/multimedia/gtk-youtube-viewer/distinfo
index 3db97b478f2b..18ce13a794bf 100644
--- a/multimedia/gtk-youtube-viewer/distinfo
+++ b/multimedia/gtk-youtube-viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-youtube-viewer-2.0.5.tar.gz) = 28cce3956d58659849db451e9d016e426577bfd8791000678f87ac8929c6def0
-SIZE (gtk-youtube-viewer-2.0.5.tar.gz) = 165777
+SHA256 (gtk-youtube-viewer-3.0.3.tar.gz) = 5775915a38852538951d308640f8a76f31eb7c2a52104d61410dd9eee46a337b
+SIZE (gtk-youtube-viewer-3.0.3.tar.gz) = 106567
diff --git a/multimedia/gtk-youtube-viewer/pkg-descr b/multimedia/gtk-youtube-viewer/pkg-descr
index a36c9df00109..ebfe466f3f7f 100644
--- a/multimedia/gtk-youtube-viewer/pkg-descr
+++ b/multimedia/gtk-youtube-viewer/pkg-descr
@@ -1,4 +1,4 @@
 GTK Youtube Viewer is created to be a flexible and reliable open-source
-Linux application which is dedicated to streaming Youtube Videos with MPlayer.
+application which is dedicated to streaming Youtube Videos with MPlayer.
 
-WWW:	https://code.google.com/p/trizen/
+WWW: https://code.google.com/p/trizen/
diff --git a/multimedia/gtk-youtube-viewer/pkg-plist b/multimedia/gtk-youtube-viewer/pkg-plist
new file mode 100644
index 000000000000..a4cc572738d1
--- /dev/null
+++ b/multimedia/gtk-youtube-viewer/pkg-plist
@@ -0,0 +1,18 @@
+%%GTK2%%bin/gtk-youtube-viewer
+bin/youtube-viewer
+%%SITE_PERL%%/WWW/YoutubeViewer.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/YoutubeViewer/.packlist
+%%GTK2%%share/applications/gtk-youtube-viewer.desktop
+%%GTK2%%share/gtk-youtube-viewer/gtk-youtube-viewer.glade
+%%GTK2%%share/gtk-youtube-viewer/icons/default_thumb.jpg
+%%GTK2%%share/gtk-youtube-viewer/icons/feed_icon.png
+%%GTK2%%share/gtk-youtube-viewer/icons/gtk-youtube-viewer.png
+%%GTK2%%share/gtk-youtube-viewer/icons/spinner.gif
+%%GTK2%%share/gtk-youtube-viewer/icons/user.png
+%%GTK2%%share/pixmaps/gtk-youtube-viewer.png
+%%GTK2%%@dirrm share/gtk-youtube-viewer/icons
+%%GTK2%%@dirrm share/gtk-youtube-viewer
+%%GTK2%%@dirrmtry share/applications
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/YoutubeViewer
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW