diff options
author | Stefan Eßer <se@FreeBSD.org> | 2022-01-13 20:56:01 +0000 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2022-01-13 21:01:28 +0000 |
commit | 98f7d7db7e9bd14301b6a481ac477729c0ed6a24 (patch) | |
tree | 1641273136f797b27378b76c547e3734914c3c51 /audio/julius | |
parent | 0db2fec06b15f7add8ebeb3e2caa2f20f2147740 (diff) | |
download | ports-98f7d7db7e9bd14301b6a481ac477729c0ed6a24.tar.gz ports-98f7d7db7e9bd14301b6a481ac477729c0ed6a24.zip |
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)
Diffstat (limited to 'audio/julius')
-rw-r--r-- | audio/julius/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/julius/Makefile b/audio/julius/Makefile index 7fefb54b5703..42737006edba 100644 --- a/audio/julius/Makefile +++ b/audio/julius/Makefile @@ -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 |