Page MenuHomeFreeBSD
Files F115727673

D31303.diff
No OneTemporary
Actions

D31303.diff
View Options

diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@@ -22,8 +22,7 @@
LAZARUS_PROJECT_FILES= project_pea.lpi project_peach.lpi
LAZBUILD_ARGS= -d
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
ARCHIVER_FILES= #
diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile
--- a/audio/asterisk-espeak/Makefile
+++ b/audio/asterisk-espeak/Makefile
@@ -16,20 +16,19 @@
FLAVOR?= ${FLAVORS:[1]}
asterisk13_PKGNAMEPREFIX= asterisk13-
-asterisk13_CONFLICTS_INSTALL= asterisk16-espeak asterisk18-espeak
asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13
asterisk13_RUN_DEPENDS= asterisk:net/asterisk13
asterisk16_PKGNAMEPREFIX= asterisk16-
-asterisk16_CONFLICTS_INSTALL= asterisk13-espeak asterisk18-espeak
asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
asterisk18_PKGNAMEPREFIX= asterisk18-
-asterisk18_CONFLICTS_INSTALL= asterisk13-espeak asterisk16-espeak
asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18
asterisk18_RUN_DEPENDS= asterisk:net/asterisk18
+CONFLICTS_INSTALL= asterisk13-espeak asterisk16-espeak asterisk18-espeak
+
USES= compiler:c11 gmake localbase
INSTALL_TARGET= install samples
diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile
--- a/audio/asterisk-flite/Makefile
+++ b/audio/asterisk-flite/Makefile
@@ -15,20 +15,19 @@
FLAVOR?= ${FLAVORS:[1]}
asterisk13_PKGNAMEPREFIX= asterisk13-
-asterisk13_CONFLICTS_INSTALL= asterisk16-flite asterisk18-flite
asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13
asterisk13_RUN_DEPENDS= asterisk:net/asterisk13
asterisk16_PKGNAMEPREFIX= asterisk16-
-asterisk16_CONFLICTS_INSTALL= asterisk13-flite asterisk18-flite
asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
asterisk18_PKGNAMEPREFIX= asterisk18-
-asterisk18_CONFLICTS_INSTALL= asterisk13-flite asterisk16-flite
asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18
asterisk18_RUN_DEPENDS= asterisk:net/asterisk18
+CONFLICTS_INSTALL= asterisk13-flite asterisk16-flite asterisk18-flite
+
USES= compiler:c11 gmake localbase
INSTALL_TARGET= install samples
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -15,12 +15,12 @@
OPTIONS_SUB= yes
ALLEGRO_DESC= Enable allegro support
+CONFLICTS= dumb-[0-9]* dumb-allegro-[0-9]*
+
ALLEGRO_LIB_DEPENDS= liballeg.so:devel/allegro
ALLEGRO_MAKE_ARGS= _PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" \
LINK_ALLEGRO="`allegro-config --libs` -lm"
-ALLEGRO_CONFLICTS= dumb-[0-9]*
ALLEGRO_MAKE_ARGS_OFF= _PORT_ALLEGRO_CFLAGS=
-ALLEGRO_CONFLICTS_OFF= dumb-allegro-[0-9]*
# libdumb.a is linked into libaudiere.so from audio/audiere.
CFLAGS+= -fPIC
diff --git a/benchmarks/vkmark/Makefile b/benchmarks/vkmark/Makefile
--- a/benchmarks/vkmark/Makefile
+++ b/benchmarks/vkmark/Makefile
@@ -15,7 +15,7 @@
BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers \
glm>0:math/glm
-LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \
+LIB_DEPENDS= libvulkan.so.1:graphics/vulkan-loader \
libassimp.so:multimedia/assimp
USES= compiler:c++14-lang localbase meson pkgconfig
diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile
--- a/benchmarks/wrk/Makefile
+++ b/benchmarks/wrk/Makefile
@@ -19,8 +19,7 @@
luajit_PKGNAMESUFFIX= -luajit
luajitor_PKGNAMESUFFIX= -luajit-openresty
-luajit_CONFLICTS_INSTALL= ${PORTNAME}-luajit-openresty
-luajitor_CONFLICTS_INSTALL= ${PORTNAME}-luajit
+CONFLICTS_INSTALL= ${PORTNAME}-luajit ${PORTNAME}-luajit-openresty
USES= gmake ssl
USE_CSTD= c99
diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -19,8 +19,7 @@
FLAVORS= x11 shlib
shlib_PKGNAMESUFFIX= -shlib
-shlib_CONFLICTS_INSTALL= ngspice_rework-2*
-x11_CONFLICTS_INSTALL= ngspice_rework-shlib-2*
+CONFLICTS_INSTALL= ngspice_rework-2* ngspice_rework-shlib-2*
USES= compiler:c11 gmake libtool ncurses readline autoreconf pkgconfig
diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile
--- a/cad/zcad/Makefile
+++ b/cad/zcad/Makefile
@@ -49,8 +49,7 @@
LAZBUILD_ARGS= -d --pcp=${WRKSRC}/tmppcp
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
PORTDOCS= UserGuide.odt UserGuide.pdf
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -40,8 +40,7 @@
INSTALLS_ICONS= yes
DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
post-extract:
@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -22,9 +22,9 @@
FLAVORS= default icu tcl
FLAVOR?= ${FLAVORS:[1]}
icu_PKGNAMESUFFIX= -${FLAVOR} # databases/p5-DBD-SQLite with ICU support
-icu_CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-tcl
tcl_PKGNAMESUFFIX= -${FLAVOR} # lang/tcl* support
-tcl_CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-icu
+
+CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-icu ${PORTNAME}-tcl
USES= libtool pathfix zip
USE_LDCONFIG= yes
diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@@ -11,10 +11,9 @@
FLAVORS= gtk3 gtk2
FLAVOR?= ${FLAVORS:[1]}
-gtk2_CONFLICTS_INSTALL= geany-plugins
gtk2_PKGNAMESUFFIX= -gtk2
-gtk3_CONFLICTS_INSTALL= geany-plugins-gtk2
+CONFLICTS_INSTALL= geany-plugins geany-plugins-gtk2
USES= metaport
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -16,10 +16,9 @@
gtk2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-gtk2_CONFLICTS_INSTALL= geany
gtk2_PKGNAMESUFFIX= -gtk2
-gtk3_CONFLICTS_INSTALL= geany-gtk2
+CONFLICTS_INSTALL= geany geany-gtk2
USES= compiler:c++11-lang desktop-file-utils gettext-tools gmake \
gnome libtool localbase pathfix pkgconfig python:build \
diff --git a/devel/git/Makefile b/devel/git/Makefile
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -18,18 +18,11 @@
LICENSE_FILE= ${WRKSRC}/COPYING
FLAVORS= default gui lite svn tiny
-default_CONFLICTS_INSTALL= git-gui git-lite git-svn git-tiny
-gui_CONFLICTS_INSTALL= git git-lite git-svn git-tiny
-gui_DESCR= ${.CURDIR}/pkg-descr-gui
+CONFLICTS_INSTALL= git git-gui git-lite git-svn git-tiny
+DESCR= ${.CURDIR}/pkg-descr${PKGNAMESUFFIX}
gui_PKGNAMESUFFIX= -gui
-lite_CONFLICTS_INSTALL= git git-gui git-svn git-tiny
-lite_DESCR= ${.CURDIR}/pkg-descr-lite
lite_PKGNAMESUFFIX= -lite
-svn_CONFLICTS_INSTALL= git git-gui git-lite git-tiny
-svn_DESCR= ${.CURDIR}/pkg-descr-svn
svn_PKGNAMESUFFIX= -svn
-tiny_CONFLICTS_INSTALL= git git-gui git-svn git-lite
-tiny_DESCR= ${.CURDIR}/pkg-descr-tiny
tiny_PKGNAMESUFFIX= -tiny
USES= autoreconf gmake iconv shebangfix ssl tar:xz
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -42,8 +42,7 @@
LAZBUILD_ARGS= -d
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
USE_FPC_gtk2= cairo
USE_GNOME_gtk2= cairo
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -17,9 +17,8 @@
LIB_DEPENDS= libgmp.so:math/gmp
FLAVORS= full nox
-full_CONFLICTS_INSTALL= emacs-devel-nox
nox_PKGNAMESUFFIX= -devel-nox
-nox_CONFLICTS_INSTALL= emacs-devel
+CONFLICTS_INSTALL= emacs-devel emacs-devel-nox
USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
CPE_VENDOR= gnu
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -24,11 +24,9 @@
FLAVORS= full canna nox
canna_PKGNAMESUFFIX= -canna
canna_LIB_DEPENDS= libcanna.so:japanese/canna-lib
-canna_CONFLICTS_INSTALL= emacs emacs-nox
canna_DESCR= ${.CURDIR}/pkg-descr-canna
-full_CONFLICTS_INSTALL= emacs-canna emacs-nox
nox_PKGNAMESUFFIX= -nox
-nox_CONFLICTS_INSTALL= emacs emacs-canna
+CONFLICTS_INSTALL= emacs emacs-canna emacs-nox
USES= cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz
CPE_VENDOR= gnu
diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -12,8 +12,7 @@
BROKEN= fails to build
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
USES= dos2unix fpc gnome lazarus:flavors xorg
USE_FPC= chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -18,9 +18,8 @@
libmspack.so:archivers/libmspack
FLAVORS= default nox11
-default_CONFLICTS_INSTALL= open-vm-tools-nox11
+CONFLICTS_INSTALL= open-vm-tools open-vm-tools-nox11
nox11_PKGNAMESUFFIX= -nox11
-nox11_CONFLICTS_INSTALL= open-vm-tools
nox11_COMMENT= (without X11)
USES= autoreconf gettext-runtime gnome kmod libtool localbase \
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -60,7 +60,7 @@
NOWIZARD_DESC= Disable Wizard mode
LUA_DESC= Bindings for LUA user scripts
-SDL_CONFLICTS= ${PORTNAME}-[0-9]*
+CONFLICTS= ${PORTNAME}-[0-9]* ${PORTNAME}-sdl-[0-9]*
SDL_USE= sdl=sdl2,image2,mixer2 gl=gl,glu
SDL_USES= gl sdl
SDL_USES_OFF= ncurses
@@ -72,7 +72,6 @@
${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
SDL_LIB_DEPENDS=libpng.so:graphics/png \
libfreetype.so:print/freetype2
-SDL_CONFLICTS_OFF= ${PORTNAME}-sdl-[0-9]*
NOWIZARD_MAKE_ARGS= NOWIZARD=y
SOUND_MAKE_ARGS= SOUND=y
diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile
--- a/graphics/lazpaint/Makefile
+++ b/graphics/lazpaint/Makefile
@@ -9,8 +9,7 @@
LICENSE= GPLv3
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
USES= desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
USE_FPC= chm fcl-base fcl-image fcl-json fcl-net fcl-web fcl-xml \
diff --git a/graphics/vulkan-caps-viewer/Makefile b/graphics/vulkan-caps-viewer/Makefile
--- a/graphics/vulkan-caps-viewer/Makefile
+++ b/graphics/vulkan-caps-viewer/Makefile
@@ -7,7 +7,7 @@
LICENSE= LGPL3 # based on license headers
-LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
+LIB_DEPENDS= libvulkan.so.1:graphics/vulkan-loader
USES= compiler:c++11-lib pkgconfig qmake qt:5
USE_GITHUB= yes
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -10,7 +10,7 @@
BUILD_DEPENDS= glslangValidator:graphics/glslang \
vulkan-headers>0:graphics/vulkan-headers
-LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
+LIB_DEPENDS= libvulkan.so.1:graphics/vulkan-loader
USES= alias cmake compiler:c++11-lib pkgconfig python:3.4+,build
USE_GITHUB= yes
diff --git a/lang/ponyc/Makefile b/lang/ponyc/Makefile
--- a/lang/ponyc/Makefile
+++ b/lang/ponyc/Makefile
@@ -17,9 +17,8 @@
FLAVOR?= ${FLAVORS:[1]}
llvm_dynamic_RUN_DEPENDS= llvm-link${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-llvm_dynamic_CONFLICTS_INSTALL= ponyc-static
llvm_static_PKGNAMESUFFIX= -static
-llvm_static_CONFLICTS_INSTALL= ponyc
+CONFLICTS_INSTALL= ponyc ponyc-static
.if ${FLAVOR} == llvm_static
COMMENT+= (statically linked with LLVM)
.endif
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -25,12 +25,12 @@
USE_GNOME= glib20 libxml2 gdkpixbuf2
USE_XORG= x11
-qt5_CONFLICTS_INSTALL= audacious-plugins-gtk2
+CONFLICTS_INSTALL= audacious-plugins audacious-plugins-gtk2
+
qt5_RUN_DEPENDS= audacious:multimedia/audacious@qt5
qt5_BUILD_DEPENDS= audacious:multimedia/audacious@qt5
gtk2_PKGNAMESUFFIX= -gtk2
-gtk2_CONFLICTS_INSTALL= audacious-plugins
gtk2_RUN_DEPENDS= audacious:multimedia/audacious@gtk2
gtk2_BUILD_DEPENDS= audacious:multimedia/audacious@gtk2
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -23,10 +23,9 @@
USE_XORG= x11 sm
USE_LDCONFIG= yes
-qt5_CONFLICTS_INSTALL= audacious-gtk2
+CONFLICTS_INSTALL= audacious audacious-gtk2
gtk2_PKGNAMESUFFIX= -gtk2
-gtk2_CONFLICTS_INSTALL= audacious
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile
--- a/net-p2p/awgg/Makefile
+++ b/net-p2p/awgg/Makefile
@@ -15,8 +15,7 @@
youtube-dl:www/youtube_dl \
axel:ftp/axel
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
USES= fpc gnome lazarus:flavors xorg
USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -34,8 +34,7 @@
LAZBUILD_ARGS= -d
PROJECT_NAME= transgui
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
post-patch:
${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/restranslator.pas
diff --git a/net/asterisk-chan_sccp/Makefile b/net/asterisk-chan_sccp/Makefile
--- a/net/asterisk-chan_sccp/Makefile
+++ b/net/asterisk-chan_sccp/Makefile
@@ -41,20 +41,19 @@
share/asterisk/documentation/thirdparty/chan_sccp-en_US.xml
asterisk13_PKGNAMEPREFIX= asterisk13-
-asterisk13_CONFLICTS_INSTALL= asterisk16-chan_sccp asterisk18-chan_sccp
asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13
asterisk13_RUN_DEPENDS= asterisk:net/asterisk13
asterisk16_PKGNAMEPREFIX= asterisk16-
-asterisk16_CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk18-chan_sccp
asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
asterisk18_PKGNAMEPREFIX= asterisk18-
-asterisk18_CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk16-chan_sccp
asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18
asterisk18_RUN_DEPENDS= asterisk:net/asterisk18
+CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk16-chan_sccp asterisk18-chan_sccp
+
OPTIONS_DEFINE= CONFERENCE VIDEO
OPTIONS_DEFAULT= CONFERENCE VIDEO
CONFERENCE_DESC= Enable Conference Support
diff --git a/net/asterisk-g72x/Makefile b/net/asterisk-g72x/Makefile
--- a/net/asterisk-g72x/Makefile
+++ b/net/asterisk-g72x/Makefile
@@ -14,7 +14,6 @@
FLAVOR?= ${FLAVORS:[1]}
asterisk13_PKGNAMEPREFIX= asterisk13-
-asterisk13_CONFLICTS_INSTALL= asterisk16-g72x asterisk18-g72x
asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13
asterisk13_RUN_DEPENDS= asterisk:net/asterisk13
.if ${FLAVOR} == asterisk13
@@ -22,7 +21,6 @@
.endif
asterisk16_PKGNAMEPREFIX= asterisk16-
-asterisk16_CONFLICTS_INSTALL= asterisk13-g72x asterisk18-g72x
asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
.if ${FLAVOR} == asterisk16
@@ -30,9 +28,11 @@
.endif
asterisk18_PKGNAMEPREFIX= asterisk18-
-asterisk18_CONFLICTS_INSTALL= asterisk13-g72x asterisk16-g72x
asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18
asterisk18_RUN_DEPENDS= asterisk:net/asterisk18
+
+CONFLICTS_INSTALL= asterisk13-g72x asterisk16-g72x asterisk18-g72x
+
.if ${FLAVOR} == asterisk18
CONFIGURE_ARGS+= --with-asterisk160
.endif
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -89,6 +89,8 @@
REST_DESC= Enable RESTful API support
WINBIND_DESC= Enable native winbind support in rlm_mschap
+CONFLICTS_BUILD= heimdal-[0-9].* krb5-[0-9].*
+
EDIR_CONFIGURE_WITH= edir
EDIR_IMPLIES= LDAP
FREETDS_CONFIGURE_WITH= rlm_freetds
@@ -97,7 +99,6 @@
HEIMDAL_CONFIGURE_ON= --with-rlm-krb5-dir=/
HEIMDAL_PORT_LIB_DEPENDS= libkrb5.so:security/heimdal
HEIMDAL_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE}
-HEIMDAL_CONFLICTS_BUILD= krb5-[0-9].*
IDN_CONFIGURE_WITH= rlm_idn
IDN_LIB_DEPENDS= libidn.so:dns/libidn
FIREBIRD_CONFIGURE_WITH= rlm_sql_firebird
@@ -108,7 +109,6 @@
LDAP_VARS= _REQUIRE+=slapd
MITKRB_PORT_CONFIGURE_ON= --with-rlm-krb5-dir=${LOCALBASE}
MITKRB_PORT_LIB_DEPENDS= libkrb5support.so:security/krb5
-MITKRB_CONFLICTS_BUILD= heimdal-[0-9].*
MYSQL_CONFIGURE_WITH= rlm_sql_mysql
MYSQL_USES= mysql
MYSQL_VARS= _REQUIRE+=mysql
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -14,8 +14,7 @@
FLAVORS= default lua
FLAVOR?= ${FLAVORS:[1]}
-default_CONFLICTS_INSTALL= haproxy-lua
-lua_CONFLICTS_INSTALL= haproxy
+CONFLICTS_INSTALL= haproxy haproxy-lua
lua_PKGNAMESUFFIX= -lua
CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
diff --git a/net/unison/Makefile b/net/unison/Makefile
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -14,10 +14,10 @@
FLAVORS= x11 nox11
FLAVOR?= ${FLAVORS:[1]}
+CONFLICTS_INSTALL= unison unison-nox11
+
nox11_PKGNAMESUFFIX= -nox11
-nox11_CONFLICTS_INSTALL= unison
-x11_CONFLICTS_INSTALL= unison-nox11
x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
icotool:graphics/icoutils
x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -23,8 +23,9 @@
_VERSIONSUFFIX= 232
+CONFLICTS_INSTALL= unison${_VERSIONSUFFIX} unison${_VERSIONSUFFIX}-nox11
+
nox11_PKGNAMESUFFIX= ${_VERSIONSUFFIX}-nox11
-nox11_CONFLICTS_INSTALL= unison${_VERSIONSUFFIX}
x11_PKGNAMESUFFIX= ${_VERSIONSUFFIX}
x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
@@ -32,7 +33,6 @@
x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2
-x11_CONFLICTS_INSTALL= unison${_VERSIONSUFFIX}-nox11
PLIST_SUB= PORTVERSION=${PORTVERSION}
USE_OCAML= yes
diff --git a/net/unison240/Makefile b/net/unison240/Makefile
--- a/net/unison240/Makefile
+++ b/net/unison240/Makefile
@@ -20,11 +20,11 @@
VERSIONSUFFIX= 240
+CONFLICTS_INSTALL= unison${VERSIONSUFFIX} unison${VERSIONSUFFIX}-nox11
+
nox11_PKGNAMESUFFIX= ${VERSIONSUFFIX}-nox11
-nox11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}
x11_PKGNAMESUFFIX= ${VERSIONSUFFIX}
-x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11
x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
icotool:graphics/icoutils
x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
diff --git a/net/unison248/Makefile b/net/unison248/Makefile
--- a/net/unison248/Makefile
+++ b/net/unison248/Makefile
@@ -18,11 +18,11 @@
VERSIONSUFFIX= 248
+CONFLICTS_INSTALL= unison${VERSIONSUFFIX} unison${VERSIONSUFFIX}-nox11
+
nox11_PKGNAMESUFFIX= ${VERSIONSUFFIX}-nox11
-nox11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}
x11_PKGNAMESUFFIX= ${VERSIONSUFFIX}
-x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11
x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
icotool:graphics/icoutils
x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -14,11 +14,10 @@
FLAVORS= inn inncurrent
FLAVOR?= ${FLAVORS:[1]}
-inn_CONFLICTS_INSTALL= cleanfeed-current
+CONFLICTS_INSTALL= cleanfeed cleanfeed-current
inn_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn
inncurrent_PKGNAMESUFFIX= -current
-inncurrent_CONFLICTS_INSTALL= cleanfeed
inncurrent_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn-current
NO_ARCH= yes
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -23,6 +23,8 @@
INSTDATFLAGS="-m ${SHAREMODE}" \
INSTMANFLAGS="-m ${MANMODE}"
+CONFLICTS_INSTALL= fig2dev
+
post-install:
for i in hr_HR hu_HU pl_PL ro_RO; do \
${LN} -sf cs_CZ.ps ${STAGEDIR}${PREFIX}/lib/X11/fig2dev/$${i}.ps; \
diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
--- a/russian/emkatic/Makefile
+++ b/russian/emkatic/Makefile
@@ -26,8 +26,7 @@
PORTDATA= *
PORTDOCS= CHANGELOG.*.txt README.*.txt
-gtk2_CONFLICTS_INSTALL= ru-${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt5
OPTIONS_DEFINE= DOCS PORTAUDIO
OPTIONS_DEFAULT= PORTAUDIO
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -25,10 +25,10 @@
MAN3_DESC= Install API manpages (section 3)
NC_DESC= Install TLS-enabled netcat
-CONFLICTS_INSTALL= libressl-devel-libtls-[0-9]*
-libtls_CONFLICTS_INSTALL= libretls-[0-9]*
-default_CONFLICTS_INSTALL= openssl-[0-9]* \
- openssl-devel-[0-9]*
+CONFLICTS_INSTALL= libretls-[0-9]* \
+ libressl-devel-libtls-[0-9]* \
+ openssl-[0-9]* \
+ openssl-devel-[0-9]*
.if ${FLAVOR:U} == default
OPTIONS_EXCLUDE= LIBTLS
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -29,15 +29,12 @@
ETCOLD= ${PREFIX}/etc
FLAVORS= default hpn gssapi
-default_CONFLICTS_INSTALL= openssh-portable-hpn openssh-portable-gssapi \
- openssh-portable-x509
-hpn_CONFLICTS_INSTALL= openssh-portable openssh-portable-gssapi \
- openssh-portable-x509
hpn_PKGNAMESUFFIX= -portable-hpn
-gssapi_CONFLICTS_INSTALL= openssh-portable openssh-portable-hpn \
- openssh-portable-x509
gssapi_PKGNAMESUFFIX= -portable-gssapi
+CONFLICTS_INSTALL= openssh-portable openssh-portable-gssapi \
+ openssh-portable-hpn openssh-portable-x509
+
OPTIONS_DEFINE= DOCS PAM TCP_WRAPPERS LIBEDIT BSM \
HPN KERB_GSSAPI \
LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD
diff --git a/shells/ksh2020/Makefile b/shells/ksh2020/Makefile
--- a/shells/ksh2020/Makefile
+++ b/shells/ksh2020/Makefile
@@ -15,8 +15,7 @@
GH_PROJECT= ast
GH_TAGNAME= ksh2020
-KSH_CONFLICTS= pdksh-*
-KSH93_CONFLICTS= ksh93-* ast-ksh-*
+CONFLICTS= pdksh-* ksh93-* ast-ksh-*
MESON_BUILD_DIR= build
diff --git a/shells/ksh93-devel/Makefile b/shells/ksh93-devel/Makefile
--- a/shells/ksh93-devel/Makefile
+++ b/shells/ksh93-devel/Makefile
@@ -35,8 +35,7 @@
# IMPORTANT: Disabling conflicts, i.e. -DDISABLE_CONFLICTS will result in
# arcane build failures due to already installed ksh/ksh93 in
# $PATH.
-KSH_CONFLICTS= pdksh-*
-KSH93_CONFLICTS= ksh93-2* ast-ksh-*
+CONFLICTS= pdksh-* ksh93-2* ast-ksh-*
OPTIONS_DEFAULT= KSH93 EXAMPLES
OPTIONS_DEFINE= EXAMPLES STATIC
diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile
--- a/shells/ksh93/Makefile
+++ b/shells/ksh93/Makefile
@@ -33,8 +33,7 @@
GH_ACCOUNT= att
GH_PROJECT= ast
-KSH_CONFLICTS= pdksh-*
-KSH93_CONFLICTS= ksh93-devel-* ast-ksh-*
+CONFLICTS= pdksh-* ksh93-devel-* ast-ksh-*
OPTIONS_DEFAULT= KSH93 EXAMPLES
OPTIONS_DEFINE= EXAMPLES STATIC
diff --git a/www/falkon/Makefile b/www/falkon/Makefile
--- a/www/falkon/Makefile
+++ b/www/falkon/Makefile
@@ -27,9 +27,8 @@
FLAVORS= default qtonly
FLAVOR?= default
-default_CONFLICTS_INSTALL= ${PORTNAME}-qtonly
+CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-qtonly
qtonly_PKGNAMESUFFIX= -qtonly
-qtonly_CONFLICTS_INSTALL= ${PORTNAME}
.if ${FLAVOR} != qtonly
CMAKE_ON+= ENABLE_KDE_FRAMEWORKS_INTEGRATION_PLUGIN
diff --git a/www/p5-RT-Extension-MandatoryOnTransition/Makefile b/www/p5-RT-Extension-MandatoryOnTransition/Makefile
--- a/www/p5-RT-Extension-MandatoryOnTransition/Makefile
+++ b/www/p5-RT-Extension-MandatoryOnTransition/Makefile
@@ -17,9 +17,8 @@
FLAVOR?= ${FLAVORS:[1]}
FLAVORS= rt44 rt50
rt44_PKGNAMEPREFIX= p5-RT44-
-rt44_CONFLICTS_INSTALL= rt50
rt50_PKGNAMEPREFIX= p5-RT50-
-rt50_CONFLICTS_INSTALL= rt44
+CONFLICTS_INSTALL= rt44 rt50
.if ${FLAVOR} == rt44
RT_VER= 44
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -22,8 +22,8 @@
apache_PKGNAMESUFFIX= -apache
nginx_PKGNAMESUFFIX= -nginx
-apache_CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}-nginx
-nginx_CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}-apache
+CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME}-nginx \
+ ${PKGNAMEPREFIX}${PORTNAME}-apache
OPTIONS_DEFINE= DEBUG SYMLINK
OPTIONS_DEFAULT=SYMLINK
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -16,8 +16,7 @@
ONLY_FOR_ARCHS= amd64 i386
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
+CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5
USES= dos2unix desktop-file-utils fpc gnome lazarus:flavors xorg
DOS2UNIX_FILES= src/dmhelpmanager.pas components/multithreadprocs/mtpcpu.pas
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -21,8 +21,7 @@
gtk2_LIB_DEPENDS= libfm-gtk.so:x11/libfm@gtk2
gtk3_LIB_DEPENDS= libfm-gtk3.so:x11/libfm@gtk3
-gtk2_CONFLICTS_INSTALL= pcmanfm-gtk3
-gtk3_CONFLICTS_INSTALL= pcmanfm
+CONFLICTS_INSTALL= pcmanfm pcmanfm-gtk3
USES= desktop-file-utils gmake gnome gettext libtool localbase \
pkgconfig tar:xz xorg
diff --git a/x11-toolkits/guile-gnome-platform/Makefile b/x11-toolkits/guile-gnome-platform/Makefile
--- a/x11-toolkits/guile-gnome-platform/Makefile
+++ b/x11-toolkits/guile-gnome-platform/Makefile
@@ -22,9 +22,8 @@
FLAVORS= lite full
FLAVOR?= ${FLAVORS:[1]}
full_PKGNAMESUFFIX=-full
-full_CONFLICTS_INSTALL=${PORTNAME}-lite
lite_PKGNAMESUFFIX=-lite
-lite_CONFLICTS_INSTALL=${PORTNAME}-full
+CONFLICTS_INSTALL=${PORTNAME}-full ${PORTNAME}-lite
# We don't actually need gettext, but for some incomprehensible reason it
# is the package that installs some basic gnulib autoconf functionality.
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -27,8 +27,7 @@
gtk3_PKGNAMESUFFIX= -gtk3
-gtk2_CONFLICTS_INSTALL= libfm-gtk3
-gtk3_CONFLICTS_INSTALL= libfm
+CONFLICTS_INSTALL= libfm libfm-gtk3
.endif
SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 28, 6:49 PM (16 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17832680
Default Alt Text
D31303.diff (26 KB)

Event Timeline