Date: Sat, 15 Jun 2013 19:30:32 +0000 (UTC) From: Andrej Zverev <az@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321014 - in head/multimedia/gtk-youtube-viewer: . files Message-ID: <201306151930.r5FJUWp9099328@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: az Date: Sat Jun 15 19:30:32 2013 New Revision: 321014 URL: http://svnweb.freebsd.org/changeset/ports/321014 Log: - Console client now support perl version 5.14+ - Cleanup Makefile and pkg-plist PR: ports/177775 Submitted by: jgh@ Approved by: nemysis <nemysis@gmx.ch> (maintainer and author of fixes) Added: head/multimedia/gtk-youtube-viewer/files/ head/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl (contents, props changed) Modified: head/multimedia/gtk-youtube-viewer/Makefile head/multimedia/gtk-youtube-viewer/pkg-plist Modified: head/multimedia/gtk-youtube-viewer/Makefile ============================================================================== --- head/multimedia/gtk-youtube-viewer/Makefile Sat Jun 15 19:14:06 2013 (r321013) +++ head/multimedia/gtk-youtube-viewer/Makefile Sat Jun 15 19:30:32 2013 (r321014) @@ -3,7 +3,7 @@ PORTNAME= gtk-youtube-viewer PORTVERSION= 3.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia perl5 MAINTAINER= nemysis@gmx.ch @@ -35,7 +35,7 @@ GH_COMMIT= c26d9a7 WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/WWW-YoutubeViewer CONFIGURE_ARGS+=${DATADIR} -PERL_MODBUILD= yes +PERL_MODBUILD= 5.14+ MAN3= WWW::YoutubeViewer::RegularExpressions.3 \ WWW::YoutubeViewer.3 \ @@ -78,16 +78,7 @@ PLIST_SUB+= GTK2="@comment " RUN_DEPENDS+= ${LOCALBASE}/bin/gcap:${PORTSDIR}/multimedia/gcap .endif -post-extract: -.if ! exists(${LOCALBASE}/bin/per5.16.2) - @${ECHO_CMD} - @${ECHO_MSG} "GTK Youtube Viewer 3.07 requires lang/perl5.16 to use CLI version" - @${ECHO_MSG} - @${ECHO_MSG} "Please read /usr/ports/UPDATING" - @${ECHO_MSG} - @${ECHO_MSG} "Hit ^c now if you don't wish to do this." - @${ECHO_MSG} -.endif +.include <bsd.port.pre.mk> post-patch: @${REINPLACE_CMD} -n '1,/create_build_script()/p' \ @@ -97,6 +88,13 @@ post-patch: ${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 + @${RM} ${WRKSRC}/bin/youtube-viewer-2patch +.endif .if ! ${PORT_OPTIONS:MCLI} @${REINPLACE_CMD} -e "s|'bin/youtube-viewer',||" \ @@ -123,4 +121,4 @@ post-install: regression-test: build cd ${WRKSRC} && ${PERL} ./Build test -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl Sat Jun 15 19:30:32 2013 (r321014) @@ -0,0 +1,12 @@ +#!/usr/local/bin/perl + +# usage: ./script.pl /usr/bin/youtube-viewer > new-youtube-viewer + +my $sub = ''; +while(<>){ + s{^use 5.01\K\d}{0}; + $sub = $1 if /^sub\s+(\w+)/; + s{^\s+(?:or)?\s*\K__SUB__->\(}{$sub(}; + s{\b__SUB__\b}{\\&$sub}; + print; +} Modified: head/multimedia/gtk-youtube-viewer/pkg-plist ============================================================================== --- head/multimedia/gtk-youtube-viewer/pkg-plist Sat Jun 15 19:14:06 2013 (r321013) +++ head/multimedia/gtk-youtube-viewer/pkg-plist Sat Jun 15 19:30:32 2013 (r321014) @@ -20,13 +20,4 @@ %%GTK2%%@dirrm %%DATADIR%% %%GTK2%%@dirrmtry share/applications %%GTK2%%@dirrm %%SITE_PERL%%/mach/auto/WWW/YoutubeViewer -%%GTK2%%@dirrm %%SITE_PERL%%/mach/auto/WWW -%%GTK2%%@dirrm %%SITE_PERL%%/mach/auto -%%GTK2%%@dirrm %%SITE_PERL%%/mach @dirrm %%SITE_PERL%%/WWW/YoutubeViewer -@dirrm %%SITE_PERL%%/WWW -@dirrm %%SITE_PERL%% -@dirrmtry lib/perl5/site_perl -@dirrmtry lib/perl5/5.14.2/man -@dirrmtry lib/perl5/5.14.2 -@dirrmtry lib/perl5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306151930.r5FJUWp9099328>