diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 7657b9f886ff..3a299072e31d 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -1,78 +1,70 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 
 PORTNAME=	bdb
 PORTVERSION=	0.6.6
 PORTREVISION=	8
 CATEGORIES=	databases ruby
 MASTER_SITES=	ftp://ftp.idaemons.org/pub/distfiles/ruby/ \
 		http://idaemons.org/distfiles/ruby/ \
 		LOCAL/knu
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to Oracle Berkeley DB revision 2 or later
 
 LICENSE=	RUBY
 
-BUILD_DEPENDS=	rubygem-rdoc>=0.a:devel/rubygem-rdoc
+BROKEN_RUBY32=	yes
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+BUILD_DEPENDS=	rubygem-rdoc>=0.a:devel/rubygem-rdoc
 
 USES=		bdb shebangfix tar:bzip2
-USE_RUBY=		yes
+USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-ALL_TARGET=	all rdoc
+SHEBANG_FILES=	examples/basic.rb examples/cats.rb examples/cursor.rb \
+		examples/func.rb examples/join.rb examples/lock.rb \
+		examples/log.rb examples/queue.rb examples/recno.rb \
+		examples/record.rb examples/replication/base/b.rb \
+		examples/replication/base/cl.rb examples/replication/base/ma.rb \
+		examples/replication/base/mc.rb examples/replication/base/op.rb \
+		examples/replication/mgr/b.rb examples/txn.rb examples/zeroc.rb
+
 CONFIGURE_ARGS=	--with-db-include=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR}
-INSTALL_TARGET=	site-install
 MAKE_ENV=	RUBY_RDOC=${LOCALBASE}/bin/rdoc
+ALL_TARGET=	all rdoc
+INSTALL_TARGET=	site-install
 
 DOCS=		Changes README.en bdb.rd docs/*.rd
 DOCSDIR=	${RUBY_MODDOCDIR}
 EXAMPLESDIR=	${RUBY_MODEXAMPLESDIR}
 SHAREMODE=	0644
-PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/bdb.so
+PLIST_FILES=	${RUBY_SITEARCHLIBDIR}/bdb.so
 PORTDOCS=	*
 PORTEXAMPLES=	*
-SHEBANG_FILES=	examples/record.rb \
-		examples/recno.rb \
-		examples/zeroc.rb \
-		examples/txn.rb \
-		examples/queue.rb \
-		examples/cats.rb \
-		examples/log.rb \
-		examples/cursor.rb \
-		examples/func.rb \
-		examples/replication/mgr/b.rb \
-		examples/replication/base/op.rb \
-		examples/replication/base/cl.rb \
-		examples/replication/base/b.rb \
-		examples/replication/base/ma.rb \
-		examples/replication/base/mc.rb \
-		examples/join.rb \
-		examples/basic.rb \
-		examples/lock.rb
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${RM} ${WRKSRC}/docs/*.orig
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/bdb.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc)
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -empty")
 
 do-test:
 	@${MKDIR} ${BUILD_WRKSRC}/tmp
 	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 
 .include <bsd.port.mk>