From jgh@FreeBSD.org  Thu Apr 11 05:44:03 2013
Return-Path: <jgh@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id AB00A546
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Apr 2013 05:44:03 +0000 (UTC)
	(envelope-from jgh@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id 8ED4ED9
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Apr 2013 05:44:03 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3B5i3K2027863
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Apr 2013 05:44:03 GMT
	(envelope-from jgh@freefall.freebsd.org)
Received: (from jgh@localhost)
	by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3B5i3Tw027862;
	Thu, 11 Apr 2013 05:44:03 GMT
	(envelope-from jgh)
Message-Id: <201304110544.r3B5i3Tw027862@freefall.freebsd.org>
Date: Thu, 11 Apr 2013 05:44:03 GMT
From: Jason Helfman <jgh@FreeBSD.org>
Reply-To: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: multimedia/gtk-youtube-viewer: properly support dependency for CLI option
X-Send-Pr-Version: 3.114
X-GNATS-Notify: nemysis@gmx.ch

>Number:         177775
>Category:       ports
>Synopsis:       multimedia/gtk-youtube-viewer: properly support dependency for CLI option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    az
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 11 05:50:00 UTC 2013
>Closed-Date:    Sat Jun 15 19:52:09 UTC 2013
>Last-Modified:  Sat Jun 15 19:52:09 UTC 2013
>Originator:     Jason Helfman
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r249172: Sat Apr 6 00:40:01 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
If you choose CLI, dependencies are still pointed to lang/perl5.14
With this update, it will be require lang/perl5.16, and note which entry for UPDATING to read, as
well as properly clean up.

Updates USER_INTERFACE to UI for group naming
Drop enable from descriptions.
Drop post-extract target, as this is no longer required.
Adjust pkg-plist accordingly for support of an additional perl version.

>How-To-Repeat:
	
>Fix:

Index: multimedia/gtk-youtube-viewer/Makefile
===================================================================
--- multimedia/gtk-youtube-viewer/Makefile	(revision 315781)
+++ multimedia/gtk-youtube-viewer/Makefile	(working copy)
@@ -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,6 @@
 WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/WWW-YoutubeViewer
 
 CONFIGURE_ARGS+=${DATADIR}
-PERL_MODBUILD=	yes
 
 MAN3=		WWW::YoutubeViewer::RegularExpressions.3 \
 		WWW::YoutubeViewer.3 \
@@ -48,21 +47,26 @@
 
 OPTIONS_DEFINE=	GCAP
 
-OPTIONS_MULTI=	USER_INTERFACE
-OPTIONS_MULTI_USER_INTERFACE=	CLI GTK2
+OPTIONS_MULTI=	UI
+OPTIONS_MULTI_UI=	CLI GTK2
 
 OPTIONS_DEFAULT=	GTK2 GCAP
 
-CLI_DESC=	Enable CLI version
-GCAP_DESC=	Enable YouTube captions support
+CLI_DESC=	CLI version (requires perl5.16)
+GCAP_DESC=	YouTube captions support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLI}
 MAN1=		youtube-viewer.1
 PLIST_SUB+=	CLI=""
+PERL_MODBUILD=	5.16+
+USE_PERL5_RUN=	5.16+
+USE_PERL5_REASON=	Requires Perl 5.16 or later, install lang/perl5.16 and try again. \
+	Please read ${PORTSDIR}/UPDATING entry from 20120630 after installation.
 .else
 PLIST_SUB+=	CLI="@comment "
+PERL_MODBUILD=	YES
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
@@ -78,17 +82,6 @@
 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
-
 post-patch:
 	@${REINPLACE_CMD} -n '1,/create_build_script()/p' \
 			${WRKSRC}/Build.PL
Index: multimedia/gtk-youtube-viewer/pkg-plist
===================================================================
--- multimedia/gtk-youtube-viewer/pkg-plist	(revision 315781)
+++ multimedia/gtk-youtube-viewer/pkg-plist	(working copy)
@@ -27,6 +27,6 @@
 @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/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%
 @dirrmtry lib/perl5
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Apr 11 05:50:07 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177775 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: nemysis@gmx.ch
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/177775: multimedia/gtk-youtube-viewer: properly support dependency for CLI option
Date: Thu, 11 Apr 2013 05:50:06 UT

 Maintainer of multimedia/gtk-youtube-viewer,
 
 Please note that PR ports/177775 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177775
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc: approval@freebsdnorth.com, miwi@FreeBSD.org, jgh@FreeBSD.org
Subject: Re: ports/177775: multimedia/gtk-youtube-viewer: properly support
 dependency for CLI option
Date: Thu, 11 Apr 2013 12:49:48 +0200

 --MP_/OjlyHrq+A2v/CeeVZEXkbi+
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 multimedia/gtk-youtube-viewer
 
 Wih OPTIONS_DEFAULT=        GTK2 GCAP
 
 https://redports.org/buildarchive/20130411101200-53386/
 
 With OPTIONS_DEFAULT=        CLI GTK2 GCAP
 
 https://redports.org/buildarchive/20130411102801-43127/
 
 
 - Bump portrevision
 - Cleanup Makefile
 - Add patch yv_5.16_to_5.10.pl.in, support Perl v5.14.2
 - Add pkg-message file to display about youtube-viewer
 - Trim pkg-plist
 
 Added file(s):
 - files/pkg-message.in
 - files/yv_5.16_to_5.10.pl.in
 
 
 This patch is from Developer Trizen after mine emails with him.
 --MP_/OjlyHrq+A2v/CeeVZEXkbi+
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=gtk-youtube-viewer.diff
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/Makefile ./Makefile
 --- /usr/ports/multimedia/gtk-youtube-viewer/Makefile	2013-03-23 02:42:29.000000000 +0100
 +++ ./Makefile	2013-04-11 12:46:41.000000000 +0200
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gtk-youtube-viewer
  PORTVERSION=	3.0.7
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	multimedia perl5
  
  MAINTAINER=	nemysis@gmx.ch
 @@ -46,10 +46,13 @@
  
  PORTDOCS=	Changes README
  
 +SUB_FILES=	pkg-message \
 +		yv_5.16_to_5.10.pl
 +
  OPTIONS_DEFINE=	GCAP
  
 -OPTIONS_MULTI=	USER_INTERFACE
 -OPTIONS_MULTI_USER_INTERFACE=	CLI GTK2
 +OPTIONS_MULTI=	UI
 +OPTIONS_MULTI_UI=	CLI GTK2
  
  OPTIONS_DEFAULT=	GTK2 GCAP
  
 @@ -78,17 +81,6 @@
  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
 -
  post-patch:
  	@${REINPLACE_CMD} -n '1,/create_build_script()/p' \
  			${WRKSRC}/Build.PL
 @@ -120,6 +112,14 @@
  	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
  .endif
  
 +.if ${PORT_OPTIONS:MCLI}
 +	@(cd ${WRKDIR} && ${PERL} ./yv_5.16_to_5.10.pl ${WRKSRC}/bin/youtube-viewer > youtube-viewer-perl-v5.10+)
 +	${INSTALL_SCRIPT} ${WRKDIR}/youtube-viewer-perl-v5.10+ ${PREFIX}/bin
 +	@${ECHO_CMD}
 +	@${CAT} ${PKGMESSAGE}
 +	@${ECHO_CMD}
 +.endif
 +
  regression-test: build
  	cd ${WRKSRC} && ${PERL} ./Build test
  
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/files/pkg-message.in ./files/pkg-message.in
 --- /usr/ports/multimedia/gtk-youtube-viewer/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/pkg-message.in	2013-04-11 10:17:45.000000000 +0200
 @@ -0,0 +1,20 @@
 +===============================================================================
 +
 +GTK Youtube Viewer has been installed.
 +
 +This package needs Perl 5.16 or Perl 5.14.
 +
 +Please read UPDATING entry from 20120630 after installation.
 +
 +
 +Youtube Viewer (CLI Version) can use either Perl version, please use
 +
 +for Perl 5.16
 +
 +    %%PREFIX%%/bin/youtube-viewer
 +
 +for Perl 5.14
 +
 +    %%PREFIX%%/bin/youtube-viewer-perl-v5.10+
 +
 +===============================================================================
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl.in ./files/yv_5.16_to_5.10.pl.in
 --- /usr/ports/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/yv_5.16_to_5.10.pl.in	2012-12-16 16:59:39.000000000 +0100
 @@ -0,0 +1,12 @@
 +#!/usr/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;
 +}
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/pkg-plist ./pkg-plist
 --- /usr/ports/multimedia/gtk-youtube-viewer/pkg-plist	2013-03-23 02:42:29.000000000 +0100
 +++ ./pkg-plist	2013-04-11 11:14:37.000000000 +0200
 @@ -1,5 +1,6 @@
  %%GTK2%%bin/gtk-youtube-viewer
  %%CLI%%bin/youtube-viewer
 +%%CLI%%bin/youtube-viewer-perl-v5.10+
  %%SITE_PERL%%/WWW/YoutubeViewer.pm
  %%SITE_PERL%%/WWW/YoutubeViewer/GetCaption.pm
  %%SITE_PERL%%/WWW/YoutubeViewer/Itags.pm
 @@ -20,13 +21,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
 ===> Done
 
 --MP_/OjlyHrq+A2v/CeeVZEXkbi+--

From: Jason Helfman <jgh@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177775: multimedia/gtk-youtube-viewer: properly support
 dependency for CLI option
Date: Thu, 11 Apr 2013 23:33:21 -0700

 This still doesn't resolve the issue, and this is not a fix for the problem.
 The problem report was opened because it is supporting a higher version of
 perl, however the dependency has not been shifted.
 
 If there is an attention to support different versions of perl, it would be
 standard to then tie to that particular version of perl.
 
 As it stands now, this port will work with 5.14 or greater, however perl
 5.14 is still the dependency, regardless of the version of perl you are
 running.
 
 -jgh

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc: crees@FreeBSD.org
Subject: Re: ports/177775: multimedia/gtk-youtube-viewer: properly support
 dependency for CLI option
Date: Thu, 30 May 2013 15:49:37 +0200

 --MP_/7GIJWzdETaC_WrqFYiDtDBh
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 multimedia/gtk-youtube-viewer
 
 https://redports.org/buildarchive/20130528160300-33308/
 
 - Bump portrevision
 - Cleanup Makefile
 - Only with enabled CLI Options
   patch with added yv_5.16_to_5.10.pl to can be used Perl 5.14.2
   display added pkg-message
 - Trim pkg-plist
 
 Added file(s):
 - files/pkg-message.in
 - files/yv_5.16_to_5.10.pl.in
 
 
 This patch is from upstream
 
 https://code.google.com/p/trizen/downloads/detail?name=3Dyv_5.16_to_5.10.pl
 
 > From: Trizen <trizenx@gmail.com>
 > To: nemysis <nemysis@gmx.ch>
 > Subject: Re: GTK Youtube Viewer 3.0.7
 > Date: Sat, 23 Mar 2013 21:27:45 +0200
 >=20
 > Hello,
 >=20
 > There is a script which transforms youtube-viewer to require perl>=3D5.010
 >=20
 >          https://trizen.googlecode.com/files/yv_5.16_to_5.10.pl
 >=20
 > youtube-viewer uses perl>=3D5.16.0 because of __SUB__ token which is
 > available only starting with this version of perl. I could leave
 > youtube-viewer that way, to require only perl>=3D5.10.0, but isn't an ele=
 gant
 > solution, and not very easy to maintain.
 >=20
 > About the HTML5 support, what do you exactly mean? Can you, please, provi=
 de
 > an URL to an Youtube HTML5 video? Thanks.
 >=20
 > Best regards,
 > Trizen
 
 
 Some user wish to use default ports version of Perl being Perl-5.14 and  do=
  not wish to
 upgrade to Perl 5.16  on account of UPDATING/rebuilding issues.
 
 
 =46rom bsd.perl.mk
 
 PERL_VERSION?=3D  5.14.2
 
 I can't insist on users what Perl version they should use and the users sho=
 uld make a choice.
 
 --MP_/7GIJWzdETaC_WrqFYiDtDBh
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=gtk-youtube-viewer.diff
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/Makefile ./Makefile
 --- /usr/ports/multimedia/gtk-youtube-viewer/Makefile	2013-03-23 02:42:29.000000000 +0100
 +++ ./Makefile	2013-05-28 17:57:55.000000000 +0200
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gtk-youtube-viewer
  PORTVERSION=	3.0.7
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	multimedia perl5
  
  MAINTAINER=	nemysis@gmx.ch
 @@ -46,6 +46,9 @@
  
  PORTDOCS=	Changes README
  
 +SUB_FILES=	pkg-message \
 +		yv_5.16_to_5.10.pl
 +
  OPTIONS_DEFINE=	GCAP
  
  OPTIONS_MULTI=	USER_INTERFACE
 @@ -78,17 +81,6 @@
  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
 -
  post-patch:
  	@${REINPLACE_CMD} -n '1,/create_build_script()/p' \
  			${WRKSRC}/Build.PL
 @@ -106,6 +98,14 @@
  .endif
  
  post-install:
 +.if ${PORT_OPTIONS:MCLI}
 +	@(cd ${WRKDIR} && ${PERL} ./yv_5.16_to_5.10.pl ${WRKSRC}/bin/youtube-viewer > youtube-viewer-stable)
 +	${INSTALL_SCRIPT} ${WRKDIR}/youtube-viewer-stable ${PREFIX}/bin
 +	@${ECHO_CMD}
 +	@${CAT} ${PKGMESSAGE}
 +	@${ECHO_CMD}
 +.endif
 +
  .if ${PORT_OPTIONS:MGTK2}
  	@${MKDIR} ${PREFIX}/share/applications
  	${INSTALL_DATA} ${WRKSRC}/share/gtk-youtube-viewer.desktop ${PREFIX}/share/applications
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/files/pkg-message.in ./files/pkg-message.in
 --- /usr/ports/multimedia/gtk-youtube-viewer/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/pkg-message.in	2013-05-28 17:59:17.000000000 +0200
 @@ -0,0 +1,20 @@
 +===============================================================================
 +
 +GTK Youtube Viewer has been installed.
 +
 +This package needs Perl 5.16 or Perl 5.14.
 +
 +Please read UPDATING entry from 20120630 after installation.
 +
 +
 +Youtube Viewer (CLI Version) can use either Perl version, please use
 +
 +for Perl 5.16
 +
 +    %%PREFIX%%/bin/youtube-viewer
 +
 +for Perl 5.14
 +
 +    %%PREFIX%%/bin/youtube-viewer-stable
 +
 +===============================================================================
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl.in ./files/yv_5.16_to_5.10.pl.in
 --- /usr/ports/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/yv_5.16_to_5.10.pl.in	2012-12-16 16:59:39.000000000 +0100
 @@ -0,0 +1,12 @@
 +#!/usr/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;
 +}
 diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/pkg-plist ./pkg-plist
 --- /usr/ports/multimedia/gtk-youtube-viewer/pkg-plist	2013-03-23 02:42:29.000000000 +0100
 +++ ./pkg-plist	2013-05-28 17:58:07.000000000 +0200
 @@ -1,5 +1,6 @@
  %%GTK2%%bin/gtk-youtube-viewer
  %%CLI%%bin/youtube-viewer
 +%%CLI%%bin/youtube-viewer-stable
  %%SITE_PERL%%/WWW/YoutubeViewer.pm
  %%SITE_PERL%%/WWW/YoutubeViewer/GetCaption.pm
  %%SITE_PERL%%/WWW/YoutubeViewer/Itags.pm
 @@ -20,13 +21,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
 ===> Done
 
 --MP_/7GIJWzdETaC_WrqFYiDtDBh--
Responsible-Changed-From-To: freebsd-ports-bugs->az 
Responsible-Changed-By: az 
Responsible-Changed-When: Thu Jun 13 11:48:38 UTC 2013 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177775 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177775: commit references a PR
Date: Sat, 15 Jun 2013 19:30:41 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: az 
State-Changed-When: Sat Jun 15 19:52:08 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177775 
>Unformatted:
