Date: Fri, 29 Oct 2021 09:57:35 GMT From: =?utf-8?Q?Stefan E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 819f25b36d45 - main - */*: Remove redundant '-[0-9]*' from CONFLICTS Message-ID: <202110290957.19T9vZKE082373@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=819f25b36d45b8ac5593ec8e6f470d9ad454b08a commit 819f25b36d45b8ac5593ec8e6f470d9ad454b08a Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2021-10-28 12:28:24 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2021-10-29 09:50:18 +0000 */*: Remove redundant '-[0-9]*' from CONFLICTS 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) --- accessibility/linux-c7-atk/Makefile | 2 +- accessibility/orca/Makefile | 2 +- archivers/deco/Makefile | 2 +- archivers/lzma/Makefile | 2 +- archivers/par/Makefile | 2 +- archivers/par2cmdline/Makefile | 2 +- archivers/squsq/Makefile | 2 +- astro/gpsbabel/Makefile | 2 +- astro/gpsbabel14/Makefile | 2 +- astro/match/Makefile | 2 +- audio/aacplusenc/Makefile | 2 +- audio/codec2/Makefile | 2 +- audio/linux-c7-alsa-lib/Makefile | 2 +- audio/linux-c7-alsa-plugins-oss/Makefile | 2 +- audio/linux-c7-alsa-plugins-pulseaudio/Makefile | 2 +- audio/linux-c7-alsa-utils/Makefile | 2 +- audio/linux-c7-audiofile/Makefile | 2 +- audio/linux-c7-flac/Makefile | 2 +- audio/linux-c7-libogg/Makefile | 2 +- audio/linux-c7-libsndfile/Makefile | 2 +- audio/linux-c7-libvorbis/Makefile | 2 +- audio/linux-c7-openal-soft/Makefile | 2 +- audio/linux-c7-pulseaudio-libs/Makefile | 2 +- audio/linux-c7-pulseaudio-utils/Makefile | 2 +- audio/linux-c7-sdl_mixer/Makefile | 2 +- audio/osalp/Makefile | 2 +- audio/play/Makefile | 2 +- audio/sox/Makefile | 2 +- audio/teamspeak3-server/Makefile | 2 +- audio/waon/Makefile | 2 +- biology/emboss/Makefile | 2 +- biology/seqan/Makefile | 2 +- cad/geda/Makefile | 6 +++--- cad/jspice3/Makefile | 2 +- cad/pcb/Makefile | 2 +- chinese/opendesktop-fonts/Makefile | 2 +- chinese/phpbb-tw/Makefile | 2 +- comms/gnokii/Makefile | 2 +- comms/smstools3/Makefile | 2 +- comms/uhd/Makefile | 2 +- databases/akonadi/Makefile | 2 +- databases/libdrizzle-redux/Makefile | 2 +- databases/linux-c7-sqlite3/Makefile | 2 +- databases/pgpool-II-36/Makefile | 2 +- databases/pgpool-II-37/Makefile | 2 +- databases/pgpool-II-40/Makefile | 2 +- databases/pgpool-II-41/Makefile | 2 +- databases/pgpool-II-42/Makefile | 2 +- databases/postgresql10-pgtcl/Makefile | 2 +- databases/postgresql11-pgtcl/Makefile | 2 +- databases/postgresql12-pgtcl/Makefile | 2 +- databases/postgresql13-pgtcl/Makefile | 2 +- databases/postgresql14-pgtcl/Makefile | 2 +- databases/postgresql96-pgtcl/Makefile | 2 +- databases/py-mysqlclient/Makefile | 2 +- deskutils/notify-osd/Makefile | 2 +- devel/antlr/Makefile | 2 +- devel/arduino18/Makefile | 2 +- devel/bcc/Makefile | 2 +- devel/binutils/Makefile | 2 +- devel/bsdcflow/Makefile | 2 +- devel/cdecl/Makefile | 2 +- devel/cflow/Makefile | 2 +- devel/cil/Makefile | 2 +- devel/courier-unicode/Makefile | 2 +- devel/cutils/Makefile | 2 +- devel/cvsps-devel/Makefile | 2 +- devel/cvsps/Makefile | 2 +- devel/dev86/Makefile | 4 ++-- devel/gamin/Makefile | 2 +- devel/gitblit/Makefile | 2 +- devel/gitg/Makefile | 2 +- devel/gnucflow/Makefile | 2 +- devel/gperf/Makefile | 2 +- devel/gputils/Makefile | 2 +- devel/jenkins-lts/Makefile | 2 +- devel/jenkins/Makefile | 2 +- devel/kyua/Makefile | 2 +- devel/libbfd/Makefile | 2 +- devel/libconfig/Makefile | 2 +- devel/linux-c7-dbus-glib/Makefile | 2 +- devel/linux-c7-dbus-libs/Makefile | 2 +- devel/linux-c7-devtools/Makefile | 2 +- devel/linux-c7-libgfortran/Makefile | 2 +- devel/linux-c7-libglade2/Makefile | 2 +- devel/linux-c7-libpciaccess/Makefile | 2 +- devel/linux-c7-libsigc++20/Makefile | 2 +- devel/linux-c7-libthai/Makefile | 2 +- devel/linux-c7-nspr/Makefile | 2 +- devel/linux-c7-qt/Makefile | 2 +- devel/linux-c7-sdl12/Makefile | 2 +- devel/mingw32-bin-msvcrt/Makefile | 2 +- devel/ninja/Makefile | 2 +- devel/onetbb/Makefile | 2 +- devel/open-beagle/Makefile | 2 +- devel/p5-libxml-enno/Makefile | 6 +++--- devel/pdcurses/Makefile | 2 +- devel/poco/Makefile | 2 +- devel/sope/Makefile | 2 +- devel/tbb/Makefile | 2 +- devel/tdl/Makefile | 2 +- devel/valgrind-devel/Makefile | 2 +- devel/valgrind/Makefile | 2 +- devel/wand-libconfig/Makefile | 2 +- dns/djbdns-tools/Makefile | 2 +- dns/djbdns/Makefile | 2 +- dns/libasr-devel/Makefile | 2 +- dns/libasr/Makefile | 2 +- dns/linux-c7-libasyncns/Makefile | 2 +- dns/p5-Net-Amazon-Route53/Makefile | 2 +- editors/jed/Makefile | 2 +- editors/libreoffice/Makefile | 2 +- editors/yudit/Makefile | 2 +- emulators/dynamips-community/Makefile | 2 +- emulators/uae/Makefile | 2 +- ftp/linux-c7-curl/Makefile | 2 +- games/bsdgames/Makefile | 2 +- games/criticalmass/Makefile | 2 +- games/filters/Makefile | 2 +- games/ponscripter-07th-mod/Makefile | 2 +- games/xboard-devel/Makefile | 2 +- games/xboard/Makefile | 2 +- graphics/ImageMagick6/Makefile | 2 +- graphics/autopano-sift-c/Makefile | 2 +- graphics/geeqie/Makefile | 2 +- graphics/gnash/Makefile | 2 +- graphics/gts/Makefile | 2 +- graphics/icat/Makefile | 2 +- graphics/leptonica/Makefile | 2 +- graphics/libart_lgpl/Makefile | 2 +- graphics/libwmf-nox11/Makefile | 2 +- graphics/libwmf/Makefile | 2 +- graphics/linux-c7-cairo/Makefile | 2 +- graphics/linux-c7-dri/Makefile | 2 +- graphics/linux-c7-gdk-pixbuf2/Makefile | 2 +- graphics/linux-c7-glx-utils/Makefile | 2 +- graphics/linux-c7-jpeg/Makefile | 2 +- graphics/linux-c7-png/Makefile | 2 +- graphics/linux-c7-sdl_image/Makefile | 2 +- graphics/linux-c7-sdl_ttf/Makefile | 2 +- graphics/linux-c7-tiff/Makefile | 2 +- graphics/ocaml-lablgl/Makefile | 2 +- graphics/ogre3d/Makefile | 2 +- graphics/ogre3d19/Makefile | 2 +- graphics/p5-Image-ExifTool-devel/Makefile | 2 +- graphics/zathura-pdf-poppler/Makefile | 2 +- irc/ircd-ratbox-devel/Makefile | 2 +- irc/ircd-ratbox/Makefile | 2 +- japanese/awffull/Makefile | 2 +- japanese/ebview-gtk2/Makefile | 2 +- japanese/groff/Makefile | 2 +- japanese/jls/Makefile | 2 +- japanese/libslang/Makefile | 2 +- japanese/mh/Makefile | 2 +- japanese/mutt-devel/Makefile | 2 +- japanese/ng-devel/Makefile | 2 +- japanese/ng/Makefile | 2 +- korean/ko.TeX-fonts-base/Makefile | 2 +- korean/ko.TeX-fonts-extra/Makefile | 2 +- korean/ko.TeX/Makefile | 2 +- lang/io-devel/Makefile | 2 +- lang/io/Makefile | 2 +- lang/linux-c7-tcl85/Makefile | 2 +- lang/newlisp/Makefile | 2 +- lang/nhc98/Makefile | 2 +- lang/ocaml-nox11/Makefile | 2 +- lang/ocaml/Makefile | 4 ++-- lang/racket-minimal/Makefile | 2 +- lang/racket/Makefile | 2 +- lang/rexx-imc/Makefile | 2 +- lang/rexx-regina/Makefile | 2 +- lang/scheme48/Makefile | 2 +- lang/see/Makefile | 2 +- lang/squirrel/Makefile | 2 +- mail/archiveopteryx-devel/Makefile | 2 +- mail/courier-imap/Makefile | 2 +- mail/dbmail/Makefile | 2 +- mail/dspam/Makefile | 2 +- mail/heirloom-mailx/Makefile | 2 +- mail/imaptools/Makefile | 2 +- mail/maildrop/Makefile | 2 +- mail/mailscanner/Makefile | 2 +- mail/mailx/Makefile | 2 +- mail/mmh/Makefile | 2 +- mail/mutt/Makefile | 4 ++-- mail/popular/Makefile | 2 +- mail/qmail-mysql/Makefile | 2 +- mail/qmail-spamcontrol/Makefile | 2 +- mail/qmail-tls/Makefile | 2 +- mail/qmail/Makefile | 4 ++-- mail/spamassassin-devel/Makefile | 2 +- mail/spamassassin/Makefile | 2 +- mail/squirrelmail/Makefile | 2 +- mail/sylpheed/Makefile | 2 +- math/atlas/Makefile | 2 +- math/geogebra/Makefile | 2 +- math/glpk/Makefile | 2 +- math/metis/Makefile | 2 +- math/testu01/Makefile | 2 +- misc/dahdi-kmod/Makefile | 2 +- misc/dahdi-kmod26/Makefile | 2 +- misc/dahdi/Makefile | 2 +- misc/heyu2/Makefile | 2 +- multimedia/clive/Makefile | 2 +- multimedia/linux-c7-libtheora/Makefile | 2 +- multimedia/linux-c7-libv4l/Makefile | 2 +- multimedia/mjpegtools/Makefile | 2 +- multimedia/pwcbsd/Makefile | 2 +- multimedia/pwcview/Makefile | 2 +- net-im/centerim/Makefile | 2 +- net-im/tkabber/Makefile | 2 +- net-mgmt/chillispot/Makefile | 2 +- net-mgmt/coovachilli/Makefile | 2 +- net-mgmt/p5-Net-SNMP/Makefile | 2 +- net-mgmt/resource-agents/Makefile | 2 +- net-mgmt/seafile-client/Makefile | 2 +- net-mgmt/seafile-server/Makefile | 2 +- net-p2p/amule-devel/Makefile | 2 +- net-p2p/amule/Makefile | 2 +- net-p2p/microdc2/Makefile | 2 +- net-p2p/mldonkey/Makefile | 2 +- net/asterisk16/Makefile | 2 +- net/asterisk18/Makefile | 2 +- net/avahi-app/Makefile | 2 +- net/avahi-libdns/Makefile | 2 +- net/bird2/Makefile | 4 ++-- net/corosync2/Makefile | 2 +- net/corosync3/Makefile | 2 +- net/dante/Makefile | 2 +- net/freeradius-client/Makefile | 2 +- net/hping/Makefile | 2 +- net/ilbc/Makefile | 2 +- net/isc-dhcp44-server/Makefile | 4 ++-- net/libzmq2/Makefile | 2 +- net/libzmq3/Makefile | 2 +- net/libzmq4/Makefile | 2 +- net/linux-c7-avahi-libs/Makefile | 2 +- net/linux-c7-openldap/Makefile | 2 +- net/linux-c7-tcp_wrappers-libs/Makefile | 2 +- net/mpich/Makefile | 2 +- net/mpich2/Makefile | 2 +- net/netatalk3/Makefile | 2 +- net/netpipes/Makefile | 2 +- net/nss-pam-ldapd/Makefile | 2 +- net/openbgpd/Makefile | 2 +- net/openbgpd6/Makefile | 2 +- net/openradius/Makefile | 4 ++-- net/p5-Net-Z3950-ZOOM/Makefile | 2 +- net/p5-SOAP/Makefile | 2 +- net/pacemaker1/Makefile | 2 +- net/pacemaker1/Makefile.common | 2 +- net/pacemaker2/Makefile | 2 +- net/proxychains-ng/Makefile | 2 +- net/rabbitmq-c-devel/Makefile | 2 +- net/sendsms/Makefile | 2 +- net/tac_plus4/Makefile | 2 +- net/unison/Makefile | 2 +- net/unison248/Makefile | 2 +- net/vde/Makefile | 2 +- net/vde2/Makefile | 2 +- net/xmlrpc-epi/Makefile | 2 +- net/xrdp-devel/Makefile | 2 +- net/zebra/Makefile | 2 +- news/inn/Makefile | 2 +- news/s-news/Makefile | 2 +- polish/gnugadu2/Makefile | 2 +- print/cups-filters/Makefile | 2 +- print/cups/Makefile | 2 +- print/dvi2tty/Makefile | 2 +- print/enscript-a4/Makefile | 2 +- print/enscript-letter/Makefile | 2 +- print/enscript-letterdj/Makefile | 2 +- print/foomatic-filters/Makefile | 2 +- print/kde_poster/Makefile | 2 +- print/linux-c7-cups-libs/Makefile | 2 +- print/makeindex/Makefile | 2 +- print/texlive-tlmgr/Makefile | 2 +- science/afni/Makefile | 6 +++--- science/minc2/Makefile | 2 +- science/nifticlib/Makefile | 2 +- security/gnupg/Makefile | 2 +- security/gss/Makefile | 2 +- security/heimdal/Makefile | 4 ++-- security/ipsec-tools/Makefile | 2 +- security/knock/Makefile | 2 +- security/krb5-117/Makefile | 2 +- security/krb5-118/Makefile | 2 +- security/krb5-119/Makefile | 2 +- security/krb5-appl/Makefile | 2 +- security/krb5-devel/Makefile | 2 +- security/linux-c7-cyrus-sasl2/Makefile | 2 +- security/linux-c7-gnutls/Makefile | 2 +- security/linux-c7-libgcrypt/Makefile | 2 +- security/linux-c7-libgpg-error/Makefile | 2 +- security/linux-c7-libssh2/Makefile | 2 +- security/linux-c7-libtasn1/Makefile | 2 +- security/linux-c7-nss/Makefile | 2 +- security/p5-Crypt-T_e_a/Makefile | 2 +- security/p5-Crypt-Tea_JS/Makefile | 2 +- security/p5-openxpki/Makefile | 6 +++--- security/secure_delete/Makefile | 2 +- security/srm/Makefile | 2 +- security/tthsum/Makefile | 2 +- shells/bash/Makefile | 4 ++-- shells/bashc/Makefile | 2 +- sysutils/boxbackup-devel/Makefile | 6 +++--- sysutils/cdrkit/Makefile | 2 +- sysutils/conky-awesome/Makefile | 2 +- sysutils/conky/Makefile | 2 +- sysutils/cronolog-devel/Makefile | 2 +- sysutils/daemontools-encore/Makefile | 2 +- sysutils/daemontools/Makefile | 2 +- sysutils/freedt/Makefile | 2 +- sysutils/hfsutils/Makefile | 2 +- sysutils/iocage-devel/Makefile | 2 +- sysutils/iocage/Makefile | 2 +- sysutils/lbl-hf/Makefile | 2 +- sysutils/logstash6/Makefile | 2 +- sysutils/logstash7/Makefile | 2 +- sysutils/mcweject/Makefile | 2 +- sysutils/passwordsafe/Makefile | 2 +- sysutils/psmisc/Makefile | 2 +- sysutils/pstack/Makefile | 2 +- sysutils/pstacku/Makefile | 2 +- sysutils/pstree/Makefile | 2 +- sysutils/pv/Makefile | 2 +- sysutils/py-rdiff-backup/Makefile | 2 +- sysutils/samefile/Makefile | 2 +- sysutils/samesame/Makefile | 2 +- sysutils/sleuthkit/Makefile | 2 +- sysutils/syslog-ng/Makefile | 6 +++--- sysutils/userneu/Makefile | 2 +- sysutils/vcp/Makefile | 4 ++-- sysutils/xen-guest-tools/Makefile | 2 +- textproc/elasticsearch6/Makefile | 2 +- textproc/elasticsearch7/Makefile | 2 +- textproc/gnugrep/Makefile | 2 +- textproc/groff/Makefile | 2 +- textproc/html2text/Makefile | 2 +- textproc/latex2html/Makefile | 2 +- textproc/linux-c7-aspell/Makefile | 2 +- textproc/linux-c7-expat/Makefile | 2 +- textproc/linux-c7-libxml2/Makefile | 2 +- textproc/p5-Text-Format+NWrap/Makefile | 2 +- textproc/par/Makefile | 2 +- textproc/py-elasticsearch5/Makefile | 2 +- textproc/sphinxsearch/Makefile | 4 ++-- textproc/utf8proc/Makefile | 2 +- textproc/zorba/Makefile | 2 +- www/awffull/Makefile | 2 +- www/erlang-mochiweb-basho/Makefile | 2 +- www/erlang-mochiweb/Makefile | 2 +- www/free-sa-devel/Makefile | 2 +- www/gist/Makefile | 2 +- www/ilias/Makefile | 2 +- www/links/Makefile | 2 +- www/linux-c7-qtwebkit/Makefile | 2 +- www/mediawiki131/Makefile | 2 +- www/mediawiki135/Makefile | 2 +- www/mediawiki136/Makefile | 2 +- www/mnogosearch/Makefile | 2 +- www/p5-App-gist/Makefile | 2 +- www/phpbb/Makefile | 2 +- www/privoxy/Makefile | 2 +- www/pserv/Makefile | 2 +- www/sogo-activesync/Makefile | 2 +- www/sogo/Makefile | 2 +- www/sogo2-activesync/Makefile | 2 +- www/sogo2/Makefile | 2 +- www/tidy-devel/Makefile | 2 +- x11-clocks/asclock/Makefile | 2 +- x11-fonts/linux-c7-fontconfig/Makefile | 2 +- x11-fonts/mkbold-mkitalic/Makefile | 2 +- x11-fonts/mkbold/Makefile | 2 +- x11-fonts/mkitalic/Makefile | 2 +- x11-themes/clearlooks/Makefile | 4 ++-- x11-themes/gtk-engines2/Makefile | 2 +- x11-toolkits/linux-c7-gtk2/Makefile | 2 +- x11-toolkits/linux-c7-openmotif/Makefile | 2 +- x11-toolkits/linux-c7-pango/Makefile | 2 +- x11-toolkits/linux-c7-qt-x11/Makefile | 2 +- x11-toolkits/linux-c7-tk85/Makefile | 2 +- x11-toolkits/open-motif/Makefile | 2 +- x11-wm/wmii-devel/Makefile | 2 +- x11-wm/wmii/Makefile | 2 +- x11/linux-c7-xorg-libs/Makefile | 2 +- x11/xscreensaver/Makefile | 2 +- x11/xterm/Makefile | 2 +- 388 files changed, 412 insertions(+), 412 deletions(-) diff --git a/accessibility/linux-c7-atk/Makefile b/accessibility/linux-c7-atk/Makefile index 560a577f9aef..8b441b54b162 100644 --- a/accessibility/linux-c7-atk/Makefile +++ b/accessibility/linux-c7-atk/Makefile @@ -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 diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index 15054227340a..eb5f79aadc99 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -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 diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile index e6f7d29ac2f6..b4a0a61acc8f 100644 --- a/archivers/deco/Makefile +++ b/archivers/deco/Makefile @@ -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" diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile index a888bfc84267..6987c919ce52 100644 --- a/archivers/lzma/Makefile +++ b/archivers/lzma/Makefile @@ -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 diff --git a/archivers/par/Makefile b/archivers/par/Makefile index babddc6ab742..ac27d0253c4d 100644 --- a/archivers/par/Makefile +++ b/archivers/par/Makefile @@ -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}" diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile index 35d3a9022ac5..efe300bf7eb9 100644 --- a/archivers/par2cmdline/Makefile +++ b/archivers/par2cmdline/Makefile @@ -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 diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile index 5f6005d05363..bd7cd8e95802 100644 --- a/archivers/squsq/Makefile +++ b/archivers/squsq/Makefile @@ -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 diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile index 53e275f51c89..8ac5130d1534 100644 --- a/astro/gpsbabel/Makefile +++ b/astro/gpsbabel/Makefile @@ -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 diff --git a/astro/gpsbabel14/Makefile b/astro/gpsbabel14/Makefile index bc0e7ba1e14b..e8b56be7f6ea 100644 --- a/astro/gpsbabel14/Makefile +++ b/astro/gpsbabel14/Makefile @@ -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 diff --git a/astro/match/Makefile b/astro/match/Makefile index 3c3cf38b1d6f..dc076bb07121 100644 --- a/astro/match/Makefile +++ b/astro/match/Makefile @@ -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> diff --git a/audio/aacplusenc/Makefile b/audio/aacplusenc/Makefile index 2275a1f2f89e..b6bcf203c023 100644 --- a/audio/aacplusenc/Makefile +++ b/audio/aacplusenc/Makefile @@ -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} diff --git a/audio/codec2/Makefile b/audio/codec2/Makefile index 1a600e522cb5..1eb339097887 100644 --- a/audio/codec2/Makefile +++ b/audio/codec2/Makefile @@ -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 diff --git a/audio/linux-c7-alsa-lib/Makefile b/audio/linux-c7-alsa-lib/Makefile index 8b893c02b5bc..7a481c1c7d8c 100644 --- a/audio/linux-c7-alsa-lib/Makefile +++ b/audio/linux-c7-alsa-lib/Makefile @@ -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 diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile index 7fc910a27fe0..ed3c8f33d757 100644 --- a/audio/linux-c7-alsa-plugins-oss/Makefile +++ b/audio/linux-c7-alsa-plugins-oss/Makefile @@ -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} diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile index b02c649f1bff..b23dd9539efc 100644 --- a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile +++ b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile @@ -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} diff --git a/audio/linux-c7-alsa-utils/Makefile b/audio/linux-c7-alsa-utils/Makefile index cee18823c31d..78da890435e2 100644 --- a/audio/linux-c7-alsa-utils/Makefile +++ b/audio/linux-c7-alsa-utils/Makefile @@ -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 diff --git a/audio/linux-c7-audiofile/Makefile b/audio/linux-c7-audiofile/Makefile index e9ebd3756126..02277aa7d8b3 100644 --- a/audio/linux-c7-audiofile/Makefile +++ b/audio/linux-c7-audiofile/Makefile @@ -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 diff --git a/audio/linux-c7-flac/Makefile b/audio/linux-c7-flac/Makefile index 98621d290857..618f4c923c27 100644 --- a/audio/linux-c7-flac/Makefile +++ b/audio/linux-c7-flac/Makefile @@ -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} diff --git a/audio/linux-c7-libogg/Makefile b/audio/linux-c7-libogg/Makefile index e31668554cb4..fae12d0d8f58 100644 --- a/audio/linux-c7-libogg/Makefile +++ b/audio/linux-c7-libogg/Makefile @@ -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 diff --git a/audio/linux-c7-libsndfile/Makefile b/audio/linux-c7-libsndfile/Makefile index 7771764e60b2..7db947cb86e1 100644 --- a/audio/linux-c7-libsndfile/Makefile +++ b/audio/linux-c7-libsndfile/Makefile @@ -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 diff --git a/audio/linux-c7-libvorbis/Makefile b/audio/linux-c7-libvorbis/Makefile index e805806c66fa..8fecd181adc1 100644 --- a/audio/linux-c7-libvorbis/Makefile +++ b/audio/linux-c7-libvorbis/Makefile @@ -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 diff --git a/audio/linux-c7-openal-soft/Makefile b/audio/linux-c7-openal-soft/Makefile index ac934059c93c..b8b4f12540ca 100644 --- a/audio/linux-c7-openal-soft/Makefile +++ b/audio/linux-c7-openal-soft/Makefile @@ -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 diff --git a/audio/linux-c7-pulseaudio-libs/Makefile b/audio/linux-c7-pulseaudio-libs/Makefile index 0cb2508322af..e3e5a6c435cd 100644 --- a/audio/linux-c7-pulseaudio-libs/Makefile +++ b/audio/linux-c7-pulseaudio-libs/Makefile @@ -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} diff --git a/audio/linux-c7-pulseaudio-utils/Makefile b/audio/linux-c7-pulseaudio-utils/Makefile index fecc270f5ee1..7230686eca27 100644 --- a/audio/linux-c7-pulseaudio-utils/Makefile +++ b/audio/linux-c7-pulseaudio-utils/Makefile @@ -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> diff --git a/audio/linux-c7-sdl_mixer/Makefile b/audio/linux-c7-sdl_mixer/Makefile index aa84134d4985..25fe000bc9e7 100644 --- a/audio/linux-c7-sdl_mixer/Makefile +++ b/audio/linux-c7-sdl_mixer/Makefile @@ -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} diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile index 2c7f34dbb198..69d7d1c8ddbd 100644 --- a/audio/osalp/Makefile +++ b/audio/osalp/Makefile @@ -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 \ diff --git a/audio/play/Makefile b/audio/play/Makefile index 5512670547e1..5af1030c20ef 100644 --- a/audio/play/Makefile +++ b/audio/play/Makefile @@ -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" diff --git a/audio/sox/Makefile b/audio/sox/Makefile index fa7fff6b5863..cc1574d82b75 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -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 diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile index a107cf556b2e..451168be2e42 100644 --- a/audio/teamspeak3-server/Makefile +++ b/audio/teamspeak3-server/Makefile @@ -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} \ diff --git a/audio/waon/Makefile b/audio/waon/Makefile index d214f188fe26..3462a25810a3 100644 --- a/audio/waon/Makefile +++ b/audio/waon/Makefile @@ -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 diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile index fed3bdc4df4e..e4e120effa16 100644 --- a/biology/emboss/Makefile +++ b/biology/emboss/Makefile @@ -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 diff --git a/biology/seqan/Makefile b/biology/seqan/Makefile index 7ed81b7b9283..f55de391aee5 100644 --- a/biology/seqan/Makefile +++ b/biology/seqan/Makefile @@ -16,7 +16,7 @@ USES= tar:xz NO_BUILD= yes NO_ARCH= yes -CONFLICTS= seqan1-[0-9]* +CONFLICTS= seqan1 OPTIONS_DEFINE= DOCS diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 9d65f6e344c1..6cf616463ab8 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -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 diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile index 3a7cd82dda1a..58ef5d291802 100644 --- a/cad/jspice3/Makefile +++ b/cad/jspice3/Makefile @@ -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 diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index b040cb13ce69..23c4806d7104 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -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 diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile index cb33df9f6b30..3ff62cabe2a2 100644 --- a/chinese/opendesktop-fonts/Makefile +++ b/chinese/opendesktop-fonts/Makefile @@ -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 diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile index 571a22003e44..7e72d5f799d3 100644 --- a/chinese/phpbb-tw/Makefile +++ b/chinese/phpbb-tw/Makefile @@ -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 diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 8051a4aa5c44..a53326c8f6b1 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -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 diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile index 9d47be46e89e..17475a3d9996 100644 --- a/comms/smstools3/Makefile +++ b/comms/smstools3/Makefile @@ -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 diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index 2fbadca1c7af..e37da3602847 100644 --- a/comms/uhd/Makefile +++ b/comms/uhd/Makefile @@ -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 diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 50d1ec3f1e0c..5a1cf9e3056c 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -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 diff --git a/databases/libdrizzle-redux/Makefile b/databases/libdrizzle-redux/Makefile index d0782d9e465d..625c8bf34896 100644 --- a/databases/libdrizzle-redux/Makefile +++ b/databases/libdrizzle-redux/Makefile @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes USES= gmake libtool ssl USE_LDCONFIG= yes -CONFLICTS= libdrizzle-[0-9]* +CONFLICTS= libdrizzle OPTIONS_DEFINE= DOCS diff --git a/databases/linux-c7-sqlite3/Makefile b/databases/linux-c7-sqlite3/Makefile index 65105ba32a28..e512abdd22df 100644 --- a/databases/linux-c7-sqlite3/Makefile +++ b/databases/linux-c7-sqlite3/Makefile @@ -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 diff --git a/databases/pgpool-II-36/Makefile b/databases/pgpool-II-36/Makefile index 0a4f58bd1e5b..38ea30060c99 100644 --- a/databases/pgpool-II-36/Makefile +++ b/databases/pgpool-II-36/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= pgpool -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II *** 4520 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110290957.19T9vZKE082373>