FreeBSD/freebsd-ports
Fork 14
Code Releases Activity

*/*: Remove redundant '-[0-9]*' from CONFLICTS

Browse source 
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").

Many CONFLICTS definitions used patterns like "bash-[0-9]*" to filter
for the bash package in any version. But that pattern is functionally
identical with just "bash".

Approved by:	portmgr (blanket)
This commit is contained in:
Stefan Eßer 2021-10-28 14:28:24 +02:00
commit 819f25b36d
388 changed files with 412 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

2
accessibility/linux-c7-atk/Makefile
View file

@ -15,7 +15,7 @@ USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS NLS

2
accessibility/orca/Makefile
View file

@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
# conflict with py*-json-py because orca uses the json from python itself
# and py*-json-py shadows this.
CONFLICTS= py*-json-py-[0-9]*
CONFLICTS= py*-json-py
PORTSCOUT= limitw:1,even
NO_ARCH= yes

2
archivers/deco/Makefile
View file

@ -26,7 +26,7 @@ RUN_DEPENDS= arc:archivers/arc \
zoo:archivers/zoo \
flac:audio/flac
CONFLICTS= deco-[0-9]*
CONFLICTS= deco
post-patch:
@${CP} ${FILESDIR}/extract ${WRKDIR}/${PORTNAME}-archive-1.7/x/"tar\.xz"

2
archivers/lzma/Makefile
View file

@ -9,7 +9,7 @@ DISTNAME= lzma${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
COMMENT= High-ratio LZMA compressor
CONFLICTS= lzmautils-[0-9]* xz-[0-9]*
CONFLICTS= lzmautils xz
USES= 7z gmake dos2unix
NO_WRKSUBDIR= yes

2
archivers/par/Makefile
View file

@ -11,7 +11,7 @@ COMMENT= Archiver for Quake I and II packed data files
LICENSE= GPLv2
CONFLICTS= par-[0-9]*
CONFLICTS= par
MAKEFILE= Makefile.Linux
MAKE_ARGS= CC="${CC}"

2
archivers/par2cmdline/Makefile
View file

@ -17,7 +17,7 @@ USE_GITHUB= yes
GH_ACCOUNT= Parchive
PORTDOCS= README
CONFLICTS= par2cmdline-tbb-[0-9]*
CONFLICTS= par2cmdline-tbb
PLIST_FILES= bin/par2 bin/par2create bin/par2repair bin/par2verify man/man1/par2.1.gz

2
archivers/squsq/Makefile
View file

@ -9,7 +9,7 @@ DISTNAME= t20-squsq-3.3
MAINTAINER= ports@FreeBSD.org
COMMENT= Compressor/decompressor for CP/M "Squeeze" compressed files
CONFLICTS= squirrel-[0-9]*
CONFLICTS= squirrel
WRKSRC= ${WRKDIR}/t20-squsq
MAKEFILE= ${FILESDIR}/Makefile
CFLAGS+= -Wno-error=return-type

2
astro/gpsbabel/Makefile
View file

@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= compiler:c++11-lang gmake localbase qt:5
USE_QT= core qmake_build
CONFLICTS= gpsbabel14-[0-9]*
CONFLICTS= gpsbabel14
USE_GITHUB= yes
GNU_CONFIGURE= yes

2
astro/gpsbabel14/Makefile
View file

@ -23,7 +23,7 @@ CONFIGURE_ARGS= --with-expathdr=${LOCALBASE}/include \
PLIST_FILES= bin/gpsbabel
CONFLICTS= gpsbabel-[0-9]*
CONFLICTS= gpsbabel
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gpsbabel

2
astro/match/Makefile
View file

@ -11,7 +11,7 @@ COMMENT= Program for matching star lists
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS= avenger-[0-9]*
CONFLICTS= avenger
GNU_CONFIGURE= yes
.include <bsd.port.mk>

2
audio/aacplusenc/Makefile
View file

@ -24,7 +24,7 @@ OPTIONS_DEFINE= FFTW3
OPTIONS_DEFAULT= FFTW3
FFTW3_DESC= Use FFTW3 library for performance
CONFLICTS= libaacplus-[0-9]*
CONFLICTS= libaacplus
PLIST_FILES= bin/aacplusenc
MAKE_ARGS+= INSTDIR=${STAGEDIR}${PREFIX}

2
audio/codec2/Makefile
View file

@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libspeexdsp.so:audio/speexdsp
CONFLICTS= libcodec2-[0-9]*
CONFLICTS= libcodec2
USES= cmake pathfix pkgconfig shebangfix tar:xz
USE_LDCONFIG= yes

2
audio/linux-c7-alsa-lib/Makefile
View file

@ -16,7 +16,7 @@ USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
OPTIONS_DEFINE= DOCS

2
audio/linux-c7-alsa-plugins-oss/Makefile
View file

@ -37,7 +37,7 @@ LIBDIR_i386= /usr/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRC32= ${WRKDIR}/32/${PORTNAME}-${PORTVERSION}
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
PLIST= ${PKGDIR}/pkg-plist.${ARCH}

2
audio/linux-c7-alsa-plugins-pulseaudio/Makefile
View file

@ -19,7 +19,7 @@ USE_LINUX_RPM= yes
LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}

2
audio/linux-c7-alsa-utils/Makefile
View file

@ -14,7 +14,7 @@ USES= linux:c7
USE_LINUX= alsalib alsa-plugins-oss
USE_LINUX_RPM= nolib
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS NLS

2
audio/linux-c7-audiofile/Makefile
View file

@ -13,7 +13,7 @@ USES= cpe linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS

2
audio/linux-c7-flac/Makefile
View file

@ -19,7 +19,7 @@ CPE_VENDOR= flac_project
LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}

2
audio/linux-c7-libogg/Makefile
View file

@ -13,7 +13,7 @@ USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS

2
audio/linux-c7-libsndfile/Makefile
View file

@ -16,7 +16,7 @@ USE_LINUX_RPM= yes
CPE_VENDOR= libsndfile_project
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS

2
audio/linux-c7-libvorbis/Makefile
View file

@ -16,7 +16,7 @@ USE_LINUX_RPM= yes
CPE_VENDOR= xiph.org
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS

2
audio/linux-c7-openal-soft/Makefile
View file

@ -16,7 +16,7 @@ USE_LDCONFIG= yes
USE_LINUX= alsalib
USE_LINUX_RPM= yes
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
OPTIONS_DEFINE= DOCS

2
audio/linux-c7-pulseaudio-libs/Makefile
View file

@ -19,7 +19,7 @@ USE_LINUX_RPM= yes
LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} \
${PORTNAME}${PKGNAMESUFFIX}-glib2-${DISTVERSIONFULL}
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}

2
audio/linux-c7-pulseaudio-utils/Makefile
View file

@ -17,7 +17,7 @@ USE_LINUX_RPM= nolib
BIN_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
.include <bsd.port.mk>

2
audio/linux-c7-sdl_mixer/Makefile
View file

@ -18,7 +18,7 @@ USE_LDCONFIG= yes
USE_LINUX= sdl12
USE_LINUX_RPM= yes
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
DOCSDIR= ${PREFIX}/usr/share/doc/SDL_mixer-${PORTVERSION}

2
audio/osalp/Makefile
View file

@ -27,7 +27,7 @@ USE_LDCONFIG= yes
PLIST_SUB= VERSION=${PORTVERSION}
CONFLICTS= libaudiofile-[0-9]*
CONFLICTS= libaudiofile
post-patch:
@${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -E \

2
audio/play/Makefile
View file

@ -9,7 +9,7 @@ MASTER_SITES= PORTS_JP
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple audio file player
CONFLICTS= sox-[0-9]*
CONFLICTS= sox
USES= uidfix
MAKE_ARGS= CFLAGS="${CFLAGS}" MANDIR="${PREFIX}/man/ja/man" BINDIR="${PREFIX}/bin"

2
audio/sox/Makefile
View file

@ -17,7 +17,7 @@ LICENSE_COMB= dual
LIB_DEPENDS= libltdl.so:devel/libltdl
CONFLICTS= play-[0-9]*
CONFLICTS= play
GNU_CONFIGURE= yes
USES= autoreconf cpe libtool localbase:ldflags pkgconfig

2
audio/teamspeak3-server/Makefile
View file

@ -29,7 +29,7 @@ SUB_FILES= pkg-message
USERS= teamspeak
GROUPS= teamspeak
CONFLICTS= teamspeak_server-[0-9]*
CONFLICTS= teamspeak_server
PLIST_SUB= DBDIR=${DBDIR} \
ETCDIR=${ETCDIR} \

2
audio/waon/Makefile
View file

@ -16,7 +16,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \
libsndfile.so:audio/libsndfile \
libsamplerate.so:audio/libsamplerate
CONFLICTS= pv-[0-9]*
CONFLICTS= pv
USES= gnome ncurses pkgconfig
USE_GNOME= gtk20

2
biology/emboss/Makefile
View file

@ -21,7 +21,7 @@ LIB_DEPENDS= libgd.so:graphics/gd \
USES= gmake libtool iconv mysql pgsql ssl
USE_SUBMAKE= yes
CONFLICTS= qmail-ldap-[0-9]* digest-[0-9]*
CONFLICTS= qmail-ldap digest
PREFIX?= ${LOCALBASE}/emboss
NO_MTREE= yes

2
biology/seqan/Makefile
View file

@ -16,7 +16,7 @@ USES= tar:xz
NO_BUILD= yes
NO_ARCH= yes
CONFLICTS= seqan1-[0-9]*
CONFLICTS= seqan1
OPTIONS_DEFINE= DOCS

6
cad/geda/Makefile
View file

@ -41,9 +41,9 @@ DATADIR= ${PREFIX}/share/gEDA
INFO= geda-scheme
BINARY_WRAPPERS= gm4
CONFLICTS= geda-docs-[0-9]* geda-examples-[0-9]* geda-gattrib-[0-9]* \
geda-gschem-[0-9]* geda-netlist-[0-9]* geda-symbols-[0-9]* \
geda-symcheck-[0-9]* geda-utils-[0-9]* libgeda-[0-9]*
CONFLICTS= geda-docs geda-examples geda-gattrib \
geda-gschem geda-netlist geda-symbols \
geda-symcheck geda-utils libgeda
PORTSCOUT= limitw:1,even

2
cad/jspice3/Makefile
View file

@ -13,7 +13,7 @@ BROKEN_riscv64= fails to install: jspice3: No such file or directory
BROKEN_FreeBSD_13= fails to install: jspice3: No such file or directory
BROKEN_FreeBSD_14= fails to install: jspice3: No such file or directory
CONFLICTS= spice-[0-9]*
CONFLICTS= spice
OPTIONS_DEFINE= X11 EXAMPLES
OPTIONS_DEFAULT= X11

2
cad/pcb/Makefile
View file

@ -27,7 +27,7 @@ USE_GL= gl glu
USE_GNOME= intltool cairo pangox-compat
USE_XORG= x11 xrender xinerama
CONFLICTS= gts-[0-9]*
CONFLICTS= gts
GNU_CONFIGURE= yes
CONFIGURE_ENV+= INSTALL_DATA="${BSD_INSTALL_DATA}"
LDFLAGS+= -lpthread

2
chinese/opendesktop-fonts/Makefile
View file

@ -9,7 +9,7 @@ MASTER_SITES?= LOCAL/chinsan/fonts
MAINTAINER= ports@FreeBSD.org
COMMENT= Ming and Kai face of OpenDesktop fonts
CONFLICTS= zh-fireflyttf-[0-9]*
CONFLICTS= zh-fireflyttf
DIST_SUBDIR= OpenFonts
NO_BUILD= yes
NO_ARCH= yes

2
chinese/phpbb-tw/Makefile
View file

@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING
RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
CONFLICTS= phpbb-[0-9]*
CONFLICTS= phpbb
USES= dos2unix php
# Get HOSTNAME

2
comms/gnokii/Makefile
View file

@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --enable-security
SUB_FILES+= pkg-message
PORTDOCS= *
CONFLICTS= smstools-[0-9]* sendsms-[0-9]*
CONFLICTS= smstools sendsms
FIXPREFIX= Docs/man/gnokiid.8 Docs/DataCalls-QuickStart Docs/README \
common/cfgreader.c

2
comms/smstools3/Makefile
View file

@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libinotify.so:devel/libinotify
CONFLICTS= gnokii-[0-9]* smstools-2.* sendsms-[0-9]*
CONFLICTS= gnokii smstools-2.* sendsms
OPTIONS_DEFINE= STATS UTF8 EXAMPLES DOCS
OPTIONS_DEFAULT= STATS UTF8

2
comms/uhd/Makefile
View file

@ -29,7 +29,7 @@ USE_GITHUB= yes
GH_ACCOUNT= EttusResearch
GH_TAGNAME= 90ce6062b6b5df2eddeee723777be85108e4e7c7
CONFLICTS= usrp-[0-9]*
CONFLICTS= usrp
BROKEN_FreeBSD_12_aarch64= fails to configure: Could not find standard set_new_handler function
BROKEN_FreeBSD_12_armv6= fails to configure: Could not find standard set_new_handler function

2
databases/akonadi/Makefile
View file

@ -11,7 +11,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs
# Let process generate meaningful backtrace on core dump.
BUILD_DEPENDS= xsltproc:textproc/libxslt
CONFLICTS= akonadi-[0-9]* akonadi-kf5-git-[0-9]*
CONFLICTS= akonadi akonadi-kf5-git
USES= cmake compiler:c++11-lib gettext gnome kde:5 qt:5 \
shared-mime-info tar:xz

2
databases/libdrizzle-redux/Makefile
View file

@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USES= gmake libtool ssl
USE_LDCONFIG= yes
CONFLICTS= libdrizzle-[0-9]*
CONFLICTS= libdrizzle
OPTIONS_DEFINE= DOCS

2
databases/linux-c7-sqlite3/Makefile
View file

@ -15,7 +15,7 @@ USES= cpe linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}3/pkg-descr
OPTIONS_DEFINE= DOCS

2
databases/pgpool-II-36/Makefile
View file

@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_RC_SUBR= pgpool
CONFLICTS= pgpool-II-[0-9]*
CONFLICTS= pgpool-II
PORTDOCS= *

2
databases/pgpool-II-37/Makefile
View file

@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_RC_SUBR= pgpool
CONFLICTS= pgpool-II-[0-9]*
CONFLICTS= pgpool-II
PORTDOCS= *

2
databases/pgpool-II-40/Makefile
View file

@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_RC_SUBR= pgpool
CONFLICTS= pgpool-II-[0-9]*
CONFLICTS= pgpool-II
PORTDOCS= *

2
databases/pgpool-II-41/Makefile
View file

@ -18,7 +18,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
CONFLICTS= pgpool-II-[0-9]*
CONFLICTS= pgpool-II
PORTDOCS= *

2
databases/pgpool-II-42/Makefile
View file

@ -18,7 +18,7 @@ USE_RC_SUBR= pgpool
GNU_CONFIGURE= yes
CONFLICTS= pgpool-II-[0-9]*
CONFLICTS= pgpool-II
PORTDOCS= *

2
databases/postgresql10-pgtcl/Makefile
View file

@ -1,7 +1,7 @@
PORTREVISION= 0
PKGNAMESUFFIX= -postgresql10
CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]*
CONFLICTS= pgtcl pgtcl-postgresql9[0123456]
PGTCL_SLAVE= 10
MASTERDIR= ${.CURDIR}/../pgtcl

2
databases/postgresql11-pgtcl/Makefile
View file

@ -1,7 +1,7 @@
PORTREVISION= 0
PKGNAMESUFFIX= -postgresql11
CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql10-*
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql10-*
PGTCL_SLAVE= 11
MASTERDIR= ${.CURDIR}/../pgtcl

Some files were not shown because too many files have changed in this diff Show more