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

11 files changed, 20 insertions, 64 deletions

diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common
index db3a28bdadc..869cdcc9183 100644
--- a/databases/postgresql10/Makefile.common
+++ b/databases/postgresql10/Makefile.common
@@ -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 @@ 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/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index 5dcc5c4551f..7b3df0b26e6 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -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 @@ 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/postgresql92/options.mk b/databases/postgresql92/options.mk
index d83a859a069..ca403739e8f 100644
--- a/databases/postgresql92/options.mk
+++ b/databases/postgresql92/options.mk
@@ -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 @@ CONFIGURE_ARGS+=	--enable-dtrace
 
 # 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 --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 2b5b305bcc8..fcf1538a483 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -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 @@ 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/postgresql93/options.mk b/databases/postgresql93/options.mk
index 6603c9066d5..b6fe36a67a6 100644
--- a/databases/postgresql93/options.mk
+++ b/databases/postgresql93/options.mk
@@ -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 @@ CONFIGURE_ARGS+=	--enable-dtrace
 
 # 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 --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index 7cd8dc61db7..a05a1fe53ad 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -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 @@ 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/postgresql94/options.mk b/databases/postgresql94/options.mk
index d0d2894cefb..132f00bdcc4 100644
--- a/databases/postgresql94/options.mk
+++ b/databases/postgresql94/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.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 @@ 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"
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"
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index ebd02e4e7dc..8b8870f96d1 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -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 @@ 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/postgresql96/options.mk b/databases/postgresql96/options.mk
index 657b2ddf324..a1b45a48032 100644
--- a/databases/postgresql96/options.mk
+++ b/databases/postgresql96/options.mk
@@ -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 @@ 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"