git: ee06ac7a6cc1 - main - math/libxls, textproc/catdoc: add mutual conflicts
Date: Tue, 01 Nov 2022 15:21:19 UTC
The branch main has been updated by amdmi3:
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(-)
diff --git a/math/libxls/Makefile b/math/libxls/Makefile
index 50775156c8f9..7e7d2add3b0f 100644
--- a/math/libxls/Makefile
+++ b/math/libxls/Makefile
@@ -9,9 +9,11 @@ WWW= https://github.com/libxls/libxls
LICENSE= BSD2CLAUSE
-USES= compiler:c++11-lang cpe libtool
+USES= compiler:c++11-lang cpe libtool
CPE_VENDOR= ${PORTNAME}_project
+CONFLICTS_INSTALL= catdoc
+
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 1467ceb509fc..e593a403a661 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -2,7 +2,7 @@ PORTNAME= catdoc
PORTVERSION= 0.95
CATEGORIES= textproc
MASTER_SITES= http://ftp.wagner.pp.ru/pub/catdoc/ \
- http://mirror.amdmi3.ru/distfiles/
+ https://mirror.amdmi3.ru/distfiles/
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= MS Word/Excel converter to plain ASCII or TeX. TK viewer included
@@ -11,11 +11,13 @@ WWW= https://www.wagner.pp.ru/~vitus/software/catdoc/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= cpe gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-install-root="${STAGEDIR}"
-USES= cpe gmake
CPE_VENDOR= fossies
+CONFLICTS_INSTALL= libxls
+
PORTDATA= *
OPTIONS_DEFINE= WORDVIEW