mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-17 19:39:43 +00:00
Fix CONFLICTS entries in archivers, astro, audio
Fix conflicts entries based on a script that searches for duplicate files installed by several ports. Some patters seem to make ports conflict with themselves, but this is actually not the case due to the check-*-conflicts logic implemented in bsd.port.mk, which excludes self-conflicts. PHP based ports have been ignored in this commit as requested by the committers currently working on the php-8.1 import. Approved by: portmgr (implicit)
This commit is contained in:
Stefan Eßer
parent
0db2fec06b
commit
98f7d7db7e
@ -13,6 +13,8 @@ LICENSE= GPLv3+
|
||||
USES= cpe charsetfix makeinfo tar:xz
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
CONFLICTS_INSTALL= zutils # bin/zcat bin/zcmp bin/zdiff bin/zgrep
|
||||
|
||||
INFO= gzip
|
||||
CPE_VENDOR= gnu
|
||||
|
||||
|
||||
@ -13,6 +13,9 @@ COMMENT= Library to work with RAR archives
|
||||
WRKSRC= ${WRKDIR}/unrar
|
||||
|
||||
USES= gmake
|
||||
|
||||
CONFLICTS_INSTALL= libunrar6 # lib/libunrar.so
|
||||
|
||||
MAKEFILE= makefile.unix
|
||||
ALL_TARGET= lib
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
@ -15,6 +15,8 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
|
||||
USES= compiler:c++11-lang gmake
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFLICTS_INSTALL= libunrar # lib/libunrar.so
|
||||
|
||||
ALL_TARGET= lib
|
||||
MAKEFILE= makefile
|
||||
MAKE_ARGS= AR="${AR}" \
|
||||
|
||||
@ -23,6 +23,8 @@ USE_PERL5= build
|
||||
USE_LDCONFIG= yes
|
||||
CPE_VENDOR= lrzip_project
|
||||
|
||||
CONFLICTS_INSTALL= lrzsz # bin/lrz man/man1/lrz.1.gz
|
||||
|
||||
post-install:
|
||||
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblrzip.so.0.0.0
|
||||
|
||||
|
||||
@ -17,6 +17,8 @@ CMAKE_ARGS= -DINSTALL_LMOD="${LUA_MODSHAREDIR}" \
|
||||
-DINSTALL_DOC="${DOCSDIR}" \
|
||||
-DINSTALL_TEST="${EXAMPLESDIR}"
|
||||
|
||||
CONFLICTS_INSTALL= ${LUA_PKGNAMEPREFIX}zlib lua*-lzlib # lib/lua/5.1/zlib.so share/doc/lzlib/README
|
||||
|
||||
OPTIONS_DEFINE= DOCS EXAMPLES
|
||||
|
||||
post-patch:
|
||||
|
||||
@ -18,6 +18,8 @@ GH_PROJECT= lua-zlib
|
||||
|
||||
USES= lua:51,module
|
||||
|
||||
CONFLICTS_INSTALL= ${LUA_PKGNAMEPREFIX}lzlib # lib/lua/5.1/zlib.so
|
||||
|
||||
ALL_TARGET= bsd
|
||||
MAKE_ENV+= LUAPATH="${LOCALBASE}"
|
||||
MAKE_ENV+= LUACPATH="${STAGEDIR}${LUA_MODLIBDIR}"
|
||||
|
||||
@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
USES= tar:bzip2
|
||||
HAS_CONFIGURE= yes
|
||||
|
||||
CONFLICTS_INSTALL= foo2zjs # bin/msexpand
|
||||
|
||||
PLIST_FILES= bin/mscompress bin/msexpand \
|
||||
share/man/man1/mscompress.1.gz \
|
||||
share/man/man1/msexpand.1.gz
|
||||
|
||||
@ -11,7 +11,7 @@ COMMENT= Archiver for Quake I and II packed data files
|
||||
|
||||
LICENSE= GPLv2
|
||||
|
||||
CONFLICTS= par
|
||||
CONFLICTS= par_format # bin/par
|
||||
|
||||
MAKEFILE= Makefile.Linux
|
||||
MAKE_ARGS= CC="${CC}"
|
||||
|
||||
@ -49,6 +49,8 @@ CPPFLAGS+= -I${LOCALBASE}/include \
|
||||
LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \
|
||||
-L${BDB_LIB_DIR} -L${LUA_LIBDIR}
|
||||
|
||||
CONFLICTS_INSTALL= rpm2cpio # bin/rpm2cpio
|
||||
|
||||
PLIST_SUB= VERSION=${PORTVERSION} \
|
||||
OPSYS=${OPSYS:tl}
|
||||
|
||||
|
||||
@ -14,6 +14,8 @@ WRKSRC= ${WRKDIR}/t20-squsq
|
||||
MAKEFILE= ${FILESDIR}/Makefile
|
||||
CFLAGS+= -Wno-error=return-type
|
||||
|
||||
CONFLICTS_INSTALL= sequoia squirrel # bin/sq
|
||||
|
||||
PLIST_FILES= bin/sq bin/usq
|
||||
PORTDOCS= readme
|
||||
|
||||
|
||||
@ -12,6 +12,9 @@ LICENSE= GPLv2
|
||||
|
||||
USES= cpe tar:lz
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
CONFIGURE_INSTALL= gzip openzfs # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz
|
||||
|
||||
INSTALL_TARGET= install-strip
|
||||
CPE_VENDOR= nongnu
|
||||
|
||||
|
||||
@ -27,6 +27,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \
|
||||
|
||||
USES= gmake jpeg localbase pkgconfig python shebangfix
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFLICTS_INSTALL= afni p5-Text-RecordParser # bin/imstat bin/tabmerge
|
||||
|
||||
SHEBANG_FILES= bin/* sdss/*.py solver/*.py util/[!c]*.py
|
||||
|
||||
MAKE_ARGS= NETPBM_INC="-I${LOCALBASE}/include/netpbm" \
|
||||
|
||||
@ -11,7 +11,8 @@ COMMENT= Program for matching star lists
|
||||
LICENSE= GPLv2+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
CONFLICTS= avenger
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
CONFLICTS= avenger schilyutils # bin/match man/man1/match.1.gz
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -23,4 +23,6 @@ RUN_DEPENDS= ${PYNUMPY} \
|
||||
USES= compiler:c11 python:3.8+
|
||||
USE_PYTHON= autoplist cython distutils
|
||||
|
||||
CONFLICTS_INSTALL= p5-Data-ShowTable # bin/showtable
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -14,6 +14,8 @@ OPTIONS_DEFINE= DOCS
|
||||
USES= compiler gmake perl5 tar:tgz
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFLICTS_INSTALL= jabberd # bin/router
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
post-patch:
|
||||
|
||||
@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
GNU_CONFIGURE= yes
|
||||
USES= gmake
|
||||
|
||||
CONFLICTS_INSTALL= sex # bin/sex
|
||||
|
||||
OPTIONS_DEFINE= STATIC
|
||||
OPTIONS_DEFAULT= STATIC
|
||||
|
||||
|
||||
@ -10,6 +10,8 @@ COMMENT= ATSC A/52 audio encoder
|
||||
|
||||
USES= tar:bzip2 cmake
|
||||
|
||||
CONFLICTS_INSTALL= wavbreaker # bin/wavinfo
|
||||
|
||||
OPTIONS_DEFINE= SHARED_LIB CXX_BINDINGS DOUBLE
|
||||
OPTIONS_DEFAULT=
|
||||
|
||||
|
||||
@ -16,6 +16,8 @@ USES= cpe zip gettext php:flavors mysql
|
||||
USE_PHP= pdo pdo_mysql hash session json intl simplexml curl dom xml
|
||||
IGNORE_WITH_PHP=73 80
|
||||
|
||||
CONFLICTS_INSTALL= ampache-php* # etc/periodic/daily/500.ampache-cron man/man1/ampache.1.gz
|
||||
|
||||
NO_WRKSUBDIR= yes
|
||||
NO_BUILD= yes
|
||||
SUB_FILES= 500.ampache-cron
|
||||
|
||||
@ -28,6 +28,8 @@ asterisk18_RUN_DEPENDS= asterisk:net/asterisk18
|
||||
USES= compiler:c11 gmake localbase
|
||||
INSTALL_TARGET= install samples
|
||||
|
||||
CONFLICTS_INSTALL= asterisk*-espeak # etc/asterisk/espeak.conf.sample
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= zaf
|
||||
GH_PROJECT= Asterisk-eSpeak
|
||||
|
||||
@ -14,6 +14,8 @@ USES= cmake sdl tar:bzip2
|
||||
USE_SDL= sdl
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CONFLICTS_INSTALL= btanks # lib/libclunk.so
|
||||
|
||||
OPTIONS_DEFINE= SSE
|
||||
OPTIONS_DEFAULT_amd64=SSE
|
||||
SSE_CMAKE_ON= -DWITH_SSE:BOOL=TRUE
|
||||
|
||||
@ -27,6 +27,8 @@ USE_GL= gl
|
||||
CXXFLAGS+= -I${FILESDIR}
|
||||
LDFLAGS+= -pthread
|
||||
|
||||
CONFLICTS_INSTALL= nekobi-lv2 # bin/Nekobi
|
||||
|
||||
OPTIONS_DEFINE= JACK
|
||||
OPTIONS_DEFAULT= JACK
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
@ -17,6 +17,8 @@ BUILD_DEPENDS= texi2dvi:print/texinfo
|
||||
|
||||
USES= emacs gmake
|
||||
|
||||
CONFLICTS_INSTALL= emms emms-emacs_* # share/emacs/site-lisp/emms/emms-auto.el
|
||||
|
||||
INFO= emms
|
||||
NO_ARCH= yes
|
||||
|
||||
|
||||
@ -26,6 +26,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \
|
||||
|
||||
MAKE_ENV+= EXAMPLESDIR="${STAGEDIR}${EXAMPLESDIR}"
|
||||
|
||||
CONFLICTS_INSTALL= mate-control-center # share/applications/mimeinfo.cache
|
||||
|
||||
OPTIONS_DEFINE= BASH_COMPLETIONS DOCS EXAMPLES NAS NLS
|
||||
OPTIONS_DEFAULT= BASH_COMPLETIONS
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
@ -24,7 +24,7 @@ USE_XORG= ice sm x11 xext
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= --disable-werror
|
||||
|
||||
CONFLICTS_INSTALL= py*-grip
|
||||
CONFLICTS_INSTALL= py*-grip # bin/grip
|
||||
|
||||
OPTIONS_DEFINE= CDDA2WAV CDPARANOIA FAAC FLAC LAME NLS VORBIS
|
||||
OPTIONS_DEFAULT= CDPARANOIA FLAC VORBIS
|
||||
|
||||
@ -19,4 +19,6 @@ USES= gnome pkgconfig
|
||||
GNU_CONFIGURE= yes
|
||||
USE_GNOME= glib20
|
||||
|
||||
CONFLICTS_INSTALL= libsmf # bin/smfsh
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
|
||||
USES= iconv perl5 shebangfix
|
||||
SHEBANG_FILES= jclient-perl/jclient.pl
|
||||
|
||||
INSTALL_CONFLICTS= generate julius-caesariii php*-pear-Text_Highlighter
|
||||
CONFLICTS_INSTALL= generate julius-caesariii php*-pear-Text_Highlighter # bin/generate bin/julius
|
||||
|
||||
CONFIGURE_ENV= ac_cv_path_PERL=${PERL}
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
|
||||
@ -17,4 +17,6 @@ USE_GNOME= glib20
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
CONFLICTS_INSTALL= jack-smf-utils # bin/smfsh
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -22,6 +22,8 @@ GH_PROJECT= sonic
|
||||
MAKE_ARGS= CC=${CC} CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" USE_SPECTROGRAM=1
|
||||
CFLAGS+= -ansi -fPIC -pthread -Wno-unused-function -DSONIC_SPECTROGRAM
|
||||
|
||||
CONFLICTS_INSTALL= sonic # bin/sonic
|
||||
|
||||
PLIST_FILES= bin/sonic \
|
||||
include/sonic.h \
|
||||
lib/libsonic.a \
|
||||
|
||||
@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
USES= gmake localbase:ldflags ncurses
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
CONFLICTS_INSTALL= p5-MP3-Tag-Utils splay # bin/mp3tag bin/splay
|
||||
|
||||
OPTIONS_DEFINE= DOCS LIRC NAS SDL SIDPLAY VORBIS
|
||||
OPTIONS_DEFAULT= SIDPLAY VORBIS
|
||||
SIDPLAY_DESC= Sidplayer support
|
||||
|
||||
@ -9,6 +9,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= Renaming program for MP3 files based on their ID3 tag
|
||||
|
||||
CONFLICTS_INSTALL= p5-MP3-Tag-Utils # bin/mp3rename
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
|
||||
|
||||
PLIST_FILES= bin/mp3rename
|
||||
|
||||
@ -27,6 +27,8 @@ USE_XORG= x11
|
||||
CFLAGS+= -I${FILESDIR}
|
||||
CFLAGS+= -Wno-c++11-narrowing # clang prints errors: https://github.com/DISTRHO/Nekobi/issues/7
|
||||
|
||||
CONFLICTS_INSTALL= dpf-plugins-lv2 # bin/Nekobi
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${CHOSEN_COMPILER_TYPE} == gcc
|
||||
|
||||
@ -21,6 +21,8 @@ RUN_DEPENDS= p5-MP3-Tag>=1.13:audio/p5-MP3-Tag \
|
||||
USES= perl5 shebangfix
|
||||
USE_PERL5= configure
|
||||
|
||||
CONFLICTS_INSTALL= mp3blaster mp3rename # bin/mp3rename bin/mp3tag
|
||||
|
||||
SHEBANG_FILES= bin/mp3rename bin/mp3show bin/mp3tag
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -14,6 +14,6 @@ COMMENT= Read, change, and write different tags of MP3 audio files
|
||||
USES= perl5
|
||||
USE_PERL5= configure
|
||||
|
||||
CONFLICTS= p5-MP3-Tag-0.*
|
||||
CONFLICTS= p5-MP3-Tag # lib/perl5/site_perl/MP3/Tag.pm
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -21,6 +21,8 @@ GH_PROJECT= ${PORTNAME}.lv2
|
||||
|
||||
MAKE_ARGS= LV2VERSION=${DISTVERSION}
|
||||
|
||||
CONFLICTS_INSTALL= x42-plugins-lv2 # lib/lv2/phaserotate.lv2/phaserotate.so
|
||||
|
||||
PLIST_FILES= lib/lv2/phaserotate.lv2/manifest.ttl \
|
||||
lib/lv2/phaserotate.lv2/phaserotate.so \
|
||||
lib/lv2/phaserotate.lv2/phaserotate.ttl
|
||||
|
||||
@ -24,6 +24,8 @@ USE_LOCALE= en_US.UTF-8
|
||||
USE_PYQT= core_run dbus_run gui_run network_run widgets_run sip
|
||||
USE_PYTHON= autoplist distutils noflavors
|
||||
|
||||
CONFLICTS_INSTALL= picard-tools py*-python-picard # bin/picard
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-release-${DISTVERSION}
|
||||
|
||||
OPTIONS_DEFINE= ACOUSTID PLAYER PLUGINS
|
||||
|
||||
@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
USES= pkgconfig python:3.6+
|
||||
USE_PYTHON= autoplist concurrent distutils
|
||||
|
||||
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}zita-audiotools
|
||||
|
||||
OPTIONS_DEFINE= CDIO LAME MPG123 OPUS TWOLAME VORBIS
|
||||
OPTIONS_DEFAULT=CDIO MPG123 OPUS TWOLAME VORBIS
|
||||
|
||||
|
||||
@ -15,6 +15,8 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \
|
||||
USES= localbase python:3.6+ tar:bz2
|
||||
USE_PYTHON= autoplist distutils
|
||||
|
||||
CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}fmoo-audiotools
|
||||
|
||||
post-install:
|
||||
@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/audiotools/*.so
|
||||
|
||||
|
||||
@ -16,6 +16,8 @@ LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
CONFLICTS_INSTALL= mp3blaster # bin/splay
|
||||
|
||||
PLIST_FILES= bin/splay man/man1/splay.1.gz
|
||||
|
||||
# XXX: pthread library can be used, but sound quality is buggy(?)
|
||||
|
||||
@ -33,6 +33,8 @@ CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
|
||||
--with-ogg-includes=${LOCALBASE}/include/ogg
|
||||
CONFIGURE_ENV= LIBS="`pkg-config --libs gmodule-2.0`"
|
||||
|
||||
CONFIGURE_INSTALL= libsweep-lidar # include/sweep/sweep.h
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|^ac_enable_alsa=yes|ac_enable_alsa=no|g ; \
|
||||
s|$${datadir}|$${datarootdir}|g' ${WRKSRC}/configure
|
||||
|
||||
@ -5,6 +5,8 @@ PKGNAMESUFFIX= -slang
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= Slang interface for TiMidity++
|
||||
|
||||
CONFLICTS_INSTALL= ja-timidity++-slang # lib/timidity/if_slang.so
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../../audio/timidity++
|
||||
|
||||
PLIST_FILES= ${TIMID_LIBDIR}/if_${INTERFACE}.so
|
||||
|
||||
@ -55,7 +55,7 @@ USES+= ncurses
|
||||
CONFIGURE_ARGS+=--enable-interface=ncurses,vt100,server \
|
||||
--enable-network
|
||||
|
||||
CONFLICTS_INSTALL= timidity
|
||||
CONFLICTS_INSTALL?= timidity
|
||||
|
||||
DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ COMMENT= MIDI to PCM software synthesizer
|
||||
LICENSE= GPLv2+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
CONFLICTS_INSTALL= timidity++-2.*
|
||||
CONFLICTS_INSTALL= timidity++
|
||||
|
||||
USES= alias ncurses
|
||||
INSTALL_TARGET= install.all
|
||||
|
||||
@ -15,6 +15,8 @@ USE_GITHUB= yes
|
||||
USE_GNOME= cairo gtk30
|
||||
GH_ACCOUNT= thp
|
||||
|
||||
CONFLICTS_INSTALL= aften # bin/wavinfo
|
||||
|
||||
OPTIONS_DEFINE= MOODBAR MPG123
|
||||
OPTIONS_DEFAULT=MOODBAR MPG123
|
||||
|
||||
|
||||
@ -38,6 +38,8 @@ SHEBANG_FILES= stepseq.lv2/gridgen.sh
|
||||
|
||||
CXXFLAGS+= -std=c++98
|
||||
|
||||
CONFLICTS_INSTALL= phaserotate-lv2 # lib/lv2/phaserotate.lv2/phaserotate.so
|
||||
|
||||
OPTIONS_DEFINE_amd64= SSE
|
||||
OPTIONS_DEFINE_i386= SSE
|
||||
OPTIONS_DEFAULT_amd64= SSE
|
||||
|
||||
@ -22,6 +22,8 @@ SUB_FILES= pkg-message
|
||||
|
||||
CFLAGS+= -D_WANT_SEMUN
|
||||
|
||||
CONFLICTS_INSTALL= py*-cclib # bin/cda
|
||||
|
||||
LIBBINDIR= ${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/aarch64/arm64/:C/armv.*/arm/:C/powerpc64.*/powerpc/:C/riscv64.*/riscv/}
|
||||
|
||||
pre-patch:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user