svn commit: r564168 - in head: devel devel/gitaly devel/grpc134 devel/rubygem-gitlab-labkit net net/rubygem-gitaly net/rubygem-grpc130 www/gitlab-ce

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Sat Feb 6 01:22:53 UTC 2021 

Author: sunpoet
Date: Sat Feb  6 01:22:51 2021
New Revision: 564168
URL: https://svnweb.freebsd.org/changeset/ports/564168

Log:
  Fix grpc issue in gitlab-ce
  
  - While I'm here, use = instead of ?= because gitlab-ce does not have slave port
  - Bump PORTREVISION for dependency change
  
  gitlab-ce has some runtime issue with grpc versions, especially upb stuff.
  Move all gitlab-ce dependencies to specific grpc/rubygem-grpc versions in order
  to keep gitlab-ce port more robust.
  
  The changes are as follows:
  - Add devel/grpc134 (copied from devel/grpc)
  - Add net/rubygem-grpc130 (copied from net/rubygem-grpc)
  - Move gitlab-ce and its dependencies to grpc134 and rubygem-grpc130
  
  Differential Revision:	https://reviews.freebsd.org/D28491
  Submitted by:	sunpoet (myself)
  Approved by:	mfechner
  Tested by:	mfechner

Added:
  head/devel/grpc134/
     - copied from r563295, head/devel/grpc/
  head/net/rubygem-grpc130/
     - copied from r563463, head/net/rubygem-grpc/
Modified:
  head/devel/Makefile
  head/devel/gitaly/Makefile
  head/devel/grpc134/Makefile
  head/devel/rubygem-gitlab-labkit/Makefile
  head/net/Makefile
  head/net/rubygem-gitaly/Makefile
  head/net/rubygem-grpc130/Makefile
  head/www/gitlab-ce/Makefile

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Feb  6 00:05:23 2021	(r564167)
+++ head/devel/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -887,6 +887,7 @@
     SUBDIR += grcov
     SUBDIR += grex
     SUBDIR += grpc
+    SUBDIR += grpc134
     SUBDIR += grv
     SUBDIR += gsettings-desktop-schemas
     SUBDIR += gsoap

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Sat Feb  6 00:05:23 2021	(r564167)
+++ head/devel/gitaly/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitaly
 DISTVERSION=	13.8.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner at FreeBSD.org
@@ -21,7 +21,7 @@ MY_DEPENDS=	git>=2.29:devel/git \
 		rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
 		rubygem-gitlab-gollum-lib>=4.2.7.9<4.2.8:www/rubygem-gitlab-gollum-lib \
 		rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
-		rubygem-grpc>=1.30.2<1.31:net/rubygem-grpc \
+		rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
 		rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
 		rubygem-faraday>=1.0.1<2:www/rubygem-faraday \
 		rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \

Modified: head/devel/grpc134/Makefile
==============================================================================
--- head/devel/grpc/Makefile	Sat Jan 30 12:18:49 2021	(r563295)
+++ head/devel/grpc134/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -4,9 +4,8 @@
 PORTNAME=	grpc
 PORTVERSION=	1.34.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
-PORTEPOCH=	2
 CATEGORIES=	devel
+PKGNAMESUFFIX=	134
 
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	HTTP/2-based RPC framework
@@ -38,5 +37,7 @@ CMAKE_ON=	BUILD_SHARED_LIBS
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+CONFLICTS_INSTALL=	grpc
 
 .include <bsd.port.mk>

Modified: head/devel/rubygem-gitlab-labkit/Makefile
==============================================================================
--- head/devel/rubygem-gitlab-labkit/Makefile	Sat Feb  6 00:05:23 2021	(r564167)
+++ head/devel/rubygem-gitlab-labkit/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gitlab-labkit
 PORTVERSION=	0.14.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-actionpack60>=5<7:www/rubygem-actionpack60 \
 		rubygem-activesupport60>=5<7:devel/rubygem-activesupport60 \
 		rubygem-gitlab-pg_query>=1.3<2:databases/rubygem-gitlab-pg_query \
-		rubygem-grpc>=1.19<2:net/rubygem-grpc \
+		rubygem-grpc130>=1.19<2:net/rubygem-grpc130 \
 		rubygem-jaeger-client>=1.1<2:devel/rubygem-jaeger-client \
 		rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing \
 		rubygem-redis>3.0.0<5.0.0:databases/rubygem-redis

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Sat Feb  6 00:05:23 2021	(r564167)
+++ head/net/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -1257,6 +1257,7 @@
     SUBDIR += rubygem-google-cloud-storage
     SUBDIR += rubygem-grpc
     SUBDIR += rubygem-grpc124
+    SUBDIR += rubygem-grpc130
     SUBDIR += rubygem-hangouts-chat
     SUBDIR += rubygem-http-parser
     SUBDIR += rubygem-http_parser.rb

Modified: head/net/rubygem-gitaly/Makefile
==============================================================================
--- head/net/rubygem-gitaly/Makefile	Sat Feb  6 00:05:23 2021	(r564167)
+++ head/net/rubygem-gitaly/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitaly
 PORTVERSION=	13.8.0.pre.rc2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@ COMMENT=	Auto-generated gRPC client for gitaly
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-grpc>=1.0<2.0:net/rubygem-grpc \
+RUN_DEPENDS=	rubygem-grpc130>=1.0<2.0:net/rubygem-grpc130 \
 		gitaly>=13.8:devel/gitaly
 
 USES=		gem

Modified: head/net/rubygem-grpc130/Makefile
==============================================================================
--- head/net/rubygem-grpc/Makefile	Sun Jan 31 05:29:06 2021	(r563463)
+++ head/net/rubygem-grpc130/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -5,6 +5,7 @@ PORTVERSION=	1.30.2
 PORTREVISION=	1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
+PKGNAMESUFFIX=	130
 
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Ruby implementation of gRPC
@@ -12,7 +13,7 @@ COMMENT=	Ruby implementation of gRPC
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcares.so:dns/c-ares \
-		libgrpc.so:devel/grpc
+		libgrpc.so:devel/grpc134
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		rubygem-google-protobuf>=3.12<4:devel/rubygem-google-protobuf \
 		rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types
@@ -21,6 +22,8 @@ USES=		gem gmake pkgconfig
 USE_RUBY=	yes
 
 MAKE_JOBS_UNSAFE=	yes
+
+PORTSCOUT=	limit:^1\.30\.
 
 post-extract:
 	@${RM} ${WRKSRC}/Makefile ${WRKSRC}/.yardopts

Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile	Sat Feb  6 00:05:23 2021	(r564167)
+++ head/www/gitlab-ce/Makefile	Sat Feb  6 01:22:51 2021	(r564168)
@@ -1,13 +1,13 @@
 # Created by: Torsten Zuehlsdorff <tz at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME?=	gitlab-ce
-PORTVERSION?=	13.8.1
-PORTREVISION?=	1
+PORTNAME=	gitlab-ce
+PORTVERSION=	13.8.1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
-MAINTAINER?=	mfechner at FreeBSD.org
-COMMENT?=	Web GUI for managing git repositories
+MAINTAINER=	mfechner at FreeBSD.org
+COMMENT=	Web GUI for managing git repositories
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -219,7 +219,7 @@ MY_DEPENDS=	git>=2.29:devel/git \
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
 	rubygem-gitaly>=13.8.0.pre.rc2<13.9.0:net/rubygem-gitaly \
-	rubygem-grpc>=1.30.2<1.31:net/rubygem-grpc \
+	rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
 	rubygem-google-protobuf>=3.12<4:devel/rubygem-google-protobuf \
 	rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
 	rubygem-flipper017>=0.17.1<0.18.0:devel/rubygem-flipper017 \

More information about the svn-ports-all mailing list