1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-16 03:24:07 +00:00
Commit Graph

67 Commits

Author SHA1 Message Date
Greg Lewis
0a8d3c6c13 . Prefer jdk15 over jdk14 on amd64 since the latter isn't supported on
that architecture.
2005-10-04 15:55:45 +00:00
Herve Quiroz
8d777aa3f2 Fix typo in header documentation
PR:		83498
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
2005-07-15 11:32:31 +00:00
Herve Quiroz
466ef83db3 Add JAVA_VERSION, JAVA_OS and JAVA_VENDOR to SUB_LIST.
NOTE: these are only added if the related variables are defined by the port.

This should ease the configuration of launcher shell scripts used for Java
application ports, when they are using javavmwrapper to invoke a JVM. From now,
a simple launcher that suits most of the Java application ports can be writen
using the following scheme:

  #!/bin/sh
  JAVA_VERSION="%%JAVA_VERSION%%" \
    "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/myport.jar" "$@"

As mentioned above, this is of course only correct provided that the port
defines JAVA_VERSION.

Approved by:	glewis (co-maintainer)
2005-02-27 23:49:33 +00:00
Herve Quiroz
27d4d379d6 Fix a typo in header documentation
Submitted by:	vs
2005-02-25 13:29:52 +00:00
Herve Quiroz
c84a75b4c1 Fix a typo
PR:		77330
Submitted by:	Conrad J. Sabatier <conrads@cox.net>
2005-02-10 01:44:14 +00:00
Alexey Zelkin
e25a1ba484 Add minimal support for jdk 1.5 2005-01-20 08:43:09 +00:00
Herve Quiroz
d638c122fb Add Java related substitutions to SUB_LIST: JAVASHAREDIR, JAVAJARDIR and
JAVALIBDIR
2004-12-19 02:26:53 +00:00
Greg Lewis
47777f27c3 . Default 4.x to jdk14 as the Diablo JDK has been marked FORBIDDEN. 2004-12-05 07:06:33 +00:00
Herve Quiroz
3bc39f5fdd When USE_ANT is defined, JAVA_BUILD is automatically set to 'jdk' but this
conflicts with the default values for JAVA_BUILD and JAVA_RUN. Those variables
are indeed set a default value when none of the them (together with
JAVA_EXTRACT) is defined. Having USE_ANT set a value for JAVA_BUILD will cause
JAVA_RUN not to be set its default value.

This has RUN_DEPENDS not correctly set (missing the JDK entry) on many ports
that use USE_ANT.

This patch addresses this issue by moving the statements dealing with default
values to have them executed before USE_ANT handling.

Approved by:	glewis (co-maintainer)
2004-11-29 17:33:41 +00:00
Herve Quiroz
cfffec88cb Ports that use USE_ANT will now automatically build with Jikes if available and
not explicitly forbiden.

PR:		44432
Suggested by:	znerd
Approved by:	glewis (co-maintainer)
2004-11-09 02:11:42 +00:00
Herve Quiroz
d1da4b5fb6 Additional error checking: check for defined variables that should not be. With
this patch, for instance:

$ cd /usr/port/devel/apache-ant
$ make JAVA_HOME=toto

apache-ant-1.6.2: Environement error: "JAVA_HOME" should not be defined.
*** Error code 1

PR:		70914
Reported by:	Rong-En Fan <rafan@infor.org>
Approved by:	glewis (co-maintainer)
2004-11-07 00:51:53 +00:00
Greg Lewis
c3a949e44f . Update the location the linux-ibm-jdk14 port installs into based on its
most recent update.

Forgotten by:	glewis
Approved by:	portmgr (marcus)
2004-09-09 20:31:48 +00:00
Greg Lewis
75efba599d . java/javavmwrapper now uses JAVALIBDIR rather than JAVAJARDIR, so modify
a comment to that effect.
2004-09-03 16:25:11 +00:00
Greg Lewis
e9ef0396c4 . Rope in hq as a co-maintainer since he wrote most of the current version
of this file.

Approved by:	hq
2004-09-03 06:11:10 +00:00
Herve Quiroz
1a2867dbbf - Fix missing build dependency on devel/jikes (Jikes is effectively used for
building the port but not added to BUILD_DEPENDS)
- Use ${VAR:U} to test YES/NO values a more simple way
- Refactor: Jikes now has its own sub-stages (error-handling and support)
  together in Stage 6
- New variable to be used by porters (and used internally by bsd.java.mk),
  HAVE_JIKES

Approved by:	glewis (mentor)
2004-09-02 13:18:59 +00:00
Greg Lewis
58327a1eba . Take maintainership. Ernst doesn't currently have time and I've been
performing all of the recent changes.
. Add to the header comment to document JAVASHAREDIR, JAVAJARDIR and
  JAVALIBDIR.
. Add a definition for JAVALIBDIR.  This is where other ports have
  installed their JAR files (a port should install in JAVAJARDIR but
  look for other JARs in JAVALIBDIR).
2004-09-02 05:02:58 +00:00
Greg Lewis
e2e2d90fbe . Add a USE_ANT variable with that provides a simple way to build a
Java-based port with ant, using MAKE_ENV, MAKE_ARGS and ALL_TARGET but
  using ant instead of make.  When a port is built this way it also
  causes ant to respect the JDK selected by bsd.java.mk rather than
  using the JDK that ant was build with.

  Most ports should just be able to do

  USE_ANT=	yes

  You may also need to set ALL_TARGET if your port doesn't use the
  default ant target.

  See the comments on USE_ANT at the head of bsd.java.mk for more
  information.

PR:		59997
Reviewed by:	hq (who spotted a bug and provided the comments
                    documenting USE_ANT).
2004-08-02 21:44:17 +00:00
Greg Lewis
f276a222e8 . Align some .endif with their corresponding .if. 2004-07-27 05:16:34 +00:00
Greg Lewis
d1632b5278 . Add a comment that the javavmwrapper port will need updating if
${JAVAJARDIR} is changed.
2004-07-12 19:43:47 +00:00
Greg Lewis
b05bcfe3a0 . Reapply the changes of PR/61351 (by linimon) to bsd.java.mk 2.0. These
got spammed in the update to bsd.java.mk 2.0.  They replace .BEGIN blocks
  with check-makevars:: targets.

PR:		68516
Submitted by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2004-07-01 22:44:00 +00:00
Greg Lewis
a44f1d6e4f . Add appropriate definitions for JAVASHAREDIR and JAVAJARDIR to
PLIST_SUB.
. Define java utility variables such as JAVA, JAVAC, JAVAH, APPLETVIEWER,
  etc. conditionally (?=) rather than explicitly (=).  This is in line with
  both bsd.port.mk and the earlier version of bsd.java.mk.

Reviewed by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2004-06-29 20:16:37 +00:00
Greg Lewis
b3464483eb . Switched stage 6 and 7 so JAVAC is no longer empty when not using jikes
. Added '-bootclasspath ${JAVA_CLASSES}' to the command-line for JAVAC when
  jikes is used as a substitute for javac.

PR:		66349
Submitted by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2004-06-09 18:17:24 +00:00
Greg Lewis
d709fa8022 . Remove parentheses around the comparison of ${OSVERSION}. This is in
line with bsd.port.mk and prevents errors when ${OSVERSION} is (somehow)
  undefined.

Problem report from:	Thomas Abthorpe <thomas@stthomas.stthomasanglican.org>
2004-04-19 16:56:04 +00:00
Greg Lewis
469f0e8f80 Many fixes to the new bsd.java.mk, including:
. Make the USE_JIKES setting to actually work.
. Simplified backwards compatibility with the old bsd.java.mk.
. Allowed java dependency selection with JAVA_PREFERRED_PORTS.
. More error checking on variable settings.
. Allowed USE_JAVA=yes to work without specifying a version.
. Expanded the meta-info for the individual ports so the full version
  is now available, among other things.

Submitted by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2004-04-16 14:53:22 +00:00
Greg Lewis
a85567ede0 . Document the variables used/set in the header comment.
PR:		65211
Submitted by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2004-04-05 21:40:04 +00:00
Greg Lewis
a85259a2d9 . Fix an indentation bogon.
. Use the appropriate command variable (e.g. ${SED}) rather than the raw
  command itself.  Most of the files in Mk appear to do this, although
  there are some exceptions.  Certainly bsd.port.mk does.

  The one exception is uniq, for which there isn't yet a defined variable.

PR:		65210
Submitted by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2004-04-05 21:24:25 +00:00
Greg Lewis
1c329bc674 . Correct spelling of "BSD Java Porting Team". 2004-04-05 06:50:07 +00:00
Greg Lewis
b96f3ee7cb . Allow ports to defined JAVA_EXTRACT when they want an explicit
EXTRACT_DEPENDS for java (and not necessarily a BUILD_DEPENDS or
  RUN_DEPENDS).

Result of a problem report from:	kris
2004-04-05 06:41:53 +00:00
Greg Lewis
88a41fc9c7 Bring in the new bsd.java.mk 2.0.
bsd.java.mk now provides a new set of macros to be used by ports that
require a JDK. When USE_JAVA is set, the following variables may be set
in order to give to precision regarding the requirements of the port:

- JAVA_VERSION: A list of space-separated suitable java versions for the
  port. An optional "+" allows you to specify a range of versions.
  (allowed values: 1.1[+] 1.2[+] 1.3[+] 1.4[+])
- JAVA_OS: A list of space-separated suitable JDK port operating systems
  for the port. (allowed values: native linux)
- JAVA_VENDOR: A list of space-sperated suitable JDK port vendors for
  the port. (allowed values: freebsd bsdjava sun ibm blackdown)
- JAVA_BUILD: When set, it means that the selected JDK port should be
  added to build dependencies for the port.
- JAVA_RUN: This variable works exactly the same as JAVA_BUILD but
  regarding run dependencies.

Here are some of the macros defined after setting USE_JAVA:

- JAVA_PORT: The name of the JDK port (e.g. java/jdk14)
- JAVA_HOME: The home of the JDK port in the local base
- JAVA_PORT_VERSION: The version of the JDK port.
- JAVA_PORT_OS: The operating system used by the JDK port.
- JAVA_PORT_VENDOR: The vendor of the JDK port.
- And many macros for the commonly used java executables, such as JAVA,
  JAVAC, JAVADOC, JAVAH, RMID, JAR...

bsd.java.mk 2.0 is backward compatible with the previous version. Using
the new features is strongly encouraged, since the old bsd.java.mk 1.0
features will be deprecated and removed in the near future.

You will find more detailed info (as well as a quick tutorial) at:
http://www.esil.univ-mrs.fr/~hquiroz/freebsd/bsd.java.mk-2.0.html

If you experience any problems with java based ports that you believe
is due to this change then please let me know.

PR:		63511
Submitted by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2004-04-03 03:37:05 +00:00
Ernst de Haan
8ca0e055a2 Fixed an incorrect comment.
Requested by:	Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
PR:		61741
2004-01-23 07:43:23 +00:00
Joe Marcus Clarke
e587cce18d Here come the patches!
* Add ghostscript knobs [1]
* Add per-port persistent build options with a menu-driven front-end [2]
* Allow porters to override the message generated when do-configure fails [3]
* Add patch to obviate many pkg-plist files [4]
* Fix the PKG_DBDIR comment [5]
* Make ports framework more robust with regard to make index [6]
* Add new command macros to bsd.port.mk [7]
* Remove direct command use from bsd.port.mk [8]
* Make the ports system respect WITHOUT_CPU_CFLAGS [9]
* Break the SDL code out into bsd.sdl.mk [10]
* Add working support for USE_SIZE [11]
* Fix RANDOMIZE_MASTER_SITES on -CURRENT [12]
* Convert some spaces to tabs [13]
* Add new physcial categories accessibility and x11-themes [14]
* Speed up GNU configure scripts [15]
* Remove "//" from MLINKS items in PLISTs and fix make -s install and
  make -s deinstall [16]
* Be more specific about looking for files in distinfo [17]
* Add new run-autotools target, and resort configure targets [18]
* Make CONFLICTS compare prefix for installed packages and PREFIX [19]
* Change directory to ${.CURDIR} before running certain make commands [20]
* When INSTALL_AS_USER is set, run ldconfig with failures ignored [21]
* Speed up the security check phase [22]
* Fix some corner cases in the PORTDOCS code [23]
* Add a new DEPRECATED macro [24]
* Make INDEX breakage more informative [25]

Look for a full write-up to follow on ports@ and ports-developers@.

PR:		36112 [1]
		59909 [4]
		61351 [6]
		59058 [7]
		59058 [8]
		59493 [9]
		55494 [10]
		59058 [11]
		59315 [12]
		59058 [13]
		59811 [15]
		59058 [16]
		59058 [17]
		60882 [18]
		58149 [19]
		59058 [20]
		61133 [21]
		55331 [22]
		59070 [23]
		59362 [24]
		59626 [25]
Submitted by:	linimon [1]
		eivind [2]
		marcus [3]
		trevor [4]
		gerald [5]
		linimon [6]
		eik [7]
		eik [8]
		jeh [9]
		edwin [10]
		eik [11]
		Sergey Matveychuk <sem@ciam.ru> [12]
		eik [13]
		trevor gnome [14]
		adamw [15]
		eik [16]
		eik [17]
		edwin [18]
		clement [19]
		eik [20]
		edwin lev [21]
		Eugene M. Kim <ab@astralblue.com> [22]
		eik [23]
		linimon [24]
		eik [25]
2004-01-20 09:14:10 +00:00
Ernst de Haan
a423698f97 Fixed bug. If a Linux 1.4 JDK would have been installed, it
would not have been picked up if USE_JAVA was set to "1.3+".

The behaviour is now as follows if USE_JAVA is set to
"1.3+":
- If the setting is 1.3+, then use an already installed 1.3
  or 1.4 JDK. If there is no such JDK, then set USE_JAVA to
  1.3. The FreeBSD JDK 1.4 is preferred over all other
  JDK's.

Noticed by:	pav
2003-12-15 07:04:50 +00:00
Greg Lewis
22c2963e1c . Note some of the JDKs are now 1.4.2 rather than 1.4.1 (the native one
was updated today in particular).
2003-11-11 22:25:08 +00:00
Greg Lewis
f82643c805 . Add support for the new diablo-jdk13 port. This will be the default
JDK 1.3 port for any 1.3 dependencies.

Approved by:	znerd
2003-09-03 16:29:18 +00:00
Ernst de Haan
5d20905d9a Sun JDK 1.4 for Linux is now 1.4.2, not 1.4.1. 2003-07-18 14:31:45 +00:00
Greg Lewis
775b2931cb . Remove an erroneous check that limited USE_JAVA to the form X.Y+. The
form X.Y is also allowed.  A similar check is performed later in the
  file which will catch bogus versions of both forms.

Reviewed by:	znerd
2003-05-01 16:50:00 +00:00
Alexey Zelkin
99e7681e29 Bad idea to have cvsup/conflict reminder about not-committed changes, but...
complete previous commit by adding support of Blackdown and IBM 1.4.1 JDKs
(existing in ports tree for long time), add support for Sun JDK 1.2.2 and
fix/update comments appropriately to this and previous Maxim's commits.
2003-04-16 15:31:17 +00:00
Maxim Sobolev
498638b6e5 Add support for native JDK 1.4.1 port. 2003-04-15 17:13:26 +00:00
Ernst de Haan
b268aac8ef Defining JAVASHAREDIR and JAVAJARDIR. If they're already set,
they will not be overridden.

Reviewed by:	freebsd-java
Approved by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
		Dave Glowacki <dglo@hyde.ssec.wisc.edu>
2002-11-18 13:00:00 +00:00
Ernst de Haan
f20a5c3128 Only using Jikes if NO_BUILD is not set.
Requested by:	Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
2002-11-14 15:18:44 +00:00
Ernst de Haan
3fe0dc931c Fixed support for Blackdown JDK 1.3.x.
Submitted by:	Seamus Venasse <Seamus.Venasse@polaris.ca>
2002-10-14 19:16:40 +00:00
Ernst de Haan
75e9be51aa Now supports the Sun JDK 1.4.1 for Linux instead of 1.4.0. 2002-09-17 09:12:32 +00:00
Ernst de Haan
8a2877e957 Fixed support for Blackdown JDK 1.3 for Linux.
Submitted by:	Seamus Venasse <Seamus.Venasse@gov.yk.ca>
2002-09-17 09:03:20 +00:00
Ernst de Haan
35712f9ac7 Again changed the order within some lists for estetical reasons. 2002-08-12 12:59:23 +00:00
Ernst de Haan
0a2b751781 Added Blackdown JDK 1.4.1 for Linux.
See also:	http://www.blackdown.org/java-linux/java2-status/jdk1.4-status.html
2002-08-12 11:02:58 +00:00
Ernst de Haan
f83151ee42 Changed the order within a list for estetical reasons. 2002-08-12 10:57:35 +00:00
Ernst de Haan
5d2630c7f4 Changed the installation directory of the Sun JDK 1.4.x
for Linux from linux-sun-jdk1.4.0.01 to linux-sun-jdk1.4.0.
This is more like the installation directories for the other
JDK ports.

PR:		41424
2002-08-10 10:54:06 +00:00
Ernst de Haan
b0efcd4f99 Changed the installation directory of the Sun JDK 1.4.x for Linux
to linux-sun-jdk1.4.0.01.

PR:		41424
2002-08-10 10:47:25 +00:00
Ernst de Haan
0050da690f Changed the installation directory of the Sun JDK 1.3.x for Linux to
linux-sun-jdk1.3.1.

PR:		41424
2002-08-10 10:31:09 +00:00
Ernst de Haan
c6295a4356 Now correctly looks for the Blackdown JDK 1.2 for Linux in
${LOCALBASE}/linux-blackdown-jdk1.2.2.
2002-08-10 09:03:47 +00:00