- This updates ruby-postgres to the latest version: 0.7.1.2006.04.06.

  This offers greatly improved performance and compatibility.

The Makefile has been revamped to use RubyGems instead of a plain tarball.
The RubyGem packaging is the preferred method of distribution, and simplifies
the Makefile.

PR:		ports/114048
Submitted by:	Roderick van Domburg <r dot s dot a dot vandomburg_AT_nedforce dot nl>

3 files changed, 197 insertions, 47 deletions

diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile
index 4821b591053a..681c9d17e17f 100644
--- a/databases/rubygem-postgres/Makefile
+++ b/databases/rubygem-postgres/Makefile
@@ -5,39 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	postgres
-PORTVERSION=	0.7.1
-PORTREVISION=	2
-CATEGORIES=	databases ruby
-MASTER_SITES=	http://ruby.scripting.ca/postgres/archive/
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
-DIST_SUBDIR=	ruby
+PORTNAME=	ruby-postgres
+PORTVERSION=	0.7.1.2006.04.06
+CATEGORIES=	databases rubygems
+MASTER_SITES=   ${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=     ${PORTNAME}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ruby interface to PostgreSQL library
 
 USE_PGSQL=	yes
-USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
 
-CONFIGURE_ARGS=	--with-pgsql-include-dir="${LOCALBASE}/include"
-INSTALL_TARGET=	site-install
+PG_CONFIG=	${LOCALBASE}/bin/pg_config
+CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
+		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
 
-DOCS_EN=	ChangeLog README doc/postgres.html
-DOCS_JA=	README.ja doc/postgres.jp.html
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
-.endfor
-.endif
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
+.include <bsd.port.post.mk>
diff --git a/databases/rubygem-postgres/distinfo b/databases/rubygem-postgres/distinfo
index af78e2a2bad6..b2a0056b4a6f 100644
--- a/databases/rubygem-postgres/distinfo
+++ b/databases/rubygem-postgres/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-postgres-0.7.1.tar.gz) = 8ef67b3f4b089248f0420baeb0e3b3c8
-SHA256 (ruby/ruby-postgres-0.7.1.tar.gz) = 78b875f6632dd89ecaab22c264e4c99f7742c8ca6100b380b01e2f65221b80d1
-SIZE (ruby/ruby-postgres-0.7.1.tar.gz) = 29256
+MD5 (rubygem/ruby-postgres-0.7.1.2006.04.06.gem) = 810ccd6684e93c25ed7281d4f96b3839
+SHA256 (rubygem/ruby-postgres-0.7.1.2006.04.06.gem) = 13f27bf37fe8c98c8775bc28225025996e0f72afb5fc574cd3fd8d0f6bf1b887
+SIZE (rubygem/ruby-postgres-0.7.1.2006.04.06.gem) = 46592
diff --git a/databases/rubygem-postgres/pkg-plist b/databases/rubygem-postgres/pkg-plist
index 1535649e3bc3..73bea32174d7 100644
--- a/databases/rubygem-postgres/pkg-plist
+++ b/databases/rubygem-postgres/pkg-plist
@@ -1,15 +1,183 @@
-%%RUBY_SITEARCHLIBDIR%%/postgres.so
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/losample.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/psql.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/psqlHelp.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test4.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/postgres.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/postgres.jp.html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%GEM_CACHE%%
+%%GEM_DOC_DIR%%/rdoc/classes/PGError.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000048.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000049.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000050.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000051.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000052.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000054.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000055.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000056.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000057.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000058.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000059.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000060.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000061.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000062.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000063.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000064.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000065.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000066.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000067.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000068.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000069.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000070.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000071.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000072.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000073.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000074.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000075.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000076.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000077.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000078.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000079.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000080.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000081.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000082.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000083.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000084.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000085.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000086.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000087.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000088.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGconn.src/M000089.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000096.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000097.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000098.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000099.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000100.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000101.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000102.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000103.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000104.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src/M000105.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000106.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000107.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000108.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000109.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000110.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000111.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000112.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000113.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000114.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000115.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000116.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000117.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000118.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000119.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000120.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000121.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000122.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000123.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGresult.src/M000124.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000032.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000033.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000034.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000035.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000036.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000037.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000038.html
+%%GEM_DOC_DIR%%/rdoc/classes/PGrow.src/M000039.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src/M000040.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src/M000041.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src/M000042.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src/M000043.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src/M000044.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src/M000045.html
+%%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src/M000046.html
+%%GEM_DOC_DIR%%/rdoc/created.rid
+%%GEM_DOC_DIR%%/rdoc/files/extconf_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/extconf_rb.src/M000001.html
+%%GEM_DOC_DIR%%/rdoc/files/extconf_rb.src/M000002.html
+%%GEM_DOC_DIR%%/rdoc/files/extconf_rb.src/M000003.html
+%%GEM_DOC_DIR%%/rdoc/files/libpq-compat_c.html
+%%GEM_DOC_DIR%%/rdoc/files/postgres_c.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/losample_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/losample_rb.src/M000004.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psqlHelp_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000008.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000009.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000010.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000011.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000012.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000013.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000014.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000015.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000016.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000017.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000018.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000019.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000020.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000021.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000022.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000023.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000024.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000025.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000026.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000027.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000028.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000029.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src/M000030.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/test1_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/test1_rb.src/M000007.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/test2_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/test2_rb.src/M000006.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/test4_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/sample/test4_rb.src/M000005.html
+%%GEM_DOC_DIR%%/rdoc/files/tests/tc_postgres_rb.html
+%%GEM_DOC_DIR%%/rdoc/fr_class_index.html
+%%GEM_DOC_DIR%%/rdoc/fr_file_index.html
+%%GEM_DOC_DIR%%/rdoc/fr_method_index.html
+%%GEM_DOC_DIR%%/rdoc/index.html
+%%GEM_DOC_DIR%%/rdoc/rdoc-style.css
+%%GEM_LIB_DIR%%/ChangeLog
+%%GEM_LIB_DIR%%/Contributors
+%%GEM_LIB_DIR%%/MANIFEST
+%%GEM_LIB_DIR%%/Makefile
+%%GEM_LIB_DIR%%/README
+%%GEM_LIB_DIR%%/README.ja
+%%GEM_LIB_DIR%%/doc/postgres.html
+%%GEM_LIB_DIR%%/doc/postgres.jp.html
+%%GEM_LIB_DIR%%/extconf.rb
+%%GEM_LIB_DIR%%/libpq-compat.c
+%%GEM_LIB_DIR%%/mkmf.log
+%%GEM_LIB_DIR%%/postgres.c
+%%GEM_LIB_DIR%%/postgres.o
+%%GEM_LIB_DIR%%/postgres.so
+%%GEM_LIB_DIR%%/ruby-postgres.gemspec
+%%GEM_LIB_DIR%%/sample/losample.rb
+%%GEM_LIB_DIR%%/sample/psql.rb
+%%GEM_LIB_DIR%%/sample/psqlHelp.rb
+%%GEM_LIB_DIR%%/sample/test1.rb
+%%GEM_LIB_DIR%%/sample/test2.rb
+%%GEM_LIB_DIR%%/sample/test4.rb
+%%GEM_LIB_DIR%%/tests/tc_postgres.rb
+%%GEM_LIB_DIR%%/type-oids.h
+%%GEM_SPEC%%
+@dirrm %%GEM_LIB_DIR%%/tests
+@dirrm %%GEM_LIB_DIR%%/sample
+@dirrm %%GEM_LIB_DIR%%/doc
+@dirrm %%GEM_LIB_DIR%%
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/tests
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/sample/test4_rb.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/sample/test2_rb.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/sample/test1_rb.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/sample/psql_rb.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/sample/losample_rb.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/sample
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/extconf_rb.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/files
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/PostgresTestCase.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/PGrow.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/PGresult.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/PGlarge.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/PGconn.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes
+@dirrm %%GEM_DOC_DIR%%/rdoc
+@dirrm %%GEM_DOC_DIR%%