diff options
| author | jlam <jlam@pkgsrc.org> | 2005-02-07 11:35:41 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-02-07 11:35:41 +0000 |
| commit | bccaba8d4be2a3c883336ad53db6de460fdb1750 (patch) | |
| tree | 3fbd25c3d9c76742dee39e150259e83751db0c93 /databases | |
| parent | 05ce7c6c30f28a62778f19a3d886b7217c4fda06 (diff) | |
| download | pkgsrc-bccaba8d4be2a3c883336ad53db6de460fdb1750.tar.gz | |
Instantly deprecate USE_PAM from pkgsrc as its value is being set from
within NetBSD-current's bsd.own.mk, which conflicts with its usage in
pkgsrc. The package that use USE_PAM have been converted to use the
bsd.options.mk framework. This should fix PR pkg/29257.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql73-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/postgresql74-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/postgresql80-server/Makefile | 10 |
3 files changed, 19 insertions, 7 deletions
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index fc001fc2d3e..bedd10561f1 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/02/05 14:49:03 jdolecek Exp $ +# $NetBSD: Makefile,v 1.10 2005/02/07 11:35:41 jlam Exp $ PKGNAME= postgresql73-server-${BASE_VERS} PKGREVISION= # empty @@ -25,7 +25,11 @@ BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs # XXX this breaks PostgreSQL server - see PR pkg/28729 #.include "../../mk/dlopen.buildlink3.mk" -.if defined(USE_PAM) +PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql73-server +PKG_SUPPORTED_OPTIONS= PAM +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:MPAM) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 5b80718bf57..7a5897ab652 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/02/05 14:31:20 jdolecek Exp $ +# $NetBSD: Makefile,v 1.13 2005/02/07 11:35:41 jlam Exp $ PKGNAME= postgresql74-server-${BASE_VERS} PKGREVISION= # empty @@ -24,7 +24,11 @@ BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs # XXX this breaks PostgreSQL server - see PR pkg/28729 #.include "../../mk/dlopen.buildlink3.mk" -.if defined(USE_PAM) +PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql74-server +PKG_SUPPORTED_OPTIONS= PAM +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:MPAM) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 459a6044624..5802240ba01 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/02/06 13:21:45 taca Exp $ +# $NetBSD: Makefile,v 1.3 2005/02/07 11:35:42 jlam Exp $ PKGNAME= postgresql80-server-${BASE_VERS} PKGREVISION= # empty @@ -19,8 +19,12 @@ CONFIGURE_ARGS+= --with-openssl BUILD_DIRS= ${WRKSRC}/src/backend BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs -.if defined(USE_PAM) -. include "../../security/PAM/buildlink3.mk" +PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql80-server +PKG_SUPPORTED_OPTIONS= PAM +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:MPAM) +. include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif |