9 files changed, 14 insertions, 12 deletions

diff --git a/MOVED b/MOVED
index ecf78107ab1e..ecb5e020a923 100644
--- a/MOVED
+++ b/MOVED
@@ -6492,3 +6492,4 @@ www/rubygem-feedzirra|www/rubygem-feedjira|2014-08-24|Has expired: Project renam
 devel/picosat|math/picosat|2014-08-25|More appropriate primary category
 devel/py-pycosat|math/py-pycosat|2014-08-25|More appropriate primary category
 games/bomns3|games/3omns|2014-08-26|Has expired: Development ceased, use 3omns
+misc/rubygem-mime-types117|misc/rubygem-mime-types1|2014-08-26|Renamed to properly reflect version
diff --git a/mail/rubygem-mail/Makefile b/mail/rubygem-mail/Makefile
index 306b418e56a7..3aaba4881f53 100644
--- a/mail/rubygem-mail/Makefile
+++ b/mail/rubygem-mail/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mail
-PORTVERSION=	2.6.1
-PORTEPOCH=	1
+PORTVERSION=	2.5.4
+PORTEPOCH=	2
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
@@ -12,7 +12,7 @@ COMMENT=	Ruby email handler
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
+RUN_DEPENDS=	rubygem-mime-types1>=1.25.1:${PORTSDIR}/misc/rubygem-mime-types1 \
 		rubygem-treetop>=1.4.8:${PORTSDIR}/devel/rubygem-treetop
 
 USE_RUBY=	yes
diff --git a/mail/rubygem-mail/distinfo b/mail/rubygem-mail/distinfo
index 2b13db40541a..897f24fe816a 100644
--- a/mail/rubygem-mail/distinfo
+++ b/mail/rubygem-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/mail-2.6.1.gem) = 1d56216c0a426f908e8726d44209dc3140b37f8b34e1653b99301e664fe1fa9d
-SIZE (rubygem/mail-2.6.1.gem) = 335872
+SHA256 (rubygem/mail-2.5.4.gem) = 446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c
+SIZE (rubygem/mail-2.5.4.gem) = 272384
diff --git a/misc/Makefile b/misc/Makefile
index 48cfe0b13bbb..2688fc48bb2f 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -398,7 +398,7 @@
     SUBDIR += rubygem-dotenv
     SUBDIR += rubygem-iesd
     SUBDIR += rubygem-mime-types
-    SUBDIR += rubygem-mime-types117
+    SUBDIR += rubygem-mime-types1
     SUBDIR += rubygem-rabbit
     SUBDIR += rubygem-vpim
     SUBDIR += rump
diff --git a/misc/rubygem-mime-types117/Makefile b/misc/rubygem-mime-types1/Makefile
index c90cd8f62051..5365faba49a2 100644
--- a/misc/rubygem-mime-types117/Makefile
+++ b/misc/rubygem-mime-types1/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	mime-types
-PKGNAMESUFFIX=	117
-PORTVERSION=	1.17.2
+PKGNAMESUFFIX=	1
+PORTVERSION=	1.25.1
 CATEGORIES=	misc rubygems
 MASTER_SITES=	RG
 
diff --git a/misc/rubygem-mime-types1/distinfo b/misc/rubygem-mime-types1/distinfo
new file mode 100644
index 000000000000..946aeecf6fa2
--- /dev/null
+++ b/misc/rubygem-mime-types1/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/mime-types-1.25.1.gem) = 88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56
+SIZE (rubygem/mime-types-1.25.1.gem) = 61440
diff --git a/misc/rubygem-mime-types117/pkg-descr b/misc/rubygem-mime-types1/pkg-descr
index 617b5a06783f..0c224f1eda45 100644
--- a/misc/rubygem-mime-types117/pkg-descr
+++ b/misc/rubygem-mime-types1/pkg-descr
@@ -1,4 +1,4 @@
 MIME::Types for Ruby originally based on and synchronized with MIME::Types
 for Perl by Mark Overmeer, copyright 2001 - 2005.
 
-WWW: http://rubygems.org/gems/mime-types117/
+WWW: http://rubygems.org/gems/mime-types/versions/1.25.1
diff --git a/misc/rubygem-mime-types117/distinfo b/misc/rubygem-mime-types117/distinfo
deleted file mode 100644
index 6f160284eff8..000000000000
--- a/misc/rubygem-mime-types117/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/mime-types-1.17.2.gem) = d768170d4fa10e8e0d1346c02df90e6255fa9cb7f6a7ba16ccd4ae6e50af9744
-SIZE (rubygem/mime-types-1.17.2.gem) = 52224
diff --git a/www/rubygem-mechanize26/Makefile b/www/rubygem-mechanize26/Makefile
index 258e3338feb8..2e3ace5f2f49 100644
--- a/www/rubygem-mechanize26/Makefile
+++ b/www/rubygem-mechanize26/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mechanize
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	26
@@ -13,7 +14,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-domain_name>=0.5.1:${PORTSDIR}/net/rubygem-domain_name \
 		rubygem-http-cookie>=1.0.0:${PORTSDIR}/www/rubygem-http-cookie \
-		rubygem-mime-types117>=0:${PORTSDIR}/misc/rubygem-mime-types117 \
+		rubygem-mime-types1>=0:${PORTSDIR}/misc/rubygem-mime-types1 \
 		rubygem-net-http-digest_auth11>=0:${PORTSDIR}/www/rubygem-net-http-digest_auth11 \
 		rubygem-net-http-persistent25>0:${PORTSDIR}/www/rubygem-net-http-persistent25 \
 		rubygem-nokogiri14>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri14 \