Re: pkg/52787 (postgresql92 ignores kerberos option)

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

The following reply was made to PR pkg/52787; it has been noted by GNATS.

From: Adam <adam%netbsd.org@localhost>
To: dholland%NetBSD.org@localhost,
 gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/52787 (postgresql92 ignores kerberos option)
Date: Thu, 14 Dec 2017 21:58:10 +0100

 David,
 
 My idea was to make Kerberos support on by default, as all modern =
 systems should have Kerberos on board. If you are having problems with =
 it, it is fine for me to make it an option, but could you just, please, =
 make it a suggested option?
 
 Thanks,
 Adam
 
 
 >>> I made some changes to the way PostgreSQL handles Kerberos. Can you =
 =3D
 >>> check if now it build for you?
 >>=20
 >> ...no?
 >>=20
 >> I'm test-building a real fix.
 >=20
 > I will commit the following after I've test-built all of it. This
 > moves all the kerberos back within package options, like it should be,
 > and for the one person who cares about the technical difference the
 > option is now "gssapi" for the versions (94+) that only support
 > --with-gssapi and not --with-kerberos.
 >=20
 >=20
 > Index: postgresql10/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql10/Makefile.common,v
 > retrieving revision 1.4
 > diff -u -r1.4 Makefile.common
 > --- postgresql10/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.4
 > +++ postgresql10/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.4 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.3 2017/11/13 09:33:31 adam Exp $
 >  #
 >  # This Makefile fragment is included by all PostgreSQL packages built =
 from
 >  # the main sources of the PostgreSQL distribution except =
 jdbc-postgresql.
 > @@ -63,7 +63,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -113,7 +112,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql10/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql10/options.mk,v
 > retrieving revision 1.1
 > diff -u -r1.1 options.mk
 > --- postgresql10/options.mk	23 Oct 2017 20:33:49 -0000	1.1
 > +++ postgresql10/options.mk	14 Dec 2017 20:32:13 -0000
 > @@ -1,7 +1,7 @@
 >  # $NetBSD: options.mk,v 1.1 2017/10/23 20:33:49 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql10
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace icu ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace icu gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -26,6 +26,14 @@
 >  .  include "../../textproc/icu/buildlink3.mk"
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D       --with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D       --without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 > Index: postgresql92/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql92/Makefile.common,v
 > retrieving revision 1.34
 > diff -u -r1.34 Makefile.common
 > --- postgresql92/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.34
 > +++ postgresql92/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -65,7 +65,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql92/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql92/options.mk,v
 > retrieving revision 1.5
 > diff -u -r1.5 options.mk
 > --- postgresql92/options.mk	7 Dec 2017 14:19:32 -0000	1.5
 > +++ postgresql92/options.mk	14 Dec 2017 20:32:13 -0000
 > @@ -21,7 +21,9 @@
 >=20
 >  # Kerberos5 authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mkerberos)
 > +.  include "../../mk/krb5.buildlink3.mk"
 >  CONFIGURE_ARGS+=3D	--with-krb5
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 >=20
 >  CHECK_BUILTIN.${KRB5_TYPE}:=3D	yes
 >  .include	"../../security/${KRB5_TYPE}/builtin.mk"
 > @@ -32,6 +34,9 @@
 >  CFLAGS_KRB5!=3D	${SH_KRB5_CONFIG} --cflags
 >  CPPFLAGS+=3D	${CFLAGS_KRB5}
 >  .	endif
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-krb5
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 >  .endif
 >=20
 >  # LDAP authentication for the PostgreSQL backend
 > Index: postgresql93/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql93/Makefile.common,v
 > retrieving revision 1.30
 > diff -u -r1.30 Makefile.common
 > --- postgresql93/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.30
 > +++ postgresql93/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.30 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.29 2017/11/13 09:33:31 adam Exp $
 >  #
 >  # This Makefile fragment is included by all PostgreSQL packages built =
 from
 >  # the main sources of the PostgreSQL distribution except =
 jdbc-postgresql.
 > @@ -65,7 +65,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql93/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql93/options.mk,v
 > retrieving revision 1.4
 > diff -u -r1.4 options.mk
 > --- postgresql93/options.mk	7 Dec 2017 14:19:32 -0000	1.4
 > +++ postgresql93/options.mk	14 Dec 2017 20:32:13 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: options.mk,v 1.4 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.3 2017/11/13 09:33:31 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql93
 >  PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace kerberos ldap pam
 > @@ -21,7 +21,9 @@
 >=20
 >  # Kerberos5 authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mkerberos)
 > +.  include "../../mk/krb5.buildlink3.mk"
 >  CONFIGURE_ARGS+=3D	--with-krb5
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 >=20
 >  CHECK_BUILTIN.${KRB5_TYPE}:=3D	yes
 >  .include	"../../security/${KRB5_TYPE}/builtin.mk"
 > @@ -32,6 +34,9 @@
 >  CFLAGS_KRB5!=3D	${SH_KRB5_CONFIG} --cflags
 >  CPPFLAGS+=3D	${CFLAGS_KRB5}
 >  .	endif
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-krb5
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 >  .endif
 >=20
 >  # LDAP authentication for the PostgreSQL backend
 > Index: postgresql94/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql94/Makefile.common,v
 > retrieving revision 1.22
 > diff -u -r1.22 Makefile.common
 > --- postgresql94/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.22
 > +++ postgresql94/Makefile.common	14 Dec 2017 20:32:13 -0000
 > @@ -65,7 +65,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql94/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql94/options.mk,v
 > retrieving revision 1.3
 > diff -u -r1.3 options.mk
 > --- postgresql94/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 > +++ postgresql94/options.mk	14 Dec 2017 20:32:14 -0000
 > @@ -1,7 +1,7 @@
 > -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql94
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -19,6 +19,14 @@
 >  CONFIGURE_ARGS+=3D	--enable-dtrace
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 > Index: postgresql95/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql95/Makefile.common,v
 > retrieving revision 1.16
 > diff -u -r1.16 Makefile.common
 > --- postgresql95/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.16
 > +++ postgresql95/Makefile.common	14 Dec 2017 20:32:14 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.16 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.15 2017/11/13 09:35:46 adam Exp $
 >  #
 >  # This Makefile fragment is included by all PostgreSQL packages built =
 from
 >  # the main sources of the PostgreSQL distribution except =
 jdbc-postgresql.
 > @@ -65,7 +65,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql95/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql95/options.mk,v
 > retrieving revision 1.3
 > diff -u -r1.3 options.mk
 > --- postgresql95/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 > +++ postgresql95/options.mk	14 Dec 2017 20:32:14 -0000
 > @@ -1,7 +1,7 @@
 > -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql95
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -19,6 +19,14 @@
 >  CONFIGURE_ARGS+=3D	--enable-dtrace
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 > Index: postgresql96/Makefile.common
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql96/Makefile.common,v
 > retrieving revision 1.10
 > diff -u -r1.10 Makefile.common
 > --- postgresql96/Makefile.common	7 Dec 2017 14:19:32 -0000	=
 1.10
 > +++ postgresql96/Makefile.common	14 Dec 2017 20:32:14 -0000
 > @@ -1,4 +1,4 @@
 > -# $NetBSD: Makefile.common,v 1.10 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: Makefile.common,v 1.9 2017/11/13 09:35:46 adam Exp $
 >  #
 >  # This Makefile fragment is included by all PostgreSQL packages built =
 from
 >  # the main sources of the PostgreSQL distribution except =
 jdbc-postgresql.
 > @@ -65,7 +65,6 @@
 >  CONFIGURE_ARGS+=3D	--with-template=3D${PG_TEMPLATE.${OPSYS}}
 >=20
 >  CONFIGURE_ARGS+=3D	--enable-nls
 > -CONFIGURE_ARGS+=3D	--with-gssapi
 >  CONFIGURE_ARGS+=3D	--with-libxml
 >  CONFIGURE_ARGS+=3D	--with-readline
 >  CONFIGURE_ARGS+=3D	--without-perl
 > @@ -112,7 +111,6 @@
 >  .include "../../devel/zlib/buildlink3.mk"
 >  .include "../../textproc/libxml2/buildlink3.mk"
 >=20
 > -.include "../../mk/krb5.buildlink3.mk"
 >  .include "../../mk/readline.buildlink3.mk"
 >  .if ${READLINE_TYPE} =3D=3D "editline"
 >  CONFIGURE_ARGS+=3D	--with-libedit-preferred
 > Index: postgresql96/options.mk
 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 > RCS file: /cvsroot/pkgsrc/databases/postgresql96/options.mk,v
 > retrieving revision 1.3
 > diff -u -r1.3 options.mk
 > --- postgresql96/options.mk	7 Dec 2017 14:19:32 -0000	1.3
 > +++ postgresql96/options.mk	14 Dec 2017 20:32:14 -0000
 > @@ -1,7 +1,7 @@
 > -# $NetBSD: options.mk,v 1.3 2017/12/07 14:19:32 adam Exp $
 > +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:33 adam Exp $
 >=20
 >  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.postgresql96
 > -PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace ldap pam
 > +PKG_SUPPORTED_OPTIONS=3D	bonjour dtrace gssapi ldap pam
 >=20
 >  .include "../../mk/bsd.options.mk"
 >=20
 > @@ -19,6 +19,14 @@
 >  CONFIGURE_ARGS+=3D	--enable-dtrace
 >  .endif
 >=20
 > +# GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 > +.if !empty(PKG_OPTIONS:Mgssapi)
 > +.  include "../../mk/krb5.buildlink3.mk"
 > +CONFIGURE_ARGS+=3D	--with-gssapi
 > +.else
 > +CONFIGURE_ARGS+=3D	--without-gssapi
 > +.endif
 > +
 >  # LDAP authentication for the PostgreSQL backend
 >  .if !empty(PKG_OPTIONS:Mldap)
 >  .  include "../../databases/openldap-client/buildlink3.mk"
 >=20
 > --=20
 > David A. Holland
 > dholland%netbsd.org@localhost
 >=20