4 files changed, 13 insertions, 124 deletions

diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile
index a55c6e538442..2f94d9d7e6d4 100644
--- a/databases/postgresql-plruby/Makefile
+++ b/databases/postgresql-plruby/Makefile
@@ -1,4 +1,4 @@
-ftp://moulon.inra.fr/pub/ruby/# New ports collection makefile for:	PL/Ruby
+# New ports collection makefile for:	PL/Ruby
 # Date created:		28 June 2001
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
@@ -6,24 +6,20 @@ ftp://moulon.inra.fr/pub/ruby/# New ports collection makefile for:	PL/Ruby
 #
 
 PORTNAME=	plruby
-PORTVERSION=	0.5.3
-PORTREVISION=	2
+PORTVERSION=	0.5.4
 CATEGORIES=	databases ruby
-MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	RF/${PORTNAME} \
+		ftp://ftp.iDaemons.org/pub/distfiles/
 PKGNAMEPREFIX=	postgresql-
 DIST_SUBDIR=	ruby
 
-PATCHFILES=	3b3cc0786b0814eaa792cec65cedd54e1e43e9bd.diff
-PATCH_SITES=	http://github.com/knu/postgresql-plruby/commit/
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	PL/Ruby procedural language for the PostgreSQL database system
 
 BUILD_DEPENDS=	postgres:${PORTSDIR}/${POSTGRESQL_PORT}
 RUN_DEPENDS=	postgres:${PORTSDIR}/${POSTGRESQL_PORT}
 
+USE_BZIP2=	yes
 USE_PGSQL=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
@@ -33,10 +29,8 @@ POSTGRESQL_PORT?=	databases/postgresql${PGSQL_VER}-server
 PGSQL_PORTDIR?=		${PORTSDIR}/${POSTGRESQL_PORT}
 PGSQL_WRKSRC_CMD=	cd ${PGSQL_PORTDIR} && ${MAKE} -V WRKSRC
 
-CONFIGURE_ARGS=		--with-pgsql-version="${PGSQL_VER}" \
-			--with-pgsql-srcinc="`${PGSQL_WRKSRC_CMD}`/src/include" \
-			--with-pgsql-include="${LOCALBASE}/include" \
-			--with-pgsql-lib="${LOCALBASE}/lib"
+CONFIGURE_ARGS=		--with-pg-config="${LOCALBASE}/bin/pg_config" \
+			--with-pgsql-srcinc="`${PGSQL_WRKSRC_CMD}`/src/include"
 #CONFIGURE_ARGS+=	--with-safe-level=0
 #CONFIGURE_ARGS+=	--with-main-safe-level=0
 #CONFIGURE_ARGS+=	--with-timeout=30
@@ -46,13 +40,6 @@ DOCS=		Changes README.en plruby.html plruby.rd docs/doc
 
 PKGMESSAGE=	${WRKDIR}/createlang.sql
 
-post-extract:
-	${FIND} ${WRKSRC} -name '*~' -delete
-
-post-patch:
-	${RUBY} -i -pe 'gsub /test_mklang\.sql/, "../createlang.sql"' \
-		${WRKSRC}/test/*/runtest
-
 pre-configure:
 	cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch
 
@@ -64,20 +51,10 @@ post-build:
 .endif
 
 .include <bsd.port.pre.mk>
-# Setting/finding PostgreSQL version we want.
-.if exists(${LOCALBASE}/bin/postmaster)
-PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
-		${SED} -n 's/.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
-.elif exists(${LOCALBASE}/bin/pg_config)
-PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
-.else
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
-.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
-	${CP} -R ${WRKSRC}/test/* ${RUBY_MODEXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
 	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} ${DOCS} ${RUBY_MODDOCDIR}/)
diff --git a/databases/postgresql-plruby/distinfo b/databases/postgresql-plruby/distinfo
index a06db27d30b6..6ee17f78317b 100644
--- a/databases/postgresql-plruby/distinfo
+++ b/databases/postgresql-plruby/distinfo
@@ -1,6 +1,3 @@
-MD5 (ruby/plruby-0.5.3.tar.gz) = 9411bb29e1aa5521c5327e4d916de934
-SHA256 (ruby/plruby-0.5.3.tar.gz) = 3af88626078d979373ee7b169169584732310e271a1cbbe22e0d35adf2dee267
-SIZE (ruby/plruby-0.5.3.tar.gz) = 131323
-MD5 (ruby/3b3cc0786b0814eaa792cec65cedd54e1e43e9bd.diff) = 72a5ab030e54b2379aa6b35b97d29987
-SHA256 (ruby/3b3cc0786b0814eaa792cec65cedd54e1e43e9bd.diff) = b41c04257e5525359dc1baf7b2f9bd1e56a722514cd51d3d45c9f376f11b8a13
-SIZE (ruby/3b3cc0786b0814eaa792cec65cedd54e1e43e9bd.diff) = 299
+MD5 (ruby/plruby-0.5.4.tar.bz2) = 473891176b2cb24ca071955c7e0ff914
+SHA256 (ruby/plruby-0.5.4.tar.bz2) = 8ba24ea19d9e365dc8b32f28e7c287e0dfe993fc865d4ba392acf96947f03bc2
+SIZE (ruby/plruby-0.5.4.tar.bz2) = 96126
diff --git a/databases/postgresql-plruby/pkg-descr b/databases/postgresql-plruby/pkg-descr
index 4396c3ecacf5..5262a5a4bca4 100644
--- a/databases/postgresql-plruby/pkg-descr
+++ b/databases/postgresql-plruby/pkg-descr
@@ -2,5 +2,6 @@ PL/Ruby is a loadable procedural language for the PostgreSQL database
 system (7.0 or later) that enables to write functions and trigger
 procedures in Ruby.
 
-Author:	Guy Decoux <ts@moulon.inra.fr>
-WWW:	http://moulon.inra.fr/ruby/plruby.html
+Author:	Guy Decoux <ts@moulon.inra.fr> (deceased in July 2008)
+	Akinori MUSHA <knu@idaemons.org> (current maintainer)
+WWW:	http://github.com/knu/postgresql-plruby
diff --git a/databases/postgresql-plruby/pkg-plist b/databases/postgresql-plruby/pkg-plist
index 5a8936840100..7bbff7c01c7a 100644
--- a/databases/postgresql-plruby/pkg-plist
+++ b/databases/postgresql-plruby/pkg-plist
@@ -5,91 +5,5 @@
 %%RUBY_SITEARCHLIBDIR%%/plruby/plruby_geometry.so
 %%RUBY_SITEARCHLIBDIR%%/plruby/plruby_network.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/plruby
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/b.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/runtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test.expected.73
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test.expected.74
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test.expected.80
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test.expected.81
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test.expected.82
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test.expected.83
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test.out
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test_mklang.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test_queries.orig
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_bitstring/test_queries.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/b.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/runtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test.expected.73
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test.expected.74
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test.expected.80
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test.expected.81
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test.expected.82
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test.expected.83
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test.out
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test_mklang.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test_queries.orig
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_geometry/test_queries.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/b.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/runtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test.expected.73
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test.expected.74
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test.expected.80
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test.expected.81
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test.expected.82
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test.expected.83
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test.out
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test_mklang.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test_queries.orig
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/conv_network/test_queries.sql
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/createlang.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/b.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/runtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.73
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.74
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.75
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.80
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.81
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.82
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.expected.83
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test.out
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test_mklang.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test_queries.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test_setup.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plp/test_setup_new_trigger.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/b.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/runtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.73
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.74
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.75
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.80
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.81
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.82
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.expected.83
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test.out
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_mklang.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_queries.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_setup.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/plt/test_setup_new_trigger_array.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/b.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/runtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.73
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.73.orig
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.74
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.74.orig
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.75
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.75.orig
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.80
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.81
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.82
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.expected.83
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test.out
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test_mklang.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test_queries.orig
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/range/test_queries.sql
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/range
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/plt
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/plp
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/conv_network
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/conv_geometry
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/conv_bitstring
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%