Added databases/postgresql84

4 files changed, 29 insertions, 7 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 2b8b0076121..59aa94c9722 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.302 2009/07/07 17:30:18 sno Exp $
+# $NetBSD: Makefile,v 1.303 2009/07/29 06:33:03 adam Exp $
 #
 
 COMMENT=	Databases
@@ -212,6 +212,13 @@ SUBDIR+=	postgresql83-plperl
 SUBDIR+=	postgresql83-plpython
 SUBDIR+=	postgresql83-pltcl
 SUBDIR+=	postgresql83-server
+SUBDIR+=	postgresql84
+SUBDIR+=	postgresql84-adminpack
+SUBDIR+=	postgresql84-client
+SUBDIR+=	postgresql84-plperl
+SUBDIR+=	postgresql84-plpython
+SUBDIR+=	postgresql84-pltcl
+SUBDIR+=	postgresql84-server
 SUBDIR+=	pxtools
 SUBDIR+=	py-IndexedCatalog
 SUBDIR+=	py-PgSQL
diff --git a/doc/CHANGES-2009 b/doc/CHANGES-2009
index aa4fcec8cf7..2fac27bc66a 100644
--- a/doc/CHANGES-2009
+++ b/doc/CHANGES-2009
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.2873 2009/07/28 21:35:28 seb Exp $
+$NetBSD: CHANGES-2009,v 1.2874 2009/07/29 06:36:59 adam Exp $
 
 Changes to the packages collection and infrastructure in 2009:
 
@@ -3815,3 +3815,10 @@ Changes to the packages collection and infrastructure in 2009:
 	Updated textproc/db2latex to 0.8pre1nb6 [minskim 2009-07-28]
 	Updated www/wordpress to 2.8.2 [adrianp 2009-07-28]
 	Added devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion version 0.01 [seb 2009-07-28]
+	Added databases/postgresql84 version 8.4.0 [adam 2009-07-29]
+	Added databases/postgresql84-client version 8.4.0 [adam 2009-07-29]
+	Added databases/postgresql84-server version 8.4.0 [adam 2009-07-29]
+	Added databases/postgresql84-adminpack version 8.4.0 [adam 2009-07-29]
+	Added databases/postgresql84-plperl version 8.4.0 [adam 2009-07-29]
+	Added databases/postgresql84-plpython version 8.4.0 [adam 2009-07-29]
+	Added databases/postgresql84-pltcl version 8.4.0 [adam 2009-07-29]
diff --git a/doc/TODO b/doc/TODO
index cff8c22f131..216c93b38b4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.8296 2009/07/27 13:03:28 obache Exp $
+$NetBSD: TODO,v 1.8297 2009/07/29 06:36:59 adam Exp $
 
 Suggested new packages
 ======================
@@ -1056,7 +1056,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o poppy-4.01
 	o posh-0.5.5
 	o postal-0.70
-	o postgresql-8.4.0
 	o powermanga-0.90
 	o pptp-1.7.1 [pkg/38038]
 	o prelude-correlator-0.9.0beta6 [pkg/41763]
diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk
index c237f910ea9..09c2c1e9b14 100644
--- a/mk/pgsql.buildlink3.mk
+++ b/mk/pgsql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.25 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.26 2009/07/29 06:33:03 adam Exp $
 #
 # User-settable variables:
 #
@@ -26,7 +26,7 @@ _SYS_VARS.pgsql=	PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR
 .include "../../mk/bsd.prefs.mk"
 
 PGSQL_VERSION_DEFAULT?=		82
-PGSQL_VERSIONS_ACCEPTED?=	83 82 81
+PGSQL_VERSIONS_ACCEPTED?=	84 83 82 81
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -41,6 +41,9 @@ PG_LIB_EXT=so
 
 # check what is installed
 .if ${OPSYS} == "Darwin"
+.if exists(${LOCALBASE}/lib/libecpg.6.0.1.dylib)
+_PGSQL_VERSION_84_INSTALLED=	yes
+.endif
 .if exists(${LOCALBASE}/lib/libecpg.6.0.0.dylib)
 _PGSQL_VERSION_83_INSTALLED=	yes
 .endif
@@ -60,6 +63,9 @@ _PGSQL_VERSION_74_INSTALLED=	yes
 _PGSQL_VERSION_73_INSTALLED=yes
 .endif
 .else
+.if exists(${LOCALBASE}/lib/libecpg.so.6.0.1)
+_PGSQL_VERSION_84_INSTALLED=	yes
+.endif
 .if exists(${LOCALBASE}/lib/libecpg.so.6.0.0)
 _PGSQL_VERSION_83_INSTALLED=	yes
 .endif
@@ -117,7 +123,10 @@ _PGSQL_VERSION=	${_PGSQL_VERSION_FIRSTACCEPTED}
 #
 # set variables for the version we decided to use:
 #
-.if ${_PGSQL_VERSION} == "83"
+.if ${_PGSQL_VERSION} == "84"
+PGSQL_TYPE=	postgresql84-client
+PGPKGSRCDIR=	../../databases/postgresql84-client
+.elif ${_PGSQL_VERSION} == "83"
 PGSQL_TYPE=	postgresql83-client
 PGPKGSRCDIR=	../../databases/postgresql83-client
 .elif ${_PGSQL_VERSION} == "82"