summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/android-tools-adb/Makefile2
-rw-r--r--devel/android-tools-fastboot/Makefile2
-rw-r--r--devel/cloudabi-toolchain/Makefile2
-rw-r--r--devel/cmake/Makefile2
-rw-r--r--devel/libedit/Makefile2
-rw-r--r--devel/llvm-devel/Makefile2
-rw-r--r--devel/llvm10/Makefile2
-rw-r--r--devel/llvm11/Makefile2
-rw-r--r--devel/llvm12/Makefile2
-rw-r--r--devel/llvm13/Makefile2
-rw-r--r--devel/llvm80/Makefile2
-rw-r--r--devel/llvm90/Makefile2
-rw-r--r--devel/php-composer/Makefile2
-rw-r--r--devel/php-composer2/Makefile2
-rw-r--r--devel/py-magic/Makefile2
-rw-r--r--devel/py-python-magic/Makefile2
-rw-r--r--devel/rubygem-ruby-progressbar/Makefile2
-rw-r--r--devel/talloc/Makefile2
-rw-r--r--devel/tevent/Makefile2
19 files changed, 18 insertions, 20 deletions
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index 02e07bb12573..4fe4a3f33cf6 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -12,7 +12,7 @@ LICENSE= APACHE20
USE_GITHUB= yes
GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL}
-CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
+CONFLICTS_INSTALL?= ${PORTNAME}-devel
USES= compiler:c++17-lang pkgconfig ssl uidfix
BUILD_WRKSRC= ${WRKSRC}/adb
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index d124e4f2e2f0..682fff410030 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -19,7 +19,7 @@ GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL} \
jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \
jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg
-CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
+CONFLICTS_INSTALL?= ${PORTNAME}-devel
USES= compiler:c++17-lang pkgconfig ssl uidfix
BUILD_WRKSRC= ${WRKSRC}/fastboot
diff --git a/devel/cloudabi-toolchain/Makefile b/devel/cloudabi-toolchain/Makefile
index 5a3f5aa72e36..893ed63667c9 100644
--- a/devel/cloudabi-toolchain/Makefile
+++ b/devel/cloudabi-toolchain/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
lld${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
pkgconf:devel/pkgconf
-CONFLICTS= cloudabi-binutils-*
+CONFLICTS= cloudabi-binutils
CLOUDABI_ARCHS= aarch64-unknown-cloudabi armv6-unknown-cloudabi-eabihf \
armv7-unknown-cloudabi-eabihf i686-unknown-cloudabi \
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index e934e1ff5c9f..02ac470834f0 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -45,8 +45,6 @@ CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN}
CPACK_USES_OFF= libarchive
# When CPACK is on, uses base libarchive and won't pass stage-qa
-CONFLICTS_INSTALL= cmake-modules-*
-
CXXFLAGS+= -D__BSD_VISIBLE
.include <bsd.port.pre.mk>
diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile
index ea8b5207e1c8..34842eaf1c39 100644
--- a/devel/libedit/Makefile
+++ b/devel/libedit/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
-CONFLICTS_INSTALL= editline-*
+CONFLICTS_INSTALL= editline
post-install:
${MV} ${STAGEDIR}${PREFIX}/man/man3/history.3 ${STAGEDIR}${PREFIX}/man/man3/el_history.3
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index b7c6dff379aa..896b912aa561 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -165,7 +165,7 @@ LLDB_VARS= _USES_PYTHON=python:3.6+
MLIR_DESC= Multi-Level Intermediate Representation
OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library
OPENMP_PORTDOCS= openmp
-OPENMP_CONFLICTS_INSTALL= libiomp5-devel-*
+OPENMP_CONFLICTS_INSTALL= libiomp5-devel
OPENMP_USES= perl5
OPENMP_USE= PERL5=build
STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers)
diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile
index f0a2cfbcb1d8..ae33d17cce6e 100644
--- a/devel/llvm10/Makefile
+++ b/devel/llvm10/Makefile
@@ -117,7 +117,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
-DOCS_CONFLICTS_BUILD= commonmark-cmark-*
+DOCS_CONFLICTS_BUILD= commonmark-cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
index 48ea9a25d432..8d723d56e8ba 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -113,7 +113,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
-DOCS_CONFLICTS_BUILD= commonmark-cmark-*
+DOCS_CONFLICTS_BUILD= commonmark-cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index cf0c9ac51833..8e273e45beea 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -128,7 +128,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
-DOCS_CONFLICTS_BUILD= commonmark-cmark-*
+DOCS_CONFLICTS_BUILD= commonmark-cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index 90ec23d66318..ca228f947b83 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -139,7 +139,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
-DOCS_CONFLICTS_BUILD= commonmark-cmark-*
+DOCS_CONFLICTS_BUILD= commonmark-cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile
index 399ee8acad7e..82ac6ee4bc6e 100644
--- a/devel/llvm80/Makefile
+++ b/devel/llvm80/Makefile
@@ -94,7 +94,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
-DOCS_CONFLICTS_BUILD= commonmark-cmark-*
+DOCS_CONFLICTS_BUILD= commonmark-cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile
index 553c45035bf9..806ae746991e 100644
--- a/devel/llvm90/Makefile
+++ b/devel/llvm90/Makefile
@@ -100,7 +100,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
-DOCS_CONFLICTS_BUILD= commonmark-cmark-*
+DOCS_CONFLICTS_BUILD= commonmark-cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile
index 2ef7a14e50bc..6573f2d67eb4 100644
--- a/devel/php-composer/Makefile
+++ b/devel/php-composer/Makefile
@@ -20,7 +20,7 @@ USES= cpe php:flavors
CPE_VENDOR= getcomposer
USE_PHP= ctype filter intl json mbstring openssl phar
-CONFLICTS_INSTALL= php*-composer2-*
+CONFLICTS_INSTALL= php*-composer2
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/php-composer2/Makefile b/devel/php-composer2/Makefile
index eab6bd2e93b4..f0adef64a0c3 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
NO_ARCH= yes
NO_BUILD= yes
diff --git a/devel/py-magic/Makefile b/devel/py-magic/Makefile
index c7548a65a48d..05e383699f43 100644
--- a/devel/py-magic/Makefile
+++ b/devel/py-magic/Makefile
@@ -20,7 +20,7 @@ USES= python
USE_PYTHON= autoplist distutils
# both install module as magic.py
-CONFLICTS= ${PYTHON_PKGNAMEPREFIX}python-magic-*
+CONFLICTS= ${PYTHON_PKGNAMEPREFIX}python-magic
WRKSRC= ${WRKDIR}/file-${PORTVERSION}/python
diff --git a/devel/py-python-magic/Makefile b/devel/py-python-magic/Makefile
index 6b1406c05ed4..0cf6c1b43bdb 100644
--- a/devel/py-python-magic/Makefile
+++ b/devel/py-python-magic/Makefile
@@ -18,7 +18,7 @@ USE_PYTHON= autoplist distutils
GH_ACCOUNT= ahupp
# both install module as magic.py
-CONFLICTS= ${PYTHON_PKGNAMEPREFIX}magic-*
+CONFLICTS= ${PYTHON_PKGNAMEPREFIX}magic
NO_ARCH= yes
diff --git a/devel/rubygem-ruby-progressbar/Makefile b/devel/rubygem-ruby-progressbar/Makefile
index 6044377e050b..55c6fac91812 100644
--- a/devel/rubygem-ruby-progressbar/Makefile
+++ b/devel/rubygem-ruby-progressbar/Makefile
@@ -9,7 +9,7 @@ COMMENT= Progressbar library for Ruby
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-CONFLICTS_INSTALL= ${RUBY_PKGNAMEPREFIX}progressbar-*
+CONFLICTS_INSTALL= ${RUBY_PKGNAMEPREFIX}progressbar
USES= gem
USE_RUBY= yes
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 936057ac4509..c2f55ce6acca 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -11,7 +11,7 @@ LICENSE= LGPL3
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be built with THREADS support
-CONFLICTS_INSTALL= talloc1-*
+CONFLICTS_INSTALL= talloc1
#FLAVORS= default nopython
#nopython_PKGNAMESUFFIX= -nopython
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 9506d5ce8f38..7897c7a480a8 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -15,7 +15,7 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with
BUILD_DEPENDS= talloc>=2.3.1:devel/talloc
RUN_DEPENDS= talloc>=2.3.1:devel/talloc
-CONFLICTS_INSTALL= tevent1-*
+CONFLICTS_INSTALL= tevent1
#FLAVORS= default nopython
#nopython_PKGNAMESUFFIX= -nopython
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-10 03:10:01 +0000