4 files changed, 40 insertions, 4 deletions

diff --git a/textproc/rubygem-nokogiri14/Makefile b/textproc/rubygem-nokogiri14/Makefile
index e0f7db3d4e28..6a5a0510e6ed 100644
--- a/textproc/rubygem-nokogiri14/Makefile
+++ b/textproc/rubygem-nokogiri14/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	nokogiri
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.7
 PKGNAMESUFFIX=	14
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
@@ -19,6 +19,12 @@ USE_GNOME=	libxml2 libxslt
 USES=		pkgconfig
 CONFIGURE_ARGS=	--use-system-libraries	
 
-# Don't install bin/nokogiri
+PLIST_FILES=	bin/nokogiri14
+
+PORTSCOUT=	ignore
+
+post-patch:
+	@${MV} ${WRKSRC}/bin/nokogiri ${WRKSRC}/bin/nokogiri14
+	@${RM} ${WRKSRC}/bin/nokogiri.orig
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-nokogiri14/distinfo b/textproc/rubygem-nokogiri14/distinfo
index 43a36b82bb88..ee6c226f785a 100644
--- a/textproc/rubygem-nokogiri14/distinfo
+++ b/textproc/rubygem-nokogiri14/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/nokogiri-1.4.0.gem) = 89ed690aa46e80b0a3d39f66ec4359f5acefc97a11a867539c2f4147d743b7f3
-SIZE (rubygem/nokogiri-1.4.0.gem) = 165376
+SHA256 (rubygem/nokogiri-1.4.7.gem) = 6e5f5995fd977c0847957712a5f1ab6b804a59445aa9dc9c5873152ea210e7c9
+SIZE (rubygem/nokogiri-1.4.7.gem) = 203776
diff --git a/textproc/rubygem-nokogiri14/files/patch-bin__nokogiri b/textproc/rubygem-nokogiri14/files/patch-bin__nokogiri
new file mode 100644
index 000000000000..e0d167a0c55d
--- /dev/null
+++ b/textproc/rubygem-nokogiri14/files/patch-bin__nokogiri
@@ -0,0 +1,10 @@
+--- bin/nokogiri.orig	2014-08-26 20:46:38.000000000 +0000
++++ bin/nokogiri	2014-08-26 20:46:30.000000000 +0000
+@@ -4,6 +4,7 @@
+ require 'irb'
+ require 'uri'
+ require 'rubygems'
++gem 'nokogiri', '~> 1.4'
+ require 'nokogiri'
+ 
+ parse_class = Nokogiri
diff --git a/textproc/rubygem-nokogiri14/files/patch-gemspec b/textproc/rubygem-nokogiri14/files/patch-gemspec
new file mode 100644
index 000000000000..c3344ade0319
--- /dev/null
+++ b/textproc/rubygem-nokogiri14/files/patch-gemspec
@@ -0,0 +1,20 @@
+--- nokogiri-1.4.7.gemspec.orig	2014-08-26 20:40:15.000000000 +0000
++++ nokogiri-1.4.7.gemspec	2014-08-26 20:40:32.000000000 +0000
+@@ -77,7 +77,7 @@
+ - aaronp@rubyforge.org
+ - mike.dalessio@gmail.com
+ executables: 
+-- nokogiri
++- nokogiri14
+ extensions: 
+ - ext/nokogiri/extconf.rb
+ extra_rdoc_files: 
+@@ -128,7 +128,7 @@
+ - README.ja.rdoc
+ - README.rdoc
+ - Rakefile
+-- bin/nokogiri
++- bin/nokogiri14
+ - ext/nokogiri/depend
+ - ext/nokogiri/extconf.rb
+ - ext/nokogiri/html_document.c