Commit graph

78 commits

Author SHA1 Message Date
Tobias C. Berner
526869d8dc java: remove 'Created by' lines
A big Thank You to the original contributors of these ports:

  *  Alex Dupre <ale@FreeBSD.org>
  *  Alex Semenyaka <alex@rinet.ru>
  *  Alexander Yerenkow <yerenkow@gmail.com>
  *  Anton Yudin (<contact@toha.org.ua>)
  *  Anton Yudin <toha@toha.org.ua>
  *  Benjamin Close <benjsc@FreeBSD.org>
  *  Björn König <bkoenig@alpha-tierchen.de>
  *  Conor McDermottroe <ports@mcdermottroe.com>
  *  Danilo Egea Gondolfo <danilo@FreeBSD.org
  *  Dave Glowacki <dglo@ssec.wisc.edu>
  *  Ernst de Haan <znerd@FreeBSD.org>
  *  Eugene Grosbein <ports@grosbein.net>
  *  Filippo Natali <filippo@widestore.net>
  *  Gerrit Beine <gerrit.beine@gmx.de>
  *  Greg Lewis <glewis@FreeBSD.org>
  *  Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
  *  Jason Helfman <jgh@FreeBSD.org>
  *  Jeremy <karlj000@unbc.ca>
  *  Johannes Dieterich <dieterich@ogolem.org>
  *  Johannes Dieterich <jmd@FreeBSD.org>
  *  Jonathan Chen <jonc@chen.org.nz>
  *  Jose Marques
  *  Jose Marques <noway@nohow.demon.co.uk>
  *  Lapo Luchini <lapo@lapo.it>
  *  Lev Serebryakov <lev@FreeBSD.org>
  *  Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
  *  Matthew Dillon <dillon@backplane.com>
  *  Maxim Sobolev <sobomax@FreeBSD.org>
  *  Mikhail T. <mi@aldan.algebra.com>
  *  Mikhail T. <michael@fun-box.ru>
  *  Mikhail Teterin
  *  Nicola Vitale <nivit@FreeBSD.org>
  *  Nicola Vitale <nivit@email.it>
  *  OISHI Masakuni <yamasa@bsdhouse.org>
  *  OKAZAKI Tetsurou
  *  Pedro Giffuni
  *  Simeo Reig <reig.simeo@gmail.com>
  *  Sutra Zhou <zhoushuqun@gmail.com>
  *  Tom Judge <tj@FreeBSD.org>
  *  Volker Stolz <vs@FreeBSD.org>
  *  Wen Heping <wenheping@gmail.com>
  *  Yen-Ming Lee <leeym@cae.ce.ntu.edu.tw>
  *  gldisater@gldis.ca
  *  ijliao
  *  jake@checker.org
  *  jpbeconne
  *  lon_kamikaze@gmx.de
  *  mi
  *  nordwick@xcf.berkeley.edu
  *  nork@FreeBSD.org
  *  olgeni@FreeBSD.org
  *  rasputin
  *  rfarmer@predatorlabs.net
  *  rtdean@cytherianage.net
  *  tux@pinguru.net

With hat:	portmgr
2022-07-20 16:22:12 +02:00
Greg Lewis
42d0730fd9 java/javavmwrapper: Add support for 18 as a version 2022-04-16 07:52:19 -07:00
Greg Lewis
72f430924b java/javavmwrapper: Add support for 17 as a version 2021-11-23 22:48:02 -08:00
Mathieu Arnold
135fdeebb9
all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
Mathieu Arnold
305f148f48
Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
Greg Lewis
47213c9c73 Add support for 16 as a version specifier 2021-02-23 04:44:48 +00:00
Greg Lewis
515df34e13 Add support for 15 as a version 2020-09-07 18:35:23 +00:00
Greg Lewis
34ef41c3e7 Teach javavmwrapper about "14" as a version specifier 2020-03-21 19:24:52 +00:00
Greg Lewis
7c2b69985f * Teach javavmwrapper about "13" as a version specifier
* Remove some white space while I'm here
2019-11-27 00:56:24 +00:00
Jung-uk Kim
5a52a08234 Clean up after java/openjdk6 and java/openjdk6-jre removal
java/openjdk6 support was removed from Mk/bsd.java.mk (r512662) and
java/openjdk6 and java/openjdk6-jre were removed from the ports tree
(r512663).  Now this patch completely removes remaining stuff from the
ports tree.

PR:			241953 (exp-run)
Reviewed by:		glewis
Approved by:		portmgr (antoine)
Differential Revision:	https://reviews.freebsd.org/D22342
2019-11-26 21:46:12 +00:00
Greg Lewis
2d13292940 Fixes to pkg-install and version handling
* In pkg-install, fix the exclusion of the bootstrap directories. [1]
* In pkg-install, fix the find expression so it actually finds jdks if
  there are multiple present. [1]
* When determining the VM version, be better about ensuring we end up
  with only a number.

PR:		239705 [1]
Submitted by:	John Hein <jcfyecrayz@liamekaens.com> [1]
2019-08-10 19:28:18 +00:00
Greg Lewis
587ee3db52 Sort VMs by version numerically
* VMs were sorted by VM version by lexicographically sorting the version as
  a string.  Switch to numeric sorting now that there are versions like
  10, 11, and 12 so that the intended sort order (most recent first) is
  preserved.
* Bump minor version.
2019-07-26 21:47:09 +00:00
Greg Lewis
446cb09333 Update manual pages
* Update currently supported version specifiers.
* Update currently supported vendors.
* Bump minor version.

This is mostly based on the patch in PR 223304.

PR:		223304
Submitted by:	Tommy P <tommyhp2@gmail.com>
2019-07-26 18:55:51 +00:00
Greg Lewis
8292f8dc5d Support for newer Java versions
* Switch the internal fallback logic (which is only run when the ports
  system is absent) to use modern Java versioning (e.g. 9 rather than 1.9)
* Add in support for specifying 10+, 11+ and 12+ as requested versions.
* Bump version to 2.7

Notes:

* The fallback logic doesn't support the idea of a default version the way
  bsd.java.mk does.  This was already the case.
* The sorting of VMs in the configuration file doesn't numerically sort
  versions 10 and higher correctly yet.  This will be addressed shortly.
* Manual pages need updating.
* The fallback logic is only used if bsd.java.mk is absent.  This should
  be a no-op if it is present.

PR:		223304
2019-07-26 18:35:05 +00:00
Dmitry Marakasov
689f8f9be3 - Add LICENSE
- Add NO_ARCH

PR:		228744
Approved by:	maintainer timeout (glewis, 2 weeks)
2018-06-19 13:47:52 +00:00
Greg Lewis
023c67f707 . Prepare for JDK9 support. 2017-10-14 18:36:17 +00:00
Baptiste Daroussin
12e5cb6b96 Remove the pkg-deinstall script forgotten during r419364
Pointyhat:	bapt
PR:		210313
2016-08-23 12:28:07 +00:00
Baptiste Daroussin
64f16bafaf Remove the deinstall script that appears to be deleting all the temporary files
created by pkg(8) during upgrades

It happens because the deinstall script tries to clean up the potential manual
VM registration by cleaning out all symlinks to bin/javavm

Given all VM are registring/unregistering themselves this part is not needed

The other thing the script was doing handling the configuration which has been
replaced by @sample.

pkg-install has been modified to drop the handling of the configuration file but
keep the auto registration if all VM found. While this part is not necessary as
well, we keep it because otherwise anyone doing delete/install on javavmwapper
version 2.5 being the installed version would end up with all VM unregistered.

The pkg-install should be removed after EOL of FreeBSD 10.3

PR:		210313
MFH:		2016Q3
2016-07-31 12:30:24 +00:00
Mathieu Arnold
065c026fe5 Fix ports that confused the meaning of WRKDIR and WRKSRC.
PR:		204056
Submitted by:	mat
Reviewed by:	bapt
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D2735
2015-11-05 12:36:25 +00:00
Greg Lewis
b947f3bb26 . Update internal fallback logic, including:
. Remove support for diablo* and j* ports.
  . Add support for linux-oracle* ports.
  . Remove support for Java version 1.5.
  . Add support for Java version 1.8.
  . Add support for Oracle as a vendor.
. Bump PORTVERSION.
. Remove CONFLICTS for ports that no longer exist.
2014-04-12 19:43:17 +00:00
Baptiste Daroussin
fcbbbf7bf9 Support stage 2014-02-06 07:25:16 +00:00
Baptiste Daroussin
c2c2a2b86b Add NO_STAGE all over the place in preparation for the staging support (cat: java) 2013-09-20 19:48:32 +00:00
Greg Lewis
167b1fa7bc . Cope with legacy versions "1.5" (expands to 1.6) and "1.5+" (expands to
1.6 1.7).
. Remove freebsd and bsdjava as valid vendors.
2012-12-11 05:37:54 +00:00
Jung-uk Kim
ea1e79cd5a Fix deinstallation script for 7.x. -samefile option for find(1) does not
exist there.

Reviewed by:	glewis (maintainer)
Feature safe:	yes
2012-11-02 17:12:08 +00:00
Jung-uk Kim
e93fd31996 Shut up noise when there is no JDK/JRE to register.
Reviewed by:	glewis (maintainer)
Feature safe:	yes
2012-10-31 21:50:25 +00:00
Jung-uk Kim
ace34c1a63 - Ignore bootstrap-openjdk when we automatically register existing JVMs.
- Make sure to destroy all symlinks pointing to ${PREFIX}/bin/javavm and
${PREFIX}/etc/javavms when we deinstall the package.

Reviewed by:	glewis (maintainer)
Feature safe:	yes
2012-10-28 02:11:29 +00:00
Greg Lewis
c1e89281c2 . Make the version numbers consistent so they can be compared correctly.
E.g. for jdk1.6.0 and openjdk6 will use '6' as the version.
. Modify the preference order for Java VMs used by the internal fallback
  logic to reflect that openjdk is now the default Java VM rather than diablo.
. Remove code for Java vendors that are no longer in the ports tree (e.g.
  blackdown, ibm).
. Remove code for handling version numbers that are no longer present in
  the tree (e.g. only 1.5 and up is supported).
. Note that openjdk is a native Java VM.
. If the environment variable JAVAVM_FALLBACK_ONLY is set then only use the
  internal logic to select a Java VM, don't use the ports logic even if the
  ports collection is installed. [1]
. Update the manual page for JAVAVM_FALLBACK_ONLY.
. Bump version to 2.4.

PR:		167799 [1]
2012-07-13 05:38:43 +00:00
Greg Lewis
2772382d5c . Minor man page tweaks:
. Remove references to ibm (we have no IBM JDKs in the tree)
  . Remove references to JDK 1.4.2 (only 1.5+ are in the tree)
2012-06-16 16:28:39 +00:00
Mark Linimon
06e6677793 Now that the Java 1.3 and Java 1.4 ports are deprecated and will expire soon,
remove support for them from bsd.java.mk.  As Jikes is not available in Java 1.5
or higher, remove it from bsd.java.mk too (suggested by hq@) and from the ports
which used it (only occurences were USE_JIKES=no).  Support for the Blackdown VM
is also removed, as it is not available in Java 1.5 and higher.

Also remove the mapping from Java 1.1-1.4 to Java 1.5+ in bsd.java.mk to detect
old, broken ports; therefore bump the minimal value of JAVA_VERSION to 1.5.
While here, replace static values of JAVA_VERSION in files/*.in by
%%JAVA_VERSION%% .

PR:		ports/158969
Submitted by:	rene
Tested on:	pointyhat-west -exp
2011-07-21 05:03:02 +00:00
Jung-uk Kim
72445c6ce6 Fix "realpath: : No such file or directory" error from the latest realpath.
Reported by:	Mike Jakubik (mike dot jakubik at intertainservices dot com)
Reviewed by:	glewis (maintainer)
2010-05-13 23:50:29 +00:00
Greg Lewis
a2e9b71248 . Add support for JAVA_VERSION of 1.7.
. Note such support in the manual pages.
. Correctly determine the Java version of the OpenJDK ports when bsd.java.mk
  isn't present.
. Bump version to 2.3.4.
2010-01-17 22:41:10 +00:00
Greg Lewis
e6192a26ab . Add support for openjdk6.
. Sort vendor references.
2009-05-22 05:40:17 +00:00
Jung-uk Kim
57e298067e Try jman(1) from ports/japanese/man instead of man(1) for japanese manual
pages if LANG is set to ja_JP.eucJP and the port is installed.
Diablo packages contain japanese manual pages and jman seems to format them
mostly fine.

Reviewed by:	glewis (maintainer)
2008-04-30 22:33:17 +00:00
Jung-uk Kim
13191cd6ce - Add support for 1.6 VMs.
- Fix reversed vendors (bsdjava <-> freebsd).
- Update port version to 2.3.1.

Reviewed by:	glewis (maintainer)
2008-04-28 15:44:18 +00:00
Greg Lewis
8fd6d36ac0 . Cross reference manvm(1). 2006-09-20 15:33:52 +00:00
Greg Lewis
0a27ea89b8 . The new Diablo JDK release doesn't need -XX:+UseMembar. 2006-07-05 20:32:58 +00:00
Greg Lewis
7fdb2af1ba . Add manvm(1). This is similar to javavm(1), but allows one to view the
manual pages for the different VMs. [1]
. Minor code clean ups (white space, redirection).

PR:		93099
2006-06-12 16:57:29 +00:00
Greg Lewis
2469e3b726 . Introduce the JAVAVM_DRYRUN variable. If this is set, then javavm will
not invoke any Java programmes, but will instead print out what it would
  have invoked and some related settings.

  This work was inspired by the PR, but doesn't use its implementation.

PR:		96050
2006-06-08 17:58:15 +00:00
Greg Lewis
ca4a8507f4 . Revert previous commit. It was my recollection that javac needed the
flags when being used to bootstrap the jdk15 port, and this was confirmed
  by somebody else.  However, javac doesn't seem to be happy with it so
  turn it back off.

Submitted by:	hq
2006-06-07 20:26:21 +00:00
Greg Lewis
1868851b7a . Diablo's javac also needs -XX:+UseMembar. 2006-06-07 04:12:31 +00:00
Greg Lewis
efe0ee6196 . Restrict the -XX:+UseMembar option to the java(1) programme to prevent it
causing problems for programmes such as jar(1).  I actually believe it is
  needed by some of the other programmes, but we'll add it as needed.
. Bump PORTREVISION for this change.

PR:		98586
Submitted by:	Achilleas Mantzios <achill@matrix.gatewaynet.com>
2006-06-06 15:25:50 +00:00
Greg Lewis
6cc070f32d . ! -z -> -n for clarity.
Suggested by:	hq
2006-06-04 03:52:19 +00:00
Greg Lewis
3694308948 . Allow the setting up of command line options to be passed to the
invoked Java VM.

Reviewed by:	hq
2006-06-03 17:32:24 +00:00
Greg Lewis
9f137bf589 . Bump PORTREVISION for the previous fix.
Suggested by:	hq
2006-04-27 14:49:42 +00:00
Greg Lewis
7947c327e5 . Avoid stomping on environment variables by prefixing variable names with
_JAVAVM_.  The notable exception is JAVA_HOME, which is deliberately set
  by the wrapper.

PR:		88048
2006-04-26 19:48:08 +00:00
Greg Lewis
dbc431427c . Avoid an infinite loop by ignoring JAVA_HOME if its set to the location
of the wrapper script.  I'm using a different patch than Herve submitted,
  but the idea is the same.
. Bump PORTREVISION.

Submitted by:	hq
2005-11-02 21:03:56 +00:00
Greg Lewis
9a4718a679 . Add a couple of comments.
. Kick unprivileged users out early in registervm/unregistervm to
  prevent double error messages.
2005-06-20 18:39:29 +00:00
Greg Lewis
d9e60aea40 . Check the user can read/write the configuration file and that it exists
before attempting to sort it when running checkvms.  This prevents a
  double error message for an unprivileged user.
. When asked to register a VM that is already registered, don't error.
  Print a warning that the VM is already registered and don't add it to
  the configuration file (but do check its links and sort the config
  file still).  This prevents problems with

	'make install -DFORCE_PKG_REGISTER'

  erroring out during the post-install stage for the JDK ports.
  Bump PORTREVISION for this change since it affects the various JDK
  ports. [2]

Reported by:	anholt, via hq [2]
2005-06-20 18:08:33 +00:00
Greg Lewis
2cad98267f . Update description.
Suggested by:	hq
2005-04-25 15:00:34 +00:00
Greg Lewis
4f7387e2e5 . Try to clarify that the BUGS section is talking about the Java VM
selection procedure used when ${PORTSDIR}/Mk/bsd.java.mk isn't present.
. Fix a typo (JAVA_PREFERRED_PORT -> JAVA_PREFERRED_PORTS).

Pointed out by:	hq
2005-04-18 17:44:30 +00:00