diff options
| author | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2018-03-27 17:35:54 +0800 |
|---|---|---|
| committer | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2018-03-27 17:35:54 +0800 |
| commit | 58f3d3ec3b7fa1dbcd5fd734052fc95e962897bf (patch) | |
| tree | 753e3695dfe4b09820f41b8e66a20af43e582fc1 | |
| parent | 9a8cd66e4e574190d28a75d42ce24ebfef4f87dd (diff) | |
| download | freebsd-ports-58f3d3ec3b7fa1dbcd5fd734052fc95e962897bf.tar.gz freebsd-ports-58f3d3ec3b7fa1dbcd5fd734052fc95e962897bf.tar.zst freebsd-ports-58f3d3ec3b7fa1dbcd5fd734052fc95e962897bf.zip | |
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
Notes
Notes:
svn path=/head/; revision=465682
| -rw-r--r-- | security/rubygem-doorkeeper-openid_connect12/Makefile | 4 | ||||
| -rw-r--r-- | security/rubygem-doorkeeper42/Makefile | 2 | ||||
| -rw-r--r-- | www/gitlab/Makefile | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/security/rubygem-doorkeeper-openid_connect12/Makefile b/security/rubygem-doorkeeper-openid_connect12/Makefile index 7a0390573199..b6e5fb558607 100644 --- a/security/rubygem-doorkeeper-openid_connect12/Makefile +++ b/security/rubygem-doorkeeper-openid_connect12/Makefile @@ -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 diff --git a/security/rubygem-doorkeeper42/Makefile b/security/rubygem-doorkeeper42/Makefile index 1e16841aff4e..2ecc9e138bbc 100644 --- a/security/rubygem-doorkeeper42/Makefile +++ b/security/rubygem-doorkeeper42/Makefile @@ -12,6 +12,8 @@ COMMENT= Doorkeeper is an OAuth 2 provider for Rails and Grape LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE +CONFLICTS_INSTALL= rubygem-doorkeeper + RUN_DEPENDS= rubygem-railties4>=4.2:www/rubygem-railties4 PORTSCOUT= limit:^4\.2\. diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index b3d8fe088e02..02665519b55d 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -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 \ |