diff options
Diffstat (limited to 'devel')
90 files changed, 164 insertions, 33 deletions
diff --git a/devel/aphpbreakdown/Makefile b/devel/aphpbreakdown/Makefile index b870a96b8b15..28862631d288 100644 --- a/devel/aphpbreakdown/Makefile +++ b/devel/aphpbreakdown/Makefile @@ -16,6 +16,8 @@ USE_PHP= tokenizer phar hash NO_ARCH= yes NO_BUILD= yes +CONFLICTS_INSTALL= php*-aphpbreakdown + PLIST_FILES= bin/aphpbreakdown # Download isn't compressed or aggregated, it's just the single file diff --git a/devel/aphpunit/Makefile b/devel/aphpunit/Makefile index 952e733d7ff5..d478b0ce08aa 100644 --- a/devel/aphpunit/Makefile +++ b/devel/aphpunit/Makefile @@ -16,6 +16,8 @@ USE_PHP= mbstring pcntl phar posix sysvmsg NO_ARCH= yes NO_BUILD= yes +CONFLICTS_INSTALL= php*-aphpunit + PLIST_FILES= bin/aphpunit # Download isn't compressed or aggregated, it's just the single file diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile index a69b558a731c..4ca060e9d708 100644 --- a/devel/arcanist-lib/Makefile +++ b/devel/arcanist-lib/Makefile @@ -49,7 +49,7 @@ ENCODINGS_USE= PHP=mbstring RUN_DEPENDS= arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/arcanist-lib@${PHP_FLAVOR} -CONFLICTS= arc +CONFLICTS= arc arcanist-php?? PLIST_FILES= bin/arc diff --git a/devel/arduino/Makefile b/devel/arduino/Makefile index 96a2be909b7c..4d28a0d20679 100644 --- a/devel/arduino/Makefile +++ b/devel/arduino/Makefile @@ -30,6 +30,8 @@ JAVA_OS= native JAVA_VENDOR= openjdk JAVA_RUN= yes +CONFLICTS_INSTALL= arduino18 + NO_BUILD= yes USE_LDCONFIG= ${PREFIX}/arduino/lib diff --git a/devel/arm-none-eabi-gcc/Makefile b/devel/arm-none-eabi-gcc/Makefile index fe6b49b49476..ae56c7fa6b4f 100644 --- a/devel/arm-none-eabi-gcc/Makefile +++ b/devel/arm-none-eabi-gcc/Makefile @@ -8,6 +8,8 @@ PLIST= ${.CURDIR}/pkg-plist DISTINFO_FILE= ${.CURDIR}/distinfo COMMENT= GNU Compiler Collection for bare metal arm cross-development +CONFLICTS_INSTALL= arm-none-eabi-gcc492 + OPTIONS_SINGLE= ML OPTIONS_SINGLE_ML= ML_NONE ML_DEFAULT ML_CORTEXA ML_CORTEXRM OPTIONS_DEFAULT= ML_NONE diff --git a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile index a8fc592e63ca..72227a049174 100644 --- a/devel/arm-none-eabi-gcc492/Makefile +++ b/devel/arm-none-eabi-gcc492/Makefile @@ -44,6 +44,8 @@ CONFIGURE_ARGS= --target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \ --disable-libstdcxx \ --disable-multilib +CONFLICTS_INSTALL= arm-none-eabi-gcc + PLIST= ${.CURDIR}/pkg-plist # U-Boot requires libgcc, crossbuild and install it along with the compiler. diff --git a/devel/autoconf-wrapper/Makefile b/devel/autoconf-wrapper/Makefile index b802fde68b18..9810aaefaf0d 100644 --- a/devel/autoconf-wrapper/Makefile +++ b/devel/autoconf-wrapper/Makefile @@ -9,6 +9,8 @@ COMMENT?= Wrapper script for GNU autoconf LICENSE= BSD2CLAUSE +CONFLICTS_INSTALL= autoscan + WRKSRC= ${WRKDIR} NO_ARCH= yes NO_BUILD= YES diff --git a/devel/b2/Makefile b/devel/b2/Makefile index 344b03a1807d..7cc8dc679372 100644 --- a/devel/b2/Makefile +++ b/devel/b2/Makefile @@ -22,6 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= distutils autoplist concurrent optsuffix +CONFLICTS_INSTALL= boost_build + NO_ARCH= yes USE_GITHUB= yes diff --git a/devel/bam/Makefile b/devel/bam/Makefile index 6c383b410493..9318a3de9003 100644 --- a/devel/bam/Makefile +++ b/devel/bam/Makefile @@ -12,6 +12,8 @@ LICENSE= ZLIB USES= compiler tar:bzip2 +CONFLICTS_INSTALL= bamutil + PLIST_FILES= bin/bam .include <bsd.port.pre.mk> diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile index 05dc68670ab3..67d4bbb0489b 100644 --- a/devel/bcc/Makefile +++ b/devel/bcc/Makefile @@ -18,6 +18,6 @@ BROKEN_mips64= fails to compile: unrecognized command line option "-m32" USES= uidfix -CONFLICTS= bin86 dev86 +CONFLICTS= dev86 .include <bsd.port.mk> diff --git a/devel/boost_build/Makefile b/devel/boost_build/Makefile index 7be89c74dd9a..ce2834fc4aa2 100644 --- a/devel/boost_build/Makefile +++ b/devel/boost_build/Makefile @@ -19,6 +19,8 @@ GH_ACCOUNT= boostorg GH_PROJECT= build GH_TAGNAME= 29baa79 +CONFLICTS_INSTALL= b2 + SHEBANG_GLOB= *.py SUB_FILES= pkg-message diff --git a/devel/capnproto/Makefile b/devel/capnproto/Makefile index 356fb7844577..308601d0f7fd 100644 --- a/devel/capnproto/Makefile +++ b/devel/capnproto/Makefile @@ -17,6 +17,8 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= ac_cv_lib_ssl_OPENSSL_init_ssl=yes +CONFLICTS_INSTALL= capnproto080 + INSTALL_TARGET= install-strip TEST_TARGET= check diff --git a/devel/capstone4/Makefile b/devel/capstone4/Makefile index 2fa80e2c4166..a6e26b65644f 100644 --- a/devel/capstone4/Makefile +++ b/devel/capstone4/Makefile @@ -9,6 +9,8 @@ COMMENT= Multi-platform, multi-architecture disassembly framework LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.TXT +CONFLICTS= capstone + USES= cpe gmake CPE_VENDOR= ${PORTNAME}-engine USE_GITHUB= yes diff --git a/devel/cask/Makefile b/devel/cask/Makefile index a6030f2c1947..5d6b43c6824b 100644 --- a/devel/cask/Makefile +++ b/devel/cask/Makefile @@ -13,6 +13,8 @@ LICENSE= GPLv3 USES= emacs python shebangfix USE_GITHUB= yes +CONFLICTS_INSTALL= cask cask-emacs_* + NO_ARCH= yes NO_BUILD= yes diff --git a/devel/chroma/Makefile b/devel/chroma/Makefile index 492d01ec2198..b0a082501981 100644 --- a/devel/chroma/Makefile +++ b/devel/chroma/Makefile @@ -25,6 +25,9 @@ GH_TUPLE= \ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ sergi:go-diff:v1.0.0:sergi_go_diff/vendor/github.com/sergi/go-diff + +CONFLICTS_INSTALL= chroma + GO_TARGET= ./cmd/chroma PLIST_FILES= bin/${PORTNAME} diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile index 3f050476f7b8..ad49c92212dc 100644 --- a/devel/cpan-upload/Makefile +++ b/devel/cpan-upload/Makefile @@ -18,4 +18,6 @@ RUN_DEPENDS= p5-AppConfig-Std>=1.05:devel/p5-AppConfig-Std \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= p5-CPAN-Uploader + .include <bsd.port.mk> diff --git a/devel/cvs+ipv6/Makefile b/devel/cvs+ipv6/Makefile index 2ecab01a2ac5..186018f7db38 100644 --- a/devel/cvs+ipv6/Makefile +++ b/devel/cvs+ipv6/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= +ipv6 MAINTAINER= ports@FreeBSD.org COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver -CONFLICTS_INSTALL= cvs-[12]* cvs-devel-[12]* +CONFLICTS_INSTALL= cvs cvs-devel OPTIONS_SLAVE= IPV6 OPTIONS_EXCLUDE= # empty diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile index 864b3d29a13a..7ce4d4e28fdc 100644 --- a/devel/cvs-devel/Makefile +++ b/devel/cvs-devel/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= bdheeman@gmail.com COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver -CONFLICTS= cvsnt-[12]* cvs+ipv6-[12]* +CONFLICTS= cvs cvs+ipv6 USES= cpe makeinfo perl5 tar:bzip2 CPE_VENDOR= gnu diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index e845e08f4283..fac27528a6b9 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2+ USES= cpe shebangfix tar:xz uidfix -CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]* +CONFLICTS_INSTALL?= cvs-devel cvs+ipv6 OPTIONS_DEFINE= INFO IPV6 KERBEROS EXAMPLES OPTIONS_DEFAULT=INFO KERBEROS diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile index b40ac2008418..97857bb23a66 100644 --- a/devel/cweb/Makefile +++ b/devel/cweb/Makefile @@ -16,6 +16,8 @@ MAKE_ARGS= CWEBINPUTS="${DATADIR}" \ LINKFLAGS="" \ CC="${CC}" +CONFLICTS_INSTALL= tex-web2c + OPTIONS_DEFINE= DOCS post-patch: diff --git a/devel/delta/Makefile b/devel/delta/Makefile index 1dd56ce1789b..a9ae29b161b5 100644 --- a/devel/delta/Makefile +++ b/devel/delta/Makefile @@ -15,6 +15,8 @@ USES= gmake perl5 shebangfix USE_PERL5= run SHEBANG_FILES= delta multidelta +CONFLICTS_INSTALL= git-delta + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/delta ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/multidelta ${STAGEDIR}${PREFIX}/bin diff --git a/devel/deployer/Makefile b/devel/deployer/Makefile index f20c8044b3f1..10aace5deaff 100644 --- a/devel/deployer/Makefile +++ b/devel/deployer/Makefile @@ -15,6 +15,8 @@ LICENSE= MIT USES= php:flavors USE_PHP= curl iconv json openssl pcntl phar posix zlib +CONFLICTS_INSTALL= php*-deployer + NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/devel/dev86/Makefile b/devel/dev86/Makefile index a84e2daa418b..dbb6a3b59bcd 100644 --- a/devel/dev86/Makefile +++ b/devel/dev86/Makefile @@ -11,8 +11,7 @@ DISTNAME= Dev86src-${PORTVERSION} MAINTAINER= phs@deadc0.de COMMENT= 8086 development tools -CONFLICTS= bcc \ - bin86 +CONFLICTS= bcc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DESTDIRNAME= DIST diff --git a/devel/dia2code+/Makefile b/devel/dia2code+/Makefile index 1fa8df531ded..824f0372165a 100644 --- a/devel/dia2code+/Makefile +++ b/devel/dia2code+/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= dia2code + PLIST_FILES= bin/dia2code \ man/man1/dia2code.1.gz diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile index f66e33d98105..b1486ed60c57 100644 --- a/devel/dia2code/Makefile +++ b/devel/dia2code/Makefile @@ -20,6 +20,8 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +CONFLICTS_INSTALL= dia2code+ + PLIST_FILES= bin/dia2code \ man/man1/dia2code.1.gz diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile index 0580a5139c26..2c7143bb5f59 100644 --- a/devel/dmake/Makefile +++ b/devel/dmake/Makefile @@ -20,6 +20,8 @@ GH_ACCOUNT= jimjag GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datarootdir=${DATADIR} +CONFLICTS_INSTALL= sunpromake + post-install: ${INSTALL_MAN} ${WRKSRC}/man/dmake.tf ${STAGEDIR}${PREFIX}/man/man1/dmake.1 diff --git a/devel/dragon/Makefile b/devel/dragon/Makefile index 2259dbd99539..64aa5bc3609f 100644 --- a/devel/dragon/Makefile +++ b/devel/dragon/Makefile @@ -13,6 +13,8 @@ LIB_DEPENDS= liblfcbase.so:devel/lfcbase GNU_CONFIGURE= yes PLIST_FILES= bin/dragon +CONFLICTS_INSTALL= dragon-player + MAKE_JOBS_UNSAFE=yes .include <bsd.port.mk> diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile index 3b0182a035ab..6d5762e2df67 100644 --- a/devel/easygit/Makefile +++ b/devel/easygit/Makefile @@ -22,6 +22,8 @@ NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/eg bin/easygit +CONFLICTS_INSTALL= go-tools + do-extract: @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC} diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile index 7c8d3dea72e2..de24b16d2535 100644 --- a/devel/etcd/Makefile +++ b/devel/etcd/Makefile @@ -18,8 +18,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= github.com/coreos/etcd github.com/coreos/etcd/etcdctl -CONFLICTS_INSTALL= coreos-etcd31-* coreos-etcd32-* coreos-etcd33-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PORTSCOUT= limit:^2.* diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile index 4a6fb008832a..13e8c63a0ec8 100644 --- a/devel/etcd31/Makefile +++ b/devel/etcd31/Makefile @@ -19,8 +19,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= ./cmd/etcd ./cmd/etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd32-* coreos-etcd33-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile index e033d6d86adb..6f6a5691a141 100644 --- a/devel/etcd32/Makefile +++ b/devel/etcd32/Makefile @@ -19,8 +19,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= ./cmd/etcd ./cmd/etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd33-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd33/Makefile b/devel/etcd33/Makefile index 8dc792c6e180..8036919dcdc0 100644 --- a/devel/etcd33/Makefile +++ b/devel/etcd33/Makefile @@ -73,8 +73,7 @@ GH_TUPLE= beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ GO_PKGNAME= github.com/coreos/etcd GO_TARGET= . ./etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \ - coreos-etcd34-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd34/Makefile b/devel/etcd34/Makefile index 4567e69be5d9..7f4cd7d38951 100644 --- a/devel/etcd34/Makefile +++ b/devel/etcd34/Makefile @@ -19,8 +19,7 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= . ./etcdctl -CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \ - coreos-etcd33-* coreos-etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile index cbd86f5829cb..59d5ee8c5794 100644 --- a/devel/flex-sdk/Makefile +++ b/devel/flex-sdk/Makefile @@ -7,7 +7,7 @@ DISTNAME= flex_sdk_${PORTVERSION}_mpl MAINTAINER= ports@FreeBSD.org COMMENT= Adobe Flex SDK -CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.* +CONFLICTS= flex-sdk3 USES= zip USE_JAVA= yes SUB_FILES= ${SCRIPTS:C/\$/.sh/g} diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile index 24389f3674cf..7dd77948449e 100644 --- a/devel/flex-sdk35/Makefile +++ b/devel/flex-sdk35/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= 3 MAINTAINER= ports@FreeBSD.org COMMENT= Adobe Flex SDK -CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.* +CONFLICTS= flex-sdk USES= zip USE_JAVA= yes SUB_FILES= ${SCRIPTS:C/\$/.sh/g} diff --git a/devel/generate/Makefile b/devel/generate/Makefile index d4712ceb1fcc..1b608279e96f 100644 --- a/devel/generate/Makefile +++ b/devel/generate/Makefile @@ -14,6 +14,8 @@ USES= gmake tar:tgz MAKE_ARGS= BINDIR=${STAGEDIR}${PREFIX}/bin \ MANDIR=${STAGEDIR}${PREFIX}/man +CONFLICTS_INSTALL= julius php*-pear-Text_Highlighter + PLIST_FILES= bin/generate bin/rgenerate man/man1/generate.1.gz post-patch: diff --git a/devel/git-delta/Makefile b/devel/git-delta/Makefile index ee7850acc316..15ba3abe2fab 100644 --- a/devel/git-delta/Makefile +++ b/devel/git-delta/Makefile @@ -138,7 +138,7 @@ CARGO_CRATES= adler-0.2.3 \ xml-rs-0.8.3 \ yaml-rust-0.4.5 -CONFLICTS_INSTALL= devel/delta +CONFLICTS_INSTALL= delta PLIST_FILES= bin/delta OPTIONS_DEFINE= BASH diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 64768401cc33..8656ee7bc449 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -33,6 +33,8 @@ BINARY_ALIAS= python3=${PYTHON_CMD} PORTSCOUT= limitw:1,even CPE_VENDOR= gnome +CONFLICTS_INSTALL= p5-Giovanni + _LIBVERSION= 0.7000.2 PLIST_SUB= LIBVERSION=${_LIBVERSION} diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile index fa64d360f9d3..9f46356c436a 100644 --- a/devel/go-tools/Makefile +++ b/devel/go-tools/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +CONFLICTS_INSTALL= easygit p5-Devel-Cover rubygem-bundler + GO_MODULE= golang.org/x/tools GO_TARGET= ./cmd/auth/authtest \ ./cmd/auth/cookieauth \ diff --git a/devel/got/Makefile b/devel/got/Makefile index 43024bca5569..74407adbfe4e 100644 --- a/devel/got/Makefile +++ b/devel/got/Makefile @@ -11,6 +11,8 @@ LICENSE_FILE= ${WRKSRC}/LICENCE USES= uidfix +CONFLICTS_INSTALL= p5-App-GitGot + # Insert #include "openbsd-compat.h" into each source file, # after the <...> includes and before the "..." ones. n= ${.newline} diff --git a/devel/gradle/Makefile b/devel/gradle/Makefile index f714680e426d..eb947b116550 100644 --- a/devel/gradle/Makefile +++ b/devel/gradle/Makefile @@ -15,6 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe zip USE_JAVA= yes + +CONFLICTS_INSTALL= gradle6 gradle62 + NO_ARCH= yes NO_BUILD= yes SUB_FILES= gradle diff --git a/devel/gradle6/Makefile b/devel/gradle6/Makefile index 172e8f917873..be5253af57a7 100644 --- a/devel/gradle6/Makefile +++ b/devel/gradle6/Makefile @@ -14,6 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe zip USE_JAVA= yes + +CONFLICTS_INSTALL= gradle gradle62 + NO_ARCH= yes NO_BUILD= yes SUB_FILES= gradle diff --git a/devel/gradle62/Makefile b/devel/gradle62/Makefile index 2baa767c3bb1..66b32a83c99a 100644 --- a/devel/gradle62/Makefile +++ b/devel/gradle62/Makefile @@ -17,6 +17,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe zip USE_JAVA= yes + +CONFLICTS_INSTALL= gradle gradle6 + DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} NO_ARCH= yes NO_BUILD= yes diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index 681218b20abe..40dfb4971620 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -35,6 +35,8 @@ CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \ CMAKE_ON= BUILD_SHARED_LIBS USE_LDCONFIG= yes +CONFLICTS_INSTALL= grpc130 grpc134 + PLIST_SUB= SHLIB_MAJOR=${PORTVERSION:R} \ SHLIB_MINOR=${PORTVERSION:E} diff --git a/devel/grpc130/Makefile b/devel/grpc130/Makefile index 40ca73fb11ec..e54fe2b90ca4 100644 --- a/devel/grpc130/Makefile +++ b/devel/grpc130/Makefile @@ -36,6 +36,8 @@ CMAKE_ON= BUILD_SHARED_LIBS USE_LDCONFIG= yes STRIP= +CONFLICTS_INSTALL= grpc grpc134 + PLIST_SUB= PORTVERSION=${PORTVERSION} .include <bsd.port.pre.mk> diff --git a/devel/grpc134/Makefile b/devel/grpc134/Makefile index 7025c68598ad..8a56cf6de82f 100644 --- a/devel/grpc134/Makefile +++ b/devel/grpc134/Makefile @@ -35,6 +35,8 @@ CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \ CMAKE_ON= BUILD_SHARED_LIBS USE_LDCONFIG= yes +CONFLICTS_INSTALL= grpc grpc130 + PLIST_SUB= PORTVERSION=${PORTVERSION} CONFLICTS_INSTALL= grpc diff --git a/devel/horde-content/Makefile b/devel/horde-content/Makefile index 1acecbc99629..6530604291b9 100644 --- a/devel/horde-content/Makefile +++ b/devel/horde-content/Makefile @@ -18,4 +18,6 @@ USE_HORDE_RUN= Horde_Role \ Horde_Rdo \ Horde_Util +CONFLICTS_INSTALL= php*-horde-content + .include <bsd.port.mk> diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile index 0da07f7df68d..e58d77b26055 100644 --- a/devel/hwloc/Makefile +++ b/devel/hwloc/Makefile @@ -27,6 +27,8 @@ CONFIGURE_ARGS= --enable-static \ INSTALL_TARGET= install-strip USE_LDCONFIG= yes +CONFLICTS_INSTALL= hwloc2 + PORTDOCS= * OPTIONS_DEFINE= CAIRO DOCS diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index 832389fb1b05..98845ef1c6b0 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR} \ FLAVORS= ${12 11:L:S/^/llvm/} -CONFLICTS_INSTALL= ${PORTNAME}-* +CONFLICTS_INSTALL= ${PORTNAME}-llvm* USES= bison cmake compiler:c++17-lang python:build USE_GITHUB= yes diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile index e465b98e8437..34210b03eb36 100644 --- a/devel/ipython/Makefile +++ b/devel/ipython/Makefile @@ -26,6 +26,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backcall>=0:devel/py-backcall@${PY_FLAVOR} \ USES= cpe python:3.7+ USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= py*-ipython5 + NO_ARCH= yes PORTEXAMPLES= * diff --git a/devel/ipython5/Makefile b/devel/ipython5/Makefile index 14201222adb7..f4393fd6091b 100644 --- a/devel/ipython5/Makefile +++ b/devel/ipython5/Makefile @@ -27,6 +27,8 @@ USES= cpe python:3.5+ USE_PYTHON= autoplist concurrent distutils USE_GCC= yes # To be removed - Needed as a work-around for numpy, see PR ports/188114 +CONFLICTS_INSTALL= py*-ipython + NO_ARCH= yes PORTEXAMPLES= * diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 89de7ed78a60..f5c7586b782c 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -114,7 +114,7 @@ PLIST_FILES= PLIST_SUB_SED_EXCLUDE_VAL= lib "3.0.0" CLANG_DESC= Build clang -CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]* +CLANG_CONFLICTS_INSTALL= clang-devel CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \ -DCLANG_LINK_LLVM_DYLIB=ON CLANG_PORTDOCS= clang @@ -173,6 +173,8 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils +CONFLICTS_INSTALL= llvm-devel + PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \ LLVM_RELEASE=${LLVM_RELEASE} diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile index 88c9ae52ed77..24fb37c53762 100644 --- a/devel/llvm/Makefile +++ b/devel/llvm/Makefile @@ -25,6 +25,8 @@ LIT_DESC= The lit and FileCheck test tools LLD_DESC= The LLVM linker LLDB_DESC= The LLVM debugger +CONFLICTS_INSTALL= cling zapcc + NO_ARCH= yes NO_BUILD= yes diff --git a/devel/ocaml-dune/Makefile b/devel/ocaml-dune/Makefile index 04199cac7ea1..20fa49289d96 100644 --- a/devel/ocaml-dune/Makefile +++ b/devel/ocaml-dune/Makefile @@ -16,6 +16,8 @@ GH_ACCOUNT= ocaml USE_OCAML= yes USE_OCAML_FINDLIB= yes +CONFLICTS_INSTALL= wdune + ALL_TARGET= release MAKE_ENV= LIBDIR="${OCAML_SITELIBDIR}" DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile index cb3dd05b7155..1280b21a8b88 100644 --- a/devel/p5-App-GitGot/Makefile +++ b/devel/p5-App-GitGot/Makefile @@ -39,6 +39,8 @@ TEST_DEPENDS= p5-Test-Class>=0:devel/p5-Test-Class \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= got + NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/p5-CPAN-Uploader/Makefile b/devel/p5-CPAN-Uploader/Makefile index 33f15dd65ac6..90b91a9a3298 100644 --- a/devel/p5-CPAN-Uploader/Makefile +++ b/devel/p5-CPAN-Uploader/Makefile @@ -26,4 +26,6 @@ NO_ARCH= yes USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= cpan-upload + .include <bsd.port.mk> diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile index c2799e9b4eed..425ac352c333 100644 --- a/devel/p5-Devel-Cover/Makefile +++ b/devel/p5-Devel-Cover/Makefile @@ -17,6 +17,8 @@ TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= go-tools + OPTIONS_DEFINE= CPANCOVER HTML_REPORTS POD_COVERAGE SYNTAX_HIGHLIGHTING OPTIONS_DEFAULT=CPANCOVER HTML_REPORTS POD_COVERAGE OPTIONS_SUB= yes diff --git a/devel/p5-Devel-NYTProf/Makefile b/devel/p5-Devel-NYTProf/Makefile index 2ce63fb6a43b..ed722a7a460f 100644 --- a/devel/p5-Devel-NYTProf/Makefile +++ b/devel/p5-Devel-NYTProf/Makefile @@ -21,6 +21,8 @@ TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= flamegraph + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Devel/NYTProf/NYTProf.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/Devel/auto/Devel/NYTProf/NYTProf.so diff --git a/devel/p5-Dist-Joseki/Makefile b/devel/p5-Dist-Joseki/Makefile index 61831a10aab1..0954a2d7562c 100644 --- a/devel/p5-Dist-Joseki/Makefile +++ b/devel/p5-Dist-Joseki/Makefile @@ -26,6 +26,8 @@ RUN_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \ USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= ja-mh mmh nmh + NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/p5-File-DirSync/Makefile b/devel/p5-File-DirSync/Makefile index d842ab93874f..6f26b0069964 100644 --- a/devel/p5-File-DirSync/Makefile +++ b/devel/p5-File-DirSync/Makefile @@ -13,4 +13,6 @@ COMMENT= Perl5 module for synchronizing two directories rapidly USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= py*-dirsync + .include <bsd.port.mk> diff --git a/devel/p5-Set-CrossProduct/Makefile b/devel/p5-Set-CrossProduct/Makefile index 901de66a1bf6..b18f67750769 100644 --- a/devel/p5-Set-CrossProduct/Makefile +++ b/devel/p5-Set-CrossProduct/Makefile @@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= perl5 USE_PERL5= configure +CONFLICTS_INSTALL= topcom + NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/pear-HTML_Template_PHPLIB/Makefile b/devel/pear-HTML_Template_PHPLIB/Makefile index cfe18395b875..eaf7e4b8476b 100644 --- a/devel/pear-HTML_Template_PHPLIB/Makefile +++ b/devel/pear-HTML_Template_PHPLIB/Makefile @@ -12,4 +12,6 @@ LICENSE= LGPL3 USES= pear NO_ARCH= yes +CONFLICTS_INSTALL= php*-pear-HTML_Template_PHPLIB + .include <bsd.port.mk> diff --git a/devel/pear-Horde_Autoloader_Cache/Makefile b/devel/pear-Horde_Autoloader_Cache/Makefile index 4edbec1bafdd..ed6959929c5a 100644 --- a/devel/pear-Horde_Autoloader_Cache/Makefile +++ b/devel/pear-Horde_Autoloader_Cache/Makefile @@ -11,4 +11,6 @@ USES= horde php cpe USE_HORDE_RUN= Horde_Autoloader USE_PHP= json +CONFLICTS_INSTALL= php*-pear-horde-Horde_Autoloader_Cache + .include <bsd.port.mk> diff --git a/devel/pear-Horde_Prefs/Makefile b/devel/pear-Horde_Prefs/Makefile index 4f5d5060ac9e..95504332bbf7 100644 --- a/devel/pear-Horde_Prefs/Makefile +++ b/devel/pear-Horde_Prefs/Makefile @@ -13,4 +13,6 @@ USE_HORDE_RUN= Horde_Exception \ Horde_Util USE_PHP= json +CONFLICTS_INSTALL= php*-pear-horde-Horde_Prefs + .include <bsd.port.mk> diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile index f08589aaff26..074f1203683d 100644 --- a/devel/pear-Var_Dump/Makefile +++ b/devel/pear-Var_Dump/Makefile @@ -15,4 +15,6 @@ RUN_DEPENDS= bash:shells/bash USES= pear shebangfix SHEBANG_FILES= scripts/gen_php_doc.sh +CONFLICTS_INSTALL= php*-pear-Var_Dump + .include <bsd.port.mk> diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile index fb9b32ae0077..ae769170cce3 100644 --- a/devel/php-composer/Makefile +++ b/devel/php-composer/Makefile @@ -22,7 +22,7 @@ USES= cpe php:flavors CPE_VENDOR= getcomposer USE_PHP= ctype filter intl json mbstring openssl phar -CONFLICTS_INSTALL= php*-composer2 +CONFLICTS_INSTALL= php*-composer php*-composer2 NO_ARCH= yes NO_BUILD= yes diff --git a/devel/php-composer2/Makefile b/devel/php-composer2/Makefile index 1ae5ee0e1754..05c7449b7585 100644 --- a/devel/php-composer2/Makefile +++ b/devel/php-composer2/Makefile @@ -21,7 +21,7 @@ USES= cpe php:flavors CPE_VENDOR= getcomposer USE_PHP= ctype filter intl json mbstring openssl phar -CONFLICTS_INSTALL= php*-composer +CONFLICTS_INSTALL= php*-composer php*-composer2 NO_ARCH= yes NO_BUILD= yes diff --git a/devel/psptoolchain-pspsdk-stage2/Makefile b/devel/psptoolchain-pspsdk-stage2/Makefile index 67c6a4fec85e..db43fbf92d81 100644 --- a/devel/psptoolchain-pspsdk-stage2/Makefile +++ b/devel/psptoolchain-pspsdk-stage2/Makefile @@ -23,6 +23,8 @@ SSP_UNSAFE= yes CFLAGS+= -fno-stack-protector LDFLAGS+= -fno-stack-protector +CONFLICTS_INSTALL= grx hxtools + PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../psptoolchain-pspsdk-stage1 diff --git a/devel/py-Faker/Makefile b/devel/py-Faker/Makefile index 29fb2f45ef0b..e5c2c2285e77 100644 --- a/devel/py-Faker/Makefile +++ b/devel/py-Faker/Makefile @@ -21,6 +21,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist +CONFLICTS_INSTALL= rubygem-faker + NO_ARCH= yes do-test: diff --git a/devel/py-cachecontrol/Makefile b/devel/py-cachecontrol/Makefile index ed7d302d5b89..8384affb4868 100644 --- a/devel/py-cachecontrol/Makefile +++ b/devel/py-cachecontrol/Makefile @@ -18,6 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0.5.2:devel/py-msgpack@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-CacheControl + NO_ARCH= yes OPTIONS_DEFINE= FILECACHE REDIS diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile index d8f84e87b216..9f222d273cfa 100644 --- a/devel/py-circuits/Makefile +++ b/devel/py-circuits/Makefile @@ -18,6 +18,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= apache24 + NO_ARCH= yes do-test: diff --git a/devel/py-datadog/Makefile b/devel/py-datadog/Makefile index c2e6d65e7016..abc6975d8376 100644 --- a/devel/py-datadog/Makefile +++ b/devel/py-datadog/Makefile @@ -17,6 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= dog + NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/py-dateutils/Makefile b/devel/py-dateutils/Makefile index f2f0cfe10e32..6fd82b220335 100644 --- a/devel/py-dateutils/Makefile +++ b/devel/py-dateutils/Makefile @@ -18,6 +18,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= dateutils + NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile index 0a27cee5871b..09490f4c0aa9 100644 --- a/devel/py-fabric/Makefile +++ b/devel/py-fabric/Makefile @@ -24,7 +24,7 @@ USES= cpe python:3.6+ CPE_VENDOR= fabfile USE_PYTHON= distutils concurrent autoplist -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fabric1 +CONFLICTS_INSTALL= py*-fabric3 # bin/fab NO_ARCH= yes diff --git a/devel/py-fabric3/Makefile b/devel/py-fabric3/Makefile index 0525f66f1716..f1a466faec89 100644 --- a/devel/py-fabric3/Makefile +++ b/devel/py-fabric3/Makefile @@ -17,6 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:3.6+ USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= py*-fabric # bin/fab + NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/py-jsondiff/Makefile b/devel/py-jsondiff/Makefile index 0b8d9498417e..fd6d1a44b84d 100644 --- a/devel/py-jsondiff/Makefile +++ b/devel/py-jsondiff/Makefile @@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= jojodiff py*-jsonpatch # bin/jdiff bin/jsondiff + NO_ARCH= yes .include <bsd.port.mk> diff --git a/devel/py-jsonpatch/Makefile b/devel/py-jsonpatch/Makefile index 5a37f06dee4b..62e56d963893 100644 --- a/devel/py-jsonpatch/Makefile +++ b/devel/py-jsonpatch/Makefile @@ -14,6 +14,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAV USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils + +CONFLICTS_INSTALL= py*-jsondiff # bin/jsondiff + NO_ARCH= yes do-test: build diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile index 49cf70ca8c06..927b957bd7d0 100644 --- a/devel/py-jsonschema/Makefile +++ b/devel/py-jsonschema/Makefile @@ -23,6 +23,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils +CONFLICTS_INSTALL= py*-jsonschema3 # bin/jsonschema + NO_ARCH= yes do-test: diff --git a/devel/py-jsonschema3/Makefile b/devel/py-jsonschema3/Makefile index 8d92df1d7772..92edb58f3ad8 100644 --- a/devel/py-jsonschema3/Makefile +++ b/devel/py-jsonschema3/Makefile @@ -23,6 +23,8 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +CONFLICTS_INSTALL= py*-jsonschema # bin/jsonschema + PORTSCOUT= limit:^3\. .include <bsd.port.pre.mk> diff --git a/devel/py-python-gist/Makefile b/devel/py-python-gist/Makefile index e05cd34e634c..fd8f5927af82 100644 --- a/devel/py-python-gist/Makefile +++ b/devel/py-python-gist/Makefile @@ -20,6 +20,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= autoplist distutils +CONFLICTS_INSTALL= gist p5-App-gist py*-python-gist yorick + NO_ARCH= yes do-test: # tests are currently broken and undergoing redesign, see https://github.com/jdowner/gist/issues/100#issuecomment-817039193 diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile index 115ce5904723..aff9f50e77e6 100644 --- a/devel/rcs/Makefile +++ b/devel/rcs/Makefile @@ -11,6 +11,8 @@ LICENSE= GPLv3 USES= groff makeinfo tar:xz GNU_CONFIGURE= yes +CONFLICTS_INSTALL= rcs57 + INFO= rcs .include <bsd.port.mk> diff --git a/devel/rcs57/Makefile b/devel/rcs57/Makefile index 517022cfe803..24b51660e4ed 100644 --- a/devel/rcs57/Makefile +++ b/devel/rcs57/Makefile @@ -9,7 +9,7 @@ COMMENT= Version control system (as was in FreeBSD prior to removal) LICENSE= GPLv2 -CONFLICTS= rcs-5.[89]* +CONFLICTS= rcs OPTIONS_DEFINE= FREEBSD OPTIONS_DEFAULT= FREEBSD diff --git a/devel/rubygem-faker/Makefile b/devel/rubygem-faker/Makefile index cf829ec8d4ed..6d5ab9d6c02c 100644 --- a/devel/rubygem-faker/Makefile +++ b/devel/rubygem-faker/Makefile @@ -14,6 +14,8 @@ RUN_DEPENDS= rubygem-i18n>=1.6,2<2,2:devel/rubygem-i18n USES= gem USE_RUBY= yes +CONFLICTS_INSTALL= py*-Faker + NO_ARCH= yes PLIST_FILES= bin/faker diff --git a/devel/sasm/Makefile b/devel/sasm/Makefile index c27ee7731b89..e45607fc5801 100644 --- a/devel/sasm/Makefile +++ b/devel/sasm/Makefile @@ -15,6 +15,8 @@ GH_ACCOUNT= Dman95 USE_GL= gl USE_QT= core gui network widgets buildtools_build +CONFLICTS_INSTALL= fasm fasm-fpga + DATADIR= ${PREFIX}/share/sasm DOCSDIR= ${PREFIX}/share/doc/sasm diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile index 7ec1c0cdea90..cb15d4461b81 100644 --- a/devel/shapelib/Makefile +++ b/devel/shapelib/Makefile @@ -22,6 +22,8 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes +CONFLICTS_INSTALL= p5-DBD-XBase + post-install: ${INSTALL_PROGRAM} ${WRKSRC}/.libs/shptest ${STAGEDIR}${PREFIX}/bin/ diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index a96de2dda9c5..443a7bc685f1 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -6,9 +6,7 @@ PKGNAMESUFFIX= -lts MAINTAINER= lev@FreeBSD.org COMMENT= Version control system, long-time-support version -CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \ - subversion-1.1[0-9].[0-9]* \ - subversion1[0-9]-1.[0-9].[0-9]* +CONFLICTS_INSTALL= subversion USE_RC_SUBR= svnserve diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 5df5175b25a8..8589bc367982 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -5,9 +5,7 @@ PORTREVISION= 0 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system -CONFLICTS_INSTALL= subversion-1.[0-9].[0-9]* \ - subversion-1.1[0-1].[0-9]* \ - subversion1[0-9]-1.[0-9].[0-9]* +CONFLICTS_INSTALL= subversion-lts USE_RC_SUBR= svnserve diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile index 255fd2ec1b01..373db9bba338 100644 --- a/devel/tex-web2c/Makefile +++ b/devel/tex-web2c/Makefile @@ -50,6 +50,8 @@ CONFIGURE_ARGS+=--with-system-$L \ CFLAGS+= -I${LOCALBASE}/include INSTALL_TARGET= install-strip +CONFLICTS_INSTALL= cweb + INFO= web2c pre-configure: diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile index 44f04acee6e3..7c43afff1ecc 100644 --- a/devel/util-linux/Makefile +++ b/devel/util-linux/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --disable-nls --disable-ipcrm --disable-ipcs \ INSTALL_TARGET= install-strip -#CONFLICTS_INSTALL= cal getopt flock hardlink # non-default options conflicts +CONFLICTS_INSTALL= heirloom-doctools OPTIONS_DEFINE= CAL FLOCK GETOPT HARDLINK UUID OPTIONS_SUB= yes diff --git a/devel/zapcc/Makefile b/devel/zapcc/Makefile index bdbc1970ecf3..c15ad42da807 100644 --- a/devel/zapcc/Makefile +++ b/devel/zapcc/Makefile @@ -22,6 +22,8 @@ SHEBANG_FILES= tools/clang/tools/clang-format/git-clang-format tools/clang/tools USE_GNOME= libxml2 USE_LDCONFIG= yes +CONFLICTS_INSTALL= cling llvm + CMAKE_OFF= LLVM_ENABLE_WARNINGS LLVM_BUILD_EXAMPLES LLVM_INCLUDE_EXAMPLES LLVM_INCLUDE_TESTS LLVM_INCLUDE_GO_TESTS LLVM_ENABLE_OCAMLDOC LLVM_BUILD_TEST CMAKE_ON= LLVM_ENABLE_CXX1Y LLVM_ENABLE_LLD BUILD_SHARED_LIBS |