From nobody Mon Jun 05 15:37:45 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZd621kbxz4Z2Mx; Mon, 5 Jun 2023 15:37:46 +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 4QZd621HPrz4DsX; Mon, 5 Jun 2023 15:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685979466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFlW/pdc9DSYqrIpt/HIJ9X4i15yzIqHoEkW8Q6OAKc=; b=w9MWIhD+iKwTceNUomO+SPulajWaKkQUGdBfNLxNLCOp8ZjyiqbkWuOggwr8Ft1jietJpw zuiC2fHeFaxEedUW+i68Zqs0zIU69igzJn7iqGXoQb9XD1onSIfTG6QgPb6PJhu0gS67yP jC10AB/WiLiTJJdaiJa8XXPaoAspVYOwZ+Q5x00syR01ImFAy4JNNxzg9G3da4tuGdenJ8 P5SxQ4s5ar2Us+66m2EDkeXSYArjHCvl2/kHJ+EkdHWD86iOguOPaxYldgpvf5h93PzBZx gxYdWt7GSU1ymZaGMUHGp6hJRTGiVKCqVuREkg6GYTvD0SV0nCjdWM8kzYn8iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685979466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFlW/pdc9DSYqrIpt/HIJ9X4i15yzIqHoEkW8Q6OAKc=; b=n6cE+ssDmeMoTj4wKyMQcGzc/hg8vo1+jqZpLiSbX3YpPUaA2GmgimHEMltpC4La0Qu0X1 WyYMnd4yCK5K2pyDPiRWz5GOk11ILvcOpeDGy6u6F0CEfbN4ozpyL08Q+QXWp58yJZCcph FwZKFRZCYygmbS9GbVnMuIWj/A3gSh7J0jfLvovryBcSKsmjG9+NTYiA2AFGH44FRWYZTc lFESLP+mymlpk2uaw38+pQb+8UU0FTaBnw1wVmz5sg1j7cqq1G9R25sy2h3xLJFVQMWMR5 kcmXDNU8t/mSiyzc1NdnwwBtQGuiRpjRF++BufJQ3PFy4R4hhNNcopq80+UG4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685979466; a=rsa-sha256; cv=none; b=bR0vnPL1+sr9gXcMhOZn89dNHtRuMKiM7Dha4k0QQLOjkvyynIuzu+tDBRtV64cWr9SK14 g5dVCXn3lP1sarzLAB44gQGQTLreqtoaYLffHfqG5+93KRKjxdodFsfjz5OQiEthUG5yBW g4q4wQfs+ppJJiwgGB4nIS+d/Ux+FKZWCQdynvbk7f6sAlZPnNB02nJrhP8r50BGnDruxt 7BjeiM2XBS7ie8+6b8RIPTjmQAuG2Wjb8SvkA1IayI/qUBwKHKfL2MiyivphTbN2aaxwyO P9tis60Y8G36Ojyp0zPdCDY4XbYkzEKnzXUKBbN3KUC0kEH3mYw0A+UuoyyAUg== 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 4QZd620FMczt6p; Mon, 5 Jun 2023 15:37:46 +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 355FbjSQ016845; Mon, 5 Jun 2023 15:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355FbjRP016844; Mon, 5 Jun 2023 15:37:45 GMT (envelope-from git) Date: Mon, 5 Jun 2023 15:37:45 GMT Message-Id: <202306051537.355FbjRP016844@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: c7ebfa287cec - main - devel/libevent: register CONFLICTS_INSTALL with -devel port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7ebfa287cecd6a76bfc4aebd69d4fe1d1d86404 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7ebfa287cecd6a76bfc4aebd69d4fe1d1d86404 commit c7ebfa287cecd6a76bfc4aebd69d4fe1d1d86404 Author: Alexey Dokuchaev AuthorDate: 2023-06-05 15:36:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-06-05 15:36:44 +0000 devel/libevent: register CONFLICTS_INSTALL with -devel port While here, drop needless OPENSSL_{CPP,LD}FLAGS assignments. With DEFAULT_VERSIONS+=ssl=openssl|libressl, the following definitions end up in the ${WRKSRC}/Makefile without manual specification of the paths, as they come from pkgconf(1): OPENSSL_INCS = -I/usr/local/include OPENSSL_LIBS = -L/usr/local/lib -lssl -lcrypto With default OpenSSL implementation (base): OPENSSL_INCS = OPENSSL_LIBS = -lssl -lcrypto --- devel/libevent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile index c921b55bd11b..77831a375b0b 100644 --- a/devel/libevent/Makefile +++ b/devel/libevent/Makefile @@ -19,13 +19,13 @@ INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes +CONFLICTS_INSTALL= ${PORTNAME}-devel + OPTIONS_DEFINE= OPENSSL THREADS OPTIONS_DEFAULT= OPENSSL THREADS OPTIONS_SUB= yes OPENSSL_USES= ssl -OPENSSL_CPPFLAGS= -I${OPENSSLINC} -OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_CONFIGURE_ENABLE= openssl THREADS_CONFIGURE_ENABLE= thread-support