diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-10-28 12:28:24 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-10-29 09:50:18 +0000 |
| commit | 819f25b36d45b8ac5593ec8e6f470d9ad454b08a (patch) | |
| tree | a9ad0caa2a052fc695c1cdede2866080f5660431 | |
| parent | f2b9a177fa65d8010c60d9dd2803a4b4bb9bcec8 (diff) | |
| download | ports-819f25b36d45b8ac5593ec8e6f470d9ad454b08a.tar.gz ports-819f25b36d45b8ac5593ec8e6f470d9ad454b08a.zip | |
*/*: 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)
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 PORTDOCS= * diff --git a/databases/pgpool-II-37/Makefile b/databases/pgpool-II-37/Makefile index d4d7a12cd957..43b4332202d9 100644 --- a/databases/pgpool-II-37/Makefile +++ b/databases/pgpool-II-37/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= pgpool -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/pgpool-II-40/Makefile b/databases/pgpool-II-40/Makefile index 008f0c4ee1f8..1cda25b3de48 100644 --- a/databases/pgpool-II-40/Makefile +++ b/databases/pgpool-II-40/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= pgpool -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/pgpool-II-41/Makefile b/databases/pgpool-II-41/Makefile index 6a29cd2ee075..0fd9c1d83566 100644 --- a/databases/pgpool-II-41/Makefile +++ b/databases/pgpool-II-41/Makefile @@ -18,7 +18,7 @@ USE_RC_SUBR= pgpool GNU_CONFIGURE= yes -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/pgpool-II-42/Makefile b/databases/pgpool-II-42/Makefile index dbdd86f33c2c..a89611c68d26 100644 --- a/databases/pgpool-II-42/Makefile +++ b/databases/pgpool-II-42/Makefile @@ -18,7 +18,7 @@ USE_RC_SUBR= pgpool GNU_CONFIGURE= yes -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/postgresql10-pgtcl/Makefile b/databases/postgresql10-pgtcl/Makefile index b825c8936b99..84d8f44575b4 100644 --- a/databases/postgresql10-pgtcl/Makefile +++ b/databases/postgresql10-pgtcl/Makefile @@ -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 diff --git a/databases/postgresql11-pgtcl/Makefile b/databases/postgresql11-pgtcl/Makefile index 9db5b7ceb2c7..712386ca9c64 100644 --- a/databases/postgresql11-pgtcl/Makefile +++ b/databases/postgresql11-pgtcl/Makefile @@ -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 diff --git a/databases/postgresql12-pgtcl/Makefile b/databases/postgresql12-pgtcl/Makefile index 6bf1cf32f000..082e23aa5423 100644 --- a/databases/postgresql12-pgtcl/Makefile +++ b/databases/postgresql12-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql12 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[013-9]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[013-9]-* PGTCL_SLAVE= 12 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql13-pgtcl/Makefile b/databases/postgresql13-pgtcl/Makefile index 6210c1a524ff..dc8cf9802d62 100644 --- a/databases/postgresql13-pgtcl/Makefile +++ b/databases/postgresql13-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql13 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[012-49]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012-49]-* PGTCL_SLAVE= 13 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql14-pgtcl/Makefile b/databases/postgresql14-pgtcl/Makefile index 3d8c061ea298..850d0f0057c2 100644 --- a/databases/postgresql14-pgtcl/Makefile +++ b/databases/postgresql14-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql14 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[0123-56789]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789]-* PGTCL_SLAVE= 14 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql96-pgtcl/Makefile b/databases/postgresql96-pgtcl/Makefile index 761f1c4a8264..a46a8135d229 100644 --- a/databases/postgresql96-pgtcl/Makefile +++ b/databases/postgresql96-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql96 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[01234]-[0-9]* +CONFLICTS= pgtcl pgtcl-postgresql9[01234] PGTCL_SLAVE= 9.6 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/py-mysqlclient/Makefile b/databases/py-mysqlclient/Makefile index 17461c0b73d9..864095dfdee6 100644 --- a/databases/py-mysqlclient/Makefile +++ b/databases/py-mysqlclient/Makefile @@ -15,7 +15,7 @@ USE_PYTHON= autoplist concurrent distutils PORTDOCS= * -CONFLICTS= py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]* py*-MySQLdb +CONFLICTS= py*-MySQLdb py*-MySQLdb5[0-9] py*-MySQLdb OPTIONS_DEFINE= DOCS diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile index 69562dc9f8c0..618396f83fbb 100644 --- a/deskutils/notify-osd/Makefile +++ b/deskutils/notify-osd/Makefile @@ -28,7 +28,7 @@ USE_XORG= pixman x11 GNU_CONFIGURE= yes GLIB_SCHEMAS= com.canonical.NotifyOSD.gschema.xml -CONFLICTS= xfce4-notification-daemon-[0-9]* +CONFLICTS= xfce4-notification-daemon post-patch: @${REINPLACE_CMD} '/SUBDIRS =/s/tests//' ${WRKSRC}/Makefile.in diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile index fb4c1791d202..df69cc9f9b03 100644 --- a/devel/antlr/Makefile +++ b/devel/antlr/Makefile @@ -12,7 +12,7 @@ COMMENT= ANother Tool for Language Recognition LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS= pccts-[0-9]* +CONFLICTS= pccts USES= compiler:c++11-lang gmake USE_JAVA= yes diff --git a/devel/arduino18/Makefile b/devel/arduino18/Makefile index 57ae546bc7dd..1813b3e8dbde 100644 --- a/devel/arduino18/Makefile +++ b/devel/arduino18/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= arduino-builder:devel/arduino-builder \ bash:shells/bash \ ${JSSC_DEP} -CONFLICTS= arduino-[0-9]* +CONFLICTS= arduino BUNDLE_GH_ACCOUNT= arduino-libraries BUNDLE_LIBRARIES= Firmata:2.5.6:firmata \ diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile index 7ba8339ce325..05dc68670ab3 100644 --- a/devel/bcc/Makefile +++ b/devel/bcc/Makefile @@ -18,6 +18,6 @@ BROKEN_mips64= fails to compile: unrecognized command line option "-m32" USES= uidfix -CONFLICTS= bin86-[0-9]* dev86-[0-9]* +CONFLICTS= bin86 dev86 .include <bsd.port.mk> diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 9115eca8aa34..31280c3fa4ed 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -37,7 +37,7 @@ MAKE_ARGS+= LIBDL="" MAKE_ENV+= ac_cv_func_sbrk=0 TEST_TARGET= check -CONFLICTS= libbfd-[0-9]* +CONFLICTS= libbfd OPTIONS_DEFINE= NLS RELRO STATIC OPTIONS_SUB= yes diff --git a/devel/bsdcflow/Makefile b/devel/bsdcflow/Makefile index a6fd64382951..1e9518cdd5c6 100644 --- a/devel/bsdcflow/Makefile +++ b/devel/bsdcflow/Makefile @@ -10,7 +10,7 @@ COMMENT= Call graph generator for C and assembler code LICENSE= BSD2CLAUSE -CONFLICTS= gnucflow-[0-9]* cflow-[0-9]* +CONFLICTS= gnucflow cflow USES= gmake MAKE_ENV= MANDIR=${PREFIX}/man diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index 47a3800c766c..6904a63b49c9 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= flex:textproc/flex USES= autoreconf bison ncurses readline -CONFLICTS= cutils-[0-9]* +CONFLICTS= cutils USE_GITHUB= yes diff --git a/devel/cflow/Makefile b/devel/cflow/Makefile index 3ca92f671b01..cdd6d3d188f6 100644 --- a/devel/cflow/Makefile +++ b/devel/cflow/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= SUNSITE/devel/lang/c MAINTAINER= ports@FreeBSD.org COMMENT= Call graph generator for C code -CONFLICTS= bsdcflow-[0-9]* gnucflow-[0-9]* +CONFLICTS= bsdcflow gnucflow USES= gmake diff --git a/devel/cil/Makefile b/devel/cil/Makefile index a49e02ac7964..5356e1955698 100644 --- a/devel/cil/Makefile +++ b/devel/cil/Makefile @@ -12,7 +12,7 @@ COMMENT= Infrastructure for C Program Analysis and Transformation LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= ccured-[0-9]* +CONFLICTS= ccured BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild diff --git a/devel/courier-unicode/Makefile b/devel/courier-unicode/Makefile index 6201598190fe..f665c8df7005 100644 --- a/devel/courier-unicode/Makefile +++ b/devel/courier-unicode/Makefile @@ -8,7 +8,7 @@ COMMENT= Courier implementation of Unicode Standard related algorithms LICENSE= GPLv3 -CONFLICTS= libunicode-[0-9]* +CONFLICTS= libunicode USES= compiler:c++11-lang iconv libtool localbase:ldflags \ perl5 tar:bzip2 diff --git a/devel/cutils/Makefile b/devel/cutils/Makefile index fc02911b7b21..9f9d3348f42c 100644 --- a/devel/cutils/Makefile +++ b/devel/cutils/Makefile @@ -15,6 +15,6 @@ MAKE_ENV= MAKEINFO="${MAKEINFO}" INFO= cutils MAKE_JOBS_UNSAFE= yes -CONFLICTS= cdecl-[0-9]* +CONFLICTS= cdecl .include <bsd.port.mk> diff --git a/devel/cvsps-devel/Makefile b/devel/cvsps-devel/Makefile index 96a504435f42..0470e61c0693 100644 --- a/devel/cvsps-devel/Makefile +++ b/devel/cvsps-devel/Makefile @@ -12,7 +12,7 @@ COMMENT= Create patchset information from CVS LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= cvsps-[0-9]* +CONFLICTS= cvsps USES= gmake ALL_TARGET= cvsps diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile index b1722b177485..4b49db0489f0 100644 --- a/devel/cvsps/Makefile +++ b/devel/cvsps/Makefile @@ -12,7 +12,7 @@ COMMENT= Create patchset information from CVS LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= cvsps-devel-[0-9]* +CONFLICTS= cvsps-devel PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz diff --git a/devel/dev86/Makefile b/devel/dev86/Makefile index dba4313731f5..a84e2daa418b 100644 --- a/devel/dev86/Makefile +++ b/devel/dev86/Makefile @@ -11,8 +11,8 @@ DISTNAME= Dev86src-${PORTVERSION} MAINTAINER= phs@deadc0.de COMMENT= 8086 development tools -CONFLICTS= bcc-[0-9]* \ - bin86-[0-9]* +CONFLICTS= bcc \ + bin86 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DESTDIRNAME= DIST diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index 7a804c050cc1..01cb2a510b19 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -20,7 +20,7 @@ CPPFLAGS+= -DHAVE_LINUX -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -CONFLICTS= fam-[0-9]* +CONFLICTS= fam .if !defined(GAMIN_SLAVE) OPTIONS_DEFINE= GAM_POLLER LIBINOTIFY RUN_AS_EUID diff --git a/devel/gitblit/Makefile b/devel/gitblit/Makefile index f96db2ae4040..17708d4847d0 100644 --- a/devel/gitblit/Makefile +++ b/devel/gitblit/Makefile @@ -13,7 +13,7 @@ COMMENT= Open-source servlet for Git repositories LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/WEB-INF/LICENSE -CONFLICTS= ${PORTNAME}-go-[0-9]* +CONFLICTS= ${PORTNAME}-go NO_ARCH= yes NO_BUILD= yes diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile index a0a140621361..83fd6b733c54 100644 --- a/devel/gitg/Makefile +++ b/devel/gitg/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libsecret-1.so:security/libsecret RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas -CONFLICTS= gitg0-[0-9]* +CONFLICTS= gitg0 PORTSCOUT= limitw:1,even USES= compiler:c11 desktop-file-utils gettext gnome localbase \ diff --git a/devel/gnucflow/Makefile b/devel/gnucflow/Makefile index cd9c958999fc..e087ab4de84d 100644 --- a/devel/gnucflow/Makefile +++ b/devel/gnucflow/Makefile @@ -11,7 +11,7 @@ COMMENT= Tool to chart control flow within the C program LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= bsdcflow-[0-9]* cflow-[0-9]* +CONFLICTS= bsdcflow cflow USES= cpe gmake tar:bzip2 CPE_VENDOR= gnu diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile index 6992acbf1259..3ef7f8571521 100644 --- a/devel/gperf/Makefile +++ b/devel/gperf/Makefile @@ -9,7 +9,7 @@ COMMENT= Generates perfect hash functions for sets of keywords LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= ace+tao-[0-9]* +CONFLICTS= ace+tao MAKE_JOBS_UNSAFE= yes USES= cpe diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile index 599779c4f2d1..608db0250292 100644 --- a/devel/gputils/Makefile +++ b/devel/gputils/Makefile @@ -11,7 +11,7 @@ COMMENT= Utilities for Microchip PIC microcontrollers LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= gplink-[0-9]* +CONFLICTS= gplink GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking --disable-html-doc USES= bison:alias gmake tar:bz2 diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile index c095b8e8eaf4..8be099b945b0 100644 --- a/devel/jenkins-lts/Makefile +++ b/devel/jenkins-lts/Makefile @@ -18,7 +18,7 @@ CPE_EDITION= lts USE_JAVA= yes USE_RC_SUBR= jenkins -CONFLICTS= jenkins-[0-9]* +CONFLICTS= jenkins NO_ARCH= yes NO_BUILD= yes diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile index f1fa6df93bc6..1a3503608b0e 100644 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -16,7 +16,7 @@ USES= cpe USE_JAVA= yes USE_RC_SUBR= jenkins -CONFLICTS= jenkins-lts-[0-9]* +CONFLICTS= jenkins-lts NO_ARCH= yes NO_BUILD= yes diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile index fc83b93fd011..80cd9819cd27 100644 --- a/devel/kyua/Makefile +++ b/devel/kyua/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --docdir=${DOCSDIR} \ MAKE_ARGS= examplesdir=${EXAMPLESDIR} \ pkgdatadir=${DATADIR} -CONFLICTS= kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]* +CONFLICTS= kyua-atf-compat kyua-cli kyua-testers SUB_FILES= kyua.conf _TESTS_USER= tests diff --git a/devel/libbfd/Makefile b/devel/libbfd/Makefile index 48c17353e05e..b5742cff45c0 100644 --- a/devel/libbfd/Makefile +++ b/devel/libbfd/Makefile @@ -15,7 +15,7 @@ BROKEN_armv7= Fails to configure: BFD does not support target armv7-portbld-fre BROKEN_mips64= Fails to configure: BFD does not support target mips64-portbld-freebsd12.0 BROKEN_riscv64= Fails to configure: machine riscv64-portbld not recognized -CONFLICTS= mingw-binutils-[0-9]* binutils-[0-9]* +CONFLICTS= mingw-binutils binutils WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/bfd diff --git a/devel/libconfig/Makefile b/devel/libconfig/Makefile index 0b8f673c2312..1a0de9e5224a 100644 --- a/devel/libconfig/Makefile +++ b/devel/libconfig/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} USE_GITHUB= YES GH_ACCOUNT= hyperrealm -CONFLICTS= wand-libconfig-[0-9]* +CONFLICTS= wand-libconfig INFO= libconfig diff --git a/devel/linux-c7-dbus-glib/Makefile b/devel/linux-c7-dbus-glib/Makefile index 38e09ef72ada..71291f502d1a 100644 --- a/devel/linux-c7-dbus-glib/Makefile +++ b/devel/linux-c7-dbus-glib/Makefile @@ -15,7 +15,7 @@ USE_LDCONFIG= yes USE_LINUX= dbuslibs expat 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/devel/linux-c7-dbus-libs/Makefile b/devel/linux-c7-dbus-libs/Makefile index 336e7acca409..4bad0b0b6ffe 100644 --- a/devel/linux-c7-dbus-libs/Makefile +++ b/devel/linux-c7-dbus-libs/Makefile @@ -20,7 +20,7 @@ CPE_VENDOR= freedesktop 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/devel/linux-c7-devtools/Makefile b/devel/linux-c7-devtools/Makefile index 16776f71fc7b..39da17f1c947 100644 --- a/devel/linux-c7-devtools/Makefile +++ b/devel/linux-c7-devtools/Makefile @@ -42,7 +42,7 @@ SRC_DISTFILES= binutils-${BUVERSION}${SRC_SUFX}:SOURCE \ mpfr-3.1.1-4.el7${SRC_SUFX}:SOURCE \ gcc-4.8.5-44.el7${SRC_SUFX}:SOURCE -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes diff --git a/devel/linux-c7-libgfortran/Makefile b/devel/linux-c7-libgfortran/Makefile index 8e6febb9f5ec..f88a474554f0 100644 --- a/devel/linux-c7-libgfortran/Makefile +++ b/devel/linux-c7-libgfortran/Makefile @@ -16,6 +16,6 @@ USE_LINUX_RPM= yes SRC_DISTFILES= gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} .include <bsd.port.mk> diff --git a/devel/linux-c7-libglade2/Makefile b/devel/linux-c7-libglade2/Makefile index f8a2a838209d..31014df58da4 100644 --- a/devel/linux-c7-libglade2/Makefile +++ b/devel/linux-c7-libglade2/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} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/devel/linux-c7-libpciaccess/Makefile b/devel/linux-c7-libpciaccess/Makefile index b4dda8e4bab9..3bf07f7a2695 100644 --- a/devel/linux-c7-libpciaccess/Makefile +++ b/devel/linux-c7-libpciaccess/Makefile @@ -12,7 +12,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/devel/linux-c7-libsigc++20/Makefile b/devel/linux-c7-libsigc++20/Makefile index b8a6366c3a96..134030fc27b8 100644 --- a/devel/linux-c7-libsigc++20/Makefile +++ b/devel/linux-c7-libsigc++20/Makefile @@ -12,7 +12,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/devel/linux-c7-libthai/Makefile b/devel/linux-c7-libthai/Makefile index e8caa687ab50..85784e8275f7 100644 --- a/devel/linux-c7-libthai/Makefile +++ b/devel/linux-c7-libthai/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/devel/linux-c7-nspr/Makefile b/devel/linux-c7-nspr/Makefile index 475c6ee60412..95fb2e697b51 100644 --- a/devel/linux-c7-nspr/Makefile +++ b/devel/linux-c7-nspr/Makefile @@ -12,7 +12,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 .include <bsd.port.mk> diff --git a/devel/linux-c7-qt/Makefile b/devel/linux-c7-qt/Makefile index c30afeca6b5a..f75a033318c7 100644 --- a/devel/linux-c7-qt/Makefile +++ b/devel/linux-c7-qt/Makefile @@ -15,7 +15,7 @@ USE_LDCONFIG= yes USE_LINUX= fontconfig png dbuslibs sqlite3 USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}47-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}47 DATADIR= ${PREFIX}/usr/share/${PORTNAME}4 OPTIONS_DEFINE= DOCS diff --git a/devel/linux-c7-sdl12/Makefile b/devel/linux-c7-sdl12/Makefile index 5c219ea8549a..71fff6f97c51 100644 --- a/devel/linux-c7-sdl12/Makefile +++ b/devel/linux-c7-sdl12/Makefile @@ -15,7 +15,7 @@ USE_LDCONFIG= yes USE_LINUX= xorglibs USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}12/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/SDL-${PORTVERSION} diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile index e73ed12c69b6..9741b8bdf448 100644 --- a/devel/mingw32-bin-msvcrt/Makefile +++ b/devel/mingw32-bin-msvcrt/Makefile @@ -14,7 +14,7 @@ DIST_SUBDIR= mingw MAINTAINER= ports@FreeBSD.org COMMENT= Headers and Libraries for Windows cross-development -CONFLICTS= mingw-bin-msvcrt-[0-9]* +CONFLICTS= mingw-bin-msvcrt USES= tar:xz diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile index a4b4f117bd0f..6c288611e76d 100644 --- a/devel/ninja/Makefile +++ b/devel/ninja/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= ninja-build -CONFLICTS= irc/ninja-[0-9]* +CONFLICTS= irc/ninja USES= python PORTSCOUT= limit:^1\. diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index c24dba9c5909..7690cb338cb7 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -19,7 +19,7 @@ CMAKE_ARGS+= -DTBB_STRICT:BOOL=FALSE \ -DCMAKE_HWLOC_2_LIBRARY_PATH:PATH="${LOCALBASE}/lib/libhwloc.so" \ -DCMAKE_HWLOC_2_INCLUDE_PATH:PATH="${LOCALBASE}/include" -CONFLICTS= tbb-[0-9]* +CONFLICTS= tbb USE_GITHUB= yes GH_ACCOUNT= oneapi-src diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile index a1808947bedd..78225a8e273b 100644 --- a/devel/open-beagle/Makefile +++ b/devel/open-beagle/Makefile @@ -10,7 +10,7 @@ DISTNAME= beagle-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Evolutionary Computation Framework -CONFLICTS= beagle-[0-9]* +CONFLICTS= beagle GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-optimization --with-zlib=/usr diff --git a/devel/p5-libxml-enno/Makefile b/devel/p5-libxml-enno/Makefile index 29780943416c..79a4f87ca7b2 100644 --- a/devel/p5-libxml-enno/Makefile +++ b/devel/p5-libxml-enno/Makefile @@ -22,9 +22,9 @@ RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-libxml>=0:textproc/p5-libxml \ p5-Parse-Yapp>=0:devel/p5-Parse-Yapp -CONFLICTS= p5-XML-DOM-[0-9]* p5-XML-Filter-DetectWS-[0-9]* \ - p5-XML-Filter-Reindent-[0-9]* p5-XML-Filter-SAXT-[0-9]* \ - p5-XML-RegExp-[0-9]* p5-XML-XQL-[0-9]* +CONFLICTS= p5-XML-DOM p5-XML-Filter-DetectWS \ + p5-XML-Filter-Reindent p5-XML-Filter-SAXT \ + p5-XML-RegExp p5-XML-XQL USES= perl5 USE_PERL5= configure diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile index 52b9c983a4ba..e5fad87d60ff 100644 --- a/devel/pdcurses/Makefile +++ b/devel/pdcurses/Makefile @@ -11,7 +11,7 @@ COMMENT= Curses library implementation for Win32, DOS, OS/2, and X11 LICENSE= PD -CONFLICTS= pdcurses-the-[0-9]* +CONFLICTS= pdcurses-the USES= xorg USE_LDCONFIG= yes diff --git a/devel/poco/Makefile b/devel/poco/Makefile index 3aadd93e6f72..7209a72db846 100644 --- a/devel/poco/Makefile +++ b/devel/poco/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ USES= cmake compiler:c++14-lang cpe localbase pkgconfig tar:bz2 USE_LDCONFIG= yes -CONFLICTS= poco-ssl-[0-9]* +CONFLICTS= poco-ssl CPE_VENDOR= pocoproject diff --git a/devel/sope/Makefile b/devel/sope/Makefile index 2c6dc674ce01..b77d5f509ee3 100644 --- a/devel/sope/Makefile +++ b/devel/sope/Makefile @@ -31,7 +31,7 @@ USE_GNUSTEP= base build USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} LLD_UNSAFE= yes # PR 230608 -CONFLICTS= sope2-[0-9]* sope4-[0-9]* +CONFLICTS= sope2 sope4 SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES} diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile index 552038afaa80..81304a0f9af4 100644 --- a/devel/tbb/Makefile +++ b/devel/tbb/Makefile @@ -16,7 +16,7 @@ ONLY_FOR_ARCHS_REASON= has not been ported to this platform USES= compiler gmake tar:tgz -CONFLICTS= onetbb-[0-9]* +CONFLICTS= onetbb USE_GITHUB= yes GH_ACCOUNT= oneapi-src diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile index b9cdd9cf704e..5cb2723f2136 100644 --- a/devel/tdl/Makefile +++ b/devel/tdl/Makefile @@ -12,7 +12,7 @@ COMMENT= To-do list manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= devtodo-[0-9]* +CONFLICTS= devtodo USES= readline diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile index 7b87ef1bd745..f064c3cdbcff 100644 --- a/devel/valgrind-devel/Makefile +++ b/devel/valgrind-devel/Makefile @@ -25,7 +25,7 @@ SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in SSP_UNSAFE= yes LIB32_PATH?= /usr/lib32/libc.so -CONFLICTS= valgrind-[0-9]* +CONFLICTS= valgrind USE_GITHUB= yes GH_ACCOUNT= paulfloyd diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index 90a304c96554..6cbccd84b4c1 100644 --- a/devel/valgrind/Makefile +++ b/devel/valgrind/Makefile @@ -22,7 +22,7 @@ SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in SSP_UNSAFE= yes LIB32_PATH?= /usr/lib32/libc.so -CONFLICTS= valgrind-devel-[0-9]* +CONFLICTS= valgrind-devel CONFIGURE_ENV+= ac_cv_path_PERL=${PERL} diff --git a/devel/wand-libconfig/Makefile b/devel/wand-libconfig/Makefile index df11eb331f41..f947718f92db 100644 --- a/devel/wand-libconfig/Makefile +++ b/devel/wand-libconfig/Makefile @@ -11,7 +11,7 @@ PKGNAMEPREFIX= wand- MAINTAINER= matt@peterson.org COMMENT= C library for parsing config files -CONFLICTS= libconfig-[0-9]* +CONFLICTS= libconfig USES= gmake libtool GNU_CONFIGURE= yes diff --git a/dns/djbdns-tools/Makefile b/dns/djbdns-tools/Makefile index 4be027800eaa..d92f0fcfd6e6 100644 --- a/dns/djbdns-tools/Makefile +++ b/dns/djbdns-tools/Makefile @@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= ports@FreeBSD.org COMMENT= Resolver tools from djbdns package -CONFLICTS= djbdns-[0-9]* +CONFLICTS= djbdns PROGRAMS= dnsip dnsipq dnsname dnstxt dnsmx dnsfilter \ random-ip dnsqr dnsq dnstrace diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile index 7735624ee106..3516de649ce9 100644 --- a/dns/djbdns/Makefile +++ b/dns/djbdns/Makefile @@ -23,7 +23,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= setuidgid:sysutils/daemontools \ tcpserver:sysutils/ucspi-tcp -CONFLICTS= djbdns-tools-[0-9]* +CONFLICTS= djbdns-tools OPTIONS_DEFINE= DUMPCACHE IP6 IGNOREIP JUMBO MAN PERSISTENT_MMAP SRV DNSCURVE ADD_USERS OPTIONS_DEFAULT= MAN diff --git a/dns/libasr-devel/Makefile b/dns/libasr-devel/Makefile index 1815d7413402..b665a35a8e6f 100644 --- a/dns/libasr-devel/Makefile +++ b/dns/libasr-devel/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENCE USES= cpe groff libtool -CONFLICTS= libasr-[0-9]* +CONFLICTS= libasr OPTIONS_DEFINE= CA_BUNDLE OPTIONS_DEFAULT= CA_BUNDLE diff --git a/dns/libasr/Makefile b/dns/libasr/Makefile index 53ad33a82241..d4dbc76e63a5 100644 --- a/dns/libasr/Makefile +++ b/dns/libasr/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENCE USES= cpe groff libtool -CONFLICTS= libasr-devel-[0-9]* +CONFLICTS= libasr-devel CPE_VENDOR= openbsd diff --git a/dns/linux-c7-libasyncns/Makefile b/dns/linux-c7-libasyncns/Makefile index 4ec1a39981f3..57fa408e2740 100644 --- a/dns/linux-c7-libasyncns/Makefile +++ b/dns/linux-c7-libasyncns/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} OPTIONS_DEFINE= DOCS diff --git a/dns/p5-Net-Amazon-Route53/Makefile b/dns/p5-Net-Amazon-Route53/Makefile index 812fc6c72f30..ecf8d4806d9a 100644 --- a/dns/p5-Net-Amazon-Route53/Makefile +++ b/dns/p5-Net-Amazon-Route53/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \ p5-XML-Bare>=0:textproc/p5-XML-Bare \ p5-libwww>=0:www/p5-libwww -CONFLICTS= py[23][0-9]-boto-devel-[0-9]* +CONFLICTS= py[23][0-9]-boto-devel USES= perl5 USE_PERL5= configure diff --git a/editors/jed/Makefile b/editors/jed/Makefile index 94f0e6b92c87..aa25a52342db 100644 --- a/editors/jed/Makefile +++ b/editors/jed/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libslang.so:devel/libslang2 -CONFLICTS= jed-devel-[0-9]* +CONFLICTS= jed-devel OPTIONS_DEFINE= X11 PERMS HOSTLOOKUP DOCS OPTIONS_DEFAULT=X11 HOSTLOOKUP diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index fa0dd0272d52..d6ef02a6b06b 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -173,7 +173,7 @@ JAVA_CONFIGURE_ON= --with-ant-home=${LOCALBASE}/share/java/apache-ant \ --without-system-jfreereport JAVA_CONFIGURE_WITH= java # XXX jni.h from GNU classpath causes ABI conflicts. -JAVA_CONFLICTS_BUILD= classpath-[0-9]* +JAVA_CONFLICTS_BUILD= classpath JAVA_DISTFILES= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \ diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index de63115f65c8..cf37e16d39ca 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -12,7 +12,7 @@ COMMENT= Multi-lingual Unicode text editor with TTF support LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.TXT -CONFLICTS= netatalk-[0-9]* +CONFLICTS= netatalk USES= gmake xorg USE_XORG= x11 diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile index 825b1bdc0fe4..bdb227650aea 100644 --- a/emulators/dynamips-community/Makefile +++ b/emulators/dynamips-community/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libelf.so:devel/libelf CFLAGS+= -I${PREFIX}/include/libelf -CONFLICTS= dynamips-[0-9]* dynamips-devel-[0-9]* +CONFLICTS= dynamips dynamips-devel USES= cmake:insource USE_GITHUB= yes diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index 1e8d44473714..69de69fa13a7 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -11,7 +11,7 @@ COMMENT= Commodore Amiga emulator LICENSE= GPLv2 -CONFLICTS= e-uae-[0-9]* +CONFLICTS= e-uae USES= gmake gnome pkgconfig tar:bzip2 GNU_CONFIGURE= yes diff --git a/ftp/linux-c7-curl/Makefile b/ftp/linux-c7-curl/Makefile index 5a50c16528a0..8f3f37080f74 100644 --- a/ftp/linux-c7-curl/Makefile +++ b/ftp/linux-c7-curl/Makefile @@ -20,7 +20,7 @@ CPE_VENDOR= haxx LIB_DISTNAMES= lib${DISTNAME} -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile index 7be755787c5c..c5494bd2204f 100644 --- a/games/bsdgames/Makefile +++ b/games/bsdgames/Makefile @@ -21,7 +21,7 @@ MAKE_ENV= WITHOUT_WERROR=yes CFLAGS+= -fcommon -CONFLICTS= hangman-[0-9]* +CONFLICTS= hangman INFO= wump INFO_PATH= share/games diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index ef5ae3c7edba..88813ad70b04 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -25,7 +25,7 @@ USE_CXXSTD= gnu++98 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-optimize -CONFLICTS= shaaft-[0-9]* +CONFLICTS= shaaft PLIST_FILES= bin/Packer \ bin/critter \ diff --git a/games/filters/Makefile b/games/filters/Makefile index 676dd3f26a92..1bdc1409593b 100644 --- a/games/filters/Makefile +++ b/games/filters/Makefile @@ -12,7 +12,7 @@ COMMENT= Collection of filters, including B1FF, and the Swedish Chef LICENSE= GPLv2 -CONFLICTS= talkfilters-[0-9]* jive-[0-9]* chef-[0-9]* kenny-[0-9]* +CONFLICTS= talkfilters jive chef kenny USES= gmake perl5 shebangfix MAKE_JOBS_UNSAFE= yes diff --git a/games/ponscripter-07th-mod/Makefile b/games/ponscripter-07th-mod/Makefile index ea10467907f5..23ba015b464f 100644 --- a/games/ponscripter-07th-mod/Makefile +++ b/games/ponscripter-07th-mod/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsmpeg2.so:multimedia/smpeg2 \ libfreetype.so:print/freetype2 -CONFLICTS= ponscripter-[0-9]* # doesn't exist yet +CONFLICTS= ponscripter # doesn't exist yet USE_GITHUB= yes GH_ACCOUNT= 07th-mod diff --git a/games/xboard-devel/Makefile b/games/xboard-devel/Makefile index 888cd296412e..496e2293edbe 100644 --- a/games/xboard-devel/Makefile +++ b/games/xboard-devel/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv3 LIB_DEPENDS?= libpangocairo-1.0.so:x11-toolkits/pango -CONFLICTS= xboard-[0-9]* +CONFLICTS= xboard MASTERDIR= ${.CURDIR}/../xboard DISTINFO_FILE= ${.CURDIR}/distinfo diff --git a/games/xboard/Makefile b/games/xboard/Makefile index debcc4dbae99..512223fe010d 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -14,7 +14,7 @@ LICENSE?= GPLv3 LIB_DEPENDS?= libcairo.so:graphics/cairo -CONFLICTS?= xboard-devel-[0-9]* +CONFLICTS?= xboard-devel OPTIONS_DEFINE?= NLS DOCS ZIPPY OPTIONS_SINGLE?= FRONTEND diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index fca01f41e974..ced5af8d0674 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -176,7 +176,7 @@ X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=ice,sm,x11,xext,xt X11_VARS= CONFLICTS_INSTALL+="ImageMagick-nox11-6* ImageMagick6-nox11-6*" \ - CONFLICTS+=display-[0-9]* + CONFLICTS+=display X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick-6* ImageMagick6-6*" \ PKGNAMESUFFIX=6-nox11 diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile index b6ad6d493e87..fe9dbaa2807d 100644 --- a/graphics/autopano-sift-c/Makefile +++ b/graphics/autopano-sift-c/Makefile @@ -11,7 +11,7 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ libpano13.so:graphics/libpano13 -CONFLICTS= autopano-sift-[0-9]* +CONFLICTS= autopano-sift USE_GNOME= libxml2 USES= cmake gnome jpeg diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index 5d57372be5d0..a35760ee716a 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png RUN_DEPENDS= bash:shells/bash -CONFLICTS= geeqie-devel-[0-9]* +CONFLICTS= geeqie-devel USES= autoreconf compiler:c++11-lang gettext gmake gnome jpeg \ localbase pkgconfig desktop-file-utils tar:xz lua:53 shebangfix diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 9bc6371b0178..e0ceab4461ef 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libdca.so:multimedia/libdca \ libgsm.so:audio/gsm -CONFLICTS= gnash-devel-[0-9]* +CONFLICTS= gnash-devel USES= cpe tar:bzip2 compiler:c++11-lang autoreconf gmake libtool \ pkgconfig jpeg gnome gl sdl desktop-file-utils xorg diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile index 62adccbc4901..4475215c23e3 100644 --- a/graphics/gts/Makefile +++ b/graphics/gts/Makefile @@ -11,7 +11,7 @@ COMMENT= GNU Triangulated Surface Library LICENSE= LGPL20 -CONFLICTS= pcb-[0-9]* +CONFLICTS= pcb GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/graphics/icat/Makefile b/graphics/icat/Makefile index a2e4149061d5..e81a6c7f7815 100644 --- a/graphics/icat/Makefile +++ b/graphics/icat/Makefile @@ -17,7 +17,7 @@ USES= dos2unix gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= atextor -CONFLICTS= sleuthkit-[0-9]* +CONFLICTS= sleuthkit PLIST_FILES= bin/icat \ share/man/man1/icat.1.gz diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index 73778aa6c799..65dcce42271d 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -11,7 +11,7 @@ COMMENT= C library for efficient image processing and image analysis operations LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/leptonica-license.txt -CONFLICTS= leptonlib-[0-9]* +CONFLICTS= leptonlib USES= autoreconf cpe libtool localbase:ldflags pathfix pkgconfig diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile index fbcb24ab0b05..2a95c14e8807 100644 --- a/graphics/libart_lgpl/Makefile +++ b/graphics/libart_lgpl/Makefile @@ -20,6 +20,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes -CONFLICTS= libart-[0-9]* +CONFLICTS= libart .include <bsd.port.mk> diff --git a/graphics/libwmf-nox11/Makefile b/graphics/libwmf-nox11/Makefile index 8a2264155700..b069265ff6bb 100644 --- a/graphics/libwmf-nox11/Makefile +++ b/graphics/libwmf-nox11/Makefile @@ -3,7 +3,7 @@ PKGNAMESUFFIX= -nox11 PORTSCOUT= ignore:1 -CONFLICTS= libwmf-[0-9]* +CONFLICTS= libwmf MASTERDIR= ${.CURDIR}/../libwmf OPTIONS_EXCLUDE= X11 diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 1a81d4bfd8a0..7f1020b83c16 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -28,7 +28,7 @@ INSTALL_TARGET= install-strip PORTDOCS= * -CONFLICTS?= libwmf-nox11-[0-9]* +CONFLICTS?= libwmf-nox11 OPTIONS_DEFINE= X11 DOCS OPTIONS_DEFAULT=X11 diff --git a/graphics/linux-c7-cairo/Makefile b/graphics/linux-c7-cairo/Makefile index c8d073004e2f..0689efef4e78 100644 --- a/graphics/linux-c7-cairo/Makefile +++ b/graphics/linux-c7-cairo/Makefile @@ -15,7 +15,7 @@ USE_LINUX= dri fontconfig pixman png xorglibs USE_LINUX_RPM= yes CPE_VENDOR= cairographics -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/graphics/linux-c7-dri/Makefile b/graphics/linux-c7-dri/Makefile index 900e0a226f89..a5ebb0fb3fc2 100644 --- a/graphics/linux-c7-dri/Makefile +++ b/graphics/linux-c7-dri/Makefile @@ -32,7 +32,7 @@ SRC_DISTFILES= freeglut-3.0.0-8.el7${SRC_SUFX}:SOURCE \ mesa-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE \ mesa-libGLU-9.0.0-4.el7${SRC_SUFX}:SOURCE -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} OPTIONS_DEFINE= DOCS diff --git a/graphics/linux-c7-gdk-pixbuf2/Makefile b/graphics/linux-c7-gdk-pixbuf2/Makefile index 7175a788f6b1..c35e08884747 100644 --- a/graphics/linux-c7-gdk-pixbuf2/Makefile +++ b/graphics/linux-c7-gdk-pixbuf2/Makefile @@ -15,7 +15,7 @@ USE_LDCONFIG= yes USE_LINUX= jasper jpeg png tiff xorglibs 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/graphics/linux-c7-glx-utils/Makefile b/graphics/linux-c7-glx-utils/Makefile index 019a8de1f5fd..a7c5489713b8 100644 --- a/graphics/linux-c7-glx-utils/Makefile +++ b/graphics/linux-c7-glx-utils/Makefile @@ -16,6 +16,6 @@ USE_LINUX_RPM= yes SRC_DISTFILES= mesa-demos-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} .include <bsd.port.mk> diff --git a/graphics/linux-c7-jpeg/Makefile b/graphics/linux-c7-jpeg/Makefile index fceae28ed5b3..b9d9ec00be9d 100644 --- a/graphics/linux-c7-jpeg/Makefile +++ b/graphics/linux-c7-jpeg/Makefile @@ -15,7 +15,7 @@ CPE_PRODUCT= libjpeg-turbo USE_LDCONFIG= yes USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}-turbo/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/libjpeg-turbo-${PORTVERSION} diff --git a/graphics/linux-c7-png/Makefile b/graphics/linux-c7-png/Makefile index 7bda7048dfbf..11692b6b3102 100644 --- a/graphics/linux-c7-png/Makefile +++ b/graphics/linux-c7-png/Makefile @@ -18,7 +18,7 @@ USES= cpe linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../png/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/graphics/linux-c7-sdl_image/Makefile b/graphics/linux-c7-sdl_image/Makefile index a8f0f52f8242..9bac1dc6d6aa 100644 --- a/graphics/linux-c7-sdl_image/Makefile +++ b/graphics/linux-c7-sdl_image/Makefile @@ -19,7 +19,7 @@ USE_LDCONFIG= yes USE_LINUX= jpeg png sdl12 tiff 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_image-${PORTVERSION} diff --git a/graphics/linux-c7-sdl_ttf/Makefile b/graphics/linux-c7-sdl_ttf/Makefile index 6872e8ad61db..416518ad1c1f 100644 --- a/graphics/linux-c7-sdl_ttf/Makefile +++ b/graphics/linux-c7-sdl_ttf/Makefile @@ -18,7 +18,7 @@ USE_LDCONFIG= yes USE_LINUX= jpeg png sdl12 tiff 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_ttf-${PORTVERSION} diff --git a/graphics/linux-c7-tiff/Makefile b/graphics/linux-c7-tiff/Makefile index b3ff0c513f62..9a4bc16f7268 100644 --- a/graphics/linux-c7-tiff/Makefile +++ b/graphics/linux-c7-tiff/Makefile @@ -14,7 +14,7 @@ USE_LDCONFIG= yes USE_LINUX= jbigkit jpeg USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../tiff/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile index 9a16fcb09e02..2235706480c6 100644 --- a/graphics/ocaml-lablgl/Makefile +++ b/graphics/ocaml-lablgl/Makefile @@ -14,7 +14,7 @@ COMMENT= OpenGL interface for Objective Caml LICENSE= BSD3CLAUSE -CONFLICTS= ocaml-nox11-[0-9]* +CONFLICTS= ocaml-nox11 USES= gl gmake tk xorg USE_XORG= x11 xext xmu diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile index cf1eaea926b2..250386fbaf4b 100644 --- a/graphics/ogre3d/Makefile +++ b/graphics/ogre3d/Makefile @@ -17,7 +17,7 @@ BROKEN_FreeBSD_12_powerpc64= fails to build: /usr/local/bin/ld: /usr/lib/crt1.o: LIB_DEPENDS= libzzip.so:devel/zziplib \ libfreetype.so:print/freetype2 -CONFLICTS= ogre3d19-[0-9]* +CONFLICTS= ogre3d19 USES= cmake compiler:c++11-lib pkgconfig sdl xorg USE_LDCONFIG= yes diff --git a/graphics/ogre3d19/Makefile b/graphics/ogre3d19/Makefile index c1623aa88b80..b0398afb9157 100644 --- a/graphics/ogre3d19/Makefile +++ b/graphics/ogre3d19/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= libzzip.so:devel/zziplib \ libfreetype.so:print/freetype2 \ libfreeimage.so:graphics/freeimage -CONFLICTS= ogre3d-[0-9]* +CONFLICTS= ogre3d USES= tar:bzip2 cmake pkgconfig compiler:c++11-lib sdl xorg USE_LDCONFIG= yes diff --git a/graphics/p5-Image-ExifTool-devel/Makefile b/graphics/p5-Image-ExifTool-devel/Makefile index 2e004d08d23e..404fe6d9b71b 100644 --- a/graphics/p5-Image-ExifTool-devel/Makefile +++ b/graphics/p5-Image-ExifTool-devel/Makefile @@ -16,7 +16,7 @@ LICENSE_COMB= dual USES= perl5 USE_PERL5= configure -CONFLICTS= p5-Image-ExifTool-[0-9]* +CONFLICTS= p5-Image-ExifTool NO_ARCH= yes PORTDOCS= * diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile index 22a46095d58e..16d9b40f460d 100644 --- a/graphics/zathura-pdf-poppler/Makefile +++ b/graphics/zathura-pdf-poppler/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= zathura:graphics/zathura USES= compiler:c11 desktop-file-utils gnome meson ninja pkgconfig USE_GNOME= glib20 gtk30 -CONFLICTS= zathura-pdf-mupdf-[0-9]* +CONFLICTS= zathura-pdf-mupdf PLIST_FILES= lib/zathura/libpdf-poppler.so \ share/appdata/org.pwmt.zathura-pdf-poppler.metainfo.xml \ diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile index 662b08afc1db..5ae8b637e447 100644 --- a/irc/ircd-ratbox-devel/Makefile +++ b/irc/ircd-ratbox-devel/Makefile @@ -13,7 +13,7 @@ COMMENT= Advanced, stable IRC daemon, used widely on EFnet ('testing' release) LICENSE= GPLv2 -CONFLICTS= ircd-ratbox-[0-9]* charybdis-[0-9]* +CONFLICTS= ircd-ratbox charybdis USES= libtool perl5 sqlite tar:bzip2 USE_RC_SUBR= ircd-ratbox diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile index d65025b5ba3a..b4d51d127501 100644 --- a/irc/ircd-ratbox/Makefile +++ b/irc/ircd-ratbox/Makefile @@ -12,7 +12,7 @@ COMMENT= Advanced, stable IRC daemon, used widely on EFnet LICENSE= GPLv2 -CONFLICTS= ircd-ratbox-devel-[0-9]* charybdis-[0-9]* +CONFLICTS= ircd-ratbox-devel charybdis USES= cpe libtool sqlite tar:bzip2 CPE_VENDOR= ratbox diff --git a/japanese/awffull/Makefile b/japanese/awffull/Makefile index 6ce62dfd8b0f..50fea1058676 100644 --- a/japanese/awffull/Makefile +++ b/japanese/awffull/Makefile @@ -4,7 +4,7 @@ CATEGORIES= japanese www MAINTAINER= ports@FreeBSD.org -CONFLICTS= awffull-[0-9]* +CONFLICTS= awffull MASTERDIR= ${.CURDIR}/../../www/awffull EXTRA_PATCHES= ${.CURDIR}/files/awffull-ja.diff diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile index 62cf94bd99c5..f7c22988a385 100644 --- a/japanese/ebview-gtk2/Makefile +++ b/japanese/ebview-gtk2/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2+ LIB_DEPENDS= libeb.so:japanese/eb -CONFLICTS= ja-ebview-[0-9]* +CONFLICTS= ja-ebview USES= gettext gmake gnome pkgconfig USE_GNOME= gtk20 pangox-compat diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile index d6266bdd6359..6cf876933d78 100644 --- a/japanese/groff/Makefile +++ b/japanese/groff/Makefile @@ -38,7 +38,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}/${PORTVERSION} INFO= groff -CONFLICTS= groff-[0-9]* mdocml-[0-9]* +CONFLICTS= groff mdocml TMAC_DISTNAME= tmac-20030521_2 TMACFILES= tmac.orig_me tmac.vgrind \ diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile index 46643abce53a..8527d6a72e41 100644 --- a/japanese/jls/Makefile +++ b/japanese/jls/Makefile @@ -13,7 +13,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= kazami@angels.vg COMMENT= Japanized ls -CONFLICTS= sleuthkit-[0-9]* +CONFLICTS= sleuthkit USES= ncurses uidfix PLIST_FILES= bin/jls \ diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile index 2c2a251c3e5d..fe05da07c51a 100644 --- a/japanese/libslang/Makefile +++ b/japanese/libslang/Makefile @@ -21,7 +21,7 @@ INSTALL_TARGET= install-elf USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes -CONFLICTS= libslang2-[0-9]* libslang-1.*[^j]* +CONFLICTS= libslang2 libslang-1.*[^j]* DOCSDIR= ${PREFIX}/share/doc/slang diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile index 82c40cc55a9e..d9ae2fd32700 100644 --- a/japanese/mh/Makefile +++ b/japanese/mh/Makefile @@ -31,7 +31,7 @@ PORTDOCS= 00.READ.ME.1ST CHANGES.JP COMMANDS.JP FAQ.JP FEATURES.JP \ INSTALL.JP OPTIONS.JP READ-ME.JP TODO.JP DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -CONFLICTS= nmh-[0-9]* +CONFLICTS= nmh OPTIONS_DEFINE= DOCS diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile index bacc2c5ab36d..b1276d0e2996 100644 --- a/japanese/mutt-devel/Makefile +++ b/japanese/mutt-devel/Makefile @@ -50,7 +50,7 @@ BROKEN_aarch64= fails to compile: conflicting types for __wcwidth BROKEN_armv6= fails to compile: conflicting types for __wcwidth BROKEN_armv7= fails to compile: conflicting types for __wcwidth -CONFLICTS= ja-mutt-[0-9]* mutt-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* +CONFLICTS= ja-mutt mutt mutt-devel mutt-devel-lite mutt-lite zh-mutt-devel VERSION= 1.5.21 JP_VERSION= 1 diff --git a/japanese/ng-devel/Makefile b/japanese/ng-devel/Makefile index 934936cc92e9..0c73cf0f0880 100644 --- a/japanese/ng-devel/Makefile +++ b/japanese/ng-devel/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= ports@FreeBSD.org COMMENT= Light Emacs-clone with Japanese support -CONFLICTS= ng-[0-9]* +CONFLICTS= ng USES= ncurses GNU_CONFIGURE= yes diff --git a/japanese/ng/Makefile b/japanese/ng/Makefile index 2a465d975c2e..2e8b0ae3eb90 100644 --- a/japanese/ng/Makefile +++ b/japanese/ng/Makefile @@ -22,7 +22,7 @@ LDFLAGS+= -lncurses DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME} -CONFLICTS= ng-devel-[0-9]* +CONFLICTS= ng-devel PORTDOCS= ${MYPORTDOCS:C/$/.euc-jp/} PLIST_FILES= bin/ng diff --git a/korean/ko.TeX-fonts-base/Makefile b/korean/ko.TeX-fonts-base/Makefile index a5479e385f13..3ace3428a0ce 100644 --- a/korean/ko.TeX-fonts-base/Makefile +++ b/korean/ko.TeX-fonts-base/Makefile @@ -11,7 +11,7 @@ MAINTAINER= hyogeollee@gmail.com COMMENT= Korean TeX base fonts USE_TEX= dvipsk latex -CONFLICTS= hlatex-[0-9]* +CONFLICTS= hlatex NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/korean/ko.TeX-fonts-extra/Makefile b/korean/ko.TeX-fonts-extra/Makefile index 342c0c91a1a0..89fd38be3fae 100644 --- a/korean/ko.TeX-fonts-extra/Makefile +++ b/korean/ko.TeX-fonts-extra/Makefile @@ -11,7 +11,7 @@ MAINTAINER= hyogeollee@gmail.com COMMENT= Korean TeX extra fonts USE_TEX= dvipsk latex -CONFLICTS= hlatex-[0-9]* +CONFLICTS= hlatex NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile index 28275e8cf3e1..0a45a212d211 100644 --- a/korean/ko.TeX/Makefile +++ b/korean/ko.TeX/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${BASE_MAP}:korean/ko.TeX-fonts-base USES= shebangfix SHEBANG_FILES= util/*.pl USE_TEX= latex -CONFLICTS= hlatex-[0-9]* +CONFLICTS= hlatex NO_WRKSUBDIR= yes diff --git a/lang/io-devel/Makefile b/lang/io-devel/Makefile index e8773501681a..53fba1fd9a15 100644 --- a/lang/io-devel/Makefile +++ b/lang/io-devel/Makefile @@ -12,7 +12,7 @@ COMMENT= Small prototype-based programming language (devel version) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS= io-[0-9]* +CONFLICTS= io USES= cmake:noninja compiler:c11 diff --git a/lang/io/Makefile b/lang/io/Makefile index 16f3107d1aaf..ed25eaba6c2c 100644 --- a/lang/io/Makefile +++ b/lang/io/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE BROKEN_armv6= fails to compile: ucontext.h: expected parameter declarator BROKEN_armv7= fails to compile: Coro.c:392:2: no member named 'arm_r0' in 'mcontext_t' -CONFLICTS= io-devel-[0-9]* +CONFLICTS= io-devel USES= cmake:noninja compiler:c11 ssl diff --git a/lang/linux-c7-tcl85/Makefile b/lang/linux-c7-tcl85/Makefile index 2a3c7db9357d..3de185e8a1ec 100644 --- a/lang/linux-c7-tcl85/Makefile +++ b/lang/linux-c7-tcl85/Makefile @@ -15,7 +15,7 @@ USE_LDCONFIG= yes USE_LINUX_RPM= yes USE_LINUX_RPM_BAD_PERMS= yes -CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX} DATADIR= ${PREFIX}/usr/share/tcl${PORTVERSION:R} DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 239f58bc78e5..7f5b0804a735 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 LIB_DEPENDS= libffi.so:devel/libffi -CONFLICTS= newlisp-devel-[0-9]* +CONFLICTS= newlisp-devel USES= readline tar:tgz OPTIONS_SUB= yes diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index 89fc7d971ad8..e3a0e6e67ae8 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -27,7 +27,7 @@ DOCS_CONFIGURE_ON= --docdir=${DOCSDIR} +docs DOCS_CONFIGURE_OFF= -docs PORTDOCS= * -CONFLICTS= hs-cpphs-[0-9]* +CONFLICTS= hs-cpphs post-patch: @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/Makefile.inc diff --git a/lang/ocaml-nox11/Makefile b/lang/ocaml-nox11/Makefile index 000b85e89b6b..fb370bc709e3 100644 --- a/lang/ocaml-nox11/Makefile +++ b/lang/ocaml-nox11/Makefile @@ -8,7 +8,7 @@ COMMENT= Objective Caml compiler and programming environment (no X11) MASTERDIR= ${.CURDIR}/../ocaml -CONFLICTS= metaocaml-[0-9]* ocaml-[0-9]* ocaml-notk-[0-9]* +CONFLICTS= metaocaml ocaml ocaml-notk OPTIONS_EXCLUDE=TK X11 diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index e5bf42a77dd0..35e38647cc97 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -51,7 +51,7 @@ CMP_LIB_DESC= Install compiler libraries MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt DOCSDISTNAME= ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/} -CONFLICTS= metaocaml-[0-9]* +CONFLICTS= metaocaml .include <bsd.port.options.mk> @@ -89,7 +89,7 @@ CONFIGURE_ARGS+=-no-pthread PLIST_SUB+= X11="" USES+= xorg USE_XORG= x11 -CONFLICTS+= ocaml-nox11-[0-9]* +CONFLICTS+= ocaml-nox11 CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib .else PLIST_SUB+= X11="@comment " diff --git a/lang/racket-minimal/Makefile b/lang/racket-minimal/Makefile index 7fd7a2df5de8..014eb34f9eeb 100644 --- a/lang/racket-minimal/Makefile +++ b/lang/racket-minimal/Makefile @@ -36,7 +36,7 @@ WRKSRC= ${WRKDIR}/racket-${PORTVERSION}/src PATCH_WRKSRC= ${WRKDIR}/racket-${PORTVERSION} USE_LDCONFIG= yes REINPLACE_ARGS= -i "" -CONFLICTS= racket-[0-9]* +CONFLICTS= racket OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= CS diff --git a/lang/racket/Makefile b/lang/racket/Makefile index df7c890af4fd..67c3e67f6cc3 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -36,7 +36,7 @@ WRKSRC= ${WRKDIR}/racket-${PORTVERSION}/src PATCH_WRKSRC= ${WRKDIR}/racket-${PORTVERSION} USE_LDCONFIG= yes REINPLACE_ARGS= -i "" -CONFLICTS= racket-minimal-[0-9]* +CONFLICTS= racket-minimal OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= CS diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile index 7584428b41c4..a377459631dd 100644 --- a/lang/rexx-imc/Makefile +++ b/lang/rexx-imc/Makefile @@ -13,7 +13,7 @@ COMMENT= Procedural programming language designed by IBM's UK Laboratories BROKEN_armv6= fails to link: /nxb-bin/usr/bin/ld: hidden symbol __aeabi_uidivmod in libgcc.a is referenced by DSO BROKEN_armv7= fails to link: /nxb-bin/usr/bin/ld: hidden symbol __aeabi_uidivmod in libgcc.a is referenced by DSO -CONFLICTS= rexx-regina-* oorexx-[0-9]* +CONFLICTS= rexx-regina-* oorexx HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Make diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile index aed19039dd8b..2d9ceb8fffd0 100644 --- a/lang/rexx-regina/Makefile +++ b/lang/rexx-regina/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-addon-dir=${PREFIX}/lib/Regina-REXX/addons CONFIGURE_ENV= ac_cv_c_char_unsigned=yes MAKE_JOBS_UNSAFE= yes -CONFLICTS= rexx-imc-[0-0]* oorexx-[0-9]* +CONFLICTS= rexx-imc-[0-0]* oorexx DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile index a20f5bf6844f..c8ef5e03e9d0 100644 --- a/lang/scheme48/Makefile +++ b/lang/scheme48/Makefile @@ -11,7 +11,7 @@ COMMENT= Scheme Underground's implementation of R5RS LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi -CONFLICTS= scsh-[0-9]* +CONFLICTS= scsh ALL_TARGET= enough USES= cpe gmake tar:tgz diff --git a/lang/see/Makefile b/lang/see/Makefile index 2254323e820d..e9946c9d5cfa 100644 --- a/lang/see/Makefile +++ b/lang/see/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFAULT= GC GC_DESC= Use Boehm-Weiser garbage collection package DEBUG_DESC= Internal SEE library debugging -CONFLICTS= see-devel-[0-9]* +CONFLICTS= see-devel USES= libtool pathfix perl5 USE_LDCONFIG= yes diff --git a/lang/squirrel/Makefile b/lang/squirrel/Makefile index 85de9713f0e5..145d80cad5c3 100644 --- a/lang/squirrel/Makefile +++ b/lang/squirrel/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}_stable MAINTAINER= ports@FreeBSD.org COMMENT= High level imperative/OO programming language -CONFLICTS= squsq-[0-9]* +CONFLICTS= squsq USES= cmake compiler:c++11-lang dos2unix CMAKE_ARGS= -DINSTALL_INC_DIR:STRING=include diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile index 3edf4281a63d..d6531a5326f9 100644 --- a/mail/archiveopteryx-devel/Makefile +++ b/mail/archiveopteryx-devel/Makefile @@ -28,7 +28,7 @@ SUB_FILES= pkg-message USE_RC_SUBR= ${PORTNAME} -CONFLICTS= archiveopteryx-[0-9]* +CONFLICTS= archiveopteryx USERS= aox GROUPS= aox diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index c1a031bc26fb..12a60df21758 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -22,7 +22,7 @@ USES= compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \ USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl -CONFLICTS= courier-[0-9]* imap-uw-[0-9]* panda-imap-[0-9]* +CONFLICTS= courier imap-uw panda-imap GNU_CONFIGURE= yes CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 01ffd0e8b0e1..7458324ab93f 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -27,7 +27,7 @@ USE_GNOME= glib20 USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved -CONFLICTS= dbmail22-[0-9]* +CONFLICTS= dbmail22 OPTIONS_DEFINE= DOCS LDAP SIEVE OPTIONS_DEFAULT= SIEVE diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index c95aeeaa737f..3349e8d6e0e7 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -98,7 +98,7 @@ STRIP= PKGMESSAGE= ${WRKSRC}/README.FreeBSD -CONFLICTS= dspam-devel-[0-9]* +CONFLICTS= dspam-devel SIGNATURE_LIFE?= 15 diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile index 42a6391f130b..032c39d54939 100644 --- a/mail/heirloom-mailx/Makefile +++ b/mail/heirloom-mailx/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD4CLAUSE OPTIONS_DEFINE= IPV6 DOCS -CONFLICTS= mailx-[0-9]* +CONFLICTS= mailx MAKE_JOBS_UNSAFE= yes USES= cpe iconv localbase ssl tar:bzip2 diff --git a/mail/imaptools/Makefile b/mail/imaptools/Makefile index 5401bc44d021..4ae22580ab6d 100644 --- a/mail/imaptools/Makefile +++ b/mail/imaptools/Makefile @@ -11,7 +11,7 @@ COMMENT= Tools and scripts to use with IMAP servers LICENSE= ISCL -CONFLICTS= imaputils-[0-9]* +CONFLICTS= imaputils NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 336496af9981..8d05354fc3fc 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --enable-syslog=1 \ --enable-maildirquota INSTALL_TARGET= install-strip -CONFLICTS= courier-0.65* libunicode-[0-9]* +CONFLICTS= courier-0.65* libunicode MAILDROP_LOG_COLUMNS?= 72 # lenght of 'File:' line in log diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 0365d751054d..1ef9cc1f25ee 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -54,7 +54,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ tnef:converters/tnef \ wget:ftp/wget -CONFLICTS= MailScanner-devel-[0-9]* +CONFLICTS= MailScanner-devel USES= cpe perl5 shebangfix SHEBANG_GLOB= * usr/lib/MailScanner/init/* usr/lib/MailScanner/wrapper/* \ diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile index 623f8a151e64..38ebd3b1207a 100644 --- a/mail/mailx/Makefile +++ b/mail/mailx/Makefile @@ -16,7 +16,7 @@ COMMENT= Mail command with mailx extensions LICENSE= BSD4CLAUSE -CONFLICTS= heirloom-mailx-[0-9]* +CONFLICTS= heirloom-mailx EXTRACT_ONLY= mail-2.2.8.tar.gz WRKSRC= ${WRKDIR}/mail-2.2.8 diff --git a/mail/mmh/Makefile b/mail/mmh/Makefile index 79247af2ac7f..a21dee9b2530 100644 --- a/mail/mmh/Makefile +++ b/mail/mmh/Makefile @@ -40,7 +40,7 @@ LDFLAGS+= -g DEBUG_FLAGS+= -O0 -Wall -Wextra -g .endif -CONFLICTS= ja-mh-[0-9]* nmh-[0-9]* p5-Dist-Joseki-* +CONFLICTS= ja-mh nmh p5-Dist-Joseki-* post-install: @${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}.sample \; diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 818b32e6eb3b..879e3d932e48 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -42,8 +42,8 @@ CONFIGURE_ARGS= --disable-fcntl \ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif -CONFLICTS= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* \ - mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* +CONFLICTS= ja-mutt ja-mutt-devel mutt-1.4* \ + mutt-devel-lite mutt-lite zh-mutt-devel INFO= ${PORTNAME} diff --git a/mail/popular/Makefile b/mail/popular/Makefile index 82ea458173f0..869764dad1fc 100644 --- a/mail/popular/Makefile +++ b/mail/popular/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM USES= libtool perl5 gmake tar:bzip2 ssl -CONFLICTS= pserv-[0-9]* synce-librapi2-[0-9]* +CONFLICTS= pserv synce-librapi2 CONFLICTS_INSTALL= ports-tools # bin/pcheck GNU_CONFIGURE= yes diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index 3ea8dea996d1..a712cd03eb37 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -mysql COMMENT= Secure, reliable, and fast MTA for UNIX systems with MySQL support -CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]* +CONFLICTS= *qmail qmail-ldap qmail-spamcontrol *qmail-tls MYSQL_PATCH_VERSION= 1.1.15 diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile index 5d2b0413ad0c..dba06d477db9 100644 --- a/mail/qmail-spamcontrol/Makefile +++ b/mail/qmail-spamcontrol/Makefile @@ -13,7 +13,7 @@ COMMENT= Qmail MTA with SpamControl patches BROKEN_FreeBSD_12= incomplete definition of type 'struct X509_name_st' BROKEN_FreeBSD_13= incomplete definition of type 'struct X509_name_st' BROKEN_FreeBSD_14= incomplete definition of type 'struct X509_name_st' -CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* *qmail-mysql-[0-9]* *qmail-tls-[0-9]* +CONFLICTS= *qmail qmail-ldap *qmail-mysql *qmail-tls EXTRA_PATCHES+= ${MASTERDIR}/files/patch-install.c \ ${MASTERDIR}/files/patch-Makefile \ diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile index 91673e044d81..2dd5989c7dd9 100644 --- a/mail/qmail-tls/Makefile +++ b/mail/qmail-tls/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -tls COMMENT= Secure, reliable, and fast MTA for UNIX systems with TLS support -CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* +CONFLICTS= *qmail qmail-ldap *qmail-mysql qmail-spamcontrol SLAVE_TLS= yes diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 0f33ff1f9ebe..5478aa1c2a6c 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -14,8 +14,8 @@ COMMENT?= Secure, reliable, efficient, simple, and fast MTA DIST_SUBDIR= qmail -CONFLICTS?= qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]* -CONFLICTS+= qmail-vida-[0-9]* +CONFLICTS?= qmail-ldap *qmail-mysql qmail-spamcontrol *qmail-tls +CONFLICTS+= qmail-vida USES+= qmail:vars fakeroot PREFIX?= ${QMAIL_PREFIX} diff --git a/mail/spamassassin-devel/Makefile b/mail/spamassassin-devel/Makefile index 22737c8c7d4f..0147815c311a 100644 --- a/mail/spamassassin-devel/Makefile +++ b/mail/spamassassin-devel/Makefile @@ -31,7 +31,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ TEST_DEPENDS+= ${${dep}_RUN_DEPENDS} .endfor -CONFLICTS?= ja-spamassassin-[0-9]* spamassassin-[0-9]* +CONFLICTS?= ja-spamassassin spamassassin CPE_VENDOR= apache diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 848088294b8d..579b19e0fb8d 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -27,7 +27,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ TEST_DEPENDS+= ${${dep}_RUN_DEPENDS} .endfor -CONFLICTS?= ja-spamassassin-[0-9]* +CONFLICTS?= ja-spamassassin CPE_VENDOR= apache diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index d4f7cebfbc77..fe73cfa19297 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -47,7 +47,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} \ SUB_FILES= pkg-message SUB_LIST= SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP} -CONFLICTS= squirreloutlook-[0-9]* +CONFLICTS= squirreloutlook post-patch: @${REINPLACE_CMD} -e 's|ispell|${LOCALBASE}/bin/aspell|g' \ diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index ca710bebb4a5..3a4d508f172b 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --program-transform-name='' -CONFLICTS= sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2-[0-9]* +CONFLICTS= sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2 OPTIONS_DEFINE= CA_BUNDLE COMPFACE CURL DOCS GPGME GTKSPELL LDAP \ ONIGURUMA SSL HIDE_OSSIG diff --git a/math/atlas/Makefile b/math/atlas/Makefile index f5f9bd6f0ac1..6e7515bf11d6 100644 --- a/math/atlas/Makefile +++ b/math/atlas/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:math/lapack:checksum USES= fortran gmake tar:bzip2 USE_GCC= yes -CONFLICTS= cblas-[0-9]* +CONFLICTS= cblas MANUAL_PACKAGE_BUILD= Optimizes for the local machine. OPTIONS_DEFINE= DOCS DATA ARCHDEF TSC WALL_TIMER diff --git a/math/geogebra/Makefile b/math/geogebra/Makefile index beec12361a1a..8efb53e9eee4 100644 --- a/math/geogebra/Makefile +++ b/math/geogebra/Makefile @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= amd64 i386 USES= tar:bzip2 desktop-file-utils gnome shebangfix USE_JAVA= yes -CONFLICTS= math/geogebra-i18n-[0-9]* +CONFLICTS= math/geogebra-i18n NO_BUILD= yes NO_ARCH= yes diff --git a/math/glpk/Makefile b/math/glpk/Makefile index be178f3414c8..ddc2de0fb8e1 100644 --- a/math/glpk/Makefile +++ b/math/glpk/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgmp.so:math/gmp -CONFLICTS= goblin-[0-9]* +CONFLICTS= goblin USES= gmake libtool localbase GNU_CONFIGURE= yes diff --git a/math/metis/Makefile b/math/metis/Makefile index bca9c8949282..226f35b71119 100644 --- a/math/metis/Makefile +++ b/math/metis/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 USES= cmake:noninja compiler:c11 -CONFLICTS= metis-edf-[0-9]* metis4-4* +CONFLICTS= metis-edf metis4-4* PORTDOCS= manual.pdf diff --git a/math/testu01/Makefile b/math/testu01/Makefile index 5cc4fe9d995f..40aea8f634e9 100644 --- a/math/testu01/Makefile +++ b/math/testu01/Makefile @@ -26,7 +26,7 @@ MAKE_ARGS= docdir="${DOCSDIR}" exdir="${EXAMPLESDIR}" USE_LDCONFIG= yes INSTALL_TARGET= install-strip -CONFLICTS= emboss-[0-9]* +CONFLICTS= emboss CFLAGS+= -fPIC diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile index 6edf57a168bf..e5ff5aba7946 100644 --- a/misc/dahdi-kmod/Makefile +++ b/misc/dahdi-kmod/Makefile @@ -42,7 +42,7 @@ USE_RC_SUBR= dahdi MAKE_ARGS= ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes DEPEND_MP= GROUPS= dahdi -CONFLICTS= zaptel-[0-9]* dahdi-kmod26-* +CONFLICTS= zaptel dahdi-kmod26-* USES= kmod uidfix diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile index 5483a7f9493e..4c5b0a61e0ce 100644 --- a/misc/dahdi-kmod26/Makefile +++ b/misc/dahdi-kmod26/Makefile @@ -47,7 +47,7 @@ USE_RC_SUBR= dahdi MAKE_ARGS= NO_FETCH=yes WITHOUT_HEADERS=yes #ADDITIONAL_DRIVERS="wcb1xxp" GROUPS= dahdi -CONFLICTS= zaptel-[0-9]* dahdi-kmod-* +CONFLICTS= zaptel dahdi-kmod-* KMODDIR= ${PREFIX}/lib/dahdi USES= kmod uidfix diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile index f2a7e1caf80f..fc90edf51afa 100644 --- a/misc/dahdi/Makefile +++ b/misc/dahdi/Makefile @@ -24,7 +24,7 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes MAKE_ENV= HOST_CC=${CC} -CONFLICTS= zaptel-[0-9]* +CONFLICTS= zaptel post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,g'\ diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile index c7810db8fd60..affb04a41694 100644 --- a/misc/heyu2/Makefile +++ b/misc/heyu2/Makefile @@ -13,7 +13,7 @@ COMMENT= Control a CM11A interface from the command line BROKEN_FreeBSD_13= ld: error: duplicate symbol: newsb BROKEN_FreeBSD_14= ld: error: duplicate symbol: newsb -CONFLICTS= heyu-[0-9]* +CONFLICTS= heyu ALL_TARGET= all diff --git a/multimedia/clive/Makefile b/multimedia/clive/Makefile index 4f66aebb92fb..525ea664c425 100644 --- a/multimedia/clive/Makefile +++ b/multimedia/clive/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= p5-Getopt-ArgvFile>=1.11:devel/p5-Getopt-ArgvFile \ quvi>=0.2.16.1:multimedia/quvi # deskutils/ljclive, multimedia/clive1 (same executable/manpage/distfile name) -CONFLICTS= py*-clive-[0-1]* ljclive-[0-9]* +CONFLICTS= py*-clive-[0-1]* ljclive USES= perl5 USE_PERL5= configure diff --git a/multimedia/linux-c7-libtheora/Makefile b/multimedia/linux-c7-libtheora/Makefile index e7b3f0c90ae5..00c1ddddc6ab 100644 --- a/multimedia/linux-c7-libtheora/Makefile +++ b/multimedia/linux-c7-libtheora/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 diff --git a/multimedia/linux-c7-libv4l/Makefile b/multimedia/linux-c7-libv4l/Makefile index a60284695680..12fb103d64a1 100644 --- a/multimedia/linux-c7-libv4l/Makefile +++ b/multimedia/linux-c7-libv4l/Makefile @@ -17,7 +17,7 @@ USE_LINUX_RPM= yes SRC_DISTFILES= v4l-utils-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 2e0cd097795f..725f83fa0727 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat -CONFLICTS= mplex-[0-9]* +CONFLICTS= mplex USES= compiler:c++11-lang gmake gnome jpeg libtool localbase pathfix \ pkgconfig diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile index e7053df600b7..df9bebb51aef 100644 --- a/multimedia/pwcbsd/Makefile +++ b/multimedia/pwcbsd/Makefile @@ -13,7 +13,7 @@ COMMENT= The Linux pwc webcam driver ported to FreeBSD LICENSE= GPLv2 -CONFLICTS= pwcview-[0-9]* +CONFLICTS= pwcview SSP_UNSAFE= kernel module does not support ssp diff --git a/multimedia/pwcview/Makefile b/multimedia/pwcview/Makefile index aa014ddd0694..cee943839386 100644 --- a/multimedia/pwcview/Makefile +++ b/multimedia/pwcview/Makefile @@ -14,7 +14,7 @@ COMMENT= The Video4Linux PWC webcam viewer BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat LIB_DEPENDS= libv4l1.so:multimedia/libv4l -CONFLICTS= pwcbsd-[0-9]* +CONFLICTS= pwcbsd USES= jpeg sdl USE_SDL= sdl diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile index c67acbc20678..4cc330838b27 100644 --- a/net-im/centerim/Makefile +++ b/net-im/centerim/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-ssl --with-openssl --disable-yahoo --disable-msn -CONFLICTS= centericq-[0-9]* centerim-devel-[0-9]* +CONFLICTS= centericq centerim-devel SHEBANG_FILES= misc/CenterIMLog2HTML.py misc/cimformathistory misc/cimextracthistory.pl SHEBANG_LANG= gawk diff --git a/net-im/tkabber/Makefile b/net-im/tkabber/Makefile index 1345581ecafe..83f2601f0559 100644 --- a/net-im/tkabber/Makefile +++ b/net-im/tkabber/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= tcllib>=1.2:devel/tcllib \ OPTIONS_DEFINE= DOCS EXAMPLES IPV6 SOUND TDOM TKCON TKTRAY TLS OPTIONS_DEFAULT= TLS -CONFLICTS= tkabber-devel-[0-9]* +CONFLICTS= tkabber-devel USES= cpe shebangfix tar:xz CPE_VENDOR= ${PORTNAME}_project diff --git a/net-mgmt/chillispot/Makefile b/net-mgmt/chillispot/Makefile index 60b6564e66aa..0eb5863c4ef1 100644 --- a/net-mgmt/chillispot/Makefile +++ b/net-mgmt/chillispot/Makefile @@ -11,7 +11,7 @@ MASTER_SITES= http://www.chillispot.info/download/ \ MAINTAINER= venture37@geeklan.co.uk COMMENT= Wireless LAN Access Point Controller -CONFLICTS= coovachilli-[0-9]* +CONFLICTS= coovachilli USES= compiler:nestedfct shebangfix SHEBANG_FILES= doc/hotspotlogin.cgi diff --git a/net-mgmt/coovachilli/Makefile b/net-mgmt/coovachilli/Makefile index 73f692dd2134..e15915142be2 100644 --- a/net-mgmt/coovachilli/Makefile +++ b/net-mgmt/coovachilli/Makefile @@ -12,7 +12,7 @@ DISTNAME= coova-chilli-${PORTVERSION} MAINTAINER= venture37@geeklan.co.uk COMMENT= Access controller for wired & wireless clients -CONFLICTS= chillispot-[0-9]* +CONFLICTS= chillispot #if __FreeBSD__ >= 10.0 #IGNORE= Does not work correctly, awaiting new release upstream with fixes integrated. #endif diff --git a/net-mgmt/p5-Net-SNMP/Makefile b/net-mgmt/p5-Net-SNMP/Makefile index f6277e3e28b3..76c0c8843202 100644 --- a/net-mgmt/p5-Net-SNMP/Makefile +++ b/net-mgmt/p5-Net-SNMP/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= p5-Crypt-DES>=0:security/p5-Crypt-DES \ USES= perl5 USE_PERL5= configure -CONFLICTS= p5-Net-SNMP3-[0-9]* +CONFLICTS= p5-Net-SNMP3 NO_ARCH= yes .include <bsd.port.mk> diff --git a/net-mgmt/resource-agents/Makefile b/net-mgmt/resource-agents/Makefile index a0545f0cb112..48d0e4c0c5de 100644 --- a/net-mgmt/resource-agents/Makefile +++ b/net-mgmt/resource-agents/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --disable-fatal-warnings --with-version=${PORTVERSION} \ PACKAGE_STRING="${PORTNAME} ${PORTVERSION}" \ PACKAGE_VERSION="${PORTVERSION}" -CONFLICTS= heartbeat-[0-9]* +CONFLICTS= heartbeat SHEBANG_LANG= sh sh_OLD_CMD= /bin/sh diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile index 3af49925c363..4f64851b7dd8 100644 --- a/net-mgmt/seafile-client/Makefile +++ b/net-mgmt/seafile-client/Makefile @@ -29,7 +29,7 @@ GH_PROJECT= seafile USE_GNOME= glib20 USE_LDCONFIG= yes -CONFLICTS= seafile-server-[0-9]* +CONFLICTS= seafile-server SHEBANG_FILES= *.sh scripts/*.sh app/seaf-cli integration-tests/*.sh diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile index 4bcb1803f91d..e178a4d551a6 100644 --- a/net-mgmt/seafile-server/Makefile +++ b/net-mgmt/seafile-server/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ bash:shells/bash -CONFLICTS= seafile-[0-9]* +CONFLICTS= seafile USES= autoreconf compiler:c11 gnome iconv libarchive libtool localbase mysql \ pathfix pgsql pkgconfig python:3.6+ shebangfix sqlite ssl diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 1942ce8037e5..ff20ab0f6f3a 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp -CONFLICTS= amule-[0-9]* +CONFLICTS= amule USES= bison compiler:c++11-lang cpe desktop-file-utils desktop-file-utils \ gmake localbase:ldflags perl5 pkgconfig shebangfix tar:bzip2 diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 88d7edfdc65b..040135241b8d 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/docs/COPYING LIB_DEPENDS= libcryptopp.so:security/cryptopp -CONFLICTS= amule-devel-[0-9]* +CONFLICTS= amule-devel USES= bison compiler:c++11-lang cpe desktop-file-utils gmake \ localbase:ldflags perl5 pkgconfig shebangfix tar:xz diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile index a702e08193c9..a20118ec3012 100644 --- a/net-p2p/microdc2/Makefile +++ b/net-p2p/microdc2/Makefile @@ -11,7 +11,7 @@ COMMENT= Command-line based Direct Connect client LICENSE= GPLv2 -CONFLICTS= tthsum-[0-9]* +CONFLICTS= tthsum USES= gnome iconv readline GNU_CONFIGURE= yes diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile index 8a441632c911..c34bea2599d6 100644 --- a/net-p2p/mldonkey/Makefile +++ b/net-p2p/mldonkey/Makefile @@ -14,7 +14,7 @@ COMMENT?= Multi-protocol peer-to-peer client written in OCaml LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/Copying.txt -CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]* +CONFLICTS= mldonkey{-{core,gui},}-devel USES= compiler:c++11-lang cpe gmake iconv pkgconfig tar:bzip2 USE_OCAML= yes diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index df5b6f2ad4c4..3ad9450af55a 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -51,7 +51,7 @@ MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} -CONFLICTS= ossp-uuid-[0-9]* +CONFLICTS= ossp-uuid CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk13 asterisk18 diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index a0f0edeb269b..1ad574940a71 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -51,7 +51,7 @@ MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} -CONFLICTS= ossp-uuid-[0-9]* +CONFLICTS= ossp-uuid CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk13 asterisk16 diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile index 256429b9a2ad..60a01d5a579a 100644 --- a/net/avahi-app/Makefile +++ b/net/avahi-app/Makefile @@ -46,7 +46,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lintl INSTALL_TARGET= install-strip .if ${AVAHI_SLAVE} == no -CONFLICTS= howl-[0-9]* +CONFLICTS= howl DAEMON_CONFIG_FILES= hosts avahi-daemon.conf .endif diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile index b5676ee9a8fe..ce9d003c36f8 100644 --- a/net/avahi-libdns/Makefile +++ b/net/avahi-libdns/Makefile @@ -18,6 +18,6 @@ PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= libdns AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc -CONFLICTS= mDNSResponder-[0-9]* +CONFLICTS= mDNSResponder .include "${MASTERDIR}/Makefile" diff --git a/net/bird2/Makefile b/net/bird2/Makefile index 21a70bcc003e..0ba12f96d705 100644 --- a/net/bird2/Makefile +++ b/net/bird2/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 USES= bison cpe gmake ncurses readline -CONFLICTS= bird-[0-9]* -CONFLICTS+= bird6-[0-9]* +CONFLICTS= bird +CONFLICTS+= bird6 CPE_VENDOR= nic diff --git a/net/corosync2/Makefile b/net/corosync2/Makefile index 4057c419cda8..84497417d023 100644 --- a/net/corosync2/Makefile +++ b/net/corosync2/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 2.4.5 PORTREVISION= 1 PKGNAMESUFFIX= 2 -CONFLICTS= corosync3-[0-9]* +CONFLICTS= corosync3 PORTSCOUT= limit:^2\.[0-9]\.[0-9] .include "${.CURDIR}/Makefile.common" diff --git a/net/corosync3/Makefile b/net/corosync3/Makefile index ff1992d87703..972ccea91fe8 100644 --- a/net/corosync3/Makefile +++ b/net/corosync3/Makefile @@ -8,6 +8,6 @@ PKGNAMESUFFIX= 3 LIB_DEPENDS+= libknet.so:devel/kronosnet -CONFLICTS= corosync2-[0-9]* +CONFLICTS= corosync2 .include <bsd.port.mk> diff --git a/net/dante/Makefile b/net/dante/Makefile index 5a27fd3a72d7..1dff9ecd87a3 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libminiupnpc.so:net/miniupnpc \ libsasl2.so:security/cyrus-sasl2 -CONFLICTS= socks5-[0-9]* +CONFLICTS= socks5 USES= libtool localbase GNU_CONFIGURE= yes diff --git a/net/freeradius-client/Makefile b/net/freeradius-client/Makefile index beb03d713eca..4b5761da8a1f 100644 --- a/net/freeradius-client/Makefile +++ b/net/freeradius-client/Makefile @@ -15,6 +15,6 @@ INSTALL_TARGET= install-strip USES= gmake libtool USE_LDCONFIG= yes -CONFLICTS= radiusclient-ng-[0-9]* +CONFLICTS= radiusclient-ng .include <bsd.port.mk> diff --git a/net/hping/Makefile b/net/hping/Makefile index cdc0a354e691..dfc9a783ef40 100644 --- a/net/hping/Makefile +++ b/net/hping/Makefile @@ -12,7 +12,7 @@ DISTNAME= hping2.0.0-rc3 MAINTAINER= ecu@200ok.org COMMENT= Network auditing tool -CONFLICTS= hping-devel-[0-9]* +CONFLICTS= hping-devel WRKSRC= ${WRKDIR}/hping2-rc3 diff --git a/net/ilbc/Makefile b/net/ilbc/Makefile index 665b1737af05..4171c365a87a 100644 --- a/net/ilbc/Makefile +++ b/net/ilbc/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://simon.morlat.free.fr/download/1.2.x/source/ MAINTAINER= asm@asm.kiev.ua COMMENT= Internet Low Bit Rate codec (RFC3951) -CONFLICTS= libilbc-[0-9]* +CONFLICTS= libilbc GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile index 95a7f5f06580..b48a712b2175 100644 --- a/net/isc-dhcp44-server/Makefile +++ b/net/isc-dhcp44-server/Makefile @@ -45,10 +45,10 @@ BINLEASES_DESC= Enable support for binary insertion of leases CONFLICTS= isc-dhcp3?-client-[0-9]* isc-dhcp4[123]-client-[0-9]* DHCP_PORTREVISION= ${PORTREVISION_CLIENT} .elif ${SUBSYS} == relay -CONFLICTS= isc-dhcp3?-relay-[0-9]* isc-dhcp4[123]-relay-[0-9]* +CONFLICTS= isc-dhcp3?-relay isc-dhcp4[123]-relay DHCP_PORTREVISION= ${PORTREVISION_RELAY} .else -CONFLICTS= isc-dhcp3?-server-[0-9]* isc-dhcp4[123]-server-[0-9]* +CONFLICTS= isc-dhcp3?-server isc-dhcp4[123]-server DHCP_PORTREVISION= ${PORTREVISION_SERVER} .endif MAKE_JOBS_UNSAFE= yes diff --git a/net/libzmq2/Makefile b/net/libzmq2/Makefile index 7073f29fb08f..36fee0aeb438 100644 --- a/net/libzmq2/Makefile +++ b/net/libzmq2/Makefile @@ -19,7 +19,7 @@ USES= libtool pathfix USE_LDCONFIG= yes TEST_TARGET= check -CONFLICTS= libzmq[^2]-[0-9]* +CONFLICTS= libzmq[^2] OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --enable-debug diff --git a/net/libzmq3/Makefile b/net/libzmq3/Makefile index c73d6bdb0c5f..9ef3bba8bb36 100644 --- a/net/libzmq3/Makefile +++ b/net/libzmq3/Makefile @@ -11,7 +11,7 @@ COMMENT= ZeroMQ core library (Version 3) LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -CONFLICTS= zmq-[0-9]* libzmq[^3]-[0-9]* +CONFLICTS= zmq libzmq[^3] USES= libtool pathfix USE_LDCONFIG= yes diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile index b0305b3c2122..c642c090cf4d 100644 --- a/net/libzmq4/Makefile +++ b/net/libzmq4/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake libtool pkgconfig USE_LDCONFIG= yes -CONFLICTS= zmq-[0-9]* libzmq[^4]-[0-9]* +CONFLICTS= zmq libzmq[^4] GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/net/linux-c7-avahi-libs/Makefile b/net/linux-c7-avahi-libs/Makefile index debef70c4d43..38b175707014 100644 --- a/net/linux-c7-avahi-libs/Makefile +++ b/net/linux-c7-avahi-libs/Makefile @@ -17,7 +17,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 .include <bsd.port.mk> diff --git a/net/linux-c7-openldap/Makefile b/net/linux-c7-openldap/Makefile index 771cdddfd964..83850ac5e9b5 100644 --- a/net/linux-c7-openldap/Makefile +++ b/net/linux-c7-openldap/Makefile @@ -14,7 +14,7 @@ USE_LDCONFIG= yes USE_LINUX= cyrus-sasl2 nspr nss USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/net/linux-c7-tcp_wrappers-libs/Makefile b/net/linux-c7-tcp_wrappers-libs/Makefile index fef563de0d60..9b60c719ec98 100644 --- a/net/linux-c7-tcp_wrappers-libs/Makefile +++ b/net/linux-c7-tcp_wrappers-libs/Makefile @@ -17,7 +17,7 @@ USE_LINUX_RPM= yes LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} -CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} OPTIONS_DEFINE= DOCS diff --git a/net/mpich/Makefile b/net/mpich/Makefile index 588179cca9e4..9ceea2f9f6d4 100644 --- a/net/mpich/Makefile +++ b/net/mpich/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libhwloc.so:devel/hwloc2 \ libepoll-shim.so:devel/libepoll-shim RUN_DEPENDS= bash:shells/bash -CONFLICTS= mpd-[0-9]* mpich2-[0-9]* +CONFLICTS= mpd mpich2 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= compiler:c11 libtool perl5 pkgconfig diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile index 6d6023fa4365..41e64570286c 100644 --- a/net/mpich2/Makefile +++ b/net/mpich2/Makefile @@ -56,7 +56,7 @@ LDFLAGS+= -lpthread -lexecinfo MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME} NO_CCACHE= yes -CONFLICTS= mpd-[0-9]* mpich-3.* +CONFLICTS= mpd mpich-3.* VERSO= 8.0.1 VERSOM= ${VERSO:R:R} diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index f378560cea6f..176912f0efc7 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -75,7 +75,7 @@ LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers SHEBANG_GLOB= afpstats -CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]* +CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit .include <bsd.port.pre.mk> diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile index e4e0329840cd..7589e41d7c33 100644 --- a/net/netpipes/Makefile +++ b/net/netpipes/Makefile @@ -9,7 +9,7 @@ DISTNAME= netpipes-4.2-export MAINTAINER= doconnor@gsoft.com.au COMMENT= Group of shell utilities to connect programs to sockets -CONFLICTS= timelimit-[0-9]* +CONFLICTS= timelimit NO_WRKSUBDIR= yes diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile index 90999086598b..bafd6760861b 100644 --- a/net/nss-pam-ldapd/Makefile +++ b/net/nss-pam-ldapd/Makefile @@ -44,7 +44,7 @@ OPTIONS_MULTI_MG1= PAM NSS PAM_DESC= Build pam_ldap NSS_DESC= Build nss support OPTIONS_DEFAULT+= PAM NSS -CONFLICTS+= nss-pam-ldapd-sasl-[0-9]* +CONFLICTS+= nss-pam-ldapd-sasl .endif USERS= nslcd diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile index 075784cf4028..1f2907862146 100644 --- a/net/openbgpd/Makefile +++ b/net/openbgpd/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${FILESDIR}/COPYING USES= tar:tgz uidfix USE_RC_SUBR= ${PORTNAME} -CONFLICTS= zebra-[0-9]* quagga-[0-9]* +CONFLICTS= zebra quagga NO_WRKSUBDIR= yes PLIST_FILES= sbin/bgpctl sbin/bgpd man/man5/bgpd.conf.5.gz \ diff --git a/net/openbgpd6/Makefile b/net/openbgpd6/Makefile index 19c49e5ac094..fd6725ab3e0b 100644 --- a/net/openbgpd6/Makefile +++ b/net/openbgpd6/Makefile @@ -20,7 +20,7 @@ SUB_FILES= pkg-message USERS= _bgpd GROUPS= _bgpd -CONFLICTS= zebra-[0-9]* quagga-[0-9]* +CONFLICTS= zebra quagga OPTIONS_DEFINE= IPV6LLPEER OPTIONS_DEFAULT= IPV6LLPEER diff --git a/net/openradius/Makefile b/net/openradius/Makefile index 21243b96dd45..475e54f06174 100644 --- a/net/openradius/Makefile +++ b/net/openradius/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LOGFILE?= /var/log/openradius.log -CONFLICTS= freeradius-[0-9]* gnu-radius-[0-9]* radiusd-cistron-[0-9]* \ - freeradius-mysql-[0-9]* +CONFLICTS= freeradius gnu-radius radiusd-cistron \ + freeradius-mysql CC?= gcc CXX?= g++ diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile index cf5a3a6b547b..8657f96bcc90 100644 --- a/net/p5-Net-Z3950-ZOOM/Makefile +++ b/net/p5-Net-Z3950-ZOOM/Makefile @@ -17,6 +17,6 @@ RUN_DEPENDS= p5-MARC-Record>=1.38:textproc/p5-MARC-Record USES= perl5 USE_PERL5= configure -CONFLICTS= p5-Net-Z3950-[0-9]* +CONFLICTS= p5-Net-Z3950 .include <bsd.port.mk> diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile index b977a9a3fe8d..3b0f838e2500 100644 --- a/net/p5-SOAP/Makefile +++ b/net/p5-SOAP/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-libwww>=0:www/p5-libwww -CONFLICTS= p5-SOAP-Lite-[0-9]* +CONFLICTS= p5-SOAP-Lite USES= perl5 USE_PERL5= configure diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile index 3f3eaf5c20b4..33515935dd60 100644 --- a/net/pacemaker1/Makefile +++ b/net/pacemaker1/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= 1 .include "${.CURDIR}/Makefile.common" -CONFLICTS+= pacemaker2-[0-9]* +CONFLICTS+= pacemaker2 SHEBANG_FILES+= cts/cts \ cts/lxc_autogen.sh.in \ diff --git a/net/pacemaker1/Makefile.common b/net/pacemaker1/Makefile.common index baf0dcc9fabb..8eac3a113c4e 100644 --- a/net/pacemaker1/Makefile.common +++ b/net/pacemaker1/Makefile.common @@ -22,7 +22,7 @@ RUN_DEPENDS= bash:shells/bash \ getopt>=0:misc/getopt \ ocf-tester:net-mgmt/resource-agents -CONFLICTS= heartbeat-[0-9]* +CONFLICTS= heartbeat USERS= hacluster GROUPS= haclient diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile index 205c8f40470f..9c57a01021eb 100644 --- a/net/pacemaker2/Makefile +++ b/net/pacemaker2/Makefile @@ -7,7 +7,7 @@ PKGNAMESUFFIX= 2 CONFIGURE_ARGS+= --with-noarch-pkgconfigdir=${PREFIX}/libdata/pkgconfig -CONFLICTS+= pacemaker1-[0-9]* +CONFLICTS+= pacemaker1 LIB_DEPENDS+= libffi.so:devel/libffi \ libgmp.so:math/gmp \ diff --git a/net/proxychains-ng/Makefile b/net/proxychains-ng/Makefile index 2545c7015d7e..2fe87fad4c69 100644 --- a/net/proxychains-ng/Makefile +++ b/net/proxychains-ng/Makefile @@ -17,7 +17,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFLICTS= proxychains-[0-9]* +CONFLICTS= proxychains PORTDOCS= AUTHORS README TODO OPTIONS_DEFINE= DOCS diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile index 654514170d93..aca8cc4ba2b7 100644 --- a/net/rabbitmq-c-devel/Makefile +++ b/net/rabbitmq-c-devel/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} -CONFLICTS= rabbitmq-c-[0-9]* +CONFLICTS= rabbitmq-c USES= cmake pathfix python ssl USE_GITHUB= yes diff --git a/net/sendsms/Makefile b/net/sendsms/Makefile index aad7f5591125..bab6f4ea2955 100644 --- a/net/sendsms/Makefile +++ b/net/sendsms/Makefile @@ -17,7 +17,7 @@ EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} PLIST_FILES= bin/sendsms -CONFLICTS= gnokii-[0-9]* smstools-[0-9]* +CONFLICTS= gnokii smstools NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile index 47693b70642d..1b9cbb541aec 100644 --- a/net/tac_plus4/Makefile +++ b/net/tac_plus4/Makefile @@ -22,7 +22,7 @@ CPE_VENDOR= cisco USERS= tacacs GROUPS= tacacs -CONFLICTS= ru-tac+ia-[0-9]* tac_plus-libradius-[0-9]* +CONFLICTS= ru-tac+ia tac_plus-libradius MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS diff --git a/net/unison/Makefile b/net/unison/Makefile index e1ad8b0240d9..11b9eb70bc67 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -30,7 +30,7 @@ USES= gmake localbase USE_OCAML= yes WRKSRC_SUBDIR= src NO_OCAML_RUNDEPENDS=yes -CONFLICTS= unison-devel-[0-9]* +CONFLICTS= unison-devel MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" ALL_TARGET= unison all diff --git a/net/unison248/Makefile b/net/unison248/Makefile index db6cdfc11254..e4e5493eaa51 100644 --- a/net/unison248/Makefile +++ b/net/unison248/Makefile @@ -34,7 +34,7 @@ USES= gmake localbase USE_OCAML= yes WRKSRC_SUBDIR= src NO_OCAML_RUNDEPENDS=yes -CONFLICTS= unison-devel-[0-9]* +CONFLICTS= unison-devel MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" ALL_TARGET= unison all diff --git a/net/vde/Makefile b/net/vde/Makefile index c658d07bc74a..e8b9e422fefd 100644 --- a/net/vde/Makefile +++ b/net/vde/Makefile @@ -11,7 +11,7 @@ COMMENT= User-mode virtual ethernet infrastructure LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= vde2-[0-9]* +CONFLICTS= vde2 MAKE_ARGS= CC="${CC}" USE_LDCONFIG= yes diff --git a/net/vde2/Makefile b/net/vde2/Makefile index 951d08b63037..1b849c5e3f1b 100644 --- a/net/vde2/Makefile +++ b/net/vde2/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libpcap.so.1:net/libpcap USES= gmake libtool pathfix shebangfix ssl USE_LDCONFIG= yes -CONFLICTS= vde-[0-9]* +CONFLICTS= vde GNU_CONFIGURE= yes INSTALL_TARGET= install-strip SHEBANG_FILES= src/lib/python/VdePlug.py diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile index 38d7ff8b3262..ef2a6cc6bd1c 100644 --- a/net/xmlrpc-epi/Makefile +++ b/net/xmlrpc-epi/Makefile @@ -26,7 +26,7 @@ PORTDOCS= AUTHORS ChangeLog NEWS README METHODS= TestNormal TestFault TestStruct TestArray TestBoolean \ TestInt TestString TestDouble TestBase64 TestDateTime -CONFLICTS= xmlrpc-c-[0-9]* +CONFLICTS= xmlrpc-c OPTIONS_DEFINE= DOCS diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile index 41b78dbcca93..166a9cb3dd42 100644 --- a/net/xrdp-devel/Makefile +++ b/net/xrdp-devel/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ --enable-pam-config=freebsd \ --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter LDFLAGS+= -lssl -CONFLICTS= xrdp-[0-9]* +CONFLICTS= xrdp INSTALL_TARGET= install-strip SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} diff --git a/net/zebra/Makefile b/net/zebra/Makefile index fa1761085201..e9f91f12accb 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi DEPRECATED= Abandoned upstream, last release in 2005. Consider migrating to net/frr7 or net/bird2 EXPIRATION_DATE=2021-12-31 -CONFLICTS= openbgpd-[0-9]* quagga-[0-9]* quagga-re-[0-9]* openospfd-[0-9]* +CONFLICTS= openbgpd quagga quagga-re openospfd SUB_FILES= pkg-message zebractl SUB_LIST= BGPDARGS=${BGPDARGS} \ diff --git a/news/inn/Makefile b/news/inn/Makefile index fe00a82bd544..ae786f1eeb46 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -21,7 +21,7 @@ SUB_FILES= pkg-install USES= cpe gmake libtool perl5 uidfix CPE_VENDOR= isc -CONFLICTS?= inn-current-[0-9]* +CONFLICTS?= inn-current OPTIONS_DEFINE= BERKELEYDB GNUPG KERBEROS PYTHON SASL KEYWORDS \ LARGE_FILES OPENSSL SETGID_INEWS TAGGED_HASH \ diff --git a/news/s-news/Makefile b/news/s-news/Makefile index ed27727b705c..29489a5834e8 100644 --- a/news/s-news/Makefile +++ b/news/s-news/Makefile @@ -11,7 +11,7 @@ COMMENT= Simple news server for hosts with one or two users LIB_DEPENDS= libgdbm.so:databases/gdbm -CONFLICTS= leafnode-[1-9]* nntp-[0-9]* +CONFLICTS= leafnode-[1-9]* nntp CONFIGURE_ARGS+= \ --with-confdir=${PREFIX}/etc/s-news \ diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile index 06ff88afd958..4a31d89f6c32 100644 --- a/polish/gnugadu2/Makefile +++ b/polish/gnugadu2/Makefile @@ -26,7 +26,7 @@ USE_LDCONFIG= yes USE_XORG= x11 xaw ice xscrnsaver INSTALL_TARGET= install-strip # there is a header conflict here, that breaks build -CONFLICTS= qhacc-[0-9]* +CONFLICTS= qhacc CONFIGURE_ARGS= --disable-esdtest \ --with-external-libgadu \ diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 3ed977c92816..b680a662265c 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -23,7 +23,7 @@ USE_GNOME= glib20 USE_LDCONFIG= yes USE_RC_SUBR= cups_browsed -CONFLICTS= cups-pstoraster-[0-9]* foomatic-filters-[0-9]* +CONFLICTS= cups-pstoraster foomatic-filters CPE_VENDOR= linuxfoundation SHEBANG_FILES= filter/braille/drivers/generic/brftoembosser.in \ diff --git a/print/cups/Makefile b/print/cups/Makefile index 58acb7241710..e772e5c579d7 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -11,7 +11,7 @@ COMMENT= Common UNIX Printing System LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= LPRng-[0-9]* +CONFLICTS= LPRng USE_GITHUB= yes GH_ACCOUNT= OpenPrinting diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile index 0dbee6234f70..1fcbd5468d22 100644 --- a/print/dvi2tty/Makefile +++ b/print/dvi2tty/Makefile @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= DVI file previewer for text only devices -CONFLICTS= ja-dvi2tty-[0-9]* +CONFLICTS= ja-dvi2tty MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${STRIP}" diff --git a/print/enscript-a4/Makefile b/print/enscript-a4/Makefile index b3ac0f1f2a1a..5ade23dfe983 100644 --- a/print/enscript-a4/Makefile +++ b/print/enscript-a4/Makefile @@ -1,6 +1,6 @@ # Created by: kline -CONFLICTS= enscript-letter-[0-9]* enscript-letterdj-[0-9]* +CONFLICTS= enscript-letter enscript-letterdj PS= A4 diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile index 0ae97fc4cd16..1681ff9ee2d6 100644 --- a/print/enscript-letter/Makefile +++ b/print/enscript-letter/Makefile @@ -22,7 +22,7 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -CONFLICTS?= enscript-a4-[0-9]* enscript-letterdj-[0-9]* +CONFLICTS?= enscript-a4 enscript-letterdj INFO= enscript CPE_VENDOR= gnu diff --git a/print/enscript-letterdj/Makefile b/print/enscript-letterdj/Makefile index 66edf3f94bac..e9bd03d0b28b 100644 --- a/print/enscript-letterdj/Makefile +++ b/print/enscript-letterdj/Makefile @@ -1,6 +1,6 @@ # Created by: kline -CONFLICTS= enscript-a4-[0-9]* enscript-letter-[0-9]* +CONFLICTS= enscript-a4 enscript-letter PS= Letterdj diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile index eb268cf8fa84..c15e4e937e87 100644 --- a/print/foomatic-filters/Makefile +++ b/print/foomatic-filters/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFLICTS= cups-filters-[0-9]* +CONFLICTS= cups-filters OPTIONS_DEFINE= A2PS CUPS_IMAGE DBUS MPAGE OPTIONS_DEFAULT= A2PS CUPS_IMAGE DBUS ENSCRIPT_A4 MPAGE diff --git a/print/kde_poster/Makefile b/print/kde_poster/Makefile index f52d51167538..634daadaa390 100644 --- a/print/kde_poster/Makefile +++ b/print/kde_poster/Makefile @@ -16,7 +16,7 @@ USES= tar:bzip2 ALL_TARGET= poster WRKSRC= ${WRKDIR}/${DISTNAME}-20060221 -CONFLICTS?= poster-[0-9]* +CONFLICTS?= poster PLIST_FILES= bin/poster man/man1/poster.1.gz diff --git a/print/linux-c7-cups-libs/Makefile b/print/linux-c7-cups-libs/Makefile index b4253bd81dc2..9d73ba557b92 100644 --- a/print/linux-c7-cups-libs/Makefile +++ b/print/linux-c7-cups-libs/Makefile @@ -17,7 +17,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/print/makeindex/Makefile b/print/makeindex/Makefile index 26ca03916b02..51812d2da04b 100644 --- a/print/makeindex/Makefile +++ b/print/makeindex/Makefile @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= General purpose, formatter-independent index processor -CONFLICTS= teTeX-base-[0-9]* +CONFLICTS= teTeX-base WRKSRC= ${WRKDIR}/makeindex diff --git a/print/texlive-tlmgr/Makefile b/print/texlive-tlmgr/Makefile index 8bfb5625ef16..04668f5d3df5 100644 --- a/print/texlive-tlmgr/Makefile +++ b/print/texlive-tlmgr/Makefile @@ -16,7 +16,7 @@ COMMENT= TeXLive manager modules RUN_DEPENDS= tex-kpathsea>=6.2.1_1:devel/tex-kpathsea -CONFLICTS= texlive-infra-[0-9]* texlive-base-20150521_[12345] +CONFLICTS= texlive-infra texlive-base-20150521_[12345] USES= cpe perl5 tar:xz CPE_VENDOR= tug diff --git a/science/afni/Makefile b/science/afni/Makefile index 5351e4d3a0b4..8ccabcd8b7fe 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -67,9 +67,9 @@ PRESTAGE= ${WRKSRC}/prestage .include <bsd.port.options.mk> -CONFLICTS= im-[0-9]* \ - nifticlib-[0-9]* \ - open-usp-tukubai-[0-9]* +CONFLICTS= im \ + nifticlib \ + open-usp-tukubai X11R6_FILES= coxplot/Makefile \ coxplot/Makefile.f2c diff --git a/science/minc2/Makefile b/science/minc2/Makefile index d88394ccc8a8..ceefcdba3659 100644 --- a/science/minc2/Makefile +++ b/science/minc2/Makefile @@ -37,7 +37,7 @@ CFLAGS+= -Wno-error=return-type CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFLICTS= minc-1* zh-tk-[0-9]* +CONFLICTS= minc-1* zh-tk pre-patch: @${RM} ${WRKSRC}/ac_config_aux/* diff --git a/science/nifticlib/Makefile b/science/nifticlib/Makefile index 6a233f4e1ed0..bb3b602080fc 100644 --- a/science/nifticlib/Makefile +++ b/science/nifticlib/Makefile @@ -13,7 +13,7 @@ USES= gmake # AFNI currently has nifti embedded in the distfile and installs the # nifti bins by itself. -CONFLICTS= afni-[0-9]* dbh-[0-9]* +CONFLICTS= afni dbh CFLAGS+= -fPIC MAKE_JOBS_UNSAFE= yes diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 91975aedfbaa..7e12050353b9 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= pinentry:security/pinentry USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 -CONFLICTS= gnupg-2.0.* dirmngr-[0-9]* +CONFLICTS= gnupg-2.0.* dirmngr CPE_VENDOR= gnupg CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 --enable-symcryptrun diff --git a/security/gss/Makefile b/security/gss/Makefile index 58d603488a76..de84985eb822 100644 --- a/security/gss/Makefile +++ b/security/gss/Makefile @@ -11,7 +11,7 @@ COMMENT= GNU Generic Security Service Library LIB_DEPENDS= libshishi.so:security/shishi -CONFLICTS= heimdal-[0-9]* +CONFLICTS= heimdal USES= libtool localbase:ldflags pathfix pkgconfig perl5 USE_PERL5= build diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 6524b7f80d6a..892d3f72bc5a 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -12,8 +12,8 @@ COMMENT= Popular BSD-licensed implementation of Kerberos 5 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]* \ - wu-ftpd-[0-9]* wu-ftpd+ipv6-[0-9]* +CONFLICTS= krb4 krb5 krb5-maint srp \ + wu-ftpd wu-ftpd+ipv6 USES= cpe gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \ pkgconfig readline makeinfo ssl diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 4afe5d46c709..3f4163a68284 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -18,7 +18,7 @@ LICENSE= BSD3CLAUSE USES= cpe libtool tar:bzip2 ssl -CONFLICTS= racoon-[0-9]* +CONFLICTS= racoon INSTALL_TARGET= install-strip USE_RC_SUBR= racoon GNU_CONFIGURE= yes diff --git a/security/knock/Makefile b/security/knock/Makefile index 71143e5c8940..bc528e4591fa 100644 --- a/security/knock/Makefile +++ b/security/knock/Makefile @@ -14,7 +14,7 @@ COMMENT= Flexible port-knocking server and client LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= doorman-[0-9]* +CONFLICTS= doorman GNU_CONFIGURE= yes diff --git a/security/krb5-117/Makefile b/security/krb5-117/Makefile index 0af99c186423..cc7c7688b788 100644 --- a/security/krb5-117/Makefile +++ b/security/krb5-117/Makefile @@ -19,7 +19,7 @@ EXPIRATION_DATE= 2022-02-01 LICENSE= MIT -CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[3-6]-[0-9]* \ +CONFLICTS= heimdal srp krb5-11[3-6] \ krb5-1.[0-9]* krb5-devel-* CONFLICTS_BUILD= boringssl-* diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile index 569b6df1c29d..67cb061f4869 100644 --- a/security/krb5-118/Makefile +++ b/security/krb5-118/Makefile @@ -16,7 +16,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT -CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[3-6]-[0-9]* \ +CONFLICTS= heimdal srp krb5-11[3-6] \ krb5-1.[0-9]* krb5-devel-* CONFLICTS_BUILD= boringssl-* diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index 0ee8b5743b8b..5c52729a8744 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -16,7 +16,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT -CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[3-6]-[0-9]* \ +CONFLICTS= heimdal srp krb5-11[3-6] \ krb5-1.[0-9]* krb5-devel-* CONFLICTS_BUILD= boringssl-* diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index 99d15d036506..e02a54851e93 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -15,7 +15,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication clients BUILD_DEPENDS= krb5-config:security/krb5 -CONFLICTS= krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]* \ +CONFLICTS= krb4 krb5-1.[0-7].* heimdal srp \ bsdftpd-ssl-* KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 022554565a47..9fee68ec7c1d 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -20,7 +20,7 @@ LICENSE= MIT USE_GITHUB= yes GH_TAGNAME= ${HASH} -CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[345]-[0-9]* \ +CONFLICTS= heimdal srp krb5-11[345] \ krb5-1.[0-9]* KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/linux-c7-cyrus-sasl2/Makefile b/security/linux-c7-cyrus-sasl2/Makefile index 22cfe22bf6a7..29176789d182 100644 --- a/security/linux-c7-cyrus-sasl2/Makefile +++ b/security/linux-c7-cyrus-sasl2/Makefile @@ -16,7 +16,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}2/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} diff --git a/security/linux-c7-gnutls/Makefile b/security/linux-c7-gnutls/Makefile index 71cda6b55b62..4d7b281b442b 100644 --- a/security/linux-c7-gnutls/Makefile +++ b/security/linux-c7-gnutls/Makefile @@ -14,7 +14,7 @@ USE_LDCONFIG= yes USE_LINUX= libtasn1 nettle p11-kit trousers 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/security/linux-c7-libgcrypt/Makefile b/security/linux-c7-libgcrypt/Makefile index 8906f2347ae8..ac9f8540b7aa 100644 --- a/security/linux-c7-libgcrypt/Makefile +++ b/security/linux-c7-libgcrypt/Makefile @@ -17,7 +17,7 @@ USE_LDCONFIG= yes USE_LINUX= libgpg-error 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/security/linux-c7-libgpg-error/Makefile b/security/linux-c7-libgpg-error/Makefile index 8e0d5446b3c9..f8026da9724e 100644 --- a/security/linux-c7-libgpg-error/Makefile +++ b/security/linux-c7-libgpg-error/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/security/linux-c7-libssh2/Makefile b/security/linux-c7-libssh2/Makefile index 74765d078b8a..214beb186b87 100644 --- a/security/linux-c7-libssh2/Makefile +++ b/security/linux-c7-libssh2/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}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/security/linux-c7-libtasn1/Makefile b/security/linux-c7-libtasn1/Makefile index 8ae9d3c14f2c..984c0c2847ca 100644 --- a/security/linux-c7-libtasn1/Makefile +++ b/security/linux-c7-libtasn1/Makefile @@ -16,7 +16,7 @@ USE_LINUX_RPM= yes CPE_VENDOR= gnu -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/security/linux-c7-nss/Makefile b/security/linux-c7-nss/Makefile index f58f958e5991..7f3b1f09aea4 100644 --- a/security/linux-c7-nss/Makefile +++ b/security/linux-c7-nss/Makefile @@ -23,7 +23,7 @@ SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE \ ${PORTNAME}-softokn-${PORTVERSION}-6.el7_9${SRC_SUFX}:SOURCE \ ${PORTNAME}-util-${PORTVERSION}-1.el7_9${SRC_SUFX}:SOURCE -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr .include <bsd.port.mk> diff --git a/security/p5-Crypt-T_e_a/Makefile b/security/p5-Crypt-T_e_a/Makefile index 43976d53e3c5..feae3a7ab084 100644 --- a/security/p5-Crypt-T_e_a/Makefile +++ b/security/p5-Crypt-T_e_a/Makefile @@ -12,7 +12,7 @@ DISTNAME= Crypt-Tea-${PORTVERSION} MAINTAINER= swills@FreeBSD.org COMMENT= The Tiny Encryption Algorithm in Perl and JavaScript -CONFLICTS= p5-Crypt-Tea_JS-[0-9]* +CONFLICTS= p5-Crypt-Tea_JS USES= perl5 USE_PERL5= configure diff --git a/security/p5-Crypt-Tea_JS/Makefile b/security/p5-Crypt-Tea_JS/Makefile index f8372b70a7e8..e7ff1afab7f8 100644 --- a/security/p5-Crypt-Tea_JS/Makefile +++ b/security/p5-Crypt-Tea_JS/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Next gen Tiny Encryption Algorithm in Perl and Javascript -CONFLICTS= p5-Crypt-T_e_a-[0-9]* +CONFLICTS= p5-Crypt-T_e_a USES= perl5 shebangfix SHEBANG_FILES= examples/tea_demo.cgi diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile index 9d03f4279b91..f384fee08b4e 100644 --- a/security/p5-openxpki/Makefile +++ b/security/p5-openxpki/Makefile @@ -93,9 +93,9 @@ _conf_VERSION= 3.12 USE_PERL5= configure USE_RC_SUBR= openxpki -CONFLICTS= p5-openxpki-client-[0-9]* p5-openxpki-client-deployment-[0-9]* \ - p5-openxpki-client-html-mason-[0-9]* \ - p5-openxpki-client-scep-[0-9]* +CONFLICTS= p5-openxpki-client p5-openxpki-client-deployment \ + p5-openxpki-client-html-mason \ + p5-openxpki-client-scep NO_ARCH= yes # stay with stable versions only: diff --git a/security/secure_delete/Makefile b/security/secure_delete/Makefile index 04607433b3e3..9f5fbeba30de 100644 --- a/security/secure_delete/Makefile +++ b/security/secure_delete/Makefile @@ -12,7 +12,7 @@ COMMENT= Secure data deletion toolkit LICENSE= GPLv2 # mentioned in manpages -CONFLICTS= srm-[0-9]* +CONFLICTS= srm MAKE_JOBS_UNSAFE= yes diff --git a/security/srm/Makefile b/security/srm/Makefile index 9248a2fb17b7..903024c786d0 100644 --- a/security/srm/Makefile +++ b/security/srm/Makefile @@ -13,7 +13,7 @@ COMMENT= Secure rm, a utility which destroys file contents before unlinking LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= secure_delete-[0-9]* +CONFLICTS= secure_delete GNU_CONFIGURE= yes TEST_TARGET= test diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile index f957eb23262e..3d0d6e75e3f7 100644 --- a/security/tthsum/Makefile +++ b/security/tthsum/Makefile @@ -13,7 +13,7 @@ COMMENT= Command-line utility for generating and checking TTH message digests LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -CONFLICTS= microdc2-[0-9]* +CONFLICTS= microdc2 USES= gmake diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 19c1275f55ab..b6d715274b3b 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -58,9 +58,9 @@ CONFIGURE_ARGS+= --without-bash-malloc \ MAKE_ARGS+= TERMCAP_LIB=-ltinfow .if empty(PKGNAMESUFFIX) -CONFLICTS+= bash-static-[0-9]* +CONFLICTS+= bash-static .else -CONFLICTS+= bash-[0-9]* +CONFLICTS+= bash .endif CONFLICTS+= bashc diff --git a/shells/bashc/Makefile b/shells/bashc/Makefile index 61bed23d78c9..8074cac5f10f 100644 --- a/shells/bashc/Makefile +++ b/shells/bashc/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --disable-rpath \ --with-libiconv-prefix=${ICONV_PREFIX} \ --without-bash-malloc -CONFLICTS+= bash-[0-9]* bash-static-[0-9]* +CONFLICTS+= bash bash-static .include <bsd.port.options.mk> diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile index ac45815ffaa2..a72792aa77e1 100644 --- a/sysutils/boxbackup-devel/Makefile +++ b/sysutils/boxbackup-devel/Makefile @@ -75,13 +75,13 @@ PLIST_SUB+= SERVER="@comment " .endif .if ! ${PORT_OPTIONS:MCLIENT} -CONFLICTS= boxbackup-client-[0-9]* boxbackup-[0-9]* +CONFLICTS= boxbackup-client boxbackup CLIENT_OR_SERVER=-server .elif ! ${PORT_OPTIONS:MSERVER} -CONFLICTS= boxbackup-server-[0-9]* boxbackup-[0-9]* +CONFLICTS= boxbackup-server boxbackup CLIENT_OR_SERVER=-client .else -CONFLICTS= boxbackup-server-[0-9]* boxbackup-client-[0-9]* +CONFLICTS= boxbackup-server boxbackup-client .endif post-patch: diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index 0b286ff2a681..c424c46c2b48 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -21,7 +21,7 @@ SHEBANG_FILES= 3rd-party/dirsplit/dirsplit # Fix build with clang11 CFLAGS+= -fcommon -CONFLICTS?= cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]* +CONFLICTS?= cdrtools cjk-cdrtools cdrtools-devel PLIST_SUB?= CDRKIT="" GENISOIMAGE="@comment " diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile index 0fa433e97f31..1dda038da626 100644 --- a/sysutils/conky-awesome/Makefile +++ b/sysutils/conky-awesome/Makefile @@ -8,7 +8,7 @@ COMMENT= Advanced, highly configurable system monitor (configured for x11-wm/awe MASTERDIR= ${.CURDIR}/../conky DESCR= ${.CURDIR}/pkg-descr -CONFLICTS= conky-[0-9]* +CONFLICTS= conky OPTIONS_EXCLUDE= X11 ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 \ LUA_RSVG diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index fb1132843560..42f3e8178d55 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -24,7 +24,7 @@ CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_AUDACIOUS:BOOL=false \ -DBUILD_DOCS:BOOL=true \ -DAPP_SED=${LOCALBASE}/bin/gsed -CONFLICTS?= conky-awesome-[0-9]* +CONFLICTS?= conky-awesome SLAVEDIRS= sysutils/conky-awesome PLIST_FILES= bin/conky man/man1/conky.1.gz diff --git a/sysutils/cronolog-devel/Makefile b/sysutils/cronolog-devel/Makefile index 4f27d3c45240..40b1c701dc0d 100644 --- a/sysutils/cronolog-devel/Makefile +++ b/sysutils/cronolog-devel/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= sbin/cronolog \ man/man1/cronolog.1m.gz \ man/man1/cronosplit.1m.gz -CONFLICTS= cronolog-[0-9]* +CONFLICTS= cronolog WRKSRC= ${WRKDIR}/cronolog-${PORTVERSION} INFO= cronolog diff --git a/sysutils/daemontools-encore/Makefile b/sysutils/daemontools-encore/Makefile index e500a69cd5bf..423f4b869feb 100644 --- a/sysutils/daemontools-encore/Makefile +++ b/sysutils/daemontools-encore/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT USES= gmake -CONFLICTS= daemontools-[0-9]* freedt-[0-9]* serialmail-[0-9]* +CONFLICTS= daemontools freedt serialmail ALL_TARGET= default diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index ab102d0c4dda..8035b5aee264 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -14,7 +14,7 @@ COMMENT= Service monitoring and logging utilities by djb LICENSE= PD -CONFLICTS= freedt-[0-9]* serialmail-[0-9]* +CONFLICTS= freedt serialmail OPTIONS_DEFINE= MAN SIGQ12 TESTS OPTIONS_SUB= yes diff --git a/sysutils/freedt/Makefile b/sysutils/freedt/Makefile index 07cea7a04d09..f875fdff02e4 100644 --- a/sysutils/freedt/Makefile +++ b/sysutils/freedt/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://offog.org/files/ \ MAINTAINER= tdb@FreeBSD.org COMMENT= Experimental reimplementation of Dan Bernstein's daemontools -CONFLICTS= daemontools-[0-9]* +CONFLICTS= daemontools GNU_CONFIGURE= yes diff --git a/sysutils/hfsutils/Makefile b/sysutils/hfsutils/Makefile index a4918b540c7d..8d9fe6ba3c88 100644 --- a/sysutils/hfsutils/Makefile +++ b/sysutils/hfsutils/Makefile @@ -12,7 +12,7 @@ COMMENT= Utilities for accessing Apple's HFS volumes LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= hfs-[0-9]* +CONFLICTS= hfs USES= gmake # passing -jX breaks BSD make(1) GNU_CONFIGURE= yes diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile index 5ff2e2250e10..c5d4c7a8bf3a 100644 --- a/sysutils/iocage-devel/Makefile +++ b/sysutils/iocage-devel/Makefile @@ -32,7 +32,7 @@ GH_TAGNAME= e94863d4c54f02523fb09e62e48be7db9ac92eda USE_PYTHON= autoplist distutils -CONFLICTS= py[0-9]*-iocage-[0-9]* +CONFLICTS= py[0-9]*-iocage NO_ARCH= yes _IOCAGE_LIB_VERSION= 1.2 diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index 0a3d672e5601..bb37e6976c6f 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -37,7 +37,7 @@ USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils -CONFLICTS= py*-iocage-[0-9]* +CONFLICTS= py*-iocage NO_ARCH= yes PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \ diff --git a/sysutils/lbl-hf/Makefile b/sysutils/lbl-hf/Makefile index d5ac7a18c093..8404faf801bd 100644 --- a/sysutils/lbl-hf/Makefile +++ b/sysutils/lbl-hf/Makefile @@ -12,7 +12,7 @@ COMMENT= Address to hostname filter LICENSE= BSD3CLAUSE -CONFLICTS= hf-[0-9]* +CONFLICTS= hf PLIST_FILES= bin/hf \ man/man1/hf.1.gz diff --git a/sysutils/logstash6/Makefile b/sysutils/logstash6/Makefile index 3423c25801a8..f126930d8250 100644 --- a/sysutils/logstash6/Makefile +++ b/sysutils/logstash6/Makefile @@ -19,7 +19,7 @@ JAVA_VERSION= 1.8+ JAVA_RUN= yes USE_RC_SUBR= logstash SHEBANG_FILES= bin/* -CONFLICTS= logstash-[0-9]* logstash5* logstash7* +CONFLICTS= logstash logstash5* logstash7* NO_BUILD= yes SUB_LIST= JAVA_HOME=${JAVA_HOME} \ diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile index 817c3865a593..d6ab1a37d628 100644 --- a/sysutils/logstash7/Makefile +++ b/sysutils/logstash7/Makefile @@ -24,7 +24,7 @@ USE_RC_SUBR= logstash SHEBANG_FILES= bin/* -CONFLICTS= logstash5-[0-9]* logstash6-[0-9]* +CONFLICTS= logstash5 logstash6 NO_BUILD= yes SUB_LIST= JAVA_HOME=${JAVA_HOME} \ diff --git a/sysutils/mcweject/Makefile b/sysutils/mcweject/Makefile index 38151e488666..191f61efc2d0 100644 --- a/sysutils/mcweject/Makefile +++ b/sysutils/mcweject/Makefile @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE SUB_FILES= pkg-message -CONFLICTS= eject-[0-9]* +CONFLICTS= eject USES= tar:xz diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile index 2405072f2f75..7ee3a35c0bdd 100644 --- a/sysutils/passwordsafe/Makefile +++ b/sysutils/passwordsafe/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libqrencode.so:graphics/libqrencode BUILD_DEPENDS= zip:archivers/zip -CONFLICTS= pwsafe-[0-9]* +CONFLICTS= pwsafe USES= gmake pkgconfig xorg USE_GITHUB= yes diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile index 90d2a3e65093..dbbeb2a7620e 100644 --- a/sysutils/psmisc/Makefile +++ b/sysutils/psmisc/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= gsed:textproc/gsed -CONFLICTS= pidof-[0-9]* pstree-2.[0-9]* +CONFLICTS= pidof pstree-2.[0-9]* GNU_CONFIGURE= yes USES= gmake ncurses diff --git a/sysutils/pstack/Makefile b/sysutils/pstack/Makefile index c5b22039c0a4..e4963410106f 100644 --- a/sysutils/pstack/Makefile +++ b/sysutils/pstack/Makefile @@ -14,7 +14,7 @@ GH_ACCOUNT= z0nt GH_TAGNAME= 874a052 USES= uidfix ONLY_FOR_ARCHS= amd64 i386 -CONFLICTS= pstacku-[0-9]* +CONFLICTS= pstacku MAKE_ARGS+= BINDIR=${PREFIX}/bin MAKE_ARGS+= MANDIR=${PREFIX}/man/man MAKE_ARGS+= LIBDIR=${PREFIX}/lib diff --git a/sysutils/pstacku/Makefile b/sysutils/pstacku/Makefile index 8b2d4be66216..c678e0ff45b4 100644 --- a/sysutils/pstacku/Makefile +++ b/sysutils/pstacku/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libunwind=${LOCALBASE} LLD_UNSAFE= yes ONLY_FOR_ARCHS= amd64 i386 -CONFLICTS= pstack-[0-9]* +CONFLICTS= pstack PLIST_FILES= bin/pstack man/man1/pstack.1.gz diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile index 6ed0692fc79e..37a63eccfaea 100644 --- a/sysutils/pstree/Makefile +++ b/sysutils/pstree/Makefile @@ -12,7 +12,7 @@ USES= alias NO_WRKSUBDIR= yes -CONFLICTS= psmisc-[0-9]* +CONFLICTS= psmisc PLIST_FILES= bin/pstree man/man1/pstree.1.gz diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile index 6dcab972001a..8060c0b78895 100644 --- a/sysutils/pv/Makefile +++ b/sysutils/pv/Makefile @@ -12,7 +12,7 @@ LICENSE= ART20 USES= tar:bzip2 gmake -CONFLICTS= waon-[0-9]* +CONFLICTS= waon GNU_CONFIGURE= yes MAKE_ENV+= LD=${LD} diff --git a/sysutils/py-rdiff-backup/Makefile b/sysutils/py-rdiff-backup/Makefile index 1da3d8bccb69..07ee563c2f09 100644 --- a/sysutils/py-rdiff-backup/Makefile +++ b/sysutils/py-rdiff-backup/Makefile @@ -20,7 +20,7 @@ USES= localbase:ldflags python:3.5+ USE_LDCONFIG= yes USE_PYTHON= autoplist concurrent distutils -CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup-1.0* +CONFLICTS= rdiff-backup-devel rdiff-backup-1.0* PORTSCOUT= limitw:1,even diff --git a/sysutils/samefile/Makefile b/sysutils/samefile/Makefile index 6ce0e50beba3..d7c48e7800e5 100644 --- a/sysutils/samefile/Makefile +++ b/sysutils/samefile/Makefile @@ -7,7 +7,7 @@ MASTER_SITES= http://www.schweikhardt.net/ MAINTAINER= schweikh@FreeBSD.org COMMENT= Find files with identical contents -CONFLICTS= samesame-[0-9]* +CONFLICTS= samesame GNU_CONFIGURE= yes diff --git a/sysutils/samesame/Makefile b/sysutils/samesame/Makefile index 7490a18f670f..e2d2d2f16869 100644 --- a/sysutils/samesame/Makefile +++ b/sysutils/samesame/Makefile @@ -12,7 +12,7 @@ COMMENT= Find duplicate files and optionally link them together LICENSE= BSD2CLAUSE -CONFLICTS= samefile-[0-9]* +CONFLICTS= samefile HAS_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile index 66638629e898..d7352e40e1ba 100644 --- a/sysutils/sleuthkit/Makefile +++ b/sysutils/sleuthkit/Makefile @@ -20,7 +20,7 @@ LICENSE_PERMS_IBM=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \ exif:graphics/exif -CONFLICTS= ja-ls-[0-9]* icat-[0-9]* +CONFLICTS= ja-ls icat GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_libpq_fe_h=no diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 225388d103fd..5b7775cd0727 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -22,9 +22,9 @@ USES= autoreconf:build compiler:c11 cpe gettext-runtime gmake gnome \ CPE_VENDOR= oneidentity -CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ - syslog-ng[0-9][0-9]-[0-9]* \ - syslog-ng-devel-[0-9]* eventlog* +CONFLICTS?= syslog-ng syslog-ng[0-9] \ + syslog-ng[0-9][0-9] \ + syslog-ng-devel eventlog* WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile index db46eba307b4..60783292696d 100644 --- a/sysutils/userneu/Makefile +++ b/sysutils/userneu/Makefile @@ -23,7 +23,7 @@ NO_BUILD= yes NO_ARCH= yes SHEBANG_FILES= userquick.pl smbrepair.pl userneu.pl -CONFLICTS= userneu-devel-[0-9]* +CONFLICTS= userneu-devel SCRIPTS= userneu.pl userquick.pl smbrepair.pl DOCS= BUGS CHANGES CREDITS REQUIREMENTS TODO \ diff --git a/sysutils/vcp/Makefile b/sysutils/vcp/Makefile index f297bcfcfc8a..9b2fbf446d26 100644 --- a/sysutils/vcp/Makefile +++ b/sysutils/vcp/Makefile @@ -11,8 +11,8 @@ COMMENT= Copy files in curses interface BROKEN_FreeBSD_13= ld: error: duplicate symbol: logw BROKEN_FreeBSD_14= ld: error: duplicate symbol: logw -CONFLICTS= p5-VCP-[0-9]* \ - p5-VCP-autrijus-[0-9]* +CONFLICTS= p5-VCP \ + p5-VCP-autrijus USES= ncurses LDFLAGS+= -lncurses diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile index 236df2d92a5f..8fb2d6a25dec 100644 --- a/sysutils/xen-guest-tools/Makefile +++ b/sysutils/xen-guest-tools/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64 or i386 -CONFLICTS= xen-tools-[0-9]* +CONFLICTS= xen-tools BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \ diff --git a/textproc/elasticsearch6/Makefile b/textproc/elasticsearch6/Makefile index 010547e66cc0..cd63fbf22e25 100644 --- a/textproc/elasticsearch6/Makefile +++ b/textproc/elasticsearch6/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= bash>0:shells/bash \ USES= cpe shebangfix -CONFLICTS= elasticsearch-[0-9]* elasticsearch2* elasticsearch5* elasticsearch7* +CONFLICTS= elasticsearch elasticsearch2* elasticsearch5* elasticsearch7* NO_ARCH= yes USE_JAVA= yes diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile index cdf79626f8a1..fac935b9be88 100644 --- a/textproc/elasticsearch7/Makefile +++ b/textproc/elasticsearch7/Makefile @@ -32,7 +32,7 @@ SHEBANG_FILES= bin/elasticsearch bin/elasticsearch-certgen \ bin/elasticsearch-users bin/x-pack-env bin/x-pack-security-env \ bin/x-pack-watcher-env -CONFLICTS= elasticsearch[56]-[0-9]* +CONFLICTS= elasticsearch[56] NO_ARCH= yes NO_BUILD= yes diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile index 5077afc5f7a8..3259c9e1b849 100644 --- a/textproc/gnugrep/Makefile +++ b/textproc/gnugrep/Makefile @@ -11,7 +11,7 @@ COMMENT= GNU version of popular pattern matching utility LICENSE= GPLv3+ -CONFLICTS= bsd-grep-[0-9]* +CONFLICTS= bsd-grep USES= charsetfix cpe tar:xz GNU_CONFIGURE= yes diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index 4755a8da54ce..2589fcf4a373 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -40,7 +40,7 @@ PAPERSIZE=A4 CONFIGURE_ENV+= PAGE=${PAPERSIZE} .endif -CONFLICTS= ja-groff-[0-9]* +CONFLICTS= ja-groff INFO= groff diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index e64bcffdd003..951a7df2b340 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes PORTDOCS= CHANGES CREDITS KNOWN_BUGS README TODO PLIST_FILES= bin/html2text man/man1/html2text.1.gz man/man5/html2textrc.5.gz -CONFLICTS= py*-html2text-[0-9]* +CONFLICTS= py*-html2text PORTSCOUT= skipb:0 skipv:1.3.2 diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile index f1a54bd6a03d..22054c02e591 100644 --- a/textproc/latex2html/Makefile +++ b/textproc/latex2html/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/anytopnm:graphics/netpbm RUN_DEPENDS:= ${BUILD_DEPENDS} -CONFLICTS= ja-latex2html-[0-9]* +CONFLICTS= ja-latex2html USES= ghostscript perl5 USE_TEX= latex dvipsk texhash diff --git a/textproc/linux-c7-aspell/Makefile b/textproc/linux-c7-aspell/Makefile index 53b26bd95e19..1ac8cec79c92 100644 --- a/textproc/linux-c7-aspell/Makefile +++ b/textproc/linux-c7-aspell/Makefile @@ -17,7 +17,7 @@ USE_LINUX_RPM= yes CPE_VENDOR= gnu -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS NLS diff --git a/textproc/linux-c7-expat/Makefile b/textproc/linux-c7-expat/Makefile index 09367105a64e..1faae737ad53 100644 --- a/textproc/linux-c7-expat/Makefile +++ b/textproc/linux-c7-expat/Makefile @@ -17,7 +17,7 @@ CPE_PRODUCT= lib${PORTNAME} USE_LDCONFIG= yes USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/textproc/linux-c7-libxml2/Makefile b/textproc/linux-c7-libxml2/Makefile index 65b272e74064..275b144d1e24 100644 --- a/textproc/linux-c7-libxml2/Makefile +++ b/textproc/linux-c7-libxml2/Makefile @@ -16,7 +16,7 @@ CPE_VENDOR= xmlsoft 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/textproc/p5-Text-Format+NWrap/Makefile b/textproc/p5-Text-Format+NWrap/Makefile index f4563a36af74..3904138b5480 100644 --- a/textproc/p5-Text-Format+NWrap/Makefile +++ b/textproc/p5-Text-Format+NWrap/Makefile @@ -11,7 +11,7 @@ DISTNAME= Text-Format0.52+NWrap0.11 MAINTAINER= vivek@khera.org COMMENT= Various subroutines to format and wrap text -CONFLICTS= p5-Text-Format-[0-9]* +CONFLICTS= p5-Text-Format USES= perl5 USE_PERL5= configure diff --git a/textproc/par/Makefile b/textproc/par/Makefile index c23f54ffff56..81158ad6c1e7 100644 --- a/textproc/par/Makefile +++ b/textproc/par/Makefile @@ -10,7 +10,7 @@ DISTNAME= Par-${PORTVERSION} MAINTAINER= markm@FreeBSD.org COMMENT= Paragraph reformatter for email -CONFLICTS= quake-par-[0-9]* +CONFLICTS= quake-par ALL_TARGET= # PLIST_FILES= bin/par \ diff --git a/textproc/py-elasticsearch5/Makefile b/textproc/py-elasticsearch5/Makefile index 8874e4176a79..306e15c47c5c 100644 --- a/textproc/py-elasticsearch5/Makefile +++ b/textproc/py-elasticsearch5/Makefile @@ -47,7 +47,7 @@ GH_TAGNAME= 719a94ab4 # use these version-specific package names/sources, at # which point CONFLICTS can be removed. -CONFLICTS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-[0-9]* +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}elasticsearch NO_ARCH= yes diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile index 4bad1cc5f5db..6bc4f8cfbacb 100644 --- a/textproc/sphinxsearch/Makefile +++ b/textproc/sphinxsearch/Makefile @@ -92,8 +92,8 @@ SYSLOG_CONFIGURE_WITH= syslog UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -CONFLICTS= sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \ - swish++-[0-9]* xaira-[0-9]* +CONFLICTS= sphinxsearch-devel dpsearch rdb \ + swish++ xaira USERS?= _sphinx GROUPS?= _sphinx diff --git a/textproc/utf8proc/Makefile b/textproc/utf8proc/Makefile index ce7bdb32f9b6..6d6c17e8ec9b 100644 --- a/textproc/utf8proc/Makefile +++ b/textproc/utf8proc/Makefile @@ -20,7 +20,7 @@ USE_LDCONFIG= yes MAKE_ARGS= prefix=${PREFIX} -CONFLICTS= libutf8proc-[0-9]* +CONFLICTS= libutf8proc PLIST_FILES= include/utf8proc.h \ lib/libutf8proc.a \ diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile index 541d4bf80668..3e4fb7197409 100644 --- a/textproc/zorba/Makefile +++ b/textproc/zorba/Makefile @@ -33,7 +33,7 @@ RUBY_CMAKE_BOOL= WITH_RUBY JAVA_CMAKE_BOOL= WITH_JAVA # Both install include/xqc.h -CONFLICTS= xqilla-[0-9]* +CONFLICTS= xqilla CONFLICTS_BUILD= bison USES= cmake compiler:c++11-lib gnome libedit diff --git a/www/awffull/Makefile b/www/awffull/Makefile index aed5704ad262..fa02db1ddbde 100644 --- a/www/awffull/Makefile +++ b/www/awffull/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libgd.so:graphics/gd \ libpcre.so:devel/pcre RUN_DEPENDS:= ${BUILD_DEPENDS} -CONFLICTS?= ja-awffull-[0-9]* +CONFLICTS?= ja-awffull FONTDEFAULT?= ${LOCALBASE}/share/fonts/bitstream-vera/VeraBd.ttf FONTLABEL?= ${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf diff --git a/www/erlang-mochiweb-basho/Makefile b/www/erlang-mochiweb-basho/Makefile index 87410d11a772..63d48156c237 100644 --- a/www/erlang-mochiweb-basho/Makefile +++ b/www/erlang-mochiweb-basho/Makefile @@ -9,7 +9,7 @@ COMMENT= Erlang library for building lightweight HTTP servers (Basho fork) LICENSE= MIT -CONFLICTS= mochiweb-[0-9]* +CONFLICTS= mochiweb USES= erlang:rebar USE_GITHUB= yes diff --git a/www/erlang-mochiweb/Makefile b/www/erlang-mochiweb/Makefile index f28917e310c3..98d2954c0e9c 100644 --- a/www/erlang-mochiweb/Makefile +++ b/www/erlang-mochiweb/Makefile @@ -9,7 +9,7 @@ COMMENT= Erlang library for building lightweight HTTP servers LICENSE= MIT -CONFLICTS= mochiweb-basho-[0-9]* +CONFLICTS= mochiweb-basho USES= cpe erlang:rebar CPE_VENDOR= mochiweb_project diff --git a/www/free-sa-devel/Makefile b/www/free-sa-devel/Makefile index 9907b09fe88e..8ae3fb5817ba 100644 --- a/www/free-sa-devel/Makefile +++ b/www/free-sa-devel/Makefile @@ -12,7 +12,7 @@ COMMENT= Statistic analyzer for daemons log files similar to SARG LICENSE= GPLv3 -CONFLICTS= free-sa-[0-9]* +CONFLICTS= free-sa WWWDIR?= ${PREFIX}/www/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} diff --git a/www/gist/Makefile b/www/gist/Makefile index 6a3f388bb721..3e501f609937 100644 --- a/www/gist/Makefile +++ b/www/gist/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.MIT RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -CONFLICTS= p5-App-gist-[0-9]* +CONFLICTS= p5-App-gist USE_GITHUB= yes GH_ACCOUNT= defunkt diff --git a/www/ilias/Makefile b/www/ilias/Makefile index c97acf5ec632..b8b575f8f776 100644 --- a/www/ilias/Makefile +++ b/www/ilias/Makefile @@ -10,7 +10,7 @@ COMMENT= Powerful, dynamic, PHP and MySQL based e-learning platform LICENSE= GPLv2 -CONFLICTS= ilias6-[0-9]* +CONFLICTS= ilias6 PORTSCOUT= limit:^5\. RUN_DEPENDS= convert:graphics/ImageMagick6 \ diff --git a/www/links/Makefile b/www/links/Makefile index ae071b9cc526..703097508fd3 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -13,7 +13,7 @@ COMMENT= Lynx-like text WWW browser LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= links-0* links-hacked-[0-9]* links1-[0-9]* +CONFLICTS= links-0* links-hacked links1 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ssl --without-pmshell --without-atheos \ diff --git a/www/linux-c7-qtwebkit/Makefile b/www/linux-c7-qtwebkit/Makefile index 8f6756a89cc1..8bc997c79538 100644 --- a/www/linux-c7-qtwebkit/Makefile +++ b/www/linux-c7-qtwebkit/Makefile @@ -18,6 +18,6 @@ USE_LDCONFIG= yes USE_LINUX= fontconfig png xorglibs sqlite3 qt qt-x11 USE_LINUX_RPM= yes -CONFLICTS= linux-c6-qt47-webkit-[0-9]* +CONFLICTS= linux-c6-qt47-webkit .include <bsd.port.mk> diff --git a/www/mediawiki131/Makefile b/www/mediawiki131/Makefile index bfc406850a16..60754926a43f 100644 --- a/www/mediawiki131/Makefile +++ b/www/mediawiki131/Makefile @@ -11,7 +11,7 @@ COMMENT= Wiki engine used by Wikipedia LICENSE= GPLv2 -CONFLICTS= mediawiki13[5-6]-[0-9]* +CONFLICTS= mediawiki13[5-6] DEPRECATED= Upstream EOL EXPIRATION_DATE=2021-12-31 diff --git a/www/mediawiki135/Makefile b/www/mediawiki135/Makefile index 8cdfdd3b3015..1d97648825c2 100644 --- a/www/mediawiki135/Makefile +++ b/www/mediawiki135/Makefile @@ -11,7 +11,7 @@ COMMENT= Wiki engine used by Wikipedia LICENSE= GPLv2 -CONFLICTS= mediawiki131-[0-9]* mediawiki136-[0-9]* +CONFLICTS= mediawiki131 mediawiki136 USES= cpe php:flavors shebangfix SHEBANG_FILES= maintenance/dev/*.sh \ diff --git a/www/mediawiki136/Makefile b/www/mediawiki136/Makefile index 5cc1dd88c010..d29004a411b0 100644 --- a/www/mediawiki136/Makefile +++ b/www/mediawiki136/Makefile @@ -11,7 +11,7 @@ COMMENT= Wiki engine used by Wikipedia LICENSE= GPLv2 -CONFLICTS= mediawiki13[1-5]-[0-9]* +CONFLICTS= mediawiki13[1-5] USES= cpe php:flavors shebangfix SHEBANG_FILES= maintenance/dev/*.sh \ diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index ccdaf978fd7c..e891e4d46d65 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -11,7 +11,7 @@ COMMENT= Full featured SQL-based hypertext search engine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= dpsearch-[0-9]* udmsearch-[0-9]* mguesser-[0-9]* +CONFLICTS= dpsearch udmsearch mguesser OPTIONS_DEFINE= DOCS EXAMPLES THREADS SSL ASIAN SYSLOG diff --git a/www/p5-App-gist/Makefile b/www/p5-App-gist/Makefile index 8e1dc2656474..e17b8e4fe223 100644 --- a/www/p5-App-gist/Makefile +++ b/www/p5-App-gist/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= p5-App-Cmd>=0:devel/p5-App-Cmd \ p5-Pithub>=0:devel/p5-Pithub \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey -CONFLICTS= gist-[0-9]* +CONFLICTS= gist USES= perl5 USE_PERL5= configure diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile index 2f9758d9a05d..b6c58db40919 100644 --- a/www/phpbb/Makefile +++ b/www/phpbb/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR} -CONFLICTS= phpbb-tw-[0-9]* +CONFLICTS= phpbb-tw USES= cpe tar:bzip2 php diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index ae5c43cbc020..9f618375fd0b 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -28,7 +28,7 @@ LDFLAGS+= -L${LOCALBASE}/lib # privoxy-devel is the development release available at the Privoxy website. # It's not (yet) part of the FreeBSD ports collection. -CONFLICTS= privoxy-devel-[0-9]* +CONFLICTS= privoxy-devel SUB_FILES= pkg-message diff --git a/www/pserv/Makefile b/www/pserv/Makefile index ca62a570b8cb..a51363190e06 100644 --- a/www/pserv/Makefile +++ b/www/pserv/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -CONFLICTS= popular-[0-9]* +CONFLICTS= popular OPTIONS_DEFINE= LOG PHP OPTIONS_DEFAULT= LOG PHP diff --git a/www/sogo-activesync/Makefile b/www/sogo-activesync/Makefile index c8c3ef26a633..8552b71ddd2a 100644 --- a/www/sogo-activesync/Makefile +++ b/www/sogo-activesync/Makefile @@ -1,6 +1,6 @@ PKGNAMESUFFIX= -activesync -CONFLICTS= sogo[2-4]-[0-9]* sogo[2-4]-activesync-[0-9]* +CONFLICTS= sogo[2-4] sogo[2-4]-activesync OPTIONS_SLAVE= ACTIVESYNC MFA diff --git a/www/sogo/Makefile b/www/sogo/Makefile index 93e82c61d1a4..48a05e982d54 100644 --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -47,7 +47,7 @@ USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}/sogo SHEBANG_LANG= python SHEBANG_FILES= ${WRKSRC}/SoObjects/SOGo/gen-saml2-exceptions.py -CONFLICTS?= sogo[2-4]-activesync-[0-9]* sogo[2-4]-[0-9]* +CONFLICTS?= sogo[2-4]-activesync sogo[2-4] USE_RC_SUBR= sogod diff --git a/www/sogo2-activesync/Makefile b/www/sogo2-activesync/Makefile index f521d46deda5..101094553702 100644 --- a/www/sogo2-activesync/Makefile +++ b/www/sogo2-activesync/Makefile @@ -1,6 +1,6 @@ PKGNAMESUFFIX= -activesync -CONFLICTS= sogo[2-4]-[0-9]* sogo[3-4]-activesync-[0-9]* +CONFLICTS= sogo[2-4] sogo[3-4]-activesync OPTIONS_SLAVE= ACTIVESYNC diff --git a/www/sogo2/Makefile b/www/sogo2/Makefile index 474ba8aa1453..96b47197d67d 100644 --- a/www/sogo2/Makefile +++ b/www/sogo2/Makefile @@ -32,7 +32,7 @@ USES= gnustep ssl objc USE_GNUSTEP= base build USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}/sogo -CONFLICTS?= sogo[2-4]-activesync-[0-9]* sogo[3-4]-[0-9]* +CONFLICTS?= sogo[2-4]-activesync sogo[3-4] USE_RC_SUBR= sogod diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile index c1befe5a9179..458c1d3bfae2 100644 --- a/www/tidy-devel/Makefile +++ b/www/tidy-devel/Makefile @@ -26,7 +26,7 @@ MAKE_JOBS_UNSAFE= yes USES+= gmake PLIST_SUB= SHLIB="@comment " NSHLIB="" MAKE_ARGS+= PREFIX=${STAGEDIR}${PREFIX} -CONFLICTS= tidy-20000804* tidy-lib-[0-9]* +CONFLICTS= tidy-20000804* tidy-lib .else USES+= autoreconf libtool USE_LDCONFIG= yes diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile index 1c0fbf3621cb..f8a98c980b99 100644 --- a/x11-clocks/asclock/Makefile +++ b/x11-clocks/asclock/Makefile @@ -12,7 +12,7 @@ COMMENT= Afterstep clock with some language extensions LICENSE= BSD2CLAUSE -CONFLICTS= asclock-gtk-[0-9]* asclock-xlib-[0-9]* +CONFLICTS= asclock-gtk asclock-xlib USES= tar:tgz imake xorg USE_XORG= xpm xext x11 diff --git a/x11-fonts/linux-c7-fontconfig/Makefile b/x11-fonts/linux-c7-fontconfig/Makefile index 1df1aaf4e6fc..3291872f1a12 100644 --- a/x11-fonts/linux-c7-fontconfig/Makefile +++ b/x11-fonts/linux-c7-fontconfig/Makefile @@ -15,7 +15,7 @@ USE_LINUX_RPM= yes CPE_VENDOR= fontconfig_project -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS NLS diff --git a/x11-fonts/mkbold-mkitalic/Makefile b/x11-fonts/mkbold-mkitalic/Makefile index 82967a6302cc..76a1fa25049d 100644 --- a/x11-fonts/mkbold-mkitalic/Makefile +++ b/x11-fonts/mkbold-mkitalic/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://hp.vector.co.jp/authors/VA013651/lib/ MAINTAINER= koma2@lovepeers.org COMMENT= Programs to make BDF font bold/italic -CONFLICTS= mkbold-[0-9]* mkitalic-[0-9]* +CONFLICTS= mkbold mkitalic PLIST_FILES= bin/mkbold bin/mkitalic bin/mkbolditalic PORTDOCS= ALGORITHM ALGORITHM.eucJP LICENSE README README.eucJP diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile index 784026e02fab..6ed5d0dc93d1 100644 --- a/x11-fonts/mkbold/Makefile +++ b/x11-fonts/mkbold/Makefile @@ -10,7 +10,7 @@ EXTRACT_SUFX= .bz2 MAINTAINER= koma2@lovepeers.org COMMENT= Perl script to make BDF font bold -CONFLICTS= mkbold-mkitalic-[0-9]* +CONFLICTS= mkbold-mkitalic PLIST_FILES= bin/mkbold USES= shebangfix perl5 tar:bzip2 diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile index 181b5d17ea74..12ba2aaadb8d 100644 --- a/x11-fonts/mkitalic/Makefile +++ b/x11-fonts/mkitalic/Makefile @@ -10,7 +10,7 @@ EXTRACT_SUFX= .bz2 MAINTAINER= koma2@lovepeers.org COMMENT= Perl script to make BDF font italic -CONFLICTS= mkbold-mkitalic-[0-9]* +CONFLICTS= mkbold-mkitalic PLIST_FILES= bin/mkitalic EXTRACT_CMD= ${BZCAT} diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile index f15c2a9f1b6f..c3194ebf30f4 100644 --- a/x11-themes/clearlooks/Makefile +++ b/x11-themes/clearlooks/Makefile @@ -28,10 +28,10 @@ METACITY_DESC= Depend on MetaCity Theme .include <bsd.port.options.mk> .if !defined(PKGNAMESUFFIX) -CONFLICTS+= gtk-engines2-[0-9]* clearlooks-themes[0-9]* +CONFLICTS+= gtk-engines2 clearlooks-themes[0-9]* PLIST_SUB+= ENGINE="" .else -CONFLICTS+= clearlooks-[0-9]* +CONFLICTS+= clearlooks BUILD_DEPENDS+= gtk-engines2>=2.7.5_1:x11-themes/gtk-engines2 RUN_DEPENDS+= gtk-engines2>=2.7.5_1:x11-themes/gtk-engines2 diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 12ec0706f294..5c104415257e 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -12,7 +12,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Theme engine for the GTK+-2.0 toolkit -CONFLICTS= gtk-smooth-engine-[0-9]* clearlooks-[0-9]* +CONFLICTS= gtk-smooth-engine clearlooks USE_GNOME= gtk20 intlhack USES= gettext gmake gnome libtool pathfix pkgconfig tar:bzip2 diff --git a/x11-toolkits/linux-c7-gtk2/Makefile b/x11-toolkits/linux-c7-gtk2/Makefile index efc409a116b9..62eedcbfc901 100644 --- a/x11-toolkits/linux-c7-gtk2/Makefile +++ b/x11-toolkits/linux-c7-gtk2/Makefile @@ -18,7 +18,7 @@ USE_LINUX_RPM= yes LIB_DISTNAMES= ${DISTNAME} \ ${PORTNAME}-immodules-${DISTVERSIONFULL} -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}0/pkg-descr OPTIONS_DEFINE= DOCS NLS diff --git a/x11-toolkits/linux-c7-openmotif/Makefile b/x11-toolkits/linux-c7-openmotif/Makefile index 8d17841edea8..201083f35ea5 100644 --- a/x11-toolkits/linux-c7-openmotif/Makefile +++ b/x11-toolkits/linux-c7-openmotif/Makefile @@ -14,7 +14,7 @@ USE_LDCONFIG= yes USE_LINUX= xorglibs USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../open-${PORTNAME}/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/x11-toolkits/linux-c7-pango/Makefile b/x11-toolkits/linux-c7-pango/Makefile index 6b3c94ce14f3..0627598d0b2d 100644 --- a/x11-toolkits/linux-c7-pango/Makefile +++ b/x11-toolkits/linux-c7-pango/Makefile @@ -15,7 +15,7 @@ USE_LDCONFIG= yes USE_LINUX= cairo fontconfig freetype fribidi harfbuzz libthai xorglibs 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/x11-toolkits/linux-c7-qt-x11/Makefile b/x11-toolkits/linux-c7-qt-x11/Makefile index 60f9feda5bd0..156a63bdb3d9 100644 --- a/x11-toolkits/linux-c7-qt-x11/Makefile +++ b/x11-toolkits/linux-c7-qt-x11/Makefile @@ -17,7 +17,7 @@ USE_LINUX_RPM= yes LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL} -CONFLICTS= linux-c6-qt47-x11-[0-9]* +CONFLICTS= linux-c6-qt47-x11 DATADIR= ${PREFIX}/usr/share/${PORTNAME}4 post-patch: diff --git a/x11-toolkits/linux-c7-tk85/Makefile b/x11-toolkits/linux-c7-tk85/Makefile index f71548ece825..e6b996c9db30 100644 --- a/x11-toolkits/linux-c7-tk85/Makefile +++ b/x11-toolkits/linux-c7-tk85/Makefile @@ -16,7 +16,7 @@ USE_LINUX= xorglibs USE_LINUX_RPM= yes USE_LINUX_RPM_BAD_PERMS= yes -CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX} DATADIR= ${PREFIX}/usr/share/tk${PORTVERSION:R} DESCR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 6f3c4edf34c4..c61d077dde8e 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_UNSAFE= yes -CONFLICTS= lesstif-[0-9]* +CONFLICTS= lesstif USES= autoreconf gmake iconv jpeg libtool:keepla pkgconfig xorg USE_XORG= x11 xaw xbitmaps xext xft xt xmu xrender sm ice diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile index e195487d3f5e..8d07330c540c 100644 --- a/x11-wm/wmii-devel/Makefile +++ b/x11-wm/wmii-devel/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libixp.so:devel/libixp -CONFLICTS= wmii-[0-9]* +CONFLICTS= wmii USES= pkgconfig python:run shebangfix tar:tbz xorg SHEBANG_FILES= alternative_wmiircs/python/wmiirc diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index 5c7b8076ba00..f70a35526d10 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= dmenu:x11/dmenu USES= xorg USE_XORG= x11 xorgproto xt xext -CONFLICTS= wmii-devel-[0-9]* +CONFLICTS= wmii-devel MAKE_ARGS= PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \ INCLUDE="${LOCALBASE}/include" \ diff --git a/x11/linux-c7-xorg-libs/Makefile b/x11/linux-c7-xorg-libs/Makefile index 13c3ccc2a815..0ed012b0ee5c 100644 --- a/x11/linux-c7-xorg-libs/Makefile +++ b/x11/linux-c7-xorg-libs/Makefile @@ -86,7 +86,7 @@ SRC_DISTFILES= libICE-1.0.9-9.el7${SRC_SUFX}:SOURCE \ libxshmfence-1.2-1.el7${SRC_SUFX}:SOURCE \ xkeyboard-config-2.24-1.el7${SRC_SUFX}:SOURCE -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 572709c0e2e2..9cd9cdd7afc8 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libgle.so:graphics/gle \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* +CONFLICTS= xscreensaver-gnome xscreensaver-gnome-hacks USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \ pkgconfig xorg diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index ebabec2c7be3..fde8bfe1b40c 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --enable-narrowproto \ CPPFLAGS+= -DPIXMAP_ROOTDIR=${LOCALBASE}/share/pixmaps -CONFLICTS= x11iraf-[0-9]* +CONFLICTS= x11iraf OPTIONS_DEFINE= 256COLOR DABBREV DECTERM GNOME LOGGING LUIT PCRE2 REGIS \ SCRNDUMP SIXEL TOOLBAR WCHAR XINERAMA |