Date: Tue, 27 Mar 2018 09:35:54 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> 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 Message-ID: <201803270935.w2R9ZscA016263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803270935.w2R9ZscA016263>