1
0
Fork 0
Browse Source

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)
main
Stefan Eßer 7 months ago
parent
commit
bcaf25a8c8
  1. 2
      archivers/arc/Makefile
  2. 2
      archivers/deco/Makefile
  3. 2
      astro/jday/Makefile
  4. 2
      audio/csound/Makefile
  5. 2
      audio/grip/Makefile
  6. 2
      audio/icecast-kh/Makefile
  7. 2
      audio/icecast/Makefile
  8. 2
      audio/julius/Makefile
  9. 2
      benchmarks/ali/Makefile
  10. 2
      benchmarks/fio/Makefile
  11. 2
      benchmarks/flamegraph/Makefile
  12. 2
      benchmarks/iozone/Makefile
  13. 2
      benchmarks/iozone21/Makefile
  14. 2
      benchmarks/rubygem-derailed_benchmarks/Makefile
  15. 2
      benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile
  16. 2
      biology/bamutil/Makefile
  17. 2
      biology/cufflinks/Makefile
  18. 2
      biology/fasta/Makefile
  19. 2
      biology/gffread/Makefile
  20. 2
      biology/gmap/Makefile
  21. 2
      biology/mummer/Makefile
  22. 2
      biology/ncbi-blast+/Makefile
  23. 2
      biology/ncbi-cxx-toolkit/Makefile
  24. 2
      biology/ncbi-entrez-direct/Makefile
  25. 2
      biology/ruby-bio/Makefile
  26. 2
      biology/rubygem-bio-shell/Makefile
  27. 2
      biology/sra-tools/Makefile
  28. 2
      cad/cascade-compiler/Makefile
  29. 2
      cad/cascade/Makefile
  30. 2
      cad/dinotrace/Makefile
  31. 2
      cad/fasm/Makefile
  32. 2
      chinese/aterm/Makefile
  33. 2
      chinese/bitchx/Makefile
  34. 2
      chinese/enscript/Makefile
  35. 2
      chinese/eterm/Makefile
  36. 2
      chinese/fcitx/Makefile
  37. 2
      chinese/hc/Makefile
  38. 2
      chinese/scim-fcitx/Makefile
  39. 2
      comms/hylafax/Makefile
  40. 2
      comms/mgetty+sendfax/Makefile
  41. 2
      comms/unixcw/Makefile
  42. 2
      comms/wsjtx/Makefile
  43. 2
      databases/dbf/Makefile
  44. 3
      databases/emacsql/Makefile
  45. 2
      databases/foundationdb-devel/Makefile
  46. 2
      databases/foundationdb/Makefile
  47. 2
      databases/freetds-devel/Makefile
  48. 2
      databases/freetds/Makefile
  49. 2
      databases/galera/Makefile
  50. 2
      databases/galera26/Makefile
  51. 2
      databases/libcouchbase/Makefile
  52. 2
      databases/mariadb104-server/Makefile
  53. 4
      databases/mysql55-server/Makefile
  54. 7
      databases/mysql56-server/Makefile
  55. 7
      databases/mysql57-server/Makefile
  56. 7
      databases/mysql80-server/Makefile
  57. 5
      databases/mysqlwsrep56-server/Makefile
  58. 5
      databases/mysqlwsrep57-server/Makefile
  59. 2
      databases/p5-DBD-XBase/Makefile
  60. 2
      databases/pear-DB_DataObject/Makefile
  61. 2
      databases/pear-DoctrineDBAL/Makefile
  62. 2
      databases/pear-Horde_Db/Makefile
  63. 2
      databases/percona56-server/Makefile
  64. 2
      databases/percona57-server/Makefile
  65. 2
      databases/py-alembic/Makefile
  66. 2
      databases/py-alembic14/Makefile
  67. 2
      databases/rubygem-dbf/Makefile
  68. 2
      deskutils/ljclive/Makefile
  69. 2
      deskutils/plan/Makefile
  70. 2
      devel/aphpbreakdown/Makefile
  71. 2
      devel/aphpunit/Makefile
  72. 2
      devel/arcanist-lib/Makefile
  73. 2
      devel/arduino/Makefile
  74. 2
      devel/arm-none-eabi-gcc/Makefile
  75. 2
      devel/arm-none-eabi-gcc492/Makefile
  76. 2
      devel/autoconf-wrapper/Makefile
  77. 2
      devel/b2/Makefile
  78. 2
      devel/bam/Makefile
  79. 2
      devel/bcc/Makefile
  80. 2
      devel/boost_build/Makefile
  81. 2
      devel/capnproto/Makefile
  82. 2
      devel/capstone4/Makefile
  83. 2
      devel/cask/Makefile
  84. 3
      devel/chroma/Makefile
  85. 2
      devel/cpan-upload/Makefile
  86. 2
      devel/cvs+ipv6/Makefile
  87. 2
      devel/cvs-devel/Makefile
  88. 2
      devel/cvs/Makefile
  89. 2
      devel/cweb/Makefile
  90. 2
      devel/delta/Makefile
  91. 2
      devel/deployer/Makefile
  92. 3
      devel/dev86/Makefile
  93. 2
      devel/dia2code+/Makefile
  94. 2
      devel/dia2code/Makefile
  95. 2
      devel/dmake/Makefile
  96. 2
      devel/dragon/Makefile
  97. 2
      devel/easygit/Makefile
  98. 3
      devel/etcd/Makefile
  99. 3
      devel/etcd31/Makefile
  100. 3
      devel/etcd32/Makefile
  101. Some files were not shown because too many files have changed in this diff Show More

2
archivers/arc/Makefile

@ -10,7 +10,7 @@ COMMENT= Create & extract files from DOS .ARC files
LICENSE= GPLv2
CONFLICTS= php5-arcanist
CONFLICTS_INSTALL= arcanist-php73 arcanist-php74 arcanist-php80
OPTIONS_DEFINE= DOCS

2
archivers/deco/Makefile

@ -28,6 +28,8 @@ RUN_DEPENDS= arc:archivers/arc \
zoo:archivers/zoo \
flac:audio/flac
CONFLICTS= deco-misc # bin/deco
DARCHIVE_VER= 1.7
DARCHIVE= deco-archive-${DARCHIVE_VER}

2
astro/jday/Makefile

@ -12,6 +12,8 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
CONFLICTS_INSTALL= netatalk3
PLIST_FILES= bin/dbd bin/j2d bin/jday \
include/jday.h lib/libjday.a \
lib/libjday.so lib/libjday.so.2 \

2
audio/csound/Makefile

@ -23,6 +23,8 @@ USE_LDCONFIG= yes
CPE_VENDOR= csounds
CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess
CFLAGS_powerpc= -maltivec
CFLAGS_powerpcspe= -DPFFFT_SIMD_DISABLE
CFLAGS_powerpc64= -maltivec

2
audio/grip/Makefile

@ -24,6 +24,8 @@ USE_XORG= ice sm x11 xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-werror
CONFLICTS_INSTALL= py*-grip
OPTIONS_DEFINE= CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS
OPTIONS_DEFAULT= CDPARANOIA FLAC VORBIS

2
audio/icecast-kh/Makefile

@ -23,7 +23,7 @@ GH_PROJECT= icecast-kh
USE_GNOME= libxml2 libxslt
USE_RC_SUBR= icecast
CONFLICTS_INSTALL= icecast icecast2
CONFLICTS_INSTALL= icecast
GNU_CONFIGURE= yes
CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE}

2
audio/icecast/Makefile

@ -31,6 +31,8 @@ USE_GNOME= libxml2 libxslt
GNU_CONFIGURE= yes
USE_RC_SUBR= icecast
CONFLICTS_INSTALL= icecast-kh
SUB_FILES= pkg-message
CPE_VENDOR= xiph

2
audio/julius/Makefile

@ -16,6 +16,8 @@ GNU_CONFIGURE= yes
USES= iconv perl5 shebangfix
SHEBANG_FILES= jclient-perl/jclient.pl
INSTALL_CONFLICTS= generate julius-caesariii php*-pear-Text_Highlighter
CONFIGURE_ENV= ac_cv_path_PERL=${PERL}
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -Wno-return-type

2
benchmarks/ali/Makefile

@ -38,6 +38,8 @@ GH_TUPLE= davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-sp
uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
uber-go:goleak:v1.1.12:uber_go_goleak/vendor/go.uber.org/goleak
CONFLICTS_INSTALL= ja-mh mmh nmh
PLIST_FILES= bin/ali
.include <bsd.port.mk>

2
benchmarks/fio/Makefile

@ -21,6 +21,8 @@ GNUPLOT_DESC= Support for plotting graphs
GNUPLOT_BUILD_DEPENDS= ${LOCALBASE}/bin/gnuplot:math/gnuplot
CONFLICTS_INSTALL= py*-Fiona
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fio ${STAGEDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/tools/fio_generate_plots ${STAGEDIR}${PREFIX}/bin

2
benchmarks/flamegraph/Makefile

@ -22,6 +22,8 @@ GH_TAGNAME= 810687f
NO_BUILD= yes
CONFLICTS_INSTALL= p5-Devel-NYTProf
SHEBANG_FILES= *.php *.pl *.py *.sh
SOURCE_FILES= aix-perf.pl \

2
benchmarks/iozone/Makefile

@ -19,6 +19,8 @@ MAKE_ARGS= ${MAKE_ENV}
ALL_TARGET= freebsd
MAKE_JOBS_UNSAFE= yes
CONFLICTS_INSTALL= iozone21
PLIST_FILES= bin/iozone man/man1/iozone.1.gz
OPTIONS_DEFINE= SSH THREADS

2
benchmarks/iozone21/Makefile

@ -10,7 +10,7 @@ PKGNAMESUFFIX= 21
MAINTAINER= ports@FreeBSD.org
COMMENT= Performance Test of Sequential File I/O (older version)
CONFLICTS= iozone-3.*
CONFLICTS_INSTALL= iozone
PLIST_FILES= bin/iozone \
man/man1/iozone.1.gz

2
benchmarks/rubygem-derailed_benchmarks/Makefile

@ -24,6 +24,8 @@ RUN_DEPENDS= rubygem-benchmark-ips>=2.0.0:benchmarks/rubygem-benchmark-ips \
USES= gem
USE_RUBY= yes
CONFLICTS_INSTALL= rubygem-gitlab-derailed_benchmarks
NO_ARCH= yes
PLIST_FILES= bin/derailed

2
benchmarks/rubygem-gitlab-derailed_benchmarks/Makefile

@ -22,6 +22,8 @@ RUN_DEPENDS= rubygem-benchmark-ips>=2.0.0:benchmarks/rubygem-benchmark-ips \
USES= gem
USE_RUBY= yes
CONFLICTS_INSTALL= rubygem-derailed_benchmarks
NO_ARCH= yes
PLIST_FILES= bin/derailed

2
biology/bamutil/Makefile

@ -21,6 +21,8 @@ GH_TUPLE= statgen:libStatGen:v${DISTVERSION}:statgen/libStatGen
MAKE_ENV= LIB_PATH_GENERAL=${WRKSRC}/libStatGen
MAKE_ENV+= INSTALLDIR=${STAGEDIR}${PREFIX}/bin
CONFLICTS_INSTALL= bam
PLIST_FILES= bin/bam
.include <bsd.port.mk>

2
biology/cufflinks/Makefile

@ -26,6 +26,8 @@ GH_ACCOUNT= cole-trapnell-lab
CXXFLAGS+= -I${LOCALBASE}/include/eigen3
CFLAGS+= -I${LOCALBASE}/include/eigen3 # https://github.com/cole-trapnell-lab/cufflinks/issues/113
CONFLICTS_INSTALL= gffread
PLIST_FILES= bin/compress_gtf \
bin/cuffcompare \
bin/cuffdiff \

2
biology/fasta/Makefile

@ -16,6 +16,8 @@ LICENSE_NAME= fasta
LICENSE_TEXT= May not be sold or incorporated into a commercial product
LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
CONFLICTS_INSTALL= align
WRKSRC= ${WRKDIR}/fasta
SUB_FILES= pkg-message

2
biology/gffread/Makefile

@ -17,6 +17,8 @@ GH_TUPLE= gpertea:gclib:v${DISTVERSION}:gpertea/gclib
INSTALL_TARGET= install-strip
CONFLICTS_INSTALL= cufflinks
PLIST_FILES= bin/gffread
.include <bsd.port.mk>

2
biology/gmap/Makefile

@ -20,6 +20,8 @@ ONLY_FOR_ARCHS_REASON= upstream supports only x86 and possibly POWER8
USES= gmake perl5
GNU_CONFIGURE= yes
CONFLICTS_INSTALL= cpuid
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C|\.|-|g}
CFLAGS+= -fcommon

2
biology/mummer/Makefile

@ -22,6 +22,8 @@ USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}4
USE_LDCONFIG= yes
CONFLICTS_INSTALL= ??-libgd libgd
SHEBANG_FILES= scripts/*.pl
perl_OLD_CMD= __PERL_PATH
_SHEBANG_REINPLACE_ARGS+= -e "s|__BIN_DIR|${PREFIX}/bin|g;s|__AUX_BIN_DIR|${PREFIX}/libexec/mummer|g;s|__SCRIPT_DIR|${PREFIX}/libexec/mummer|g"

2
biology/ncbi-blast+/Makefile

@ -48,6 +48,8 @@ GNU_CONFIGURE= yes
# a postinstall mv.
CONFIGURE_ARGS= AR="ar cr" --without-boost --libdir=${PREFIX}/lib/ncbi-tools++
CONFLICTS_INSTALL= ncbi-cxx-toolkit
WRKSRC_SUBDIR= c++
.include <bsd.port.pre.mk>

2
biology/ncbi-cxx-toolkit/Makefile

@ -25,6 +25,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-debug --with-dll --without-static \
--without-vdb
CONFLICTS_INSTALL= ncbi-blast+
post-install:
# strip
@${FIND} ${STAGEDIR}${PREFIX}/bin -type f | ${GREP} -v -E '\.(sh|py|pl)$$' | ${XARGS} ${STRIP_CMD}

2
biology/ncbi-entrez-direct/Makefile

@ -20,6 +20,8 @@ RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
USES= go:modules perl5 shebangfix
USE_GITHUB= nodefault
CONFLICTS_INSTALL= ebook-tools
# Dependency versions:
# make clean extract
# cd ${WRKSRC}/cmd

2
biology/ruby-bio/Makefile

@ -28,6 +28,8 @@ BDB4_RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
MYSQL_RUN_DEPENDS= rubygem-dbd-mysql>=0:databases/rubygem-dbd-mysql
PGSQL_RUN_DEPENDS= rubygem-dbd-pg>=0:databases/rubygem-dbd-pg
CONFLICTS_INSTALL= rubygem-bio-shell
post-patch:
${RUBY} -i -pe 'gsub(%r"(/etc/bioinformatics/)") { "${PREFIX}" + $$1 }' \
${WRKSRC}/doc/Tutorial.rd \

2
biology/rubygem-bio-shell/Makefile

@ -20,6 +20,8 @@ USE_RUBY= yes
NO_ARCH= yes
CONFLICTS_INSTALL= ruby??-bio
PLIST_FILES= bin/bioruby
.include <bsd.port.mk>

2
biology/sra-tools/Makefile

@ -45,6 +45,8 @@ FREEBSD_RELEASE= uname -r | cut -d - -f 1
CFLAGS+= -I${WRKSRC}/interfaces/os/sun
CXXFLAGS+= -I${WRKSRC}/interfaces/os/sun
CONFLICTS_INSTALL= kget
BINARY_ALIAS= gcc=${CC} g++=${CXX}
# for port developers, building with these options may fail

2
cad/cascade-compiler/Makefile

@ -23,6 +23,8 @@ MAKE_ENV= FREEBSD_WRKSRC=${WRKSRC} FREEBSD_LOCALBASE=${LOCALBASE}
CMAKE_OFF= BUILD_TESTING
CONFLICTS_INSTALL= cascade
BINARY_ALIAS= flex=${FILESDIR}/flex flex.real=${LOCALBASE}/bin/flex bison=${LOCALBASE}/bin/bison
post-patch:

2
cad/cascade/Makefile

@ -14,6 +14,8 @@ PORTDOCS= ex1.gif index.html
PORTEXAMPLES= README.examples ex1.cas ex1.gif ex1.out cascade-mode.el
PLIST_FILES= bin/cascade man/man1/cascade.1.gz
CONFLICTS_INSTALL= cascade-compiler
OPTIONS_DEFINE= DOCS EXAMPLES
do-install:

2
cad/dinotrace/Makefile

@ -19,6 +19,8 @@ USE_PERL5= build
GNU_CONFIGURE= yes
CONFLICTS_INSTALL= dinotrace dinotrace-emacs_*
INFO= dinotrace
PLIST_FILES= bin/dinotrace

2
cad/fasm/Makefile

@ -19,4 +19,6 @@ USE_PYTHON= distutils concurrent noflavors autoplist
NO_ARCH= yes
CONFLICTS_INSTALL= fasm SASM
.include <bsd.port.mk>

2
chinese/aterm/Makefile

@ -14,6 +14,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-xim --enable-big5
MAKE_JOBS_UNSAFE= yes
CONFLICTS_INSTALL= aterm
PLIST_FILES= "@(,,4711) bin/aterm" \
man/man1/aterm.1.gz

2
chinese/bitchx/Makefile

@ -11,6 +11,8 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-source__input.c \
${.CURDIR}/files/patch-include__config.h \
${.CURDIR}/files/patch-source__screen.c
CONFLICTS_INSTALL= bitchx
OPTIONS_SLAVE= LATIN
.include "${MASTERDIR}/Makefile"

2
chinese/enscript/Makefile

@ -16,6 +16,8 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
USES+= ghostscript:run
CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj
post-patch:
@${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist
@${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist

2
chinese/eterm/Makefile

@ -14,6 +14,8 @@ CONFIGURE_ARGS= --enable-trans --enable-utmp \
--with-backspace=bs --without-terminfo \
--enable-multi-charset=big5
CONFLICTS_INSTALL= eterm ja-eterm
PKGDIR= ${.CURDIR}
PLIST= ${MASTERDIR}/pkg-plist

2
chinese/fcitx/Makefile

@ -37,7 +37,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \
SUB_FILES= pkg-message
SUB_LIST+= PORTSDIR=${PORTSDIR}
CONFLICTS= zh-scim-fcitx-3.* fcitx5
CONFLICTS= zh-scim-fcitx
USE_GNOME= pango intltool libxml2 introspection
USE_KDE= ecm

2
chinese/hc/Makefile

@ -9,6 +9,8 @@ DISTFILES= hc-30.tar.gz hc-supp.tab
MAINTAINER= ports@FreeBSD.org
COMMENT= Hanzi Converter -- converts between GB and BIG-5 codes
CONFLICTS_INSTALL= rubygem-hieracles
WRKSRC= ${WRKDIR}/hc3
EXTRACT_ONLY= hc-30.tar.gz
ALL_TARGET= hc b2g g2b

2
chinese/scim-fcitx/Makefile

@ -23,6 +23,8 @@ GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
CONFIGURE_INSTALL= zh-fcitx
WRKSRC= ${WRKDIR}/fcitx
CONFIGURE_ENV+= SCIM_DATADIR=${PREFIX}/share/scim \

2
comms/hylafax/Makefile

@ -35,6 +35,8 @@ CONFIGURE_ENV= ENVOPTS="${CFLAGS}"
MAKE_ENV+= ROOT=${STAGEDIR}
MAKE_ARGS+= OPTIMIZER="" -DOPTIMIZER
CONFLICTS_INSTALL= mgetty
PORTDOCS= RELEASENOTES-4.3.txt RELEASENOTES-4.4.txt RELEASENOTES-6.0.txt
SUB_FILES= pkg-message

2
comms/mgetty+sendfax/Makefile

@ -31,6 +31,8 @@ ALL_TARGET= noident all
INFO= mgetty
CFLAGS+= -DAUTO_PPP
CONFLICTS_INSTALL= hylafax
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= FIDO

2
comms/unixcw/Makefile

@ -38,6 +38,8 @@ OPTIONS_DEFINE= NLS
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
CONFLICTS_INSTALL= cw
.ifndef XCWCP
OPTIONS_DEFINE+= ALSA PULSEAUDIO
OPTIONS_DEFAULT+= ALSA PULSEAUDIO

2
comms/wsjtx/Makefile

@ -27,6 +27,8 @@ USE_QT= core gui network widgets \
multimedia concurrent printsupport serialport sql sql-sqlite3 \
buildtools_build linguisttools_build qmake_build testlib
CONFLICTS_INSTALL= wsjtz
# for detailed debugging uncomment the next line
#CMAKE_ARGS+= --debug-output --trace
PLIST_SUB+= PORTVERSION="${PORTVERSION}"

2
databases/dbf/Makefile

@ -22,6 +22,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_prog_DOC_TO_MAN=""
USE_LDCONFIG= yes
CONFLICTS_INSTALL= rubygem-dbf
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}

3
databases/emacsql/Makefile

@ -20,6 +20,9 @@ USE_GITHUB= yes
GH_ACCOUNT= skeeto
MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
CONFLICTS_INSTALL= emacsql emacsql-emacs_*
ALL_TARGET= binary compile
TEST_TARGET= check

2
databases/foundationdb-devel/Makefile

@ -29,6 +29,8 @@ GH_PROJECT= foundationdb
USE_LDCONFIG= yes
USE_RC_SUBR= foundationdb
CONFLICTS_INSTALL= foundationdb
SHEBANG_FILES= bindings/c/generate_asm.py
CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB}

2
databases/foundationdb/Makefile

@ -27,6 +27,8 @@ GH_PROJECT= foundationdb
USE_LDCONFIG= yes
USE_RC_SUBR= foundationdb
CONFLICTS_INSTALL= foundationdb-devel
SHEBANG_FILES= bindings/c/generate_asm.py
CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB}

2
databases/freetds-devel/Makefile

@ -49,7 +49,7 @@ UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
PORTDOCS= *
CONFLICTS= freetds-1.*
INSTALL= freetds
PORTSCOUT= limit:^\d+\.\d+\.\d{3}$

2
databases/freetds/Makefile

@ -27,6 +27,8 @@ CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
CONFLICTS= freetds-devel
PORTDOCS= *
OPTIONS_DEFINE= DOCS MARS

2
databases/galera/Makefile

@ -42,6 +42,8 @@ GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFI
CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME}
CONFLICTS_INSTALL= galera26
USE_RC_SUBR= garb.sh
PLIST_FILES= bin/garbd \

2
databases/galera26/Makefile

@ -39,6 +39,8 @@ CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME}
USE_LDCONFIG= yes
USE_RC_SUBR= garb.sh
CONFLICTS_INSTALL= galera
PLIST_FILES= bin/garbd \
lib/libgalera.so \
lib/libgalera_smm.so

2
databases/libcouchbase/Makefile

@ -20,6 +20,8 @@ USE_PERL5= build run
CMAKE_ARGS= -DLCB_NO_TESTS=1
CONFLICTS_INSTALL= coin-or-cbc
.include <bsd.port.pre.mk>
.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH} == riscv64

2
databases/mariadb104-server/Makefile

@ -105,7 +105,7 @@ DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
DATADIR= ${PREFIX}/share/mysql
ETCDIR= ${PREFIX}/etc/mysql
CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
CONFLICTS_INSTALL= mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysqlwsrep*-server \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}

4
databases/mysql55-server/Makefile

@ -70,7 +70,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
.if !defined(CLIENT_ONLY)
USES+= mysql:55
CONFLICTS_INSTALL= mysql5[0-46-9]-server \
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona*-server
@ -96,7 +96,7 @@ post-patch:
post-install:
# Empty directory, but check-plist complains
@${RMDIR} ${STAGEDIR}${PREFIX}/info || ${TRUE}
.include <bsd.port.pre.mk>
.if ${ARCH} == armv6 || ${ARCH} == armv7

7
databases/mysql56-server/Makefile

@ -80,11 +80,10 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
.if !defined(CLIENT_ONLY)
USES+= mysql:56
CONFLICTS_INSTALL= mysql5[0-57-9]-server \
mysql[0-46-9][0-9]-server \
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb[0-9][0-9]-server \
percona[0-9][0-9]-server
mariadb*-server \
percona*-server
USE_RC_SUBR= mysql-server

7
databases/mysql57-server/Makefile

@ -87,11 +87,10 @@ OPTIONS_SUB= YES
.if !defined(CLIENT_ONLY)
USES+= mysql:57
CONFLICTS_INSTALL= mysql5[0-68-9]-server \
mysql[0-46-9][0-9]-server \
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb[0-9][0-9]-server \
percona[0-9][0-9]-server
mariadb*-server \
percona*-server
USE_RC_SUBR= mysql-server

7
databases/mysql80-server/Makefile

@ -115,11 +115,10 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
.if !defined(CLIENT_ONLY)
USES+= mysql:80
CONFLICTS_INSTALL= mysql8[1-9]-server \
mysql[0-79][0-9]-server \
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb[0-9][0-9]-server \
percona[0-9][0-9]-server
mariadb*-server \
percona*-server
USE_RC_SUBR= mysql-server

5
databases/mysqlwsrep56-server/Makefile

@ -93,9 +93,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_TMPDIR=${MY_TMPDIR}
CONFLICTS_INSTALL= mariadb*-server \
mysql[0-9]*-server \
mysqlwsrep57*-server \
mysqlwsrep[1-489]*-server \
mysql*-server \
mysqlwsrep*-server \
percona*-server
USE_RC_SUBR= mysql-server

5
databases/mysqlwsrep57-server/Makefile

@ -85,9 +85,8 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_TMPDIR=${MY_TMPDIR}
CONFLICTS_INSTALL= mariadb*-server \
mysql[0-9]*-server \
mysqlwsrep56*-server \
mysqlwsrep[1-489]*-server \
mysql*-server \
mysqlwsrep*-server \
percona*-server
USE_RC_SUBR= mysql-server

2
databases/p5-DBD-XBase/Makefile

@ -15,6 +15,8 @@ RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI
USES= perl5
USE_PERL5= configure
CONFLICTS_INSTALL= shapelib
NO_ARCH= yes
.include <bsd.port.mk>

2
databases/pear-DB_DataObject/Makefile

@ -15,6 +15,8 @@ RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR}
USES= pear
CONFLICTS_INSTALL= php*-pear-DB_DataObject
NO_ARCH= yes
OPTIONS_DEFINE= DB MDB2 VALIDATE

2
databases/pear-DoctrineDBAL/Makefile

@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \
${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR}
CONFLICTS_INSTALL= php*-pear-doctrine-DoctrineDBAL
OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE
OPTIONS_DEFAULT=MYSQL

2
databases/pear-Horde_Db/Makefile

@ -20,4 +20,6 @@ MYSQLI_USE= PHP=mysqli
PDO_USES= php
PDO_USE= PHP=pdo
CONFLICTS_INSTALL= php*-pear-horde-Horde_Db
.include <bsd.port.mk>

2
databases/percona56-server/Makefile

@ -74,7 +74,7 @@ USES+=mysql:56p
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona5[0-57-9]-server
percona*-server
USE_RC_SUBR= mysql-server

2
databases/percona57-server/Makefile

@ -109,7 +109,7 @@ USES+=mysql:57p
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona5[0-68-9]-server
percona*-server
USE_RC_SUBR= mysql-server

2
databases/py-alembic/Makefile

@ -22,6 +22,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
USES= python:3.6+
USE_PYTHON= autoplist concurrent distutils
CONFLICTS_INSTALL= py*-alembic14
NO_ARCH= yes
do-test:

2
databases/py-alembic14/Makefile

@ -22,6 +22,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
USES= python
USE_PYTHON= autoplist concurrent distutils
CONFLICTS_INSTALL= py*-alembic
NO_ARCH= yes
PORTSCOUT= limit:^1\.4\.

2
databases/rubygem-dbf/Makefile

@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= gem
USE_RUBY= yes
CONFLICTS_INSTALL= dbf
NO_ARCH= yes
PLIST_FILES= bin/dbf

2
deskutils/ljclive/Makefile

@ -16,6 +16,6 @@ CONFIGURE_ARGS= ac_cv_search_iconv=${ICONV_LIB}
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
CONFLICTS= *clive-[1-9]*
CONFLICTS= clive
.include <bsd.port.mk>

2
deskutils/plan/Makefile

@ -16,6 +16,8 @@ ALL_TARGET= freebsd
MAKE_ENV+= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
CONFLICTS_INSTALL= ja-plan
OPTIONS_DEFINE= DOCS
do-install:

2
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

2
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

2
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

2
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

2
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

2
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.

2
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

2
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

2
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>

2
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>

2
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

2
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

2
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

2
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

3
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}

2
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>

2
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

2
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

2
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

2
devel/cweb/Makefile

@ -16,6 +16,8 @@ MAKE_ARGS= CWEBINPUTS="${DATADIR}" \
LINKFLAGS="" \
CC="${CC}"
CONFLICTS_INSTALL= tex-web2c
OPTIONS_DEFINE= DOCS
post-patch:

2
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

2
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

3
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

2
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

2
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

2
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

2
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>

2
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}

3
devel/etcd/Makefile

@ -18,8 +18,7 @@ GH_ACCOUNT= coreos
GO_PKGNAME= github.com/coreos/etcd