From owner-svn-ports-branches@freebsd.org Fri Apr 12 11:18:00 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98A651579AF2; Fri, 12 Apr 2019 11:18:00 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0D0A26F849; Fri, 12 Apr 2019 11:18:00 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E594D209D0; Fri, 12 Apr 2019 11:17:59 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3CBHxfJ080977; Fri, 12 Apr 2019 11:17:59 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CBHxZ7080974; Fri, 12 Apr 2019 11:17:59 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201904121117.x3CBHxZ7080974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 12 Apr 2019 11:17:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r498714 - in branches/2019Q2/devel/gitaly: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2019Q2/devel/gitaly: . files X-SVN-Commit-Revision: 498714 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0D0A26F849 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 11:18:00 -0000 Author: mfechner Date: Fri Apr 12 11:17:59 2019 New Revision: 498714 URL: https://svnweb.freebsd.org/changeset/ports/498714 Log: MFH: r498360 Changed the build order that the port also works with bundler version 2. Approved by: ports-secteam (joneum) Modified: branches/2019Q2/devel/gitaly/Makefile branches/2019Q2/devel/gitaly/files/patch-__support_makegen.go Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/devel/gitaly/Makefile ============================================================================== --- branches/2019Q2/devel/gitaly/Makefile Fri Apr 12 11:12:17 2019 (r498713) +++ branches/2019Q2/devel/gitaly/Makefile Fri Apr 12 11:17:59 2019 (r498714) @@ -2,6 +2,7 @@ PORTNAME= gitaly DISTVERSION= 1.27.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@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: branches/2019Q2/devel/gitaly/files/patch-__support_makegen.go ============================================================================== --- branches/2019Q2/devel/gitaly/files/patch-__support_makegen.go Fri Apr 12 11:12:17 2019 (r498713) +++ branches/2019Q2/devel/gitaly/files/patch-__support_makegen.go Fri Apr 12 11:17:59 2019 (r498714) @@ -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 $@