From owner-svn-ports-all@FreeBSD.ORG Wed Mar 5 20:13:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1011E68D; Wed, 5 Mar 2014 20:13:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D78BF924; Wed, 5 Mar 2014 20:13:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25KDOVK081716; Wed, 5 Mar 2014 20:13:24 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25KDO4s081715; Wed, 5 Mar 2014 20:13:24 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201403052013.s25KDO4s081715@svn.freebsd.org> From: Antoine Brodin Date: Wed, 5 Mar 2014 20:13:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347139 - head/audio/rubyripper X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 20:13:25 -0000 Author: antoine Date: Wed Mar 5 20:13:24 2014 New Revision: 347139 URL: http://svnweb.freebsd.org/changeset/ports/347139 QAT: https://qat.redports.org/buildarchive/r347139/ Log: - Fix runtime (site_ruby/1.8 was hardcoded) - Stage support - Depend on rubygem-gtk2 instead of deprecated ruby-gtk2 Modified: head/audio/rubyripper/Makefile Modified: head/audio/rubyripper/Makefile ============================================================================== --- head/audio/rubyripper/Makefile Wed Mar 5 19:40:18 2014 (r347138) +++ head/audio/rubyripper/Makefile Wed Mar 5 20:13:24 2014 (r347139) @@ -3,7 +3,7 @@ PORTNAME= rubyripper DISTVERSION= 0.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio sysutils ruby MASTER_SITES= GOOGLE_CODE @@ -18,12 +18,11 @@ LICENSE= GPLv3 BUILD_DEPENDS= rxgettext:${PORTSDIR}/devel/rubygem-gettext \ cdparanoia:${PORTSDIR}/audio/cdparanoia RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \ + rubygem-gtk2>=0:${PORTSDIR}/x11-toolkits/rubygem-gtk2 \ cdrdao:${PORTSDIR}/sysutils/cdrdao \ cd-discid:${PORTSDIR}/audio/cd-discid USE_BZIP2= yes -NO_STAGE= yes USES= gettext USE_RUBY= yes INSTALLS_ICONS= yes @@ -36,19 +35,22 @@ post-patch: @${REINPLACE_CMD} -e 's,cdparanioa,cdparanoia,' \ ${WRKSRC}/locale/po/bg/rubyripper.po \ ${WRKSRC}/locale/po/ru/rubyripper.po + @${REINPLACE_CMD} 's,/usr/local/lib/ruby/site_ruby/1.8,${RUBY_SITELIBDIR},' \ + ${WRKSRC}/rubyripper_cli.rb ${WRKSRC}/rubyripper_gtk2.rb do-build: cd ${WRKSRC} && ${RUBY} configure --update-lang do-install: - ${INSTALL_DATA} ${WRKSRC}/rr_lib.rb ${RUBY_SITELIBDIR} + @${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR} + ${INSTALL_DATA} ${WRKSRC}/rr_lib.rb ${STAGEDIR}${RUBY_SITELIBDIR} .for frontend in cli gtk2 ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}_${frontend}.rb \ - ${PREFIX}/bin/rrip_${frontend} + ${STAGEDIR}${PREFIX}/bin/rrip_${frontend} .endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \ - ${PREFIX}/share/icons/hicolor/128x128/apps - cd ${WRKSRC} && ${FIND} . -type f -name \*.mo | ${XARGS} ${TAR} \ - cf - | ${TAR} xf - -C ${PREFIX}/share + ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share "-name *.mo" .include