5 files changed, 72 insertions, 56 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 0f4bbb2c8ee2..6074b98f3dac 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2597,6 +2597,7 @@
     SUBDIR += rubygem-validatable
     SUBDIR += rubygem-warbler
     SUBDIR += rubygem-zentest
+    SUBDIR += rubygem-zoom
     SUBDIR += rudeconfig
     SUBDIR += rudiments
     SUBDIR += rvi
diff --git a/devel/rubygem-zoom/Makefile b/devel/rubygem-zoom/Makefile
index 8d6d3e8841fb..d928ba734714 100644
--- a/devel/rubygem-zoom/Makefile
+++ b/devel/rubygem-zoom/Makefile
@@ -6,14 +6,10 @@
 #
 
 PORTNAME=	zoom
-PORTVERSION=	0.2.0
-PORTREVISION=	1
-CATEGORIES=	devel ruby
-MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+PORTVERSION=	0.4.1
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
-DIST_SUBDIR=	ruby
 
 MAINTAINER=	mitsuru@riken.jp
 COMMENT=	A Ruby binding to the Z39.50 Object-Orientation Model (ZOOM)
@@ -21,26 +17,8 @@ COMMENT=	A Ruby binding to the Z39.50 Object-Orientation Model (ZOOM)
 LIB_DEPENDS=	yaz.3:${PORTSDIR}/net/yaz
 
 USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
+USE_RUBYGEMS=	yes
 
-DOCS=		ChangeLog README doc/ascii/api.txt doc/xhtml/*
+CONFIGURE_ARGS+=	--with-opt-dir="${LOCALBASE}"
 
-RUBY_REQUIRE=	Ruby > 180
-
-.include <bsd.port.pre.mk>
-
-.if !defined(RUBY_PROVIDED)
-IGNORE=		only works with Ruby 1.8.0 or later
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-zoom/distinfo b/devel/rubygem-zoom/distinfo
index 404a0a3dcae9..32e3dad7ea62 100644
--- a/devel/rubygem-zoom/distinfo
+++ b/devel/rubygem-zoom/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-zoom-0.2.0.tar.gz) = ef85f8aa8a78666fdd46c95d91a23e7c
-SHA256 (ruby/ruby-zoom-0.2.0.tar.gz) = 364bf3abd0074142bc60a852a76b29fe0915bb1ce6250c7a39a0e55a8c4c7974
-SIZE (ruby/ruby-zoom-0.2.0.tar.gz) = 24168
+MD5 (rubygem/zoom-0.4.1.gem) = 8f061f41f607dede2f26d7055b5cd3ac
+SHA256 (rubygem/zoom-0.4.1.gem) = 54d469d16100b9f03b9ccc2ca008900f89c6b262d04dd383c8276db1d44061d2
+SIZE (rubygem/zoom-0.4.1.gem) = 23552
diff --git a/devel/rubygem-zoom/files/patch-extconf.rb b/devel/rubygem-zoom/files/patch-extconf.rb
deleted file mode 100644
index 9f06853a3e5c..000000000000
--- a/devel/rubygem-zoom/files/patch-extconf.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- extconf.rb.org	Fri Sep  2 20:18:20 2005
-+++ extconf.rb	Fri Sep  2 20:38:41 2005
-@@ -9,6 +9,6 @@
- err "Yaz ZOOM header not available" unless have_header("yaz/zoom.h")
- 
- $CFLAGS << " #{`yaz-config --cflags`} "
--$LDFLAGS << " #{`yaz-config --libs`} "
-+$LDFLAGS << " #{`yaz-config --libs`}".chomp
- 
- create_makefile("zoom", "src")
diff --git a/devel/rubygem-zoom/pkg-plist b/devel/rubygem-zoom/pkg-plist
index b5b220a900a3..26f249e28085 100644
--- a/devel/rubygem-zoom/pkg-plist
+++ b/devel/rubygem-zoom/pkg-plist
@@ -1,15 +1,62 @@
-%%RUBY_SITEARCHLIBDIR%%/zoom.so
-%%RUBY_SITELIBDIR%%/marc.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/api.txt
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/api.xml
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ch01.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ch02.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ch03.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ch04.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/docbook.css
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/hello.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%GEM_CACHE%%
+%%GEM_LIB_DIR%%/src/rbzoomquery.c
+%%GEM_LIB_DIR%%/src/rbzoomresultset.c
+%%GEM_LIB_DIR%%/src/rbzoomoptions.c
+%%GEM_LIB_DIR%%/src/rbzoompackage.c
+%%GEM_LIB_DIR%%/src/rbzoomrecord.c
+%%GEM_LIB_DIR%%/src/rbzoom.c
+%%GEM_LIB_DIR%%/src/rbzoomconnection.c
+%%GEM_LIB_DIR%%/src/rbzoom.h
+%%GEM_LIB_DIR%%/src/extconf.rb
+%%GEM_LIB_DIR%%/src/mkmf.log
+%%GEM_LIB_DIR%%/src/Makefile
+%%GEM_LIB_DIR%%/src/rbzoomquery.o
+%%GEM_LIB_DIR%%/src/rbzoomresultset.o
+%%GEM_LIB_DIR%%/src/rbzoomoptions.o
+%%GEM_LIB_DIR%%/src/rbzoompackage.o
+%%GEM_LIB_DIR%%/src/rbzoomrecord.o
+%%GEM_LIB_DIR%%/src/rbzoom.o
+%%GEM_LIB_DIR%%/src/rbzoomconnection.o
+%%GEM_LIB_DIR%%/src/zoom.so
+%%GEM_LIB_DIR%%/test/record.dat
+%%GEM_LIB_DIR%%/test/search_test.rb
+%%GEM_LIB_DIR%%/test/search_batch_test.rb
+%%GEM_LIB_DIR%%/test/thread_test.rb
+%%GEM_LIB_DIR%%/test/package_live.rb
+%%GEM_LIB_DIR%%/test/package_test.rb
+%%GEM_LIB_DIR%%/test/record.txt
+%%GEM_LIB_DIR%%/test/record-update.xml
+%%GEM_LIB_DIR%%/test/record.xml
+%%GEM_LIB_DIR%%/test/zebra/zebra.cfg
+%%GEM_LIB_DIR%%/test/zebra/records/programming_ruby.xml
+%%GEM_LIB_DIR%%/test/zebra/records/programming_ruby_update.xml
+%%GEM_LIB_DIR%%/test/zebra/register/empty_file
+%%GEM_LIB_DIR%%/test/zebra/shadow/empty_file
+%%GEM_LIB_DIR%%/test/zebra/tab/string.chr
+%%GEM_LIB_DIR%%/test/zebra/tab/record.abs
+%%GEM_LIB_DIR%%/test/zebra/tab/bib1.att
+%%GEM_LIB_DIR%%/test/zebra/tab/default.idx
+%%GEM_LIB_DIR%%/test/zebra/tab/usmarc.mar
+%%GEM_LIB_DIR%%/test/zebra/tab/numeric.chr
+%%GEM_LIB_DIR%%/test/zebra/key/empty_file
+%%GEM_LIB_DIR%%/test/zebra/lock/empty_file
+%%GEM_LIB_DIR%%/sample/hello.rb
+%%GEM_LIB_DIR%%/sample/needle.rb
+%%GEM_LIB_DIR%%/README
+%%GEM_LIB_DIR%%/ChangeLog
+%%GEM_LIB_DIR%%/Rakefile
+%%GEM_LIB_DIR%%/lib/zoom.so
+%%GEM_SPEC%%
+@dirrm %%GEM_LIB_DIR%%/src
+@dirrm %%GEM_LIB_DIR%%/test/zebra/records
+@dirrm %%GEM_LIB_DIR%%/test/zebra/register
+@dirrm %%GEM_LIB_DIR%%/test/zebra/shadow
+@dirrm %%GEM_LIB_DIR%%/test/zebra/tab
+@dirrm %%GEM_LIB_DIR%%/test/zebra/key
+@dirrm %%GEM_LIB_DIR%%/test/zebra/lock
+@dirrm %%GEM_LIB_DIR%%/test/zebra
+@dirrm %%GEM_LIB_DIR%%/test
+@dirrm %%GEM_LIB_DIR%%/sample
+@dirrm %%GEM_LIB_DIR%%/lib
+@dirrm %%GEM_LIB_DIR%%
+@dirrm %%GEM_DOC_DIR%%
\ No newline at end of file