From owner-svn-ports-head@FreeBSD.ORG Fri Mar 22 20:41:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BF65D3D2; Fri, 22 Mar 2013 20:41:59 +0000 (UTC) (envelope-from beech@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B13D76DA; Fri, 22 Mar 2013 20:41:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2MKfxvw018200; Fri, 22 Mar 2013 20:41:59 GMT (envelope-from beech@svn.freebsd.org) Received: (from beech@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2MKfxGb018195; Fri, 22 Mar 2013 20:41:59 GMT (envelope-from beech@svn.freebsd.org) Message-Id: <201303222041.r2MKfxGb018195@svn.freebsd.org> From: Beech Rintoul Date: Fri, 22 Mar 2013 20:41:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314965 - head/multimedia/gtk-youtube-viewer X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Mar 2013 20:41:59 -0000 Author: beech Date: Fri Mar 22 20:41:59 2013 New Revision: 314965 URL: http://svnweb.freebsd.org/changeset/ports/314965 Log: - Fix install error Submitted by: nemysis 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 Fri Mar 22 20:27:14 2013 (r314964) +++ head/multimedia/gtk-youtube-viewer/Makefile Fri Mar 22 20:41:59 2013 (r314965) @@ -3,6 +3,7 @@ PORTNAME= gtk-youtube-viewer PORTVERSION= 3.0.7 +PORTREVISION= 1 CATEGORIES= multimedia perl5 MAINTAINER= nemysis@gmx.ch @@ -33,9 +34,9 @@ GH_COMMIT= c26d9a7 WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/WWW-YoutubeViewer +CONFIGURE_ARGS+=${DATADIR} PERL_MODBUILD= yes -MAN1= youtube-viewer.1 MAN3= WWW::YoutubeViewer::RegularExpressions.3 \ WWW::YoutubeViewer.3 \ WWW::YoutubeViewer::Itags.3 \ @@ -45,12 +46,25 @@ MAN3= WWW::YoutubeViewer::RegularExpres PORTDOCS= Changes README -OPTIONS_DEFINE= GTK2 GCAP -OPTIONS_DEFAULT=GTK2 GCAP +OPTIONS_DEFINE= GCAP + +OPTIONS_MULTI= USER_INTERFACE +OPTIONS_MULTI_USER_INTERFACE= CLI GTK2 + +OPTIONS_DEFAULT= GTK2 GCAP + +CLI_DESC= Enable CLI version GCAP_DESC= Enable YouTube captions support .include +.if ${PORT_OPTIONS:MCLI} +MAN1= youtube-viewer.1 +PLIST_SUB+= CLI="" +.else +PLIST_SUB+= CLI="@comment " +.endif + .if ${PORT_OPTIONS:MGTK2} BUILD_DEPENDS+= p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 RUN_DEPENDS+= p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 @@ -64,17 +78,33 @@ 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 + post-patch: + @${REINPLACE_CMD} -n '1,/create_build_script()/p' \ + ${WRKSRC}/Build.PL @${REINPLACE_CMD} \ -e 's|5.016|0|' \ - -e 's|usr share|${PREFIX}/|' \ - -e 's|(pixmaps))|(share/pixmaps))|' \ - -e 's|(applications))|(share/applications))|' \ - -e 's|(gtk-youtube-viewer))|(share/gtk-youtube-viewer))|' \ ${WRKSRC}/Build.PL @cd ${WRKSRC}/bin && ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \ gtk-youtube-viewer youtube-viewer +.if ! ${PORT_OPTIONS:MCLI} + @${REINPLACE_CMD} -e "s|'bin/youtube-viewer',||" \ + ${WRKSRC}/Build.PL + @${REINPLACE_CMD} -i '' -e '/copy(catfile($$main_dir, qw(bin youtube-viewer))/,+1d' \ + ${WRKSRC}/Build.PL +.endif + post-install: .if ${PORT_OPTIONS:MGTK2} @${MKDIR} ${PREFIX}/share/applications Modified: head/multimedia/gtk-youtube-viewer/pkg-plist ============================================================================== --- head/multimedia/gtk-youtube-viewer/pkg-plist Fri Mar 22 20:27:14 2013 (r314964) +++ head/multimedia/gtk-youtube-viewer/pkg-plist Fri Mar 22 20:41:59 2013 (r314965) @@ -1,5 +1,5 @@ %%GTK2%%bin/gtk-youtube-viewer -bin/youtube-viewer +%%CLI%%bin/youtube-viewer %%SITE_PERL%%/WWW/YoutubeViewer.pm %%SITE_PERL%%/WWW/YoutubeViewer/GetCaption.pm %%SITE_PERL%%/WWW/YoutubeViewer/Itags.pm @@ -15,7 +15,6 @@ bin/youtube-viewer %%GTK2%%%%DATADIR%%/icons/gtk-youtube-viewer.png %%GTK2%%%%DATADIR%%/icons/spinner.gif %%GTK2%%%%DATADIR%%/icons/user.png -%%GTK2%%%%DATADIR%%/youtube-viewer %%GTK2%%share/pixmaps/gtk-youtube-viewer.png %%GTK2%%@dirrm %%DATADIR%%/icons %%GTK2%%@dirrm %%DATADIR%%