CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Apr  1 10:22:23 UTC 2021

Modified Files:
        pkgsrc/databases/postgresql13: options.mk
        pkgsrc/databases/postgresql13-server: PLIST

Log Message:
postgresql13: PLIST fix for gssapi option turned off


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql13/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql13-server/PLIST

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

Modified files:

Index: pkgsrc/databases/postgresql13/options.mk
diff -u pkgsrc/databases/postgresql13/options.mk:1.1 pkgsrc/databases/postgresql13/options.mk:1.2
--- pkgsrc/databases/postgresql13/options.mk:1.1        Sun Oct 18 09:24:02 2020
+++ pkgsrc/databases/postgresql13/options.mk    Thu Apr  1 10:22:23 2021
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2020/10/18 09:24:02 adam Exp $
+# $NetBSD: options.mk,v 1.2 2021/04/01 10:22:23 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql13
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
 PKG_SUGGESTED_OPTIONS= gssapi nls
 
-PLIST_VARS+=           llvm nls
+PLIST_VARS+=           gssapi llvm nls
 
 .include "../../mk/bsd.options.mk"
 
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=      --with-icu
 # GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 .if !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
+PLIST.gssapi=          yes
 CONFIGURE_ARGS+=       --with-gssapi
 .else
 CONFIGURE_ARGS+=       --without-gssapi

Index: pkgsrc/databases/postgresql13-server/PLIST
diff -u pkgsrc/databases/postgresql13-server/PLIST:1.2 pkgsrc/databases/postgresql13-server/PLIST:1.3
--- pkgsrc/databases/postgresql13-server/PLIST:1.2      Thu Mar 18 15:04:55 2021
+++ pkgsrc/databases/postgresql13-server/PLIST  Thu Apr  1 10:22:23 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/03/18 15:04:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/04/01 10:22:23 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -299,9 +299,9 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/auth-scram.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/auth.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc
+${PLIST.llvm}${PLIST.gssapi}lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/be-secure-common.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
+${PLIST.llvm}${PLIST.gssapi}lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/be-secure.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/crypt.bc