[pkgsrc/trunk]: pkgsrc/databases postgresql: removed obsolete "kerberos" opti...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cdac9e79beb
branches:  trunk
changeset: 372442:6cdac9e79beb
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Dec 07 14:19:32 2017 +0000

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

diffstat:

 databases/postgresql10/Makefile.common |   3 ++-
 databases/postgresql92/Makefile.common |   3 ++-
 databases/postgresql92/options.mk      |   3 +--
 databases/postgresql93/Makefile.common |   3 ++-
 databases/postgresql93/options.mk      |   3 +--
 databases/postgresql94/Makefile.common |   3 ++-
 databases/postgresql94/options.mk      |  20 ++------------------
 databases/postgresql95/Makefile.common |   3 ++-
 databases/postgresql95/options.mk      |  20 ++------------------
 databases/postgresql96/Makefile.common |   3 ++-
 databases/postgresql96/options.mk      |  20 ++------------------
 11 files changed, 20 insertions(+), 64 deletions(-)

diffs (244 lines):

diff -r bebc249f346d -r 6cdac9e79beb databases/postgresql10/Makefile.common
--- a/databases/postgresql10/Makefile.common    Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql10/Makefile.common    Thu Dec 07 14:19:32 2017 +0000
@@ -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
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -113,6 +113,7 @@
 .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 -r bebc249f346d -r 6cdac9e79beb databases/postgresql92/Makefile.common
--- a/databases/postgresql92/Makefile.common    Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql92/Makefile.common    Thu Dec 07 14:19:32 2017 +0000
@@ -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
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -112,6 +112,7 @@
 .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 -r bebc249f346d -r 6cdac9e79beb databases/postgresql92/options.mk
--- a/databases/postgresql92/options.mk Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql92/options.mk Thu Dec 07 14:19:32 2017 +0000
@@ -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_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam
@@ -21,7 +21,6 @@
 
 # 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
diff -r bebc249f346d -r 6cdac9e79beb databases/postgresql93/Makefile.common
--- a/databases/postgresql93/Makefile.common    Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql93/Makefile.common    Thu Dec 07 14:19:32 2017 +0000
@@ -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
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -112,6 +112,7 @@
 .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 -r bebc249f346d -r 6cdac9e79beb databases/postgresql93/options.mk
--- a/databases/postgresql93/options.mk Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql93/options.mk Thu Dec 07 14:19:32 2017 +0000
@@ -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_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam
@@ -21,7 +21,6 @@
 
 # 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
diff -r bebc249f346d -r 6cdac9e79beb databases/postgresql94/Makefile.common
--- a/databases/postgresql94/Makefile.common    Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql94/Makefile.common    Thu Dec 07 14:19:32 2017 +0000
@@ -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
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -112,6 +112,7 @@
 .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 -r bebc249f346d -r 6cdac9e79beb databases/postgresql94/options.mk
--- a/databases/postgresql94/options.mk Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql94/options.mk Thu Dec 07 14:19:32 2017 +0000
@@ -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_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam
+PKG_SUPPORTED_OPTIONS= bonjour dtrace ldap pam
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,22 +19,6 @@
 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"
diff -r bebc249f346d -r 6cdac9e79beb databases/postgresql95/Makefile.common
--- a/databases/postgresql95/Makefile.common    Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql95/Makefile.common    Thu Dec 07 14:19:32 2017 +0000
@@ -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 @@
 .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 -r bebc249f346d -r 6cdac9e79beb databases/postgresql95/options.mk
--- a/databases/postgresql95/options.mk Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql95/options.mk Thu Dec 07 14:19:32 2017 +0000
@@ -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 @@
 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"
diff -r bebc249f346d -r 6cdac9e79beb databases/postgresql96/Makefile.common
--- a/databases/postgresql96/Makefile.common    Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql96/Makefile.common    Thu Dec 07 14:19:32 2017 +0000
@@ -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
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -112,6 +112,7 @@
 .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 -r bebc249f346d -r 6cdac9e79beb databases/postgresql96/options.mk
--- a/databases/postgresql96/options.mk Thu Dec 07 13:17:35 2017 +0000
+++ b/databases/postgresql96/options.mk Thu Dec 07 14:19:32 2017 +0000
@@ -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_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam
+PKG_SUPPORTED_OPTIONS= bonjour dtrace ldap pam
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,22 +19,6 @@
 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"