3 files changed, 6 insertions, 27 deletions
diff --git a/japanese/ruby-eb/Makefile b/japanese/ruby-eb/Makefile
index 020502db911a..fe0bcea56ed1 100644
--- a/japanese/ruby-eb/Makefile
+++ b/japanese/ruby-eb/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	eb
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	japanese ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ruby${PORTNAME}
-DISTNAME=	ruby-${PORTNAME}${PORTVERSION}
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+#MASTER_SITE_SUBDIR=	ruby${PORTNAME}
+MASTER_SITES=	http://ruby${PORTNAME}.sourceforge.net/
+DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -20,7 +21,6 @@ LIB_DEPENDS=	eb.6:${PORTSDIR}/japanese/eb
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-NO_WRKSUBDIR=	yes
 INSTALL_TARGET=	site-install
 
 EXAMPLES=	hook2.rb test.rb
diff --git a/japanese/ruby-eb/distinfo b/japanese/ruby-eb/distinfo
index 8688e34b1e25..bd3c913d6888 100644
--- a/japanese/ruby-eb/distinfo
+++ b/japanese/ruby-eb/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-eb2.1.tar.gz) = 90f000540fca38f3d2e816a249a3e652
+MD5 (ruby/rubyeb-2.2.tar.gz) = 4490dad19936418b059cc50e4f998581
diff --git a/japanese/ruby-eb/files/patch-eb.c b/japanese/ruby-eb/files/patch-eb.c
deleted file mode 100644
index c17c85797291..000000000000
--- a/japanese/ruby-eb/files/patch-eb.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- eb.c.orig	Wed Jan 22 23:26:46 2003
-+++ eb.c	Thu Jan 23 05:22:13 2003
-@@ -1407,18 +1407,16 @@
- 	rb_define_const(mod, "HOOK_END_MONO_GRAPHIC", INT2FIX(EB_HOOK_END_MONO_GRAPHIC));
- 
- 	rb_define_const(mod, "HOOK_BEGIN_GRAY_GRAPHIC", INT2FIX(EB_HOOK_BEGIN_GRAY_GRAPHIC));
- 	rb_define_const(mod, "HOOK_END_GRAY_GRAPHIC", INT2FIX(EB_HOOK_END_GRAY_GRAPHIC));
- 
- 	rb_define_const(mod, "HOOK_BEGIN_COLOR_BMP", INT2FIX(EB_HOOK_BEGIN_COLOR_BMP));
- 	rb_define_const(mod, "HOOK_BEGIN_COLOR_JPEG", INT2FIX(EB_HOOK_BEGIN_COLOR_JPEG));
-  	rb_define_const(mod, "HOOK_END_COLOR_GRAPHIC", INT2FIX(EB_HOOK_END_COLOR_GRAPHIC));
--	rb_define_const(mod, "HOOK_BEGIN_IN_COLOR_BMP", INT2FIX(EB_HOOK_BEGIN_IN_COLOR_BMP));
--	rb_define_const(mod, "HOOK_BEGIN_IN_COLOR_JPEG", INT2FIX(EB_HOOK_BEGIN_IN_COLOR_JPEG));
-  	rb_define_const(mod, "HOOK_END_IN_COLOR_GRAPHIC", INT2FIX(EB_HOOK_END_COLOR_GRAPHIC));
- 
- #if	EB_VERSION_MAJOR==3 && EB_VERSION_MINOR < 2
- 	rb_define_const(mod, "HOOK_STOP_CODE", INT2FIX(EB_HOOK_STOP_CODE));
- 
- 	rb_define_const(mod, "HOOK_BEGIN_IN_COLOR_BMP", INT2FIX(EB_HOOK_BEGIN_IN_COLOR_BMP));
- 	rb_define_const(mod, "HOOK_BEGIN_IN_COLOR_JPEG", INT2FIX(EB_HOOK_BEGIN_IN_COLOR_JPEG));
- #else