From nobody Wed Aug 16 18:30:47 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 4RQxXT32qhz4qxN4; Wed, 16 Aug 2023 18:30:49 +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 4RQxXR4h12z4QHM; Wed, 16 Aug 2023 18:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210647; 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=Mn2k0LLYy+lKmFaQOw4Y+w0gtWGG73vvZoIrYgZXgAk=; b=resEl/OZXmf8uTh4D3dnIvDAFtKUTvkhva/7Y9/ve0ZcX77KAbhVNjqAtl576y2PLLT+h7 +wlPTPtvpxUZgllw6g0X5sicb/QPRBdrOBsepLfcjbHfoy3/HCh9gWfoAhypPhsY4xR0F+ ykAPPWH7uJEK2HbUU3Uwtzn55PceEbGQQUBST77GoXLhMl6jlZ1eIwmh4RTLP14Z5F3tcP 1tj6n5oHNNYQlFfZrCpGeXbIGNx3uEdcgPcLnizMuND0gTjU+5/DAgIB/FYtwfXgiid/HN wEM3qGzwlZnxGGCHghLKZ0c8Qm44UYhEFbkR3eqKVoceuSMke2UEBH0K2d6+YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210647; 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=Mn2k0LLYy+lKmFaQOw4Y+w0gtWGG73vvZoIrYgZXgAk=; b=em/yfI6vLNgoJlQsiBHZP90iWObw6ZZxZUbctNR+r7HdMKWPmJ/wO25KTCQmidrSmpWGFL 3GXrRGs7PRzwYY6OBmLH3IcBYgwJ4PhDJJQZJYefBFEB5BdmHLa/T6CF4xqPoRAH3Q3elV hn5grz0tduR/1QL3oYFlg2j4gZKQEM8a6R4QJJtTQB6TYhEUPrE9Gu+QR7oiYh7HJoIZ1B hLbJEZ+Q9PNXE1uO5yNu9L0ZAmZWd2Am+rxnm1Qh2cfHtERSs2erFqKJAJIuT+9CDGNJmD Otiecd2Ob7e8Z9HjBoZGMePZsChf75oYLaHr7Kn2vj763f4DN40+NP47OuNKhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210647; a=rsa-sha256; cv=none; b=aVQpELyeMJiJLcnLktt46m3jXlFXQqd46YiYo7QfiUIU1Ugxa3ylfmfS1Kqc6QFOfBvtWR jD0ezuOKNuDLVxSbNBn5EJrcSq0qb8w6KPRLWkoR+7NDq+PECdHjkttSu/yj05nmXjWnit zApBgOuYBf3MUNA6v7YKPEPowXk07wj6wpPLo+KXXJ78lmCQX9WBHOhmXFo1YLHFgAGDlz sSa3U4Xhl6HUeXSID8ob0OEnFaWDJIhWtvCcprw2BhXiE3pD1+bVqhBcejvJL/kYZl9vSX d48t0IfVOSwr5mI487XihC/9k5jpRmehaRJ3tcV7qcLlMMP8CNsm6JfJoGkCJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQxXR3mhsz1201; Wed, 16 Aug 2023 18:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GIUli4025003; Wed, 16 Aug 2023 18:30:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIUlhU025000; Wed, 16 Aug 2023 18:30:47 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:30:47 GMT Message-Id: <202308161830.37GIUlhU025000@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: f6a177696981 - main - net/speedtest: Mark CONFLICTS with net/py-speedtest-cli 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6a177696981ec69f8d3181863d50590594b1d86 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6a177696981ec69f8d3181863d50590594b1d86 commit f6a177696981ec69f8d3181863d50590594b1d86 Author: Po-Chuan Hsieh AuthorDate: 2023-08-16 18:10:33 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-08-16 18:25:11 +0000 net/speedtest: Mark CONFLICTS with net/py-speedtest-cli Reported by: nivit --- net/py-speedtest-cli/Makefile | 2 ++ net/speedtest/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/net/py-speedtest-cli/Makefile b/net/py-speedtest-cli/Makefile index 63f665a13501..cc2e19a2d6df 100644 --- a/net/py-speedtest-cli/Makefile +++ b/net/py-speedtest-cli/Makefile @@ -16,6 +16,8 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS_INSTALL= speedtest # bin/speedtest + OPTIONS_DEFINE= DOCS PORTDOCS= README.rst diff --git a/net/speedtest/Makefile b/net/speedtest/Makefile index a2ecc77cf43d..d0b61aca533b 100644 --- a/net/speedtest/Makefile +++ b/net/speedtest/Makefile @@ -21,6 +21,8 @@ NO_WRKSUBDIR= yes PLIST_FILES= bin/speedtest \ share/man/man5/speedtest.5.gz +CONFLICTS_INSTALL= py*-speedtest-cli # bin/speedtest + do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin/ ${STAGEDIR}${PREFIX}/share/man/man5/ ${INSTALL_PROGRAM} ${WRKSRC}/usr/local/bin/speedtest ${STAGEDIR}${PREFIX}/bin/speedtest