Skip to content

Commit bcaf25a

Browse files
stesserstesser
committed
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)
1 parent f1661bd commit bcaf25a

491 files changed

Lines changed: 868 additions & 220 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎archivers/arc/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COMMENT= Create & extract files from DOS .ARC files
1010

1111
LICENSE= GPLv2
1212

13-
CONFLICTS= php5-arcanist
13+
CONFLICTS_INSTALL= arcanist-php73 arcanist-php74 arcanist-php80
1414

1515
OPTIONS_DEFINE= DOCS
1616

‎archivers/deco/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ RUN_DEPENDS= arc:archivers/arc \
2828
zoo:archivers/zoo \
2929
flac:audio/flac
3030

31+
CONFLICTS= deco-misc # bin/deco
32+
3133
DARCHIVE_VER= 1.7
3234
DARCHIVE= deco-archive-${DARCHIVE_VER}
3335

‎astro/jday/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ GNU_CONFIGURE= yes
1212
USE_LDCONFIG= yes
1313
INSTALL_TARGET= install-strip
1414

15+
CONFLICTS_INSTALL= netatalk3
16+
1517
PLIST_FILES= bin/dbd bin/j2d bin/jday \
1618
include/jday.h lib/libjday.a \
1719
lib/libjday.so lib/libjday.so.2 \

‎audio/csound/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ USE_LDCONFIG= yes
2323

2424
CPE_VENDOR= csounds
2525

26+
CONFLICTS_INSTALL= clearsilver go-cs libextractor outguess
27+
2628
CFLAGS_powerpc= -maltivec
2729
CFLAGS_powerpcspe= -DPFFFT_SIMD_DISABLE
2830
CFLAGS_powerpc64= -maltivec

‎audio/grip/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ USE_XORG= ice sm x11 xext
2424
GNU_CONFIGURE= yes
2525
CONFIGURE_ARGS+= --disable-werror
2626

27+
CONFLICTS_INSTALL= py*-grip
28+
2729
OPTIONS_DEFINE= CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS
2830
OPTIONS_DEFAULT= CDPARANOIA FLAC VORBIS
2931

‎audio/icecast-kh/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GH_PROJECT= icecast-kh
2323
USE_GNOME= libxml2 libxslt
2424
USE_RC_SUBR= icecast
2525

26-
CONFLICTS_INSTALL= icecast icecast2
26+
CONFLICTS_INSTALL= icecast
2727

2828
GNU_CONFIGURE= yes
2929
CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE}

‎audio/icecast/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ USE_GNOME= libxml2 libxslt
3131
GNU_CONFIGURE= yes
3232
USE_RC_SUBR= icecast
3333

34+
CONFLICTS_INSTALL= icecast-kh
35+
3436
SUB_FILES= pkg-message
3537

3638
CPE_VENDOR= xiph

‎audio/julius/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ GNU_CONFIGURE= yes
1616
USES= iconv perl5 shebangfix
1717
SHEBANG_FILES= jclient-perl/jclient.pl
1818

19+
INSTALL_CONFLICTS= generate julius-caesariii php*-pear-Text_Highlighter
20+
1921
CONFIGURE_ENV= ac_cv_path_PERL=${PERL}
2022
CPPFLAGS+= -I${LOCALBASE}/include
2123
CFLAGS+= -Wno-return-type

‎benchmarks/ali/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ GH_TUPLE= davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-sp
3838
uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
3939
uber-go:goleak:v1.1.12:uber_go_goleak/vendor/go.uber.org/goleak
4040

41+
CONFLICTS_INSTALL= ja-mh mmh nmh
42+
4143
PLIST_FILES= bin/ali
4244

4345
.include <bsd.port.mk>

‎benchmarks/fio/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ GNUPLOT_DESC= Support for plotting graphs
2121

2222
GNUPLOT_BUILD_DEPENDS= ${LOCALBASE}/bin/gnuplot:math/gnuplot
2323

24+
CONFLICTS_INSTALL= py*-Fiona
25+
2426
do-install:
2527
${INSTALL_PROGRAM} ${WRKSRC}/fio ${STAGEDIR}${PREFIX}/bin
2628
${INSTALL_SCRIPT} ${WRKSRC}/tools/fio_generate_plots ${STAGEDIR}${PREFIX}/bin

0 commit comments

Comments
 (0)