Date: Thu, 11 Aug 2016 15:17:21 +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: r420078 - in head: devel/rubygem-devise devel/rubygem-devise-rails4 security/rubygem-devise-two-factor www/gitlab Message-ID: <201608111517.u7BFHLSY050963@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Thu Aug 11 15:17:21 2016 New Revision: 420078 URL: https://svnweb.freebsd.org/changeset/ports/420078 Log: devel/rubygem-devise: switch to Rails 4 and fix fallout Remove support of Rails 3 since we are obsoleting this version from the ports-tree. This fixes the fallout-message to ruby@. Also DEPRECATE rubygem-devise-rails4 in favor of rubygem-devise and adjust dependencies of security/rubygem-devise-two-factor and www/gitlab. Approved by: pi (mentor) Modified: head/devel/rubygem-devise-rails4/Makefile head/devel/rubygem-devise/Makefile head/security/rubygem-devise-two-factor/Makefile head/www/gitlab/Makefile Modified: head/devel/rubygem-devise-rails4/Makefile ============================================================================== --- head/devel/rubygem-devise-rails4/Makefile Thu Aug 11 15:13:34 2016 (r420077) +++ head/devel/rubygem-devise-rails4/Makefile Thu Aug 11 15:17:21 2016 (r420078) @@ -3,7 +3,9 @@ PKGNAMESUFFIX= -rails4 -RAILS4= yes +DEPRECATED= Please use devel/rubygem-devise instead +EXPIRED_DATE= 2016-12-31 + MASTERDIR= ${.CURDIR}/../rubygem-devise .include "${MASTERDIR}/Makefile" Modified: head/devel/rubygem-devise/Makefile ============================================================================== --- head/devel/rubygem-devise/Makefile Thu Aug 11 15:13:34 2016 (r420077) +++ head/devel/rubygem-devise/Makefile Thu Aug 11 15:17:21 2016 (r420078) @@ -3,6 +3,7 @@ PORTNAME= devise PORTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -16,7 +17,9 @@ RUN_DEPENDS= rubygem-bcrypt>=3.0:securit rubygem-orm_adapter>=0.1:devel/rubygem-orm_adapter \ rubygem-thread_safe>=0.1:devel/rubygem-thread_safe \ rubygem-responders>=0:www/rubygem-responders \ - rubygem-warden>=1.2.3:devel/rubygem-warden + rubygem-warden>=1.2.3:devel/rubygem-warden \ + rubygem-railties4>=4.1.1:www/rubygem-railties4 \ + rubygem-responders>=0:www/rubygem-responders NO_ARCH= yes USE_RUBY= yes @@ -24,24 +27,6 @@ USES= gem BROKEN_RUBY23= yes -SLAVEDIRS= devel/rubygem-devise-rails4 - -OPTIONS_SINGLE= RAILS -OPTIONS_SINGLE_RAILS= RAILS3 RAILS4 -.if defined(RAILS4) -OPTIONS_DEFAULT= RAILS4 -.else -OPTIONS_DEFAULT= RAILS3 -.endif - -RAILS3_DESC= Use Rails 3 as backend -RAILS4_DESC= Use Rails 4 as backend - -RAILS3_RUN_DEPENDS= rubygem-railties>=3.2.6:www/rubygem-railties \ - rubygem-responders-rails3>=0:www/rubygem-responders-rails3 -RAILS4_RUN_DEPENDS= rubygem-railties4>=4.1.1:www/rubygem-railties4 \ - rubygem-responders>=0:www/rubygem-responders - post-patch: @${REINPLACE_CMD} -e 's|, "test/rails_app/config/routes.rb"||' ${WRKSRC}/${PORTNAME}.gemspec Modified: head/security/rubygem-devise-two-factor/Makefile ============================================================================== --- head/security/rubygem-devise-two-factor/Makefile Thu Aug 11 15:13:34 2016 (r420077) +++ head/security/rubygem-devise-two-factor/Makefile Thu Aug 11 15:17:21 2016 (r420078) @@ -3,6 +3,7 @@ PORTNAME= devise-two-factor PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-activesupport4>=0:devel/rubygem-activesupport4 \ rubygem-attr_encrypted>=1.3:security/rubygem-attr_encrypted \ - rubygem-devise-rails4>=4.0:devel/rubygem-devise-rails4 \ + rubygem-devise>=4.0:devel/rubygem-devise \ rubygem-railties4>=0:www/rubygem-railties4 \ rubygem-rotp>=2.0:devel/rubygem-rotp Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Thu Aug 11 15:13:34 2016 (r420077) +++ head/www/gitlab/Makefile Thu Aug 11 15:17:21 2016 (r420078) @@ -3,6 +3,7 @@ PORTNAME= gitlab PORTVERSION= 8.9.6 +PORTREVISiON= 1 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -25,7 +26,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-sprockets3>=3.6:devel/rubygem-sprockets3 \ rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \ rubygem-pg>=0.18.2:databases/rubygem-pg \ - rubygem-devise-rails4>=4.0:devel/rubygem-devise-rails4 \ + rubygem-devise>=4.0:devel/rubygem-devise \ rubygem-doorkeeper>=3.1:security/rubygem-doorkeeper \ rubygem-omniauth>=1.3.1:security/rubygem-omniauth \ rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608111517.u7BFHLSY050963>