From owner-svn-ports-all@freebsd.org Thu Oct 17 14:12:50 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9DBEE1533B3; Thu, 17 Oct 2019 14:12:50 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46vB2V3fgNz4GB1; Thu, 17 Oct 2019 14:12:50 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61F6F21AAC; Thu, 17 Oct 2019 14:12:50 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9HECoph008219; Thu, 17 Oct 2019 14:12:50 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9HECo8R008218; Thu, 17 Oct 2019 14:12:50 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201910171412.x9HECo8R008218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Thu, 17 Oct 2019 14:12:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514661 - head/databases/postgresql12-server X-SVN-Group: ports-head X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: head/databases/postgresql12-server X-SVN-Commit-Revision: 514661 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2019 14:12:50 -0000 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