Commit graph

52 commits

Author SHA1 Message Date
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
Greg Lewis
5729185ae1 . A big mdoc fixup kindly provided by the mdoc police. Any problems should
be attributed to my merging of the mdoc fixes with some content changes
  I had made.

Submitted by:	simon
2005-04-12 20:17:46 +00:00
Greg Lewis
0c91c97816 . Yet more clarification of how the selection of the Java VM can be
different depending on whether bsd.java.mk exists on the system.
2005-04-12 16:25:01 +00:00
Greg Lewis
3d485a44fb . Fix some sentence breaks.
. Add some more details on how javavmwrapper selects the VM. [2]

Suggested by:	hq [2]
2005-04-12 16:07:21 +00:00
Greg Lewis
5d2e3b3a6f . Document that the environment variables can also be a space delimited
list of values, not just a single value.

Pointed out by:	hq
2005-04-12 15:46:57 +00:00
Greg Lewis
d964895873 . Install manual pages for javavmwrapper.
. Bump PORTREVISION.

PR:		27075
2005-04-11 21:22:43 +00:00
Greg Lewis
7ea5326d8e . Ignore errors from the call to registervm, otherwise one sees a whole
slew of spurious errors when upgrading the port.
2005-04-11 21:21:16 +00:00
Greg Lewis
df7dcddd09 . Separate standard variables from variables local to this Makefile. 2005-04-11 20:57:57 +00:00
Alexey Zelkin
fe509ee261 One more place to reflect existence of jdk 1.5.
Bump PORTREVISION
2005-01-21 10:27:52 +00:00
Herve Quiroz
e4b8a8ca7a Take into account the '-devel' package name suffix when registering CONFLICTS
with java/kaffe-devel

Pointy hat to:	me
2004-12-24 15:24:14 +00:00
Herve Quiroz
a14c373bb7 - Register CONFLICTS with java/kaffe and java/kaffe-devel 2004-12-24 15:09:16 +00:00
Greg Lewis
6e54503ac8 . Move pkg-install to files/pkg-install.in since it is modified before use.
This also fixes a problem that when being modified it wasn't specified
  by absolute path.

Reported by:	Robert Backhaus <robbak@robbak.com>
2004-12-16 15:38:17 +00:00
Greg Lewis
71d3fdc85a . Run the pkg-install script correctly.
. Bump PORTREVISION for this change and the previous change to
  javavmwrapper itself.
2004-12-07 20:18:48 +00:00
Greg Lewis
5e2e151b0f . Some minor comment and formatting fixes (should have probably have been
done separately).
. Much more stringent checks on VMs that we are trying to register.  This
  prevents most bogus and circular registrations. [1]

Suggested by:	Josh Elsasser <josh@elsasser.org> [1]
2004-12-07 20:18:04 +00:00
Greg Lewis
59fc5151e6 . javavmwrapper uses PATH to make sure it gets the system version of
utilities.  Unfortunately this overrides any PATH that may have been
  set by the user and hence affects the ability of java to execute
  external programmes.  So, save the PATH before setting it and then
  restore it immediately before executing java.
. Bump PORTREVISION for this fix.

Reported by:	Christian Laursen <xi@borderworlds.dk>
2004-11-12 16:12:48 +00:00
Greg Lewis
280df4e4ce . Usher in javavmwrapper 2.0, a rewrite of the wrapper scripts designed to
allow the simple use of multiple VMs.  Brief detail of the main changes:
  . When a VM is registered, symbolic links for its executables are
    created in ${LOCALBASE}/bin.  This allows people to just type
    'java', 'javac', etc. without having to add the VM installation
    directory to their PATH.
  . The actual 'java' that is executed via one of these symlinks is
    determined by the order of the (sorted) configuration file
    ${LOCALBASE}/etc/javavms and by the environment variables
    JAVA_VERSION, JAVA_OS and JAVA_VENDOR which function to select
    a VM as they do in the ports framework.
. There is a new command, checkvms, to sanity check the configuration
  and symlinks.
. The "javavm" executable is currently retained in its original capacity
  as a synonym for Java for backward compatibility.  However, its use
  is deprecated.
. Temporarily set MAINTAINER to myself to make monitoring any initial
  bug reports easier.  The intent is to convert it to java@ at a later
  date.

This is built on the ideas of znerd, hq and Shelton C. Johnson Jr., with
hq and Shelton contributing code and reviews.

PR:		27079, 39080
Reviewed by:	hq, Shelton C. Johnson Jr. <shelton_c_j@yahoo.com>
2004-11-11 19:17:37 +00:00
Greg Lewis
6a5d768670 . JAVALIBDIR is more appropriate than JAVAJARDIR now we have it. 2004-09-03 16:23:01 +00:00
Dag-Erling Smørgrav
d811cc16ac Add a classpath script. 2004-04-01 13:40:14 +00:00
Maxim Sobolev
10588346d3 Let be hohest: I really don't have a time now to properly maintain all
these great pieces of software, so that let others with more free time
to take over them.
2003-07-29 09:12:37 +00:00
Ade Lovett
7e52725f2a Clear moonlight beckons.
Requiem mors pacem pkg-comment,
And be calm ports tree.

E Nomini Patri, E Fili, E Spiritu Sancti.
2003-03-07 06:14:21 +00:00
Maxim Sobolev
1773476e67 Long overdue fix: correctly process arguments with spaces. 2002-02-02 22:24:20 +00:00
Maxim Sobolev
32a641962e Revert previous fix - it was not properly thought out.
Submitted by:	ted@tednet.nl (Ted Lindgreen)
2001-12-03 14:43:07 +00:00
Maxim Sobolev
3d90271529 Use "$@" instead of "$*" to pass parameters to a subshell. This ensures that
parameters with spaces are passed correctly.

PR:		32191
Submitted by:	Ben Suffolk <ben.suffolk@orange.co.uk>
2001-11-26 13:00:50 +00:00
Roger Hardiman
c996aa60be Fix typo 2001-01-19 14:24:30 +00:00
Maxim Sobolev
10e2f8893d Whitespace-only:
Make indentation uniform across my ports.
2000-11-01 15:51:11 +00:00
Maxim Sobolev
ceec80fd32 Add "unset JAVA_HOME" to make javavmwrapper working with some brain damaged
software (Adobe AcrobatViewer).
2000-06-20 07:40:20 +00:00
Maxim Sobolev
0f07eca387 Fix typo. 2000-06-12 13:37:28 +00:00