4 files changed, 22 insertions, 20 deletions

diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index c363544a9bd0..90b52da5d0bb 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -6,23 +6,32 @@
 #
 
 PORTNAME=	Pg
-PORTVERSION=	1.9.0
-PORTREVISION=	1
+POSTVERSION=	7.2
 CATEGORIES=	databases perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Pg
 PKGNAMEPREFIX=	p5-
-DISTNAME=	pgsql_perl5-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	girgen@partitur.se
+
+POSTGRESQL_SUBPORT=YES
+.include <${.CURDIR}/../postgresql7/Makefile>
 
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
-PERL_CONFIGURE=	yes
-CONFIGURE_ENV=	POSTGRES_INCLUDE="${LOCALBASE}/include/pgsql -I${LOCALBASE}/pgsql/include" \
-		POSTGRES_LIB="${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib"
+USE_PERL5=	yes
+
+CONFIGURE_ARGS=	--with-perl
 
 MAN3=		Pg.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
+MAKE_ARGS+=	-C src/interfaces/perl5
+MAKEFILE=	GNUmakefile
+
+post-patch:
+	cd ${WRKSRC}/src/interfaces/perl5 ;\
+	cp GNUmakefile GNUmakefile.old ;\
+	${SED} -e 's,\$$\$$abs_libpq_builddir,${LOCALBASE}/lib,; \
+		   s,Makefile\ libpq-all,Makefile,' \
+		 < GNUmakefile.old > GNUmakefile
+
 .include <bsd.port.mk>
diff --git a/databases/p5-Pg/distinfo b/databases/p5-Pg/distinfo
deleted file mode 100644
index 720e912ab475..000000000000
--- a/databases/p5-Pg/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (pgsql_perl5-1.9.0.tar.gz) = ec20b8e1596022f8f354550147259d56
diff --git a/databases/p5-Pg/pkg-comment b/databases/p5-Pg/pkg-comment
index 396d29ada589..592115409480 100644
--- a/databases/p5-Pg/pkg-comment
+++ b/databases/p5-Pg/pkg-comment
@@ -1 +1 @@
-An interface between perl5 and the database Postgres95
+An interface for using perl5 to access PostgreSQL databases
diff --git a/databases/p5-Pg/pkg-descr b/databases/p5-Pg/pkg-descr
index babe4094dd19..9852e2e497e0 100644
--- a/databases/p5-Pg/pkg-descr
+++ b/databases/p5-Pg/pkg-descr
@@ -1,11 +1,5 @@
-This is version 1.2.0 of pg95perl5.
+This is an API for using Perl5 to access PostgreSQL databases.
 
-Pg95perl5 is an interface between Larry Wall's language perl version 5 and
-the database Postgres95. This has been done by using the Perl 5 application
-program- ming interface for C extensions which calls the Postgres
-programmer's interface LIBQ.
+This software is part of the standard PostgreSQL distribution.
 
-Pg95perl5 is based on the pgperl package from Igor Metz and Robert Withrow.
-Because the perl interface changed, this interface has been rewritten
-following the guidelines from the perlapi manpage. Also the test script
-has been adapted to SQL, which has replaced the query language POSTQUEL.
+WWW: http://www.postgresql.org/