Bug 248294 - math/libxls, textproc/catdoc: conflicted file
Summary: math/libxls, textproc/catdoc: conflicted file
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Dmitry Marakasov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-07-27 14:14 UTC by Zsolt Udvari
Modified: 2022-11-03 12:10 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (bapt)

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Zsolt Udvari freebsd_committer freebsd_triage 2020-07-27 14:14:26 UTC 
libxls-1.5.2 [FreeBSD] conflicts with catdoc-0.95 [installed] on /usr/local/bin/xls2csv
Comment 1 commit-hook freebsd_committer freebsd_triage 2022-11-01 15:22:12 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ee06ac7a6cc1618d3268161b04bed3c30b3705eb

commit ee06ac7a6cc1618d3268161b04bed3c30b3705eb
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-11-01 15:18:44 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-11-01 15:20:53 +0000

    math/libxls, textproc/catdoc: add mutual conflicts

    The ports conflict on bin/xls2csv. While here, a couple of minor
    cosmetic fixes.

    PR:             248294
    Submitted by:   uzsolt@uzsolt.hu
    Approved by:    maintainer timeout (bapt, 2+ years)

 math/libxls/Makefile     | 4 +++-
 textproc/catdoc/Makefile | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
Comment 2 commit-hook freebsd_committer freebsd_triage 2022-11-03 12:10:32 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b2033c53d9343a663f62171900c2d71fa5e9bb4

commit 0b2033c53d9343a663f62171900c2d71fa5e9bb4
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-11-02 16:22:24 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
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(-)