Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jan 2018 07:57:44 +0000
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        Steve Wills <swills@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r457907 - in head/net/rubygem-grpc: . files
Message-ID:  <20180103075744.GA2731@FreeBSD.org>
In-Reply-To: <201801021606.w02G6xxJ033897@repo.freebsd.org>
References:  <201801021606.w02G6xxJ033897@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--a8Wt8u1KmwUX3Y2C
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, Jan 02, 2018 at 04:06:59PM +0000, Steve Wills wrote:
> New Revision: 457907
> URL: https://svnweb.freebsd.org/changeset/ports/457907
> 
> Log:
>   net/rubygem-grpc: update to 1.8.0
>   
>   PR:		224800
>   Approved by:	Matthias Fechner <idefix@fechner.net> (maintainer)
> 
> Modified:
>   head/net/rubygem-grpc/Makefile   (contents, props changed)
>   head/net/rubygem-grpc/distinfo   (contents, props changed)
>   head/net/rubygem-grpc/files/grpc.gemspec

Would you consider patching grpc.gemspec with sed(1) instead?  It is
not particularly pretty, but not as ugly as 10K pre-generated binary
file with messed up svn properties.

It also places ${RM} -r of those files and directories and subsequent
grpc.gemspec fixup closer together (rather than one part done in the
`post-extract' target and fixup ... well, somewhere else).

It produces exactly the same result as current `files/grpc.gemspec'.

./danfe

--a8Wt8u1KmwUX3Y2C
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="grpc.diff"

Index: Makefile
===================================================================
--- Makefile	(revision 457946)
+++ Makefile	(working copy)
@@ -30,9 +30,11 @@
 post-extract:
 	@${RM} -r ${WRKSRC}/include ${WRKSRC}/third_party ${WRKSRC}/src/boringssl \
 		${WRKSRC}/src/core ${WRKSRC}/Makefile ${WRKSRC}/.yardopts ${WRKSRC}/etc
-	@${CP} ${FILESDIR}/grpc.gemspec ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/src/ruby/lib/grpc.rb
+	@${REINPLACE_CMD} -E '/s\.files = /s;, "(Makefile|etc|include|third_party|src/boringssl|src/core)[^"]*"\.freeze;;g' \
+		${WRKSRC}/grpc.gemspec
+	@${REINPLACE_CMD} -e '/s\.files = /s;"\.yardopts"\.freeze, ;;' ${WRKSRC}/grpc.gemspec
 
 .include <bsd.port.mk>

--a8Wt8u1KmwUX3Y2C--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180103075744.GA2731>