cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/gitlab, security/rubygem-doorkeeper42 and security/rubygem-doorkeeper-openid_connect12:

Browse Source 
Add CONFLICTS_INSTALL and change RUN_DEPENDS in order to match each other.
Otherwise conflicting dependencies will be installed
This commit is contained in:
Torsten Zuehlsdorff 2018-03-27 09:35:54 +00:00
parent 9a8cd66e4e
commit 58f3d3ec3b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=465682
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/rubygem-doorkeeper-openid_connect12/Makefile
View File

@ -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

2
security/rubygem-doorkeeper42/Makefile
View File

@ -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\.

4
www/gitlab/Makefile
View File

@ -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 \