From b4914eaa5b05c682d834b31628b7af319df03e76 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 10 Sep 2013 15:35:30 +0000 Subject: Added databases/postgresql93 version 9.3.0 --- databases/Makefile | 17 ++++++++++++++++- doc/CHANGES-2013 | 17 ++++++++++++++++- mk/pgsql.buildlink3.mk | 15 ++++++++++++--- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/databases/Makefile b/databases/Makefile index 0c7bc5a8800..78d47cffedd 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.435 2013/07/06 00:57:34 rodent Exp $ +# $NetBSD: Makefile,v 1.436 2013/09/10 15:35:30 adam Exp $ COMMENT= Databases @@ -299,6 +299,21 @@ SUBDIR+= postgresql92-pltcl SUBDIR+= postgresql92-replicationtools SUBDIR+= postgresql92-server SUBDIR+= postgresql92-upgrade +SUBDIR+= postgresql93 +SUBDIR+= postgresql93-adminpack +SUBDIR+= postgresql93-client +SUBDIR+= postgresql93-datatypes +SUBDIR+= postgresql93-dblink +SUBDIR+= postgresql93-docs +SUBDIR+= postgresql93-fuzzystrmatch +SUBDIR+= postgresql93-monitoring +SUBDIR+= postgresql93-pgcrypto +SUBDIR+= postgresql93-plperl +SUBDIR+= postgresql93-plpython +SUBDIR+= postgresql93-pltcl +SUBDIR+= postgresql93-replicationtools +SUBDIR+= postgresql93-server +SUBDIR+= postgresql93-upgrade SUBDIR+= pxtools SUBDIR+= py-PgSQL SUBDIR+= py-bdb-xml diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index e9f965eb3cf..7af8c61211a 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.3379 2013/09/10 11:43:14 obache Exp $ +$NetBSD: CHANGES-2013,v 1.3380 2013/09/10 15:37:36 adam Exp $ Changes to the packages collection and infrastructure in 2013: @@ -4791,3 +4791,18 @@ Changes to the packages collection and infrastructure in 2013: Updated devel/p5-Date-Manip to 6.41 [wen 2013-09-10] Updated graphics/digikam to 3.2.0nb7 [wiz 2013-09-10] Updated security/xml-security-c to 1.7.2 [obache 2013-09-10] + Added databases/postgresql93 version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-client version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-server version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-docs version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-adminpack version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-datatypes version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-dblink version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-fuzzystrmatch version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-monitoring version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-pgcrypto version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-plperl version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-plpython version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-pltcl version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-replicationtools version 9.3.0 [adam 2013-09-10] + Added databases/postgresql93-upgrade version 9.3.0 [adam 2013-09-10] diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk index 4279e2e61d8..cab278d4991 100644 --- a/mk/pgsql.buildlink3.mk +++ b/mk/pgsql.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pgsql.buildlink3.mk,v 1.35 2013/04/04 21:08:25 adam Exp $ +# $NetBSD: pgsql.buildlink3.mk,v 1.36 2013/09/10 15:35:30 adam Exp $ # # User-settable variables: # @@ -25,7 +25,7 @@ _SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR .include "../../mk/bsd.prefs.mk" PGSQL_VERSION_DEFAULT?= 91 -PGSQL_VERSIONS_ACCEPTED?= 92 91 90 84 +PGSQL_VERSIONS_ACCEPTED?= 93 92 91 90 84 # transform the list into individual variables .for pv in ${PGSQL_VERSIONS_ACCEPTED} @@ -40,6 +40,9 @@ PG_LIB_EXT=so # check what is installed .if ${OPSYS} == "Darwin" +. if exists(${LOCALBASE}/lib/libecpg.6.5.dylib) +_PGSQL_VERSION_93_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.6.4.dylib) _PGSQL_VERSION_92_INSTALLED= yes . endif @@ -53,6 +56,9 @@ _PGSQL_VERSION_90_INSTALLED= yes _PGSQL_VERSION_84_INSTALLED= yes . endif .else +. if exists(${LOCALBASE}/lib/libecpg.so.6.5) +_PGSQL_VERSION_93_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.so.6.4) _PGSQL_VERSION_92_INSTALLED= yes . endif @@ -102,7 +108,10 @@ _PGSQL_VERSION= ${_PGSQL_VERSION_FIRSTACCEPTED} .endif # set variables for the version we decided to use: -.if ${_PGSQL_VERSION} == "92" +.if ${_PGSQL_VERSION} == "93" +PGSQL_TYPE= postgresql93-client +PGPKGSRCDIR= ../../databases/postgresql93-client +.elif ${_PGSQL_VERSION} == "92" PGSQL_TYPE= postgresql92-client PGPKGSRCDIR= ../../databases/postgresql92-client .elif ${_PGSQL_VERSION} == "91" -- cgit v1.2.3