From owner-svn-ports-all@freebsd.org Tue Mar 27 09:35:55 2018 Return-Path: Delivered-To: svn-ports-all@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 073FDF658A2; Tue, 27 Mar 2018 09:35:55 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB676798B2; Tue, 27 Mar 2018 09:35:54 +0000 (UTC) (envelope-from tz@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 8C3341A45D; Tue, 27 Mar 2018 09:35:54 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2R9ZsRl016266; Tue, 27 Mar 2018 09:35:54 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2R9ZscA016263; Tue, 27 Mar 2018 09:35:54 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201803270935.w2R9ZscA016263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Tue, 27 Mar 2018 09:35:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465682 - in head: security/rubygem-doorkeeper-openid_connect12 security/rubygem-doorkeeper42 www/gitlab X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head: security/rubygem-doorkeeper-openid_connect12 security/rubygem-doorkeeper42 www/gitlab X-SVN-Commit-Revision: 465682 X-SVN-Commit-Repository: ports 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.25 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: Tue, 27 Mar 2018 09:35:55 -0000 Author: tz Date: Tue Mar 27 09:35:54 2018 New Revision: 465682 URL: https://svnweb.freebsd.org/changeset/ports/465682 Log: www/gitlab, security/rubygem-doorkeeper42 and security/rubygem-doorkeeper-openid_connect12: Add CONFLICTS_INSTALL and change RUN_DEPENDS in order to match each other. Otherwise conflicting dependencies will be installed Modified: head/security/rubygem-doorkeeper-openid_connect12/Makefile head/security/rubygem-doorkeeper42/Makefile head/www/gitlab/Makefile Modified: head/security/rubygem-doorkeeper-openid_connect12/Makefile ============================================================================== --- head/security/rubygem-doorkeeper-openid_connect12/Makefile Tue Mar 27 09:33:23 2018 (r465681) +++ head/security/rubygem-doorkeeper-openid_connect12/Makefile Tue Mar 27 09:35:54 2018 (r465682) @@ -12,7 +12,9 @@ COMMENT= OpenID Connect extension for Doorkeeper LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \ +CONFLICTS_INSTALL= rubygem-doorkeeper-openid_connect + +RUN_DEPENDS= rubygem-doorkeeper42>=4.0:security/rubygem-doorkeeper42 \ rubygem-json-jwt>=1.6:www/rubygem-json-jwt NO_ARCH= yes Modified: head/security/rubygem-doorkeeper42/Makefile ============================================================================== --- head/security/rubygem-doorkeeper42/Makefile Tue Mar 27 09:33:23 2018 (r465681) +++ head/security/rubygem-doorkeeper42/Makefile Tue Mar 27 09:35:54 2018 (r465682) @@ -12,6 +12,8 @@ COMMENT= Doorkeeper is an OAuth 2 provider for Rails a LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE +CONFLICTS_INSTALL= rubygem-doorkeeper + RUN_DEPENDS= rubygem-railties4>=4.2:www/rubygem-railties4 PORTSCOUT= limit:^4\.2\. Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Tue Mar 27 09:33:23 2018 (r465681) +++ head/www/gitlab/Makefile Tue Mar 27 09:35:54 2018 (r465682) @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 10.4.4 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= idefix@fechner.net @@ -41,7 +41,7 @@ RUN_DEPENDS= git>=2.14.3:devel/git \ rubygem-faraday>=0.12.0:www/rubygem-faraday \ rubygem-devise>=4.2:devel/rubygem-devise \ rubygem-doorkeeper42>=4.2:security/rubygem-doorkeeper42 \ - rubygem-doorkeeper-openid_connect>=1.2.0:security/rubygem-doorkeeper-openid_connect \ + rubygem-doorkeeper-openid_connect12>=1.2.0:security/rubygem-doorkeeper-openid_connect12 \ rubygem-omniauth14>=1.4.2:security/rubygem-omniauth14 \ rubygem-omniauth-auth014>=1.4.1:net/rubygem-omniauth-auth014 \ rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \