diff options
| author | adam <adam@pkgsrc.org> | 2017-12-07 14:19:32 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2017-12-07 14:19:32 +0000 |
| commit | 4f16b91a09616ecf33b59253ed7845eb8c9ff354 (patch) | |
| tree | 682309d4bf7af53df77209d77aaf9fbc50794bdf /databases/postgresql95 | |
| parent | 05902f9bbf7e337c13d142c72d8603de3966bcf4 (diff) | |
| download | pkgsrc-4f16b91a09616ecf33b59253ed7845eb8c9ff354.tar.gz | |
postgresql: removed obsolete "kerberos" option; fix for #52787
Diffstat (limited to 'databases/postgresql95')
| -rw-r--r-- | databases/postgresql95/Makefile.common | 3 | ||||
| -rw-r--r-- | databases/postgresql95/options.mk | 20 |
2 files changed, 4 insertions, 19 deletions
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common index ed300ce7b7f..6929826ac52 100644 --- a/databases/postgresql95/Makefile.common +++ b/databases/postgresql95/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2017/11/13 09:35:46 adam Exp $ +# $NetBSD: Makefile.common,v 1.16 2017/12/07 14:19:32 adam Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -112,6 +112,7 @@ LIBS.SunOS+= -lintl .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../mk/krb5.buildlink3.mk" .include "../../mk/readline.buildlink3.mk" .if ${READLINE_TYPE} == "editline" CONFIGURE_ARGS+= --with-libedit-preferred diff --git a/databases/postgresql95/options.mk b/databases/postgresql95/options.mk index 7822d3f72b4..1238a43f7ab 100644 --- a/databases/postgresql95/options.mk +++ b/databases/postgresql95/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $ +# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql95 -PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam +PKG_SUPPORTED_OPTIONS= bonjour dtrace ldap pam .include "../../mk/bsd.options.mk" @@ -19,22 +19,6 @@ LIBS+= -ldns_sd CONFIGURE_ARGS+= --enable-dtrace .endif -# Kerberos5 authentication for the PostgreSQL backend -.if !empty(PKG_OPTIONS:Mkerberos) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-krb5 - -CHECK_BUILTIN.${KRB5_TYPE}:= yes -.include "../../security/${KRB5_TYPE}/builtin.mk" -CHECK_BUILTIN.${KRB5_TYPE}:= no - -. if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS]) && \ - exists(${SH_KRB5_CONFIG}) -CFLAGS_KRB5!= ${SH_KRB5_CONFIG} --cflags -CPPFLAGS+= ${CFLAGS_KRB5} -. endif -.endif - # LDAP authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" |