diff options
author | adam <adam@pkgsrc.org> | 2010-11-03 14:36:39 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2010-11-03 14:36:39 +0000 |
commit | 80b9eecefdff295eda409cdeebc60e56a9b67578 (patch) | |
tree | 707f9ff2d0590c7ac9a19339831fccb352a4b68b /databases | |
parent | 32aca2f711afe5feef17805c1108c3442759d148 (diff) | |
download | pkgsrc-80b9eecefdff295eda409cdeebc60e56a9b67578.tar.gz |
Unified PostgreSQL client and server options
Diffstat (limited to 'databases')
-rw-r--r-- | databases/postgresql83-client/Makefile | 5 | ||||
-rw-r--r-- | databases/postgresql83-server/Makefile | 6 | ||||
-rw-r--r-- | databases/postgresql83/Makefile.common | 3 | ||||
-rw-r--r-- | databases/postgresql83/options.mk | 5 | ||||
-rw-r--r-- | databases/postgresql84-client/Makefile | 5 | ||||
-rw-r--r-- | databases/postgresql84-server/Makefile | 6 | ||||
-rw-r--r-- | databases/postgresql84/Makefile.common | 3 | ||||
-rw-r--r-- | databases/postgresql84/options.mk | 5 | ||||
-rw-r--r-- | databases/postgresql90-client/Makefile | 5 | ||||
-rw-r--r-- | databases/postgresql90-server/Makefile | 6 | ||||
-rw-r--r-- | databases/postgresql90/Makefile.common | 3 | ||||
-rw-r--r-- | databases/postgresql90/options.mk | 5 |
12 files changed, 21 insertions, 36 deletions
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile index 6202112cfc2..0cc29daa5eb 100644 --- a/databases/postgresql83-client/Makefile +++ b/databases/postgresql83-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/10/07 15:52:40 adam Exp $ +# $NetBSD: Makefile,v 1.18 2010/11/03 14:36:40 adam Exp $ PKGNAME= postgresql83-client-${BASE_VERS} COMMENT= PostgreSQL database client programs @@ -43,9 +43,6 @@ BUILD_DIRS= ${INSTALL_DIRS} # Without this, the Darwin build fails (related to -bundle_loader). BUILD_DIRS+= src/backend -PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql83-client -.include "../../databases/postgresql83/options.mk" - .for _file_ in pg_service.conf psqlrc CONF_FILES+= ${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_} .endfor diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index e14582fd53d..6d9b83d2602 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/04/12 09:53:50 adam Exp $ +# $NetBSD: Makefile,v 1.12 2010/11/03 14:36:40 adam Exp $ PKGNAME= postgresql83-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -43,10 +43,6 @@ DL_LIBS+= -lltdl . include "../../devel/libltdl/buildlink3.mk" .endif -PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql83-server -PKG_SUPPORTED_OPTIONS= gssapi krb5 ldap pam -.include "../../databases/postgresql83/options.mk" - # PGUSER username of the database administrator # PGGROUP group of the database administrator # PGHOME home directory of the database administrator and location of diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common index d24ae4d809d..15ec4dd1709 100644 --- a/databases/postgresql83/Makefile.common +++ b/databases/postgresql83/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2010/10/07 15:52:40 adam Exp $ +# $NetBSD: Makefile.common,v 1.14 2010/11/03 14:36:39 adam Exp $ # # used by databases/postgresql83-adminpack/Makefile # used by databases/postgresql83-client/Makefile @@ -17,6 +17,7 @@ # postgresql-<lang> server-side module for PostgreSQL backend .include "../../databases/postgresql83/Makefile.mirrors" +.include "../../databases/postgresql83/options.mk" DISTNAME?= postgresql-${DIST_VERS} CATEGORIES+= databases diff --git a/databases/postgresql83/options.mk b/databases/postgresql83/options.mk index 78fbdb4ed92..dc24ad3f30b 100644 --- a/databases/postgresql83/options.mk +++ b/databases/postgresql83/options.mk @@ -1,6 +1,7 @@ -# $NetBSD: options.mk,v 1.3 2010/01/22 20:12:11 adam Exp $ +# $NetBSD: options.mk,v 1.4 2010/11/03 14:36:39 adam Exp $ -PKG_SUPPORTED_OPTIONS+= # empty +PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql83 +PKG_SUPPORTED_OPTIONS= gssapi krb5 ldap pam .include "../../mk/bsd.options.mk" diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile index a803d26880c..e0bc2b0b43a 100644 --- a/databases/postgresql84-client/Makefile +++ b/databases/postgresql84-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/10/07 15:53:22 adam Exp $ +# $NetBSD: Makefile,v 1.10 2010/11/03 14:36:40 adam Exp $ PKGNAME= postgresql84-client-${BASE_VERS} COMMENT= PostgreSQL database client programs @@ -43,9 +43,6 @@ BUILD_DIRS= ${INSTALL_DIRS} # Without this, the Darwin build fails (related to -bundle_loader). BUILD_DIRS+= src/backend -PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql84-client -.include "../../databases/postgresql84/options.mk" - .for _file_ in pg_service.conf psqlrc CONF_FILES+= ${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_} .endfor diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 06108c9ce66..068877f123a 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/04/12 09:58:39 adam Exp $ +# $NetBSD: Makefile,v 1.8 2010/11/03 14:36:40 adam Exp $ PKGNAME= postgresql84-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -43,10 +43,6 @@ DL_LIBS+= -lltdl . include "../../devel/libltdl/buildlink3.mk" .endif -PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql84-server -PKG_SUPPORTED_OPTIONS= gssapi krb5 ldap pam -.include "../../databases/postgresql84/options.mk" - # PGUSER username of the database administrator # PGGROUP group of the database administrator # PGHOME home directory of the database administrator and location of diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common index 3ed61250055..efbe385b7c9 100644 --- a/databases/postgresql84/Makefile.common +++ b/databases/postgresql84/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2010/10/07 15:53:22 adam Exp $ +# $NetBSD: Makefile.common,v 1.8 2010/11/03 14:36:40 adam Exp $ # # used by databases/postgresql84-adminpack/Makefile # used by databases/postgresql84-client/Makefile @@ -17,6 +17,7 @@ # postgresql-<lang> server-side module for PostgreSQL backend .include "../../databases/postgresql84/Makefile.mirrors" +.include "../../databases/postgresql84/options.mk" DISTNAME?= postgresql-${DIST_VERS} CATEGORIES+= databases diff --git a/databases/postgresql84/options.mk b/databases/postgresql84/options.mk index 78fbdb4ed92..a15127173b0 100644 --- a/databases/postgresql84/options.mk +++ b/databases/postgresql84/options.mk @@ -1,6 +1,7 @@ -# $NetBSD: options.mk,v 1.3 2010/01/22 20:12:11 adam Exp $ +# $NetBSD: options.mk,v 1.4 2010/11/03 14:36:40 adam Exp $ -PKG_SUPPORTED_OPTIONS+= # empty +PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql84 +PKG_SUPPORTED_OPTIONS= gssapi krb5 ldap pam .include "../../mk/bsd.options.mk" diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile index f904dc85dc0..6e3616feee7 100644 --- a/databases/postgresql90-client/Makefile +++ b/databases/postgresql90-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/09/21 07:52:41 adam Exp $ +# $NetBSD: Makefile,v 1.2 2010/11/03 14:36:41 adam Exp $ PKGNAME= postgresql90-client-${BASE_VERS} COMMENT= PostgreSQL database client programs @@ -42,9 +42,6 @@ BUILD_DIRS= ${INSTALL_DIRS} # Without this, the Darwin build fails (related to -bundle_loader). BUILD_DIRS+= src/backend -PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql90-client -.include "../../databases/postgresql90/options.mk" - .for _file_ in pg_service.conf psqlrc CONF_FILES+= ${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_} .endfor diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index ce2c3f28ed6..ef8e41e5c78 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/09/21 07:52:56 adam Exp $ +# $NetBSD: Makefile,v 1.2 2010/11/03 14:36:41 adam Exp $ PKGNAME= postgresql90-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -43,10 +43,6 @@ DL_LIBS+= -lltdl . include "../../devel/libltdl/buildlink3.mk" .endif -PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql90-server -PKG_SUPPORTED_OPTIONS= gssapi krb5 ldap pam -.include "../../databases/postgresql90/options.mk" - # PGUSER username of the database administrator # PGGROUP group of the database administrator # PGHOME home directory of the database administrator and location of diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common index dafc0dbd50c..c677a29e61e 100644 --- a/databases/postgresql90/Makefile.common +++ b/databases/postgresql90/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2010/10/07 15:53:54 adam Exp $ +# $NetBSD: Makefile.common,v 1.3 2010/11/03 14:36:41 adam Exp $ # # used by databases/postgresql90-adminpack/Makefile # used by databases/postgresql90-client/Makefile @@ -20,6 +20,7 @@ # postgresql-<lang> server-side module for PostgreSQL backend .include "../../databases/postgresql90/Makefile.mirrors" +.include "../../databases/postgresql90/options.mk" DISTNAME?= postgresql-${DIST_VERS} CATEGORIES+= databases diff --git a/databases/postgresql90/options.mk b/databases/postgresql90/options.mk index e5625508fb4..b6e66c7c2a8 100644 --- a/databases/postgresql90/options.mk +++ b/databases/postgresql90/options.mk @@ -1,6 +1,7 @@ -# $NetBSD: options.mk,v 1.1.1.1 2010/09/21 07:50:46 adam Exp $ +# $NetBSD: options.mk,v 1.2 2010/11/03 14:36:41 adam Exp $ -PKG_SUPPORTED_OPTIONS+= # empty +PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql90 +PKG_SUPPORTED_OPTIONS= gssapi krb5 ldap pam .include "../../mk/bsd.options.mk" |