11 files changed, 61 insertions, 8 deletions

diff --git a/databases/Makefile b/databases/Makefile
index e27a00682c57..6b631d5da573 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -820,6 +820,7 @@
     SUBDIR += rubygem-arel
     SUBDIR += rubygem-arel-helpers
     SUBDIR += rubygem-arel3
+    SUBDIR += rubygem-arel6
     SUBDIR += rubygem-awesome_nested_set
     SUBDIR += rubygem-bdb1
     SUBDIR += rubygem-bigrecord
@@ -856,6 +857,7 @@
     SUBDIR += rubygem-familia
     SUBDIR += rubygem-her
     SUBDIR += rubygem-hiredis
+    SUBDIR += rubygem-globalid
     SUBDIR += rubygem-jdbc-mysql
     SUBDIR += rubygem-leo_manager_client
     SUBDIR += rubygem-memcache
diff --git a/databases/rubygem-activemodel4/Makefile b/databases/rubygem-activemodel4/Makefile
index 7d931182fdff..264121aa91c7 100644
--- a/databases/rubygem-activemodel4/Makefile
+++ b/databases/rubygem-activemodel4/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activemodel
-PORTVERSION=	4.1.6
-PORTREVISION=	2
+PORTVERSION=	4.2.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	4
diff --git a/databases/rubygem-activemodel4/distinfo b/databases/rubygem-activemodel4/distinfo
index bf54662aeb98..4052ab9d9f0f 100644
--- a/databases/rubygem-activemodel4/distinfo
+++ b/databases/rubygem-activemodel4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/activemodel-4.1.6.gem) = a60fd5b3ec60031047311df66aea58360ac7aece470966899ffa7425413bbc92
-SIZE (rubygem/activemodel-4.1.6.gem) = 44544
+SHA256 (rubygem/activemodel-4.2.1.gem) = c55157de170de2c10ad2755c3fa434e7adcbe34af2526b4cf20b63feb5f8169b
+SIZE (rubygem/activemodel-4.2.1.gem) = 45568
diff --git a/databases/rubygem-activerecord4/Makefile b/databases/rubygem-activerecord4/Makefile
index efc930c7d9a7..4e81e39738fb 100644
--- a/databases/rubygem-activerecord4/Makefile
+++ b/databases/rubygem-activerecord4/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	activerecord
-PORTVERSION=	4.1.6
+PORTVERSION=	4.2.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	4
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:${PORTSDIR}/databases/rubygem-activemodel4 \
 		rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-arel>=5.0.0:${PORTSDIR}/databases/rubygem-arel
+		rubygem-arel6>=6.0.0:${PORTSDIR}/databases/rubygem-arel6
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-activerecord4/distinfo b/databases/rubygem-activerecord4/distinfo
index f611da1f8e36..8ad04ba730e3 100644
--- a/databases/rubygem-activerecord4/distinfo
+++ b/databases/rubygem-activerecord4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/activerecord-4.1.6.gem) = 87262b9e83b76ea4adaaf7941de0472eda1f1097159e2894aea7edc7d5134797
-SIZE (rubygem/activerecord-4.1.6.gem) = 314368
+SHA256 (rubygem/activerecord-4.2.1.gem) = 5febff6cb42c0fb94bb7708ad7df7f9ef6d365a27ef35c239674d651013c6cf2
+SIZE (rubygem/activerecord-4.2.1.gem) = 326144
diff --git a/databases/rubygem-arel6/Makefile b/databases/rubygem-arel6/Makefile
new file mode 100644
index 000000000000..52727edb350a
--- /dev/null
+++ b/databases/rubygem-arel6/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	arel
+PORTVERSION=	6.0.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	6
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Relational Algebra for Ruby
+
+LICENSE=	MIT
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-arel6/distinfo b/databases/rubygem-arel6/distinfo
new file mode 100644
index 000000000000..c04af6208891
--- /dev/null
+++ b/databases/rubygem-arel6/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/arel-6.0.0.gem) = 590178be44d2d6167b6e682e3b04329ad7c8425cb235fdbc1bb74491bf7596a3
+SIZE (rubygem/arel-6.0.0.gem) = 30720
diff --git a/databases/rubygem-arel6/pkg-descr b/databases/rubygem-arel6/pkg-descr
new file mode 100644
index 000000000000..fdd82a63e3de
--- /dev/null
+++ b/databases/rubygem-arel6/pkg-descr
@@ -0,0 +1,6 @@
+A toolkit for building modeling frameworks like Active Record and 
+Active Resource. Rich support for attributes, callbacks, 
+validations, observers, serialization, internationalization, 
+and testing.
+
+WWW: https://github.com/rails/arel
diff --git a/databases/rubygem-globalid/Makefile b/databases/rubygem-globalid/Makefile
new file mode 100644
index 000000000000..802aa00c5084
--- /dev/null
+++ b/databases/rubygem-globalid/Makefile
@@ -0,0 +1,21 @@
+# Created by: Johannes Meixner <xmj@chaot.net>
+# $FreeBSD$
+
+PORTNAME=	globalid
+PORTVERSION=	0.3.5
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	URIs for your models makes it easy to pass references around
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	rubygem-activesupport4>=4.1.0:${PORTSDIR}/devel/rubygem-activesupport4
+
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-globalid/distinfo b/databases/rubygem-globalid/distinfo
new file mode 100644
index 000000000000..4b1ded063ee3
--- /dev/null
+++ b/databases/rubygem-globalid/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/globalid-0.3.5.gem) = 2ab297d30094ce3168126c4dd299baab3ab261a2e04e84e2a62846f7d2aa964f
+SIZE (rubygem/globalid-0.3.5.gem) = 9728
diff --git a/databases/rubygem-globalid/pkg-descr b/databases/rubygem-globalid/pkg-descr
new file mode 100644
index 000000000000..0b5d416801b6
--- /dev/null
+++ b/databases/rubygem-globalid/pkg-descr
@@ -0,0 +1,3 @@
+URIs for your models makes it easy to pass references around.
+
+WWW: https://rubygems.org/gems/globalid