3 files changed, 36 insertions, 52 deletions

diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 042c0849f224..5d85f1e652b8 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bdb
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.4
 CATEGORIES=	databases ruby
 MASTER_SITES=	ftp://moulon.inra.fr/pub/ruby/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ USE_BDB=	YES
 
 CONFLICTS=	${PKGNAMEPREFIX}${PORTNAME}[2-4]*
 
-USE_RUBY=	yes
+USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes
 USE_RUBY_RDOC=		yes
 
@@ -29,32 +29,45 @@ CONFIGURE_ARGS=	--with-db-include=${BDB_INCLUDE_DIR} \
 		--with-db-version=${BDB_LIB_NAME:S/^db//}
 INSTALL_TARGET=	site-install
 
-DOCS=		Changes \
-		README.en \
-		bdb.html \
-		bdb.rd \
-		docs/*.html \
-		docs/*.rd \
-		docs/doc
-
-post-build:
-.if !defined(NOPORTDOCS)
-	cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc
-.endif
+DOCS=	Changes \
+	README.en \
+	bdb.html \
+	bdb.rd \
+	docs/*.html \
+	docs/*.rd
 
 .include <bsd.port.pre.mk>
 
+PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/bdb.so
+
+.if !defined(NOPORTDOCS)
 DOCSDIR=	${RUBY_MODDOCDIR}
 PORTDOCS=	*
+.endif
+.if !defined(NOPORTEXAMPLES)
+EXAMPLESDIR=	${RUBY_MODEXAMPLESDIR}
+PORTEXAMPLES=	*
+.endif
+
+post-build:
+.if !defined(NOPORTDOCS)
+	( cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc )
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
-	${CP} -R ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
+	${MKDIR} ${DOCSDIR}/doc
+	(cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${DOCSDIR})
+	(cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc)
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}/
+	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -empty")
 .endif
 
+regression-test:
+	( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
+	${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test )
+
 .include <bsd.port.post.mk>
diff --git a/databases/ruby-bdb/distinfo b/databases/ruby-bdb/distinfo
index ec8c0b8f33e1..09fcd507b833 100644
--- a/databases/ruby-bdb/distinfo
+++ b/databases/ruby-bdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/bdb-0.6.2.tar.gz) = 045116fb911eedb0a318b6c5221831e8
-SHA256 (ruby/bdb-0.6.2.tar.gz) = ed134ac0109a5b4d5dee0ad2c1c1e72ab326748e3509b6b688e02180b1ab65fa
-SIZE (ruby/bdb-0.6.2.tar.gz) = 304928
+MD5 (ruby/bdb-0.6.4.tar.gz) = 7fafd2490fc5fdf6b5ae09b758fddfbb
+SHA256 (ruby/bdb-0.6.4.tar.gz) = 2f380b95b6e21fdeb45078537ea70e40c22412cb2bac61f097568a8eb68acf50
+SIZE (ruby/bdb-0.6.4.tar.gz) = 304155
diff --git a/databases/ruby-bdb/pkg-plist b/databases/ruby-bdb/pkg-plist
deleted file mode 100644
index 871ccbaeab80..000000000000
--- a/databases/ruby-bdb/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/bdb.so
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cats.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/clean.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cursor.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/func.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/join.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/lock.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/log.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/queue.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/recno.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/record.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/txn.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/wordlist
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/wordtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/zeroc.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/base/b.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/base/cl.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/base/ma.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/base/mc.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/base/op.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/example
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/replication/mgr/b.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/replication/base
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/replication/mgr
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/replication
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/tmp
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/zippy
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%