svn commit: r498360 - in head/devel/gitaly: . files

[Matthias Fechner]

Author: mfechner
Date: Mon Apr  8 11:19:55 2019
New Revision: 498360
URL: https://svnweb.freebsd.org/changeset/ports/498360

Log:
  Changed the build order that the port also works with bundler version 2.

Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/files/patch-__support_makegen.go

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Mon Apr  8 11:11:45 2019	(r498359)
+++ head/devel/gitaly/Makefile	Mon Apr  8 11:19:55 2019	(r498360)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitaly
 DISTVERSION=	1.27.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner at FreeBSD.org
@@ -27,11 +28,9 @@ MY_DEPENDS=	git>=2.18:devel/git \
 		rubygem-rbtrace>0:devel/rubygem-rbtrace \
 		rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
 		rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf
-
 BUILD_DEPENDS=	go>=1.10:lang/go \
 		gem:devel/ruby-gems \
 		${MY_DEPENDS}
-
 RUN_DEPENDS=	${MY_DEPENDS} \
 		gitlab-shell>=6.0.4:devel/gitlab-shell
 

Modified: head/devel/gitaly/files/patch-__support_makegen.go
==============================================================================
--- head/devel/gitaly/files/patch-__support_makegen.go	Mon Apr  8 11:11:45 2019	(r498359)
+++ head/devel/gitaly/files/patch-__support_makegen.go	Mon Apr  8 11:19:55 2019	(r498360)
@@ -1,4 +1,4 @@
---- _support/makegen.go.orig	2019-03-11 20:46:03 UTC
+--- _support/makegen.go.orig	2019-03-25 09:02:26 UTC
 +++ _support/makegen.go
 @@ -253,7 +253,7 @@ var templateText = `
  # These variables may be overriden at runtime by top-level make
@@ -9,12 +9,13 @@
  ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly
  BUILD_TAGS := tracer_static tracer_static_jaeger
  
-@@ -274,7 +274,7 @@ build: ../.ruby-bundle
+@@ -273,8 +273,8 @@ build: ../.ruby-bundle
+ # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
  # _build. Hence the '../' in front.
  ../.ruby-bundle:  {{ .GitalyRubyDir }}/Gemfile.lock  {{ .GitalyRubyDir }}/Gemfile
++	cd  {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS)
  	cd  {{ .GitalyRubyDir }} && bundle config # for debugging
 -	cd  {{ .GitalyRubyDir }} && bundle install $(BUNDLE_FLAGS)
-+	cd  {{ .GitalyRubyDir }} && rm Gemfile.lock && bundle install $(BUNDLE_FLAGS)
  	cd  {{ .GitalyRubyDir }} && bundle show gitaly-proto # sanity check
  	touch $@