Added databases/postgresql92 version 9.2.1

4 files changed, 45 insertions, 12 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 30df7c87e89..5c8370a51f1 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.408 2012/10/03 22:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.409 2012/10/05 21:09:02 adam Exp $
 #
 
 COMMENT=	Databases
@@ -280,6 +280,21 @@ SUBDIR+=	postgresql91-pltcl
 SUBDIR+=	postgresql91-replicationtools
 SUBDIR+=	postgresql91-server
 SUBDIR+=	postgresql91-upgrade
+SUBDIR+=	postgresql92
+SUBDIR+=	postgresql92-adminpack
+SUBDIR+=	postgresql92-client
+SUBDIR+=	postgresql92-datatypes
+SUBDIR+=	postgresql92-dblink
+SUBDIR+=	postgresql92-docs
+SUBDIR+=	postgresql92-fuzzystrmatch
+SUBDIR+=	postgresql92-monitoring
+SUBDIR+=	postgresql92-pgcrypto
+SUBDIR+=	postgresql92-plperl
+SUBDIR+=	postgresql92-plpython
+SUBDIR+=	postgresql92-pltcl
+SUBDIR+=	postgresql92-replicationtools
+SUBDIR+=	postgresql92-server
+SUBDIR+=	postgresql92-upgrade
 SUBDIR+=	pxtools
 SUBDIR+=	py-PgSQL
 SUBDIR+=	py-bdb-xml
diff --git a/doc/CHANGES-2012 b/doc/CHANGES-2012
index f14c5f3f5f0..b93e271d5dc 100644
--- a/doc/CHANGES-2012
+++ b/doc/CHANGES-2012
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2012,v 1.3126 2012/10/05 19:45:44 wiz Exp $
+$NetBSD: CHANGES-2012,v 1.3127 2012/10/05 21:09:02 adam Exp $
 
 Changes to the packages collection and infrastructure in 2012:
 
@@ -4812,3 +4812,18 @@ Changes to the packages collection and infrastructure in 2012:
 	Updated pkgtools/distbb to 0.45.1nb3 [cheusov 2012-10-05]
 	Updated net/Transmission to 2.71 [wiz 2012-10-05]
 	Updated net/Transmission-gui to 2.71 [wiz 2012-10-05]
+	Added databases/postgresql92 version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-client version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-server version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-docs version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-adminpack version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-datatypes version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-dblink version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-fuzzystrmatch version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-monitoring version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-pgcrypto version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-plperl version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-plpython version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-pltcl version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-replicationtools version 9.2.1 [adam 2012-10-05]
+	Added databases/postgresql92-upgrade version 9.2.1 [adam 2012-10-05]
diff --git a/doc/TODO b/doc/TODO
index bd340c71ab7..d7ba4b5e4a5 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.11564 2012/10/05 19:45:44 wiz Exp $
+$NetBSD: TODO,v 1.11565 2012/10/05 21:09:02 adam Exp $
 
 Suggested new packages
 ======================
@@ -1023,11 +1023,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html.
 	o polsms-2.1.0
 	o poppass-4.0.14
 	o poppy-4.01
-	o postgresql92-8.3.21
-	o postgresql92-8.4.13
-	o postgresql92-9.0.10
-	o postgresql92-9.1.6
-	o postgresql92-9.2.1
 	o posh-0.5.5
 	o postal-0.72
 	o postfix-2.9.2
diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk
index d6c0707fc5f..224b72ba7a8 100644
--- a/mk/pgsql.buildlink3.mk
+++ b/mk/pgsql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.33 2012/08/02 03:53:19 asau Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.34 2012/10/05 21:09:02 adam Exp $
 #
 # User-settable variables:
 #
@@ -13,7 +13,6 @@
 # PG_LIB_EXT
 # PGSQL_TYPE
 # PGPKGSRCDIR
-#
 
 .if !defined(PGVERSION_MK)
 PGVERSION_MK=	defined
@@ -26,7 +25,7 @@ _SYS_VARS.pgsql=	PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR
 .include "../../mk/bsd.prefs.mk"
 
 PGSQL_VERSION_DEFAULT?=		91
-PGSQL_VERSIONS_ACCEPTED?=	91 90 84 83
+PGSQL_VERSIONS_ACCEPTED?=	92 91 90 84 83
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -41,6 +40,9 @@ PG_LIB_EXT=so
 
 # check what is installed
 .if ${OPSYS} == "Darwin"
+.  if exists(${LOCALBASE}/lib/libecpg.6.4.dylib)
+_PGSQL_VERSION_92_INSTALLED=	yes
+.  endif
 .  if exists(${LOCALBASE}/lib/libecpg.6.3.dylib)
 _PGSQL_VERSION_91_INSTALLED=	yes
 .  endif
@@ -54,6 +56,9 @@ _PGSQL_VERSION_84_INSTALLED=	yes
 _PGSQL_VERSION_83_INSTALLED=	yes
 .  endif
 .else
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.4)
+_PGSQL_VERSION_92_INSTALLED=	yes
+.  endif
 .  if exists(${LOCALBASE}/lib/libecpg.so.6.3)
 _PGSQL_VERSION_91_INSTALLED=	yes
 .  endif
@@ -105,7 +110,10 @@ _PGSQL_VERSION=	${_PGSQL_VERSION_FIRSTACCEPTED}
 #
 # set variables for the version we decided to use:
 #
-.if ${_PGSQL_VERSION} == "91"
+.if ${_PGSQL_VERSION} == "92"
+PGSQL_TYPE=	postgresql92-client
+PGPKGSRCDIR=	../../databases/postgresql92-client
+.elif ${_PGSQL_VERSION} == "91"
 PGSQL_TYPE=	postgresql91-client
 PGPKGSRCDIR=	../../databases/postgresql91-client
 .elif ${_PGSQL_VERSION} == "90"