2 files changed, 28 insertions, 32 deletions

diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile
index 2f4b249dd12d..50644b55f78e 100644
--- a/databases/rubygem-postgres/Makefile
+++ b/databases/rubygem-postgres/Makefile
@@ -9,43 +9,39 @@ PORTNAME=	postgres
 PORTVERSION=	0.6.1
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://webclub.kcom.ne.jp/mb/noborus/archive/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_ARGS+= --with-pgsql-include-dir="${PGDIR}/include" \
 		--with-pgsql-lib-dir="${PGDIR}/lib"
-PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${PREFIX}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+INSTALL_TARGET=	site-install
 
 PGDIR?=		${PREFIX}/pgsql
 
 DOCS_EN=	ChangeLog README doc/postgres.html
 DOCS_JA=	README.jp doc/postgres.jp.html
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/postgres
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby/postgres/
-	${MKDIR} ${PREFIX}/share/doc/ruby/postgres/ja
+	${MKDIR} ${RUBY_EXAMPLESDIR}/postgres
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/postgres/
+	${MKDIR} ${RUBY_DOCDIR}/postgres/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/postgres/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/postgres/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/postgres/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/postgres/ja/
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/databases/rubygem-postgres/pkg-plist b/databases/rubygem-postgres/pkg-plist
index 1c2ff3302e4e..46be5927c06a 100644
--- a/databases/rubygem-postgres/pkg-plist
+++ b/databases/rubygem-postgres/pkg-plist
@@ -1,15 +1,15 @@
-lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/postgres.so
-share/examples/ruby/postgres/losample.rb
-share/examples/ruby/postgres/psql.rb
-share/examples/ruby/postgres/psqlHelp.rb
-share/examples/ruby/postgres/test1.rb
-share/examples/ruby/postgres/test2.rb
-share/examples/ruby/postgres/test4.rb
-@dirrm share/examples/ruby/postgres
-share/doc/ruby/postgres/ChangeLog
-share/doc/ruby/postgres/README
-share/doc/ruby/postgres/postgres.html
-share/doc/ruby/postgres/ja/README.jp
-share/doc/ruby/postgres/ja/postgres.jp.html
-@dirrm share/doc/ruby/postgres/ja
-@dirrm share/doc/ruby/postgres
+%%RUBY_SITEARCHLIBDIR%%/postgres.so
+%%RUBY_EXAMPLESDIR%%/postgres/losample.rb
+%%RUBY_EXAMPLESDIR%%/postgres/psql.rb
+%%RUBY_EXAMPLESDIR%%/postgres/psqlHelp.rb
+%%RUBY_EXAMPLESDIR%%/postgres/test1.rb
+%%RUBY_EXAMPLESDIR%%/postgres/test2.rb
+%%RUBY_EXAMPLESDIR%%/postgres/test4.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/postgres
+%%RUBY_DOCDIR%%/postgres/ChangeLog
+%%RUBY_DOCDIR%%/postgres/README
+%%RUBY_DOCDIR%%/postgres/postgres.html
+%%RUBY_DOCDIR%%/postgres/ja/README.jp
+%%RUBY_DOCDIR%%/postgres/ja/postgres.jp.html
+@dirrm %%RUBY_DOCDIR%%/postgres/ja
+@dirrm %%RUBY_DOCDIR%%/postgres