From owner-dev-commits-ports-all@freebsd.org Thu Jul 29 05:05:40 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 AFB2E66AC6C; Thu, 29 Jul 2021 05:05:40 +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 4GZz4h3tp9z4vpQ; Thu, 29 Jul 2021 05:05:40 +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 6DAA0335E; Thu, 29 Jul 2021 05:05:40 +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 16T55e8E083357; Thu, 29 Jul 2021 05:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16T55ege083356; Thu, 29 Jul 2021 05:05:40 GMT (envelope-from git) Date: Thu, 29 Jul 2021 05:05:40 GMT Message-Id: <202107290505.16T55ege083356@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 52ec4ce41a95 - main - net-im/ejabberd: Unbreak build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52ec4ce41a95457a3d9e140cd24145cb104c7b82 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: Thu, 29 Jul 2021 05:05:40 -0000 The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=52ec4ce41a95457a3d9e140cd24145cb104c7b82 commit 52ec4ce41a95457a3d9e140cd24145cb104c7b82 Author: Ashish SHUKLA AuthorDate: 2021-07-29 04:55:34 +0000 Commit: Ashish SHUKLA CommitDate: 2021-07-29 04:59:37 +0000 net-im/ejabberd: Unbreak build - Rename eredis patch file to be extra, and apply it only when REDIS option is set Reported by: otis --- net-im/ejabberd/Makefile | 1 + ...edis_src_eredis.app.src => extrapatch-deps_eredis_src_eredis.app.src} | 0 2 files changed, 1 insertion(+) diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 21e996c2010c..4d30b2df0cec 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -141,6 +141,7 @@ PGSQL_CONFIGURE_ENABLE= pgsql PGSQL_GH_TUPLE= processone:p1_pgsql:${P1_PGSQL_VER}:p1_pgsql/deps/p1_pgsql REDIS_CONFIGURE_ENABLE= redis REDIS_GH_TUPLE= wooga:eredis:v${EREDIS_VER}:eredis/deps/eredis +REDIS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-deps_eredis_src_eredis.app.src SIP_CONFIGURE_ENABLE= sip SIP_GH_TUPLE= processone:esip:${ESIP_VER}:esip/deps/esip SIP_IMPLIES= STUN diff --git a/net-im/ejabberd/files/patch-deps_eredis_src_eredis.app.src b/net-im/ejabberd/files/extrapatch-deps_eredis_src_eredis.app.src similarity index 100% rename from net-im/ejabberd/files/patch-deps_eredis_src_eredis.app.src rename to net-im/ejabberd/files/extrapatch-deps_eredis_src_eredis.app.src