diff options
author | adam <adam@pkgsrc.org> | 2008-03-04 12:50:25 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2008-03-04 12:50:25 +0000 |
commit | 2f7d2aaf2952d73b6cedd836d6c98d3c6a038c3b (patch) | |
tree | 5b08588fad79586c9f069e55e843183ce639a2cd | |
parent | 9fa5d5a12385e453a098c363d7df4e2442c92ba3 (diff) | |
download | pkgsrc-2f7d2aaf2952d73b6cedd836d6c98d3c6a038c3b.tar.gz |
Added postgresql83
-rw-r--r-- | databases/Makefile | 9 | ||||
-rw-r--r-- | mk/pgsql.buildlink3.mk | 15 |
2 files changed, 20 insertions, 4 deletions
diff --git a/databases/Makefile b/databases/Makefile index 38afce82edf..086975fbe56 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.237 2007/12/04 00:35:28 grant Exp $ +# $NetBSD: Makefile,v 1.238 2008/03/04 12:51:11 adam Exp $ # COMMENT= Databases @@ -154,6 +154,13 @@ SUBDIR+= postgresql82-plpython SUBDIR+= postgresql82-pltcl SUBDIR+= postgresql82-server SUBDIR+= postgresql82-tsearch2 +SUBDIR+= postgresql83 +SUBDIR+= postgresql83-adminpack +SUBDIR+= postgresql83-client +SUBDIR+= postgresql83-plperl +SUBDIR+= postgresql83-plpython +SUBDIR+= postgresql83-pltcl +SUBDIR+= postgresql83-server SUBDIR+= pxtools SUBDIR+= py-IndexedCatalog SUBDIR+= py-PgSQL diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk index afa2a7fc5a5..99c0c1579eb 100644 --- a/mk/pgsql.buildlink3.mk +++ b/mk/pgsql.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pgsql.buildlink3.mk,v 1.23 2007/06/06 12:40:05 rillig Exp $ +# $NetBSD: pgsql.buildlink3.mk,v 1.24 2008/03/04 12:50:25 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?= 81 -PGSQL_VERSIONS_ACCEPTED?= 82 81 80 +PGSQL_VERSIONS_ACCEPTED?= 83 82 81 80 # 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.0.dylib) +_PGSQL_VERSION_83_INSTALLED= yes +.endif .if exists(${LOCALBASE}/lib/libecpg.5.0.2.dylib) _PGSQL_VERSION_82_INSTALLED= yes .endif @@ -57,6 +60,9 @@ _PGSQL_VERSION_74_INSTALLED= yes _PGSQL_VERSION_73_INSTALLED=yes .endif .else +.if exists(${LOCALBASE}/lib/libecpg.so.6.0.0) +_PGSQL_VERSION_83_INSTALLED= yes +.endif .if exists(${LOCALBASE}/lib/libecpg.so.5.0.2) _PGSQL_VERSION_82_INSTALLED= yes .endif @@ -111,7 +117,10 @@ _PGSQL_VERSION= ${_PGSQL_VERSION_FIRSTACCEPTED} # # set variables for the version we decided to use: # -.if ${_PGSQL_VERSION} == "82" +.if ${_PGSQL_VERSION} == "83" +PGSQL_TYPE= postgresql83-client +PGPKGSRCDIR= ../../databases/postgresql83-client +.elif ${_PGSQL_VERSION} == "82" PGSQL_TYPE= postgresql82-client PGPKGSRCDIR= ../../databases/postgresql82-client .elif ${_PGSQL_VERSION} == "81" |