CVS commit: pkgsrc/databases

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Dec  7 14:19:32 UTC 2017

Modified Files:
        pkgsrc/databases/postgresql10: Makefile.common
        pkgsrc/databases/postgresql92: Makefile.common options.mk
        pkgsrc/databases/postgresql93: Makefile.common options.mk
        pkgsrc/databases/postgresql94: Makefile.common options.mk
        pkgsrc/databases/postgresql95: Makefile.common options.mk
        pkgsrc/databases/postgresql96: Makefile.common options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql10/Makefile.common
cvs rdiff -u -r1.33 -r1.34 pkgsrc/databases/postgresql92/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql92/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/postgresql93/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql93/options.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/postgresql94/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql94/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/postgresql95/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql95/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/postgresql96/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql96/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql10/Makefile.common
diff -u pkgsrc/databases/postgresql10/Makefile.common:1.3 pkgsrc/databases/postgresql10/Makefile.common:1.4
--- pkgsrc/databases/postgresql10/Makefile.common:1.3   Mon Nov 13 09:33:31 2017
+++ pkgsrc/databases/postgresql10/Makefile.common       Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql92/Makefile.common
diff -u pkgsrc/databases/postgresql92/Makefile.common:1.33 pkgsrc/databases/postgresql92/Makefile.common:1.34
--- pkgsrc/databases/postgresql92/Makefile.common:1.33  Mon Nov 13 09:33:31 2017
+++ pkgsrc/databases/postgresql92/Makefile.common       Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql92/options.mk
diff -u pkgsrc/databases/postgresql92/options.mk:1.4 pkgsrc/databases/postgresql92/options.mk:1.5
--- pkgsrc/databases/postgresql92/options.mk:1.4        Mon Nov 13 09:33:31 2017
+++ pkgsrc/databases/postgresql92/options.mk    Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql93/Makefile.common
diff -u pkgsrc/databases/postgresql93/Makefile.common:1.29 pkgsrc/databases/postgresql93/Makefile.common:1.30
--- pkgsrc/databases/postgresql93/Makefile.common:1.29  Mon Nov 13 09:33:31 2017
+++ pkgsrc/databases/postgresql93/Makefile.common       Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql93/options.mk
diff -u pkgsrc/databases/postgresql93/options.mk:1.3 pkgsrc/databases/postgresql93/options.mk:1.4
--- pkgsrc/databases/postgresql93/options.mk:1.3        Mon Nov 13 09:33:31 2017
+++ pkgsrc/databases/postgresql93/options.mk    Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql94/Makefile.common
diff -u pkgsrc/databases/postgresql94/Makefile.common:1.21 pkgsrc/databases/postgresql94/Makefile.common:1.22
--- pkgsrc/databases/postgresql94/Makefile.common:1.21  Mon Nov 13 09:33:32 2017
+++ pkgsrc/databases/postgresql94/Makefile.common       Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql94/options.mk
diff -u pkgsrc/databases/postgresql94/options.mk:1.2 pkgsrc/databases/postgresql94/options.mk:1.3
--- pkgsrc/databases/postgresql94/options.mk:1.2        Mon Nov 13 09:33:32 2017
+++ pkgsrc/databases/postgresql94/options.mk    Thu Dec  7 14:19:32 2017
@@ -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"

Index: pkgsrc/databases/postgresql95/Makefile.common
diff -u pkgsrc/databases/postgresql95/Makefile.common:1.15 pkgsrc/databases/postgresql95/Makefile.common:1.16
--- pkgsrc/databases/postgresql95/Makefile.common:1.15  Mon Nov 13 09:35:46 2017
+++ pkgsrc/databases/postgresql95/Makefile.common       Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql95/options.mk
diff -u pkgsrc/databases/postgresql95/options.mk:1.2 pkgsrc/databases/postgresql95/options.mk:1.3
--- pkgsrc/databases/postgresql95/options.mk:1.2        Mon Nov 13 09:33:32 2017
+++ pkgsrc/databases/postgresql95/options.mk    Thu Dec  7 14:19:32 2017
@@ -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"

Index: pkgsrc/databases/postgresql96/Makefile.common
diff -u pkgsrc/databases/postgresql96/Makefile.common:1.9 pkgsrc/databases/postgresql96/Makefile.common:1.10
--- pkgsrc/databases/postgresql96/Makefile.common:1.9   Mon Nov 13 09:35:46 2017
+++ pkgsrc/databases/postgresql96/Makefile.common       Thu Dec  7 14:19:32 2017
@@ -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

Index: pkgsrc/databases/postgresql96/options.mk
diff -u pkgsrc/databases/postgresql96/options.mk:1.2 pkgsrc/databases/postgresql96/options.mk:1.3
--- pkgsrc/databases/postgresql96/options.mk:1.2        Mon Nov 13 09:33:33 2017
+++ pkgsrc/databases/postgresql96/options.mk    Thu Dec  7 14:19:32 2017
@@ -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"