kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

postgresql: removed obsolete "kerberos" option; fix for #52787

Browse source
This commit is contained in:
adam 2017-12-07 14:19:32 +00:00
parent 3f6ca346ef
commit 21c0d0dbc5
11 changed files with 20 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
databases/postgresql10/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.3 2017/11/13 09:33:31 adam Exp $ # $NetBSD: Makefile.common,v 1.4 2017/12/07 14:19:32 adam Exp $
# #
# This Makefile fragment is included by all PostgreSQL packages built from # This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql. # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -113,6 +113,7 @@ LIBS.SunOS+= -lintl
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk" .include "../../mk/readline.buildlink3.mk"
.if ${READLINE_TYPE} == "editline" .if ${READLINE_TYPE} == "editline"
CONFIGURE_ARGS+= --with-libedit-preferred CONFIGURE_ARGS+= --with-libedit-preferred

3
databases/postgresql92/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.33 2017/11/13 09:33:31 adam Exp $ # $NetBSD: Makefile.common,v 1.34 2017/12/07 14:19:32 adam Exp $
# #
# This Makefile fragment is included by all PostgreSQL packages built from # This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql. # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -112,6 +112,7 @@ LIBS.SunOS+= -lintl
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk" .include "../../mk/readline.buildlink3.mk"
.if ${READLINE_TYPE} == "editline" .if ${READLINE_TYPE} == "editline"
CONFIGURE_ARGS+= --with-libedit-preferred CONFIGURE_ARGS+= --with-libedit-preferred

3
databases/postgresql92/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.4 2017/11/13 09:33:31 adam Exp $ # $NetBSD: options.mk,v 1.5 2017/12/07 14:19:32 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql92 PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql92
PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam
@ -21,7 +21,6 @@ CONFIGURE_ARGS+= --enable-dtrace
# Kerberos5 authentication for the PostgreSQL backend # Kerberos5 authentication for the PostgreSQL backend
.if !empty(PKG_OPTIONS:Mkerberos) .if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
CONFIGURE_ARGS+= --with-krb5 CONFIGURE_ARGS+= --with-krb5
CHECK_BUILTIN.${KRB5_TYPE}:= yes CHECK_BUILTIN.${KRB5_TYPE}:= yes

3
databases/postgresql93/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.29 2017/11/13 09:33:31 adam Exp $ # $NetBSD: Makefile.common,v 1.30 2017/12/07 14:19:32 adam Exp $
# #
# This Makefile fragment is included by all PostgreSQL packages built from # This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql. # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -112,6 +112,7 @@ LIBS.SunOS+= -lintl
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk" .include "../../mk/readline.buildlink3.mk"
.if ${READLINE_TYPE} == "editline" .if ${READLINE_TYPE} == "editline"
CONFIGURE_ARGS+= --with-libedit-preferred CONFIGURE_ARGS+= --with-libedit-preferred

3
databases/postgresql93/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.3 2017/11/13 09:33:31 adam Exp $ # $NetBSD: options.mk,v 1.4 2017/12/07 14:19:32 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql93 PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql93
PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam
@ -21,7 +21,6 @@ CONFIGURE_ARGS+= --enable-dtrace
# Kerberos5 authentication for the PostgreSQL backend # Kerberos5 authentication for the PostgreSQL backend
.if !empty(PKG_OPTIONS:Mkerberos) .if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
CONFIGURE_ARGS+= --with-krb5 CONFIGURE_ARGS+= --with-krb5
CHECK_BUILTIN.${KRB5_TYPE}:= yes CHECK_BUILTIN.${KRB5_TYPE}:= yes

3
databases/postgresql94/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.21 2017/11/13 09:33:32 adam Exp $ # $NetBSD: Makefile.common,v 1.22 2017/12/07 14:19:32 adam Exp $
# #
# This Makefile fragment is included by all PostgreSQL packages built from # This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql. # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -112,6 +112,7 @@ LIBS.SunOS+= -lintl
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk" .include "../../mk/readline.buildlink3.mk"
.if ${READLINE_TYPE} == "editline" .if ${READLINE_TYPE} == "editline"
CONFIGURE_ARGS+= --with-libedit-preferred CONFIGURE_ARGS+= --with-libedit-preferred

20
databases/postgresql94/options.mk
View file

@ -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.postgresql94 PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql94
PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam PKG_SUPPORTED_OPTIONS= bonjour dtrace ldap pam
.include "../../mk/bsd.options.mk" .include "../../mk/bsd.options.mk"
@ -19,22 +19,6 @@ LIBS+= -ldns_sd
CONFIGURE_ARGS+= --enable-dtrace CONFIGURE_ARGS+= --enable-dtrace
.endif .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 # LDAP authentication for the PostgreSQL backend
.if !empty(PKG_OPTIONS:Mldap) .if !empty(PKG_OPTIONS:Mldap)
. include "../../databases/openldap-client/buildlink3.mk" . include "../../databases/openldap-client/buildlink3.mk"

3
databases/postgresql95/Makefile.common
View file

@ -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 # This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql. # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -112,6 +112,7 @@ LIBS.SunOS+= -lintl
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk" .include "../../mk/readline.buildlink3.mk"
.if ${READLINE_TYPE} == "editline" .if ${READLINE_TYPE} == "editline"
CONFIGURE_ARGS+= --with-libedit-preferred CONFIGURE_ARGS+= --with-libedit-preferred

20
databases/postgresql95/options.mk
View file

@ -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_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" .include "../../mk/bsd.options.mk"
@ -19,22 +19,6 @@ LIBS+= -ldns_sd
CONFIGURE_ARGS+= --enable-dtrace CONFIGURE_ARGS+= --enable-dtrace
.endif .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 # LDAP authentication for the PostgreSQL backend
.if !empty(PKG_OPTIONS:Mldap) .if !empty(PKG_OPTIONS:Mldap)
. include "../../databases/openldap-client/buildlink3.mk" . include "../../databases/openldap-client/buildlink3.mk"

3
databases/postgresql96/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.9 2017/11/13 09:35:46 adam Exp $ # $NetBSD: Makefile.common,v 1.10 2017/12/07 14:19:32 adam Exp $
# #
# This Makefile fragment is included by all PostgreSQL packages built from # This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql. # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@ -112,6 +112,7 @@ LIBS.SunOS+= -lintl
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk" .include "../../mk/readline.buildlink3.mk"
.if ${READLINE_TYPE} == "editline" .if ${READLINE_TYPE} == "editline"
CONFIGURE_ARGS+= --with-libedit-preferred CONFIGURE_ARGS+= --with-libedit-preferred

20
databases/postgresql96/options.mk
View file

@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:33 adam Exp $ # $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql96 PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql96
PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam PKG_SUPPORTED_OPTIONS= bonjour dtrace ldap pam
.include "../../mk/bsd.options.mk" .include "../../mk/bsd.options.mk"
@ -19,22 +19,6 @@ LIBS+= -ldns_sd
CONFIGURE_ARGS+= --enable-dtrace CONFIGURE_ARGS+= --enable-dtrace
.endif .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 # LDAP authentication for the PostgreSQL backend
.if !empty(PKG_OPTIONS:Mldap) .if !empty(PKG_OPTIONS:Mldap)
. include "../../databases/openldap-client/buildlink3.mk" . include "../../databases/openldap-client/buildlink3.mk"