From owner-dev-commits-ports-all@freebsd.org Wed Sep 29 09:39:23 2021 Return-Path: Delivered-To: dev-commits-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 5DEE8670A11; Wed, 29 Sep 2021 09:39:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HKBCv2DT5z4vwd; Wed, 29 Sep 2021 09:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 295EE15D10; Wed, 29 Sep 2021 09:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18T9dNvM068692; Wed, 29 Sep 2021 09:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18T9dN9V068691; Wed, 29 Sep 2021 09:39:23 GMT (envelope-from git) Date: Wed, 29 Sep 2021 09:39:23 GMT Message-Id: <202109290939.18T9dN9V068691@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: 59611d61d70a - main - databases/postgresql14-server: fix openssl dependency MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59611d61d70a85f4418f3f701db1b7baf58560ba Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Sep 2021 09:39:23 -0000 The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=59611d61d70a85f4418f3f701db1b7baf58560ba commit 59611d61d70a85f4418f3f701db1b7baf58560ba Author: Palle Girgensohn AuthorDate: 2021-09-29 09:36:43 +0000 Commit: Palle Girgensohn CommitDate: 2021-09-29 09:39:17 +0000 databases/postgresql14-server: fix openssl dependency libpq.pc should not require openssl from ports when built with base -lssl PR: 258760 --- databases/postgresql14-server/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile index 6a10dd228b39..e08742f33117 100644 --- a/databases/postgresql14-server/Makefile +++ b/databases/postgresql14-server/Makefile @@ -4,7 +4,7 @@ PORTNAME?= postgresql DISTVERSION?= 14rc1 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} @@ -313,6 +313,10 @@ post-patch: -e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \ -e '/icu/s/_57//' \ ${WRKSRC}/configure.in +. elif defined(CLIENT_ONLY) && !defined(OPENSSL_PORT) + @${REINPLACE_CMD} \ + -e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \ + ${WRKSRC}/src/interfaces/libpq/Makefile . endif do-install: