Index: databases/rubygem-activerecord-explain-analyze/Makefile =================================================================== --- databases/rubygem-activerecord-explain-analyze/Makefile +++ databases/rubygem-activerecord-explain-analyze/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= rubygem-activerecord5>=4:databases/rubygem-activerecord5 \ +RUN_DEPENDS= rubygem-activerecord52>=4:databases/rubygem-activerecord52 \ rubygem-pg>=0:databases/rubygem-pg USES= gem Index: databases/rubygem-flipper-active_record013/Makefile =================================================================== --- databases/rubygem-flipper-active_record013/Makefile +++ databases/rubygem-flipper-active_record013/Makefile @@ -3,7 +3,7 @@ PORTNAME= flipper-active_record PORTVERSION= 0.13.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= 013 @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= rubygem-activerecord50>=3.2<6:databases/rubygem-activerecord50 \ +RUN_DEPENDS= rubygem-activerecord52>=3.2<6:databases/rubygem-activerecord52 \ rubygem-flipper013>=${PORTVERSION}<0.14:devel/rubygem-flipper013 USES= gem Index: databases/rubygem-seed-fu/Makefile =================================================================== --- databases/rubygem-seed-fu/Makefile +++ databases/rubygem-seed-fu/Makefile @@ -2,6 +2,7 @@ PORTNAME= seed-fu PORTVERSION= 2.3.9 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -11,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activerecord50>=3.1:databases/rubygem-activerecord50 \ - rubygem-activesupport50>=3.1:devel/rubygem-activesupport50 +RUN_DEPENDS= rubygem-activerecord52>=3.1:databases/rubygem-activerecord52 \ + rubygem-activesupport52>=3.1:devel/rubygem-activesupport52 USES= gem USE_RUBY= yes Index: databases/rubygem-state_machines-activemodel/Makefile =================================================================== --- databases/rubygem-state_machines-activemodel/Makefile +++ databases/rubygem-state_machines-activemodel/Makefile @@ -3,6 +3,7 @@ PORTNAME= state_machines-activemodel PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -12,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-activemodel50>=4.1:databases/rubygem-activemodel50 \ +RUN_DEPENDS= rubygem-activemodel52>=4.1:databases/rubygem-activemodel52 \ rubygem-state_machines>=0.5.0:devel/rubygem-state_machines USES= gem Index: databases/rubygem-state_machines-activerecord05/Makefile =================================================================== --- databases/rubygem-state_machines-activerecord05/Makefile +++ databases/rubygem-state_machines-activerecord05/Makefile @@ -3,6 +3,7 @@ PORTNAME= state_machines-activerecord PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG PKGNAMESUFFIX= 05 @@ -13,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-activerecord50>=4.1<6.0:databases/rubygem-activerecord50 \ +RUN_DEPENDS= rubygem-activerecord52>=4.1<6.0:databases/rubygem-activerecord52 \ rubygem-state_machines-activemodel>=0.5.0:databases/rubygem-state_machines-activemodel USES= gem Index: devel/rubygem-capybara/Makefile =================================================================== --- devel/rubygem-capybara/Makefile +++ devel/rubygem-capybara/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= capybara -PORTVERSION= 3.29.0 +PORTVERSION= 3.28.0 CATEGORIES= devel rubygems MASTER_SITES= RG Index: devel/rubygem-capybara/distinfo =================================================================== --- devel/rubygem-capybara/distinfo +++ devel/rubygem-capybara/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1567510048 -SHA256 (rubygem/capybara-3.29.0.gem) = 1060ef44f1f03adea9a2e21e5cb78c6881d113983ffec443fc4e3982c89e81d7 -SIZE (rubygem/capybara-3.29.0.gem) = 358400 +TIMESTAMP = 1565543292 +SHA256 (rubygem/capybara-3.28.0.gem) = ec5a506ffc9c7c87b48080c13ad9f87bf53557ec83a0fb59cac3a9284f0b4d3b +SIZE (rubygem/capybara-3.28.0.gem) = 355328 Index: devel/rubygem-flipper-active_support_cache_store013/Makefile =================================================================== --- devel/rubygem-flipper-active_support_cache_store013/Makefile +++ devel/rubygem-flipper-active_support_cache_store013/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= rubygem-activesupport50>=3.26:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activesupport52>=3.26:devel/rubygem-activesupport52 \ rubygem-flipper013>=${PORTVERSION}<0.14:devel/rubygem-flipper013 USES= gem Index: devel/rubygem-grape-entity/Makefile =================================================================== --- devel/rubygem-grape-entity/Makefile +++ devel/rubygem-grape-entity/Makefile @@ -2,7 +2,7 @@ PORTNAME= grape-entity PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport50>=4.0:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activesupport52>=4.0:devel/rubygem-activesupport52 \ rubygem-multi_json>=1.3.2:devel/rubygem-multi_json USES= gem Index: devel/rubygem-grape-path-helpers/Makefile =================================================================== --- devel/rubygem-grape-path-helpers/Makefile +++ devel/rubygem-grape-path-helpers/Makefile @@ -2,6 +2,7 @@ PORTNAME= grape-path-helpers PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-activesupport5>=0:devel/rubygem-activesupport5 \ +RUN_DEPENDS= rubygem-activesupport52>=0:devel/rubygem-activesupport52 \ rubygem-grape>=1.0:devel/rubygem-grape \ rubygem-rake>=12:devel/rubygem-rake Index: devel/rubygem-grape/Makefile =================================================================== --- devel/rubygem-grape/Makefile +++ devel/rubygem-grape/Makefile @@ -2,6 +2,7 @@ PORTNAME= grape PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport50>=0:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activesupport52>=0:devel/rubygem-activesupport52 \ rubygem-builder>=0:devel/rubygem-builder \ rubygem-mustermann-grape>=1.0.0:devel/rubygem-mustermann-grape \ rubygem-rack>=1.3.0:www/rubygem-rack \ Index: devel/rubygem-grape11/Makefile =================================================================== --- devel/rubygem-grape11/Makefile +++ devel/rubygem-grape11/Makefile @@ -2,7 +2,7 @@ PORTNAME= grape PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 11 @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport50>=0:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activesupport52>=0:devel/rubygem-activesupport52 \ rubygem-builder>=0:devel/rubygem-builder \ rubygem-mustermann-grape>=1.0.0:devel/rubygem-mustermann-grape \ rubygem-rack>=1.3.0:www/rubygem-rack \ Index: devel/rubygem-omniauth_crowd22/Makefile =================================================================== --- devel/rubygem-omniauth_crowd22/Makefile +++ devel/rubygem-omniauth_crowd22/Makefile @@ -2,7 +2,7 @@ PORTNAME= omniauth_crowd PORTVERSION= 2.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 22 @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS?= rubygem-activesupport50>=0:devel/rubygem-activesupport50 \ +RUN_DEPENDS?= rubygem-activesupport52>=0:devel/rubygem-activesupport52 \ rubygem-nokogiri>=1.4.4:textproc/rubygem-nokogiri \ rubygem-omniauth>=1.0:security/rubygem-omniauth Index: devel/rubygem-validate_email/Makefile =================================================================== --- devel/rubygem-validate_email/Makefile +++ devel/rubygem-validate_email/Makefile @@ -3,6 +3,7 @@ PORTNAME= validate_email PORTVERSION= 0.1.6 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= rubygem-activemodel5>=3.0:databases/rubygem-activemodel5 \ +RUN_DEPENDS= rubygem-activemodel52>=3.0:databases/rubygem-activemodel52 \ rubygem-mail>=2.2.5:mail/rubygem-mail USES= gem Index: devel/rubygem-validate_url/Makefile =================================================================== --- devel/rubygem-validate_url/Makefile +++ devel/rubygem-validate_url/Makefile @@ -3,6 +3,7 @@ PORTNAME= validate_url PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-activemodel5>=3.0:databases/rubygem-activemodel5 \ +RUN_DEPENDS= rubygem-activemodel52>=3.0:databases/rubygem-activemodel52 \ rubygem-public_suffix>=0:dns/rubygem-public_suffix USES= gem Index: dns/rubygem-validates_hostname/Makefile =================================================================== --- dns/rubygem-validates_hostname/Makefile +++ dns/rubygem-validates_hostname/Makefile @@ -3,7 +3,7 @@ PORTNAME= validates_hostname PORTVERSION= 1.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns rubygems MASTER_SITES= RG @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-activerecord50>=3.0:databases/rubygem-activerecord50 \ - rubygem-activesupport50>=3.0:devel/rubygem-activesupport50 +RUN_DEPENDS= rubygem-activerecord52>=3.0:databases/rubygem-activerecord52 \ + rubygem-activesupport52>=3.0:devel/rubygem-activesupport52 USES= gem USE_RUBY= yes Index: net-mgmt/net-snmp/Makefile =================================================================== --- net-mgmt/net-snmp/Makefile +++ net-mgmt/net-snmp/Makefile @@ -15,6 +15,15 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +<<<<<<< .mine +LIB_DEPENDS= libpkg.so:ports-mgmt/pkg +LIB_DEPENDS= libpkg.so:ports-mgmt/pkg + +||||||| .r513141 +LIB_DEPENDS= libpkg.so:ports-mgmt/pkg + +======= +>>>>>>> .r513209 NOT_FOR_ARCHS= mips mips64 NOT_FOR_ARCHS_REASON= SSP is currently broken on MIPS Index: net/rubygem-openid_connect/Makefile =================================================================== --- net/rubygem-openid_connect/Makefile +++ net/rubygem-openid_connect/Makefile @@ -3,6 +3,7 @@ PORTNAME= openid_connect PORTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG @@ -12,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activemodel5>=0:databases/rubygem-activemodel5 \ +RUN_DEPENDS= rubygem-activemodel52>=0:databases/rubygem-activemodel52 \ rubygem-attr_required>=1.0.0:devel/rubygem-attr_required \ rubygem-json-jwt>=1.5.0:www/rubygem-json-jwt \ rubygem-rack-oauth2>=1.6.1:security/rubygem-rack-oauth2 \ Index: security/rubygem-rack-oauth2/Makefile =================================================================== --- security/rubygem-rack-oauth2/Makefile +++ security/rubygem-rack-oauth2/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport50>=0:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activesupport52>=0:devel/rubygem-activesupport52 \ rubygem-attr_required>=0:devel/rubygem-attr_required \ rubygem-httpclient>=0:www/rubygem-httpclient \ rubygem-json-jwt>=1.9.0:www/rubygem-json-jwt \ Index: textproc/rubygem-html-pipeline/Makefile =================================================================== --- textproc/rubygem-html-pipeline/Makefile +++ textproc/rubygem-html-pipeline/Makefile @@ -2,6 +2,7 @@ PORTNAME= html-pipeline PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport50>=2:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activesupport52>=2:devel/rubygem-activesupport52 \ rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri USES= gem Index: www/rubygem-acts-as-taggable-on/Makefile =================================================================== --- www/rubygem-acts-as-taggable-on/Makefile +++ www/rubygem-acts-as-taggable-on/Makefile @@ -2,6 +2,7 @@ PORTNAME= acts-as-taggable-on PORTVERSION= 6.0.0 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-activerecord5>=4.2.8:databases/rubygem-activerecord5 +RUN_DEPENDS= rubygem-activerecord52>=4.2.8:databases/rubygem-activerecord52 USES= gem USE_RUBY= YES Index: www/rubygem-carrierwave/Makefile =================================================================== --- www/rubygem-carrierwave/Makefile +++ www/rubygem-carrierwave/Makefile @@ -2,6 +2,7 @@ PORTNAME= carrierwave PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -10,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= rubygem-activemodel50>=4.0.0:databases/rubygem-activemodel50 \ - rubygem-activesupport50>=4.0.0:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activemodel52>=4.0.0:databases/rubygem-activemodel52 \ + rubygem-activesupport52>=4.0.0:devel/rubygem-activesupport52 \ rubygem-mime-types>=1.16:misc/rubygem-mime-types USES= gem Index: www/rubygem-json-jwt/Makefile =================================================================== --- www/rubygem-json-jwt/Makefile +++ www/rubygem-json-jwt/Makefile @@ -2,6 +2,7 @@ PORTNAME= json-jwt PORTVERSION= 1.10.2 +PORTREVISION= 1 CATEGORIES= www devel rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport50>=4.2:devel/rubygem-activesupport50 \ +RUN_DEPENDS= rubygem-activesupport52>=4.2:devel/rubygem-activesupport52 \ rubygem-aes_key_wrap>=0:security/rubygem-aes_key_wrap \ rubygem-bindata>=0:devel/rubygem-bindata