diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2022-01-10 15:20:12 +0100 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2022-01-10 16:15:39 +0100 |
| commit | bcaf25a8c8046b094f6b5ab5bc258333bc326ee1 (patch) | |
| tree | 3930596b8cbea97540270b3d78ffb64373c89593 /textproc | |
| parent | databases/sqlite3: Update to 3.37.2 (diff) | |
Fix CONFLICTS entries of multiple ports
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.
This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.
Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).
A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.
These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,
Approved by: portmgr (implicit)
Diffstat (limited to 'textproc')
39 files changed, 78 insertions, 5 deletions
diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile index cbfe7663ed5e..90631dd5cd97 100644 --- a/textproc/agrep/Makefile +++ b/textproc/agrep/Makefile @@ -22,6 +22,8 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept USES= tar:Z +CONFLICTS_INSTALL= rubygem-amatch # bin/agrep + ALL_TARGET= MAKE_ARGS= CFLAGS="${CFLAGS}" PLIST_FILES= bin/agrep man/man1/agrep.1.gz diff --git a/textproc/align/Makefile b/textproc/align/Makefile index bda8fe1bc126..e1962b040484 100644 --- a/textproc/align/Makefile +++ b/textproc/align/Makefile @@ -18,6 +18,8 @@ USES= perl5 shebangfix tar:tgz SHEBANG_FILES= align width USE_PERL5= run +CONFLICTS_INSTALL= fasta # bin/align + PLIST_FILES= bin/align bin/width do-install: diff --git a/textproc/bar/Makefile b/textproc/bar/Makefile index 3ce7bce0cfd5..6bdca7a27058 100644 --- a/textproc/bar/Makefile +++ b/textproc/bar/Makefile @@ -10,6 +10,9 @@ MAINTAINER= erik@bz.bzflag.bz COMMENT= Cat with ASCII progress bar USES= tar:bzip2 + +CONFLICTS_INSTALL= clpbar # bin/bar + NO_BUILD= yes PLIST_FILES= bin/bar WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile index 671f25c5d8a6..1a8bab80201a 100644 --- a/textproc/bib2html/Makefile +++ b/textproc/bib2html/Makefile @@ -21,6 +21,8 @@ USE_PERL5= run NO_BUILD= yes NO_ARCH= yes +CONFLICTS_INSTALL= bibutils sowing # bin/bib2html bin/bib2xml + post-patch: .for i in bib2html bib2sql bib2xml @${SED} -e \ diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile index 9102f1fe4221..21addcf550a5 100644 --- a/textproc/bibutils/Makefile +++ b/textproc/bibutils/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/Copying USES= cpe gmake +CONFLICTS_INSTALL= bib2html # bin/bib2xml + HAS_CONFIGURE= yes TEST_TARGET= test diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile index c60c7b25730a..87a550965265 100644 --- a/textproc/btparse/Makefile +++ b/textproc/btparse/Makefile @@ -15,4 +15,6 @@ USE_LDCONFIG= yes USES= perl5 libtool pathfix USE_PERL5= build +CONFLICTS_INSTALL= p5-Text-BibTeX # bin/bibparse + .include <bsd.port.mk> diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile index 7f6733e2ec8b..2ec0e9f8f28d 100644 --- a/textproc/cmark/Makefile +++ b/textproc/cmark/Makefile @@ -15,6 +15,8 @@ USE_GITHUB= yes GH_ACCOUNT= commonmark USE_LDCONFIG= yes +CONFLICTS_INSTALL= py*-CommonMark # bin/cmark + CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR:STRING="lib" PLIST_SUB= VERSION=${PORTVERSION} TEST_TARGET= test diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile index cf9f58184b53..a712d4773260 100644 --- a/textproc/dict/Makefile +++ b/textproc/dict/Makefile @@ -16,6 +16,8 @@ LIB_DEPENDS= libmaa.so:devel/libmaa USES= bison gmake libtool:build localbase +CONFLICTS_INSTALL= irstlm # bin/dict + ALL_TARGET= dict GNU_CONFIGURE= yes INSTALL_TARGET= install.dict diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile index 05f86094bd1e..4f784af1b03d 100644 --- a/textproc/docbook-utils/Makefile +++ b/textproc/docbook-utils/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS+= dsssl-docbook-modular>0:textproc/dsssl-docbook-modular \ sgmlspl:textproc/p5-SGMLSpm \ lynx:www/lynx -CONFLICTS= docbook2X +CONFLICTS= docbook2X linux-j # bin/docbook2man bin/docbook2texi bin/jw USES= perl5 gmake shebangfix USE_PERL5= run diff --git a/textproc/dtdparse/Makefile b/textproc/dtdparse/Makefile index 16e428523ce6..b686f66ec31f 100644 --- a/textproc/dtdparse/Makefile +++ b/textproc/dtdparse/Makefile @@ -17,4 +17,6 @@ USES= perl5 USE_PERL5= configure NO_ARCH= yes +CONFLICTS_INSTALL= p5-SGML-DTDParse # bin/dtddiff bin/dtddiff2html bin/dtdflatten bin/dtdformat bin/dtdparse + .include <bsd.port.mk> diff --git a/textproc/ebook-tools/Makefile b/textproc/ebook-tools/Makefile index 0f29dc41cf40..c67bbbd16a19 100644 --- a/textproc/ebook-tools/Makefile +++ b/textproc/ebook-tools/Makefile @@ -17,4 +17,6 @@ USES= cmake gnome USE_LDCONFIG= yes USE_GNOME= libxml2 +CONFLICTS_INSTALL= ncbi-entrez-direct # bin/einfo + .include <bsd.port.mk> diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index 2589fcf4a373..bb8b196a289a 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -40,7 +40,7 @@ PAPERSIZE=A4 CONFIGURE_ENV+= PAGE=${PAPERSIZE} .endif -CONFLICTS= ja-groff +CONFLICTS= heirloom-doctools ja-groff INFO= groff diff --git a/textproc/heirloom-doctools/Makefile b/textproc/heirloom-doctools/Makefile index 884987645d34..999e2f291fc4 100644 --- a/textproc/heirloom-doctools/Makefile +++ b/textproc/heirloom-doctools/Makefile @@ -11,6 +11,9 @@ LICENSE= CDDL USES= gmake USE_GITHUB= yes GH_ACCOUNT= n-t-roff + +CONFLICTS_INSTALL= grap groff ja-groff util-linux # bin/col bin/eqn bin/grap bin/indxbib + ALL_TARGET= #empty MAKE_ARGS+= INSTALL="${INSTALL}" \ BINDIR=${BINDIR} \ diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile index b3fe0ceb7a52..cca2098cb72f 100644 --- a/textproc/hs-yaml/Makefile +++ b/textproc/hs-yaml/Makefile @@ -10,6 +10,8 @@ LICENSE= BSD3CLAUSE USES= cabal +CONFLICTS_INSTALL= json2yaml # bin/json2yaml + USE_CABAL= aeson-1.4.7.1_1 \ attoparsec-0.13.2.4 \ base-compat-0.11.1 \ diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile index d408bd7f804f..209837d50eaf 100644 --- a/textproc/htdig/Makefile +++ b/textproc/htdig/Makefile @@ -31,6 +31,8 @@ INSTALL_TARGET= install-strip LDFLAGS+= -L${OPENSSLLIB} CFLAGS+= -I${OPENSSLINC} +CONFLICTS_INSTALL= htdump mifluz # bin/htdb_dump bin/htdb_load bin/htdb_stat bin/htdump + OPTIONS_DEFINE= APACHE DOCS OPTIONS_DEFAULT= APACHE diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index 951a7df2b340..e11a1768b4b5 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes PORTDOCS= CHANGES CREDITS KNOWN_BUGS README TODO PLIST_FILES= bin/html2text man/man1/html2text.1.gz man/man5/html2textrc.5.gz -CONFLICTS= py*-html2text +CONFLICTS= py*-html2text py*-html2text2018 # bin/html2text PORTSCOUT= skipb:0 skipv:1.3.2 diff --git a/textproc/html2xhtml/Makefile b/textproc/html2xhtml/Makefile index b14a37dcc327..f1a38dc7b3c8 100644 --- a/textproc/html2xhtml/Makefile +++ b/textproc/html2xhtml/Makefile @@ -9,6 +9,8 @@ COMMENT= Convert HTML to XHTML GNU_CONFIGURE= yes USES= iconv +CONFLICTS_INSTALL= p5-HTML-HTML5-Parser p5-XML-Driver-HTML # bin/html2xhtml + PLIST_FILES= bin/dtdquery \ bin/html2xhtml \ man/man1/html2xhtml.1.gz diff --git a/textproc/irstlm/Makefile b/textproc/irstlm/Makefile index 693a700d45ae..2786bd5ec9bb 100644 --- a/textproc/irstlm/Makefile +++ b/textproc/irstlm/Makefile @@ -17,6 +17,9 @@ USE_PERL5= run USE_CXXSTD= gnu++98 USES= autoreconf libtool perl5 shebangfix tar:tgz USE_LDCONFIG= yes + +CONFLICTS_INSTALL= dict # bin/dict + SHEBANG_FILES= scripts/add-start-end.sh scripts/lm-stat.pl scripts/sort-lm.pl scripts/build-lm-qsub.sh scripts/mdtsel.sh scripts/split-dict.pl scripts/build-lm.sh scripts/merge-sublm.pl scripts/split-ngt.sh scripts/build-sublm.pl scripts/ngram-split.pl scripts/goograms2ngrams.pl scripts/rm-start-end.sh .include <bsd.port.mk> diff --git a/textproc/java2html/Makefile b/textproc/java2html/Makefile index d90737b545db..206dd574cd05 100644 --- a/textproc/java2html/Makefile +++ b/textproc/java2html/Makefile @@ -12,6 +12,9 @@ COMMENT= Java sources to HTML converter LICENSE= GPLv2 GNU_CONFIGURE= yes + +CONFLICTS_INSTALL= source-highlight # bin/java2html + PORTDOCS= AUTHORS NEWS README PLIST_FILES= bin/java2html man/man1/java2html.1.gz diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index e3b4eeec5753..cca75227229b 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -22,6 +22,8 @@ CPE_VENDOR= gnu USE_GNOME= gtk20 gdkpixbuf2 USE_LDCONFIG= yes +CONFLICTS_INSTALL= csound outguess # bin/extract + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk-version=2 \ --with-ltdl=${LOCALBASE} diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile index 77dbb89f789b..0368b189ef7e 100644 --- a/textproc/mifluz/Makefile +++ b/textproc/mifluz/Makefile @@ -24,6 +24,8 @@ CXXFLAGS_clang= -Wno-c++11-narrowing CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= htdig # bin/htdb_dump bin/htdb_load bin/htdb_stat + SUB_FILES= pkg-message INFO= mifluz diff --git a/textproc/p5-DocSet/Makefile b/textproc/p5-DocSet/Makefile index 0db0b40606c1..20434e9ee72b 100644 --- a/textproc/p5-DocSet/Makefile +++ b/textproc/p5-DocSet/Makefile @@ -16,4 +16,6 @@ RUN_DEPENDS= p5-Pod-POM>=0:textproc/p5-Pod-POM \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= html2ps # bin/html2ps + .include <bsd.port.mk> diff --git a/textproc/p5-HTML-HTML5-Parser/Makefile b/textproc/p5-HTML-HTML5-Parser/Makefile index ff94a0bafdc8..519dcca2f577 100644 --- a/textproc/p5-HTML-HTML5-Parser/Makefile +++ b/textproc/p5-HTML-HTML5-Parser/Makefile @@ -23,4 +23,6 @@ RUN_DEPENDS= p5-HTML-HTML5-Entities>=0.002:textproc/p5-HTML-HTML5-Entities \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= html2xhtml p5-XML-Driver-HTML # bin/html2xhtml + .include <bsd.port.mk> diff --git a/textproc/p5-SGML-DTDParse/Makefile b/textproc/p5-SGML-DTDParse/Makefile index 409a2f26b0e4..76854d2ac94a 100644 --- a/textproc/p5-SGML-DTDParse/Makefile +++ b/textproc/p5-SGML-DTDParse/Makefile @@ -19,4 +19,6 @@ RUN_DEPENDS= p5-DelimMatch>=1.05:textproc/p5-DelimMatch \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= dtdparse # bin/dtddiff bin/dtddiff2html bin/dtdflatten bin/dtdformat bin/dtdparse + .include <bsd.port.mk> diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile index 51f66bf27453..1eab84c62697 100644 --- a/textproc/p5-Text-BibTeX/Makefile +++ b/textproc/p5-Text-BibTeX/Makefile @@ -23,6 +23,8 @@ USE_PERL5= modbuild CFLAGS_amd64= -fPIC USE_LDCONFIG= yes +CONFLICTS_INSTALL= btparse # bin/bibparse + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbtparse.so diff --git a/textproc/p5-XML-Driver-HTML/Makefile b/textproc/p5-XML-Driver-HTML/Makefile index 37d3aec506d3..2d045a08c072 100644 --- a/textproc/p5-XML-Driver-HTML/Makefile +++ b/textproc/p5-XML-Driver-HTML/Makefile @@ -17,4 +17,6 @@ RUN_DEPENDS= p5-XML-TreeBuilder>=0:textproc/p5-XML-TreeBuilder \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= html2xhtml p5-HTML-HTML5-Parser # bin/html2xhtml + .include <bsd.port.mk> diff --git a/textproc/pear-Text_Highlighter/Makefile b/textproc/pear-Text_Highlighter/Makefile index 2b0242763310..1225adf0fbd9 100644 --- a/textproc/pear-Text_Highlighter/Makefile +++ b/textproc/pear-Text_Highlighter/Makefile @@ -15,4 +15,6 @@ RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} USES= pear NO_ARCH= yes +CONFLICTS_INSTALL= generate julius php*-pear-Text_Highlighter # bin/generate + .include <bsd.port.mk> diff --git a/textproc/py-asciinema/Makefile b/textproc/py-asciinema/Makefile index 023cd7dcf345..1c7c45e09133 100644 --- a/textproc/py-asciinema/Makefile +++ b/textproc/py-asciinema/Makefile @@ -14,4 +14,6 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= python:3.3+ USE_PYTHON= distutils autoplist +CONFLICTS_INSTALL= cowrie # bin/asciinema + .include <bsd.port.mk> diff --git a/textproc/py-elasticsearch-curator/Makefile b/textproc/py-elasticsearch-curator/Makefile index ae608d0cc025..7ad8869bef1a 100644 --- a/textproc/py-elasticsearch-curator/Makefile +++ b/textproc/py-elasticsearch-curator/Makefile @@ -28,6 +28,8 @@ GH_ACCOUNT= elastic GH_PROJECT= curator USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= curator # bin/curator + NO_ARCH= yes .include <bsd.port.mk> diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index c0634cbeb59d..06816e107f37 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -19,7 +19,7 @@ USES= python:3.5+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes -CONFLICTS_INSTALL= html2text py*-html2text2018 +CONFLICTS_INSTALL= html2text py*-html2text2018 # bin/html2text do-test: @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest --cov=html2text diff --git a/textproc/py-html2text2018/Makefile b/textproc/py-html2text2018/Makefile index 862201d795a3..d9a926a5f738 100644 --- a/textproc/py-html2text2018/Makefile +++ b/textproc/py-html2text2018/Makefile @@ -20,7 +20,7 @@ USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes -CONFLICTS_INSTALL= html2text py*-html2text +CONFLICTS_INSTALL= html2text py*-html2text # bin/html2text do-test: @cd ${WRKSRC} && coverage run --source=html2text setup.py test -v diff --git a/textproc/rnv/Makefile b/textproc/rnv/Makefile index 4d9f393a998e..18e3aa52e4f0 100644 --- a/textproc/rnv/Makefile +++ b/textproc/rnv/Makefile @@ -17,6 +17,8 @@ USES= tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-expat="${LOCALBASE}" +CONFLICTS_INSTALL= arx-libertatis # bin/arx + PLIST_FILES= bin/arx bin/rnv bin/rvp bin/xsdck man/man1/rnv.1.gz .include <bsd.port.mk> diff --git a/textproc/rubygem-amatch/Makefile b/textproc/rubygem-amatch/Makefile index d1fbfac28cd2..b4b23fd51d2f 100644 --- a/textproc/rubygem-amatch/Makefile +++ b/textproc/rubygem-amatch/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= rubygem-mize>=0:devel/rubygem-mize \ USES= gem USE_RUBY= yes +CONFLICTS_INSTALL= agrep # bin/agrep + PLIST_FILES= bin/agrep bin/dupfind .include <bsd.port.mk> diff --git a/textproc/rubygem-diff-lcs/Makefile b/textproc/rubygem-diff-lcs/Makefile index 982b61f0dae2..03942a36b44d 100644 --- a/textproc/rubygem-diff-lcs/Makefile +++ b/textproc/rubygem-diff-lcs/Makefile @@ -19,6 +19,8 @@ USE_RUBY= yes NO_ARCH= yes +CONFLICTS_INSTALL= p5-HTML-Diff # bin/htmldiff + PLIST_FILES= bin/htmldiff bin/ldiff SHEBANG_FILES= bin/htmldiff bin/ldiff diff --git a/textproc/rubygem-github-markup/Makefile b/textproc/rubygem-github-markup/Makefile index 1722c421e0bf..7a8d21574066 100644 --- a/textproc/rubygem-github-markup/Makefile +++ b/textproc/rubygem-github-markup/Makefile @@ -12,6 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gem shebangfix USE_RUBY= yes +CONFLICTS_INSTALL= rubygem-github-markup* + NO_ARCH= yes REINPLACE_ARGS= -i '' diff --git a/textproc/rubygem-github-markup17/Makefile b/textproc/rubygem-github-markup17/Makefile index 03f12a4c509b..f0f53742070a 100644 --- a/textproc/rubygem-github-markup17/Makefile +++ b/textproc/rubygem-github-markup17/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gem shebangfix USE_RUBY= yes +CONFLICTS_INSTALL= rubygem-github-markup* + NO_ARCH= yes REINPLACE_ARGS= -i '' diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index e2cb89042438..e44f75a6ee2a 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -23,6 +23,8 @@ CONFIGURE_ARGS= --with-bash-completion INSTALL_TARGET= install-strip USE_LDCONFIG= yes +CONFLICTS_INSTALL= java2html # bin/java2html + OPTIONS_DEFINE= DOCS EXAMPLES PORTDOCS= * diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile index 0a5140ab90d2..820316cdb15b 100644 --- a/textproc/sowing/Makefile +++ b/textproc/sowing/Makefile @@ -16,6 +16,9 @@ USES= ghostscript gmake perl5 USE_TEX= latex dvipsk GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} + +CONFLICTS_INSTALL= bib2html # bin/bib2html + ALL_TARGET= all-redirect MAKE_JOBS_UNSAFE= yes diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index 6bc4f8cfbacb..3cd46aeabc51 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -20,6 +20,8 @@ LICENSE= GPLv2 USES= compiler:c++11-lang +CONFLICTS_INSTALL= mnogosearch # bin/indexer + BUILD_DEPENDS= gsed:textproc/gsed # If expat is present on the system and configure finds it, it will # unconditionally link the output binary against it. There's no way |