svn commit: r514661 - head/databases/postgresql12-server

[Palle Girgensohn]

Author: girgen
Date: Thu Oct 17 14:12:49 2019
New Revision: 514661
URL: https://svnweb.freebsd.org/changeset/ports/514661

Log:
  Fix PLIST problems when building with LLVM but without GSSAPI or OPENSSL.
  
  PR:		241053, 241166
  Submitted by:	Artyom Davidov

Modified:
  head/databases/postgresql12-server/Makefile
  head/databases/postgresql12-server/pkg-plist-server

Modified: head/databases/postgresql12-server/Makefile
==============================================================================
--- head/databases/postgresql12-server/Makefile	Thu Oct 17 14:09:36 2019	(r514660)
+++ head/databases/postgresql12-server/Makefile	Thu Oct 17 14:12:49 2019	(r514661)
@@ -218,9 +218,11 @@ CONFIGURE_ARGS+=--with-gssapi
 # so configure's -lgssapi_krb5 won't go.
 LDFLAGS+=	-lgssapi
 LDFLAGS_SL+=	-lgssapi
+PLIST_SUB+=	GSSAPI=""
 .endif
 .else
 CONFIGURE_ARGS+=--without-gssapi
+PLIST_SUB+=	GSSAPI="@comment "
 .endif
 
 .  if ${PORT_OPTIONS:MMIT_KRB5}
@@ -237,6 +239,12 @@ LIB_DEPENDS+=	libkrb5.so.3:security/krb5
 
 .  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
 CONFIGURE_ARGS+=--with-krb5
+.  endif
+
+.  if ${PORT_OPTIONS:MSSL}
+PLIST_SUB+=	SSL=""
+.  else
+PLIST_SUB+=	SSL="@comment "
 .  endif
 
 .endif # !SLAVE_ONLY

Modified: head/databases/postgresql12-server/pkg-plist-server
==============================================================================
--- head/databases/postgresql12-server/pkg-plist-server	Thu Oct 17 14:09:36 2019	(r514660)
+++ head/databases/postgresql12-server/pkg-plist-server	Thu Oct 17 14:12:49 2019	(r514661)
@@ -338,10 +338,10 @@ lib/postgresql/utf8_and_win.so
 %%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-scram.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc
+%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-common.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc
+%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
+%%LLVM%%%%SSL%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc