From nobody Thu Nov 03 12:09:29 2022 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 4N32cT5VpNz4grMR; Thu, 3 Nov 2022 12:09:29 +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 4N32cT55lpz3R7x; Thu, 3 Nov 2022 12:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667477369; 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=Gwm8qfkFLzD9dojzM2ojR9KlUk8RWki5s1kG8DDKU08=; b=pajokgbM5A0X3vXRn9S0pkLD/WlHK3y8HHevtkesuTsxuzsr69ScyqTu29lBcScfBndW5c BHpB6vwk+jtRXHlfrotGxDI4pLNO1BiVcOnsNQ6MBJIplqjaZFQszAwi9aH18SUaPWncTy vzzRRKYNx1riP+M3qVEyEFd85Kx9D0Gl3jMqDzL+6rvv6a9pq52l542zpJjivwCMysWMr0 5334NaR7si+ALuJ+DcdjH8ekf8eKiYJNB9ueGxb2juhDxdYZSxywut6RjuX26YN8gZ7OxE yCpKHbWj8pnSMZy+gEhXaevfEmzHtwF5ljGGSLp0xGjT/iRmZqRqP2Q6Bdpcrg== 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 4N32cT49v8zbXd; Thu, 3 Nov 2022 12:09:29 +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 2A3C9Tad077552; Thu, 3 Nov 2022 12:09:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3C9TWc077551; Thu, 3 Nov 2022 12:09:29 GMT (envelope-from git) Date: Thu, 3 Nov 2022 12:09:29 GMT Message-Id: <202211031209.2A3C9TWc077551@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 0b2033c53d93 - main - */*: update conflicts on bin/xls2csv in 4 ports 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b2033c53d9343a663f62171900c2d71fa5e9bb4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667477369; 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=Gwm8qfkFLzD9dojzM2ojR9KlUk8RWki5s1kG8DDKU08=; b=eMzFimt2bIUbubIuutt2AWKBhJn1vQKnSGw6BkFaE4xL9ILUeOOOzM2dJIGU08asCkRExF 1QBrvhHgC2HqCDiWW2iSzxbZLU7CMcVsYKA10j5FEAf3xydn6TwOI1w/PcfQ/MeZrexxAq drzT1SQYCfxvZzSH2hAKlKJj3YpxLRS0VEIm+A+jTtgHh50WnNbflrdq5yciYreb0tdMAq HZs4rVDQsfE1WAN1EEB0/ynDxtJAEUEjNOxvsz1BHtXV0lwL5EnOR9NKdRleiLlcQ8WhK8 BjYKY3aghXWNESVO8YCPL5ydU0MAWoXG+6gql60i0KtZM8XY5lne8mWVHpHOKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667477369; a=rsa-sha256; cv=none; b=TWYdVPPL1ZnwogQQv4wnrCnxZJIfoFn/HTq+IDw6O8ugQEAUye1+O+qIBzIMV0golu2pmB fxtv1M90jGaVqvoFwiuzW7Xj/FEoALMTBM1uIaqvMRMeGouJuHqCjRtSKkzoQNy7dhbvXQ 59zzGfiSvVjjOkFMHQOqB6Le1a6p8iV2a/qSVpsejysF8T4yL48ZELI55B2NtnngYmyfZE nYM83vB6CNG3yxdSEAAj8WT5xdIXWcxbMU8tb6lBeceplNK3s7/ETx2QzpE5q6GKk8Q+t3 Sx9DDY/F3Cccs6lRkuJo1hS1Jymy534NmmYoLuvoo59K2BTsoyKV8r2D3ZLK/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b2033c53d9343a663f62171900c2d71fa5e9bb4 commit 0b2033c53d9343a663f62171900c2d71fa5e9bb4 Author: Dmitry Marakasov AuthorDate: 2022-11-02 16:22:24 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-03 12:09:18 +0000 */*: update conflicts on bin/xls2csv in 4 ports Conflicting ports: - databases/xls2txt - math/libxls - textproc/catdoc - textproc/p5-Spreadsheet-Read PR: 248294 Reported by: jbeich --- databases/xls2txt/Makefile | 2 ++ math/libxls/Makefile | 2 +- textproc/catdoc/Makefile | 2 +- textproc/p5-Spreadsheet-Read/Makefile | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/databases/xls2txt/Makefile b/databases/xls2txt/Makefile index 21e4fd999705..4c811cbb2e31 100644 --- a/databases/xls2txt/Makefile +++ b/databases/xls2txt/Makefile @@ -61,6 +61,8 @@ EXECUTABLES= ${PORTNAME} xls2csv PLIST_FILES= ${EXECUTABLES:S/^/bin\//} +CONFLICTS_INSTALL= catdoc libxls p5-Spreadsheet-Read + post-install: cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} ${EXECUTABLES} diff --git a/math/libxls/Makefile b/math/libxls/Makefile index 7e7d2add3b0f..46b5cc343aea 100644 --- a/math/libxls/Makefile +++ b/math/libxls/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE USES= compiler:c++11-lang cpe libtool CPE_VENDOR= ${PORTNAME}_project -CONFLICTS_INSTALL= catdoc +CONFLICTS_INSTALL= catdoc p5-Spreadsheet-Read xls2txt GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile index e593a403a661..e5cf8b95eed3 100644 --- a/textproc/catdoc/Makefile +++ b/textproc/catdoc/Makefile @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-install-root="${STAGEDIR}" CPE_VENDOR= fossies -CONFLICTS_INSTALL= libxls +CONFLICTS_INSTALL= libxls p5-Spreadsheet-Read xls2txt PORTDATA= * diff --git a/textproc/p5-Spreadsheet-Read/Makefile b/textproc/p5-Spreadsheet-Read/Makefile index 2ce04d3a1f7b..22386030b4fb 100644 --- a/textproc/p5-Spreadsheet-Read/Makefile +++ b/textproc/p5-Spreadsheet-Read/Makefile @@ -22,7 +22,8 @@ TEST_DEPENDS= p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings USES= perl5 tar:tgz USE_PERL5= configure - NO_ARCH= yes +CONFLICTS_INSTALL= catdoc libxls xls2txt + .include