kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/java
History
Stefan Eßer bcaf25a8c8 Fix CONFLICTS entries of multiple ports 
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).

A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.

These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,

Approved by:	portmgr (implicit)
2022-01-10 16:15:39 +01:00
..
apache-bcel *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
apache-commons-beanutils Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
apache-commons-cli Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
apache-commons-codec One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
apache-commons-collections Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
apache-commons-dbcp java/apache-commons-dbcp: Update MASTER_SITES 2021-10-11 20:52:45 +02:00
apache-commons-discovery java/apache-commons-discovery: Update MASTER_SITES, deprecate and set expiration date to 2022-03-31 2021-10-14 10:30:54 +02:00
apache-commons-httpclient Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
apache-commons-lang java/apache-commons-lang: Add NO_ARCH 2021-07-01 04:44:27 +08:00
apache-commons-lang3 java/apache-commons-lang3: Upgrade to 3.12.0 2021-10-09 15:55:11 -07:00
apache-commons-logging Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
apache-commons-pool java/apache-commons-pool: update to 2.11.1 release. 2021-08-23 14:43:10 +02:00
apache-commons-primitives java/apache-commons-primitives: Update MASTER_SITES, deprecate and set expiration date to 2022-03-31 2021-10-10 10:51:52 +02:00
aparapi Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
avis all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
berkeley-db Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
bluej */*: Fix ENOTIME: return my ports to the pool 2021-05-22 10:13:01 +08:00
bootstrap-openjdk6 One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
bootstrap-openjdk8 java/openjdk8: Switch to server mode on aarch64 2021-09-01 18:23:08 +02:00
bootstrap-openjdk11 cleanup: drop support for EOL FreeBSD 11.X 2021-09-30 23:23:30 +02:00
bootstrap-openjdk17 java/bootstrap-openjdk17: Add i386 support 2021-12-31 23:58:27 -08:00
bouncycastle Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
bouncycastle15 java/bouncycastle15: Make sure we don't miss jars with future updates 2021-11-25 01:58:09 +01:00
cos Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
cryptix-jce One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
dbvis Deorbit RESTRICTED && NO_CDROM, part one. 2021-05-06 13:47:41 +02:00
eclipse java/eclipse: fix runtime on powerpc64 2021-08-08 22:46:59 +00:00
eclipse-cdt Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
eclipse-drjava Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
eclipse-ecj Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
eclipse-EPIC Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
eclipse-findbugs Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
eclipse-pydev *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
eclipse-shelled Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
hamcrest java/hamcrest: Add NO_ARCH 2021-07-01 04:44:27 +08:00
icedtea-web lang/rust: Rebuild consumers for Rust 1.57.0 2021-12-05 13:35:42 +01:00
infobus Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
intellij Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
intellij-fsnotifier Remove my useless "Created by" lines 2021-04-19 10:00:09 +02:00
intellij-pty4j Remove my useless "Created by" lines 2021-04-19 10:00:09 +02:00
intellij-ultimate Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
jad Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jai Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
jakarta-oro Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jasmin all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
jattach java/jattach: update to 2.0 2021-12-16 11:13:52 +03:00
java-cup all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
java-getopt Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
java-subversion *: apply refactor.remove-consecutive-empty-lines 2021-10-19 10:36:47 +02:00
java-zoneinfo java/java-zoneinfo: Update to 2021e 2021-10-31 11:07:42 -07:00
java3d graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
javahelp Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
javamail Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
javavmwrapper java/javavmwrapper: Add support for 17 as a version 2021-11-23 22:48:02 -08:00
jaxen Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jcalendar Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jcckit Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jcommon Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jd-gui Remove my useless "Created by" lines 2021-04-19 10:00:09 +02:00
jdk8-doc Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
jdk11-doc Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
jdk12-doc Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
jdom Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jflex all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
jfreechart Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jgraph Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jgraphx One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
jikes Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jlex all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
jlint Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jmf java/jmf: update (chase HTTP redirection) or otherwise actualize URLs. 2022-01-04 10:17:16 +00:00
jode Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jrosetta Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jta Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
jtiger Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jump Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
junit java/junit: Add CPE information 2021-10-23 22:25:55 +02:00
jxgrabkey all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
lightweight-java-profiler Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
linux-oracle-jdk18 java/linux-oracle-jdk18: Add CPE information 2021-10-20 18:13:16 +02:00
linux-oracle-jre18 java/linux-oracle-jre18: Add CPE information 2021-10-20 18:13:16 +02:00
linux-oracle-serverjre10 Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
mmake Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
mx4j Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
netbeans java/netbeans: Update to 12.6 2021-12-30 23:25:59 +01:00
netcomponents Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
netrexx Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
netty java/netty: Fix CPE information because current one is deprecated 2021-09-14 10:55:19 +00:00
openjdk7 *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
openjdk7-jre One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
openjdk8 java/openjdk8: Update to 8u312 2021-10-31 11:07:43 -07:00
openjdk8-jre One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
openjdk11 java/openjdk11: Update to 11.0.13 2021-10-31 11:07:42 -07:00
openjdk11-jre One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
openjdk12 java/openjdk*: work around UB in markOopDesc, fix builds with clang 13 2021-10-16 14:22:03 +02:00
openjdk13 java/openjdk13: Update to 13.0.9 2021-11-06 12:22:19 -07:00
openjdk14 java/openjdk*: work around UB in markOopDesc, fix builds with clang 13 2021-10-16 14:22:03 +02:00
openjdk15 java/openjdk15: Update to 15.0.5 2021-11-06 12:23:07 -07:00
openjdk16 java/openjdk16: Fix WWW link to point to JDK 16 2021-11-23 22:40:16 -08:00
openjdk17 java/openjdk17: Add i386 support 2021-12-31 01:09:54 -08:00
openjfx14 java/openjfx14: fix build with non-default CCACHE_DIR 2021-12-12 18:58:57 +01:00
phpeclipse Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
proguard all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
sablevm One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
sablevm-classpath Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
servingxml Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
sigar java/sigar: the port had been updated and improved (+) 2021-07-16 19:44:37 +00:00
springframework Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
springframework31 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
sqlitejdbc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
trove4j java/trove4j: Drop maintainership 2021-05-19 20:56:14 +01:00
veditor Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
visualvm One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
wildfly10 all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
wildfly11 all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
wildfly12 all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
wildfly13 java/wildfly13: fix plist (@sample) 2021-05-12 14:55:38 +03:00
wildfly14 One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
wildfly15 One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
wildfly16 One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
wildfly17 all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
wildfly18 all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
wildfly90 all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
Makefile rubymine: drop the intellij- prefix and move away from java 2021-12-31 13:26:40 +01:00