5 files changed, 11 insertions, 40 deletions

diff --git a/databases/ruby-o_dbm/Makefile b/databases/ruby-o_dbm/Makefile
index 68bd073ca244..a91adb47ffff 100644
--- a/databases/ruby-o_dbm/Makefile
+++ b/databases/ruby-o_dbm/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	o_dbm
-PORTVERSION=	0.1
+PORTVERSION=	0.3.1
 CATEGORIES=	databases ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITE_SUBDIR=	contrib in.coming
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
@@ -18,15 +18,16 @@ MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 
-NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/o_dbm.rb ${RUBY_SITELIBDIR}/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/test-o_dbm.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-o_dbm/distinfo b/databases/ruby-o_dbm/distinfo
index d1701d050f31..9b3edb80a4df 100644
--- a/databases/ruby-o_dbm/distinfo
+++ b/databases/ruby-o_dbm/distinfo
@@ -1 +1 @@
-MD5 (ruby/o_dbm-0.1.tgz) = ce5afc94d583a9557e821309802c67d5
+MD5 (ruby/o_dbm-0.3.1.tgz) = 6f69ba4ec6c04d3def746c4e87a69a37
diff --git a/databases/ruby-o_dbm/files/patch-o_dbm.rb b/databases/ruby-o_dbm/files/patch-o_dbm.rb
deleted file mode 100644
index 5184499f4332..000000000000
--- a/databases/ruby-o_dbm/files/patch-o_dbm.rb
+++ /dev/null
@@ -1,28 +0,0 @@
---- o_dbm.rb.orig	Fri Dec 12 00:31:32 1997
-+++ o_dbm.rb	Fri Mar 16 18:29:28 2001
-@@ -13,5 +13,4 @@
- require "e2mmap"
- require "dbm"
--require "marshal"
- 
- class ObjectDBM
-@@ -20,7 +19,7 @@
-   extend Exception2MessageMapper
- 
--  def_exception :ErrOnlyUsableTopTransaction, "トップトランザクションでしか実行できないオペレーション(%s)を実行しようとしました."
--  def_exception :ErrOnlyUsableInTransaction, "トランザクション内でないと実行できないオペレーション(%s)を実行しようとしました."
--  def_exception :ErrMixedTransaction, "静的トランザクションと動的トランザクションを混在して利用しようとしました."
-+  def_exception :ErrOnlyUsableTopTransaction, "The operation (%s) can only be executed in the top level transaction."
-+  def_exception :ErrOnlyUsableInTransaction, "The operation (%s) can only be executed within a transaction."
-+  def_exception :ErrMixedTransaction, "Static transactions and dynamic transactions cannot be mixed together."
- 
-   include Enumerable
-@@ -401,6 +400,6 @@
- 
-     extend Exception2MessageMapper
--    def_exception :ErrNoStartedTransaction, "トランザクションが開始されていません."
--    def_exception :ErrClosedTransaction, "トランザクションはすでに終了しています."
-+    def_exception :ErrNoStartedTransaction, "Transaction is not started yet."
-+    def_exception :ErrClosedTransaction, "Transaction is closed already."
- 
-     NO_START = :ObjectDBM__TXN_NO_START
diff --git a/databases/ruby-o_dbm/files/patch-test-o_dbm.rb b/databases/ruby-o_dbm/files/patch-test-o_dbm.rb
index 7218cf85b383..864b34b66914 100644
--- a/databases/ruby-o_dbm/files/patch-test-o_dbm.rb
+++ b/databases/ruby-o_dbm/files/patch-test-o_dbm.rb
@@ -1,5 +1,5 @@
---- test-o_dbm.rb.orig	Thu Dec 11 12:54:12 1997
-+++ test-o_dbm.rb	Fri Mar 16 18:29:28 2001
+--- test-o_dbm.rb.orig	Sun Mar 18 22:16:26 2001
++++ test-o_dbm.rb	Mon Mar 19 20:33:11 2001
 @@ -15,6 +15,3 @@
  
 -$:.unshift ENV["HOME"]+"/var/lib/ruby"
@@ -8,8 +8,3 @@
 -require "./o_dbm"
 +require "o_dbm"
  
-@@ -27,3 +24,3 @@
- 
--odbm = ObjectDBM.new("odbm.test.db")
-+odbm = ObjectDBM.new("odbm.test")
- 
diff --git a/databases/ruby-o_dbm/pkg-plist b/databases/ruby-o_dbm/pkg-plist
index f7cd351d7230..72d95f2261de 100644
--- a/databases/ruby-o_dbm/pkg-plist
+++ b/databases/ruby-o_dbm/pkg-plist
@@ -1,3 +1,6 @@
 %%RUBY_SITELIBDIR%%/o_dbm.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/o_dbm/test-o_dbm.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/o_dbm
+%%PORTDOCS%%%%RUBY_DOCDIR%%/o_dbm/ja/README.jp
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/o_dbm/ja
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/o_dbm