20:21 Tijl Coosemans (tijl) 

Mk/*: Build with a clean environment

Both our make and gmake use the MAKEFLAGS environment variable but the
values aren't compatible and the latest version of gmake complains about
that.  To rule out that any environment variable can cause problems like
this, add a new command SETENVI=/usr/bin/env -i that clears the
environment, and use it to run upstream build systems with a clean
environment.

Introduce a new variable WRK_ENV that contains the environment to use
with SETENVI in all targets that run upstream build commands.  Variables
that are common between CONFIGURE_ENV and MAKE_ENV could be moved to
WRK_ENV but for now it just contains a minimal environment:

HOME=${WRKDIR}: Fixes USES=elixir ports that were using the user's HOME.
OSVERSION: For cross building; determines the output of uname -K and
getosreldate(3); affects net/freebsd-telnetd for example.
PATH: Fixes USES=gem ports that were using the user's PATH.
PWD=$${PWD}: Preserve current working directory; affects USES=go ports.
TERM: To preserve colored output to terminals.
TMPDIR: For users who define that.
UNAME_*: For cross building; determines the output of uname(1); affects
lang/python* for example.

This commit deals with everything under Mk/.  Ports that have their own
targets running upstream build commands can switch to SETENVI later.

The ports tree adds its definition of ARCH to the MAKEFLAGS environment
variable, which is interpreted by sub-makes as command line arguments,
which means that any definition of ARCH in upstream makefiles was
overridden.  The following ports required fixes now that this is no
longer the case.

games/iortcw, games/q3cellshading, games/tremulous:
These use Quake 3 engine code.  Fix use of ARCH.  Reduce diff between
FreeBSD code and Linux code.

games/legesmotus:
Remove ARCH related patches.

lang/ocaml:
Patch configure script so it detects amd64 correctly.  Also make the
powerpc case consistent with the other architectures.  This also affects
other ocaml ports like devel/ocaml-ocamlbuild and math/ocaml-num that
include a Makefile.config installed by lang/ocaml.  While here, use
SETENVI in check-test target.

net/libnatpmp:
Use of upstream definition of ARCH triggers installation in PREFIX/lib64
on amd64.  Disable this.

PR:		276478
Approved by:	portmgr (antoine)
Exp-run by:	antoine

    572f236

04:29 Greg Lewis (glewis) 

Mk/bsd.java.mk: Complete support for Java 19, 20 and 21

PR:		273979
Reported by:	vvd@

    c94ba5ed

04:06 Greg Lewis (glewis) 

Mk/bsd.java.mk: Add support for JDKs 19, 20, and 21

PR:		273979

    9cde18f

18:10 Muhammad Moinur Rahman (bofh) 

*/*: Refactor java/openjdk7 removal

- java/openjdk7* has been removed from the tree since 2022-09-03 however
  the relevant codebases in bsd.java.mk has not been removed and the
  consumers has also not been updated to use the next jdk version. This
  commit updates all relevant consumers to use JAVA_VERSION=8 instead of
  JAVA_VERSION=1.7
- Since the introduction of jdk version 18 it looks like similar with
  jdk version 8(java version string 1.8). This is prone to error as it
  looks similar and is only seperated by a '.'. Remove using
  JAVA_VERSION with dotted fomat of java version string and update all
  consumers to utilize version 8 instead of 1.8.

Approved by:	portmgr (blanket)

    4cda17a

11:01 Rene Ladan (rene) 

Mk/bsd.java.mk: unregister expired java/openjdk7

    e11361a

19:40 Tobias C. Berner (tcberner) 

cleanup: remove 'Created by' lines

A big Thank You to the original contributors of these ports:

  *  Akinori MUSHA <knu@FreeBSD.org>
  *  Alejandro Pulver <alepulver@FreeBSD.org>
  *  Edwin Groothuis <edwin@freebsd.org>
  *  Ernst de Haan <znerd@FreeBSD.org>
  *  Florent Thoumie <flz@FreeBSD.org>
  *  Gabor Kovesdan <gabor@FreeBSD.org>
  *  Mark Linimon <linimon@FreeBSD.org>
  *  Shaun Amott <shaun@inerd.com>

With hat:	portmgr
Reported by:	mat

    2c54d26

20:09 Rene Ladan (rene) 

cleanup: remove expired versions of OpenJDK (12 through 16)

Adjust ports depending on expired versions of OpenJDK:
- biology/snpeff: 12+ -> 17+
- devel/RStudio: 12 -> 11
- www/closure-compiler: 13 -> 11+

Allow java/openjdk17 to use java/openjdk17-bootstrap on i386
too, this builds just fine on 13.1-i386

Remove jdk12-doc as it is no longer relevant.

Clean up Java version calculations in bsd.java.mk

Reviewed by: jwb, java (glewis)

Differential Revision: https://reviews.freebsd.org/D35280

    c7d1c24

01:21 Greg Lewis (glewis) 

Mk/bsd.java.mk: Revert previous commit allowing 1.11 as a version

* 1.11 has never been a valid Java version.  I've fixed the offeding
  port that used it rather than adding it here.

    1309940

11:34 Ashish SHUKLA (ashish) 

Mk/bsd.java.mk: Extend JAVA_VERSION matching

Add explicit matching for 1.11+ which is used by x11-fm/mucommander,
and was resulting in broken INDEX for it

PR:		263483
Reported by:	Tomoaki AOKI

    65526ee

06:55 Ashish SHUKLA (ashish) 

Mk/bsd.java.mk:  Fix JAVA_VERSION matching

Anchor the matched patterns to be at the beginning of each word to
prevent unexpected surprises

e.g. with JAVA_VERSION= 17+ it results in _JAVA_VERSION set to
unexpected "17 8 11 12 13 14 15 16 17 18", instead of "17 18"

PR:		263483
Reported by:	jrm
Reviewed by:	glewis
Approved by:	glewis

    90de298

10:00 Tobias C. Berner (tcberner) 

framework: cleanup conditional-indentations in Mk/

Run Tools/scripts/indent_make_if.pl on all of Mk.

These white space changes contribute greatly to the readability of those files.
As we have a version control system, finding out the reasons for the changes
prior to these white space changes is still easily possible

Differential Revision:	https://reviews.freebsd.org/D35024
Reviewed by:		portmgr (rene, bapt)

    aa25396

14:52 Greg Lewis (glewis) 

Mk/bsd.java.mk: Add support for openjdk18 and 18[+] as a version

    aad1501

06:49 Greg Lewis (glewis) 

Mk/bsd.java.mk: Add support for openjdk17 and 17[+] as a version

PR:		259167
Reported by:	cedric@precidata.com

    f10d7de

10:39 Rene Ladan (rene) 

Mk/bsd.java.mk: generalize a comment.

Differential Revision:	https://reviews.freebsd.org/D29451

    e7863f5

04:37 glewis 

Add support for openjdk16 and 16[+] as a valid version

 

18:34 glewis 

Add support for openjdk15

 

17:10 glewis 

Allow users to specify a default Java version in the standard way

PR:		244942
Submitted by:	Tommy P <tommyhp2@gmail.com>

 

19:05 glewis 

Add support for openjdk14

 

21:46 jkim 

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

 

19:35 glewis 

Eliminate references to 9 and 10

* All 9 and 10 JDKs have been removed and no ports explicitly list either
  as a desired version, so remove references to simplify the versioning
  substitutions a little.

 

19:42 glewis 

Add 13, force 9/10 -> 11

* Remove comment references to 9 and 10 as possible version specifications.
  Note that 9 and 10 aren't actually removed as valid versions as there is
  one port with a reference (news/nzbhydra2).
* Add 13 as a valid version.
* Add configuration for openjdk13.
* Modify the construction of _JAVA_VERSION to force 9 and 10 to 11.

Sponsored by:	The FreeBSD Foundation

 

11:12 rene 

bsd.java.mk: unregister expired java/linux-oracle-jdk9 and
java/linux-oracle-jdk10

 

18:19 glewis 

Remove references to openjdk6

* Remove references to "6" in comments and examples
* Remove java/openjdk6 from the list of Java ports that are considered to
  satisfy a dependency
* Don't yet remove "6" as a valid version since many ports have "1.6+" as
  a version specifier (although none have just 1.6).  Instead force this
  to mean "1.7+".

PR:		234792
Sponsored by:	The FreeBSD Foundation

 

16:06 glewis 

Support newer Java versions

* Add configuration for newer versions of the JDK (11, 12)
* Switch to modern Java versioning (e.g. 8 rather than 1.8)
* Retain backwards compatibility with existing version specification
* Support the few ports that set USE_JAVA to the requested version

PR:		237054, 238758 (exp-run)

 

01:16 kevans 

Mk/bsd.java.mk: Strict JAVA_{VERSION,VENDOR,ERROR} validation

Currently, validation of JAVA_{VERSION,VENDOR,ERROR} does not constitute an
error and make(1) will happily continue, potentially doing the wrong thing.
Adjust the behavior as follows:

- Only validate each var if it's defined
- Remain verbose about what error exists and what's expected
- Fail the build if validation fails

bsd.java.mk exhibited this behavior up until r217132 inadvertently changed
it to be non-fatal.

PR:		220737
Approved by:	portmgr (bdrewery)

 

18:41 glewis 

. Add a port of the Oracle JDK9 for Linux.
. Add support for JDK9 to bsd.java.mk

 

18:09 kevans 

Minor cleanup to Java version/vendor/OS validation

- Use POSIX compliant expressions instead of employing GNU extensions
(branching in BREs)
- Simplify regex generation using make(1)'s :ts modifier

PR:		220054
Approved by:	bapt (portmgr)

 

23:31 jkim 

Implement test target for USE_ANT=yes.

 

12:16 rene 

Mk/bsd.java.mk: unregister expired java/linux-sun-jdk17

PR:		209011
Approved by:	portmgr (bapt)
Sponsored by:	Essen Linuxhotel Hackathon 2016

 

01:23 bapt 

Remove the now unneeded ${PORTSDIR} from dependency definition in
The infrastructure Makefiles

PR:		206569
Exp run by:	antoine
Differential Revision:	D5047

 

16:14 swills 

Make OpenJDK 1.8 the default

 

20:05 swills 

- Make OpenJDK 1.7 the default

 

09:45 bapt 

Convert all :U to :tu and :L to :tl

Since FreeBSD 8.4 and FreeBSD 9.1 make(1) do support :tu and :tl as a
replacement for :U and :L (which has been marked as deprecated)

bmake which is the default on FreeBSD 10+ only support by default
:tu/:tl a hack has been added at the time to support :U and :L to ease
migration. This hack is now not necessary anymore

Note that this makes the ports tree incompatible with make(1) from
FreeBSD 8.3 or earlier

With hat:	portmgr

 

21:35 jkim 

Document JAVA_EXTRACT.

 

18:05 jkim 

- Sort Java implementations by preference, i.e., java/openjdk7 is preferred
over java/openjdk8.  java/openjdk8 is still in its infancy.
- Retire redundant _JAVA_PREFERRED_PORTS hack.  We only have one preferred
port since r290539 and we want to keep it that way.

 

17:17 jkim 

Update comments.

 

15:37 sunpoet 

- Fix _JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO
- Reorder _JAVA_VENDOR_*
- Update comment

Submitted by:	sunpoet (myself)
Approved by:	bapt (portmgr)

 

02:08 glewis 

. Set maintainer to java@FreeBSD.org.

 

07:20 bapt 

Add support for OpenJDK 1.8
Add support for Oracle JDK 1.8
Remove support for Sun JDK 1.6 (EOLed)
Remove support for USE_JAVA=1.5

 

10:36 bapt 

Change DESTDIRNAME into a ant compatible argument when a port is staged
While here remove previous workarounds.

Submitted by:	ale
Discussed with:	jkim, glewis

 

00:45 miwi 

- Remove CVS reference

PR:		178381
		177581
Submitted by:	Eitan Adler <lists@eitanadler.com>
		Alex Kozlov <spam@rm-rf.kiev.ua>

With hat:	portmgr

 

02:38 glewis 

. Split a long comment line.

 

02:37 glewis 

. Replace the use of != and shell utilities with actual make logic.  This
  should be much faster and avoid some complaints from make.

PR:		177355
Submitted by:	crees@

 

05:11 glewis 

. Fix all of the ports which still have as a version requirement

  JAVA_VERSION=1.5

  or

  JAVA_VERSION=1.5+

  The previous revision took this out as a valid version number meaning
  that we end up with the non-existent "/bin/java" as the desired JDK.

  Expand 1.5 to 1.6 and 1.5+ to 1.6 1.7 for now.  This can be reverted
  once all the ports are updated.

 

17:18 bapt 

Decommissioning java 1.5 (EOLed since October 2009):
removal of the different 1.5 jre and jdk vendors

Removing outdated jdk16 vendors:
removing all the bsdjava and freebsd vendors, consider using openjdk6 or
openjsk7 instead.

Discussed with:	java (glarkin)

 

08:17 miwi 

- Remove emacs mode, -*- mode: ...; -*- [1]
- Comments for BUILD_ and RUN_DEPENDS fail to mention alternate means to specify
dependencie [2]
- Fix make reinstall [3]
- Trivial comment change for PORTDATA [4]

PR:             151954 [1]
                161314 [2]
                167085 [3]
                167465 [4]
Submitted by:   Anonymous <swell.k@gmail.com> [1]
                dougb@ and Chris Rees <utisoft@gmail.com> [2]
                Garrett Cooper <yanegomi@gmail.com> [3]
                "Bryan Drewery" <bryan@shatow.net> [4]
Tested via:     phw

04:03 glewis 

. Instead of bailing when we hit a possibly conflicting variable being
  defined just clear it and issue a warning that it was set.

PR:             165115
Approved by:    hq@ (co-maintainer)

06:40 glewis 

. Add support for the new linux-sun-jdk17 port.

04:04 glewis 

. Make the openjdk6 port the preferred JDK by default.

  Many thanks to erwin@ for a -exp run.

19:23 glewis 

. Make commented examples reference 1.6 (the current default) rather than 1.5.

05:03 linimon 

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

18:46 rene 

- Unregister expired java/jdk14
- Update example from java/jdk14 to java/jdk16

PR:             ports/158030
Submitted by:   myself
Approved by:    glewis

15:48 hq 

Update the list of possible values for JDK vendor in the header comments

PR:             154553
Submitted by:   Warren Block <wblock@wonkity.com> (PR),
                ryusuke (patch)

06:07 glewis 

. Add support for the openjdk7 port.
. Add support for a JAVA_VERSION requirement of 1.7.

Reviewed by:    hq@

04:11 glewis 

. Add support for openjdk6 as a possible JDK.

Submitted by:   Jonathan Chen <jonc@chen.org.nz>
Reviewed by:    hq@

15:42 glewis 

. Add diablo-jdk16 and make it the default on 6.x and 7.x.
. Make jdk16 the default on all other supported versions.

17:59 kris 

Major optimizations for 'make index' and other recursive traversal
targets.

* Use /rescue/sh for index builds instead of /bin/sh, when it exists.
  The former is statically linked and faster to execute, which becomes
  significant when executing it tens of thousands of times.  This
  trick can be used with other recursive targets by passing in
  __MAKE_SHELL.

* Get rid of make variable assignments that use != command invocations
  in the critical path, using several methods:

  - rewriting logic to use shell or make builtins instead of external command
executions
  - macroizing commands and executing them in the targets where they
    are needed instead of with every invocation of make
  - precomputing the results of invariant commands in
    bsd.port.subdir.mk and passing them in explicitly to child makes,
    and using this to avoid recalculation in all the children. NB: the
    commands are still run one per top-level subdirectory but this
    does not currently seem to be a major issue.  They could be moved
    further up into the top-level Makefile at the cost of some
    cleanliness.
  - Committers are strongly discouraged from adding further "bare" !=
    assignments to the ports tree, even in their own ports.  One of
    the above strategies should be used to avoid future bloat.

* Rewrite the core 'describe' target to work entirely within a single
  shell process using only builtin commands.  The old version is
  retained as a backup for use on systems older than 603104, which
  does not have the make :u modifier.  This cuts down the number of
  processes executed during the course of a 'make index' by an order
  of magnitude, and we are essentially now amortized to the minimum of
  a single make + sh instance per port, plus whatever commands the
  port makefile itself executes (which are usually unnecessary and
  bogus).

* Less validation of the WWW: target is performed; this can become
  policed at a port level by portlint.  Specifically we look at the
  second word of the first line beginning with "WWW:" in pkg-descr,
  and append "http://" to it unless it already begins with "http://",
  "https://" or "ftp://".  Thanks to dougb for the idea of how to
  extract WWW: using shell builtins.

* Use the "true" shell builtin instead of echo > /dev/null for a
  measurable decrease in CPU use.

* Add a note about dubious escaping strategy in bsd.port.subdir.mk

* Minor change in output of 'make describe': it no longer strips
  trailing CR characters from pkg-descr files with MSDOS CR/LF
  termination.  Instead the makeindex perl script that post-processes
  make describe into the INDEX is tweaked to strip on input.

The bottom line is that on my test hardware INDEX builds are now
faster by more than a factor of 2 and with a reduction in system time
by a factor of 4-8 depending on configuration.

15:09 hq 

Remove support for Java 1.1 and 1.2 in the ports tree

To ease upgrade, bsd.java.mk now substitutes JAVA_VERSION values of 1.1+ and
1.2+ as 1.3+.

The related JDK ports that have been marked as deprecated and scheduled for
removal some time ago are now safe to be removed.

The patch has been tested successfully on the cluster.

PR:             116724

14:42 glewis 

. Remove a check for OSVERSION >= 500000 since this is now true for all
  supported versions of FreeBSD.

PR:             116890
Submitted by:   edwin

21:19 glewis 

. Enforce NO_JIKES when 1.6 is required as well.

21:16 glewis 

. Support for the JDK 1.6 ports.

Submitted by:   jkim

15:38 glewis 

. Remove references to deprecated, forbidden and expired port of the
  Linux Blackdown 1.3 JDK.

PR:             113268
Submitted by:   gabor@

07:44 linimon 

Forced commit to note that I had not finished editing the previous commit
message:

* Remove references to obsolete ports from bsd.java.mk [8]

is actually ports/104136 by hq.

mcl

06:21 linimon 

* Refine some comments about Linux emulation [1]

* Fix 'make search' with non-default ${PORTSDIR} [2]

* Fix typo in USE_LDCONFIG32 message [3]

* Allow USE_PHP after inclusion of bsd.port.pre.mk [4]

* Document NO_LDCONFIG_MTREE [5]

* Update/enhance description of INSTALLS_SHLIB and USE_LDCONFIG [6]

* Remove obsolete code in bsd.port.mk dealing with 4.X and other,
  even older, releases [7]

* Remove references to obsolete ports from bsd.java.mk [8]

PR:     105883 [1], 105917 [2], 106195 [3], 106557 [4], 108738 [5],
        108739 [6], 108782 [7], 103357 [8]

Submitted by:   bsam [1], shaun [2], edwin [3], ale [4], gerald [5] [6],
                linimon [7], kris [7], gabor [4]

14:07 pav 

bsd.port.mk
 [1] Remove DEPENDS
 [2] Add a new pkg-plist keyword @stopdaemon
 [3] Provide rc.subr script suffix as RC_SUBR_SUFFIX
 [4] Add USE_CDRTOOLS to abstract dependency on sysutils/cdrtool[-cjk]
 [5] Add DOS2UNIX_REGEX, allowing to pass a filename regex to CRLF replacement
     routine
 [6] Support partially translated manpages in MAN* variables
 [7] Fix USE_LDCONFIG on ports with @cwd in pkg-plist
 [8] Remove support for XFree86 3.X
 [9] Add user settable WITH_DEBUG flag that turns on -g in CFLAGS and resets
     STRIP
 [9] Fix `make install' to refuse overwriting of older version of the port
[10] New category ports-mgmt
[11] New category gnustep
[12] Removed category picobsd

bsd.java.mk
[13] Remove deprecated syntax

bsd.tcl.mk
[14] Provide TCL_VER when USE_TK[_BUILD] is defined. Fixes cad/netgen

ports/Makefile
[15] Make csup default `make update' method on FreeBSD 6.2 and up

PR:             ports/99742 [1], ports/93373 [2], ports/100915 [3],
                ports/105161 [4], ports/106029 [5], ports/106252 [6],
                ports/106235 [7], ports/100939 [9], ports/97507 [10],
                ports/103931 [11], ports/106921 [12], ports/104136 [13],
                ports/105215 [15]
Submitted by:   sem [1] [2], Matthias Andree <matthias.andree@gmx.de> [3],
                nork [4], pav [5] [7] [14], Nick Barkas <snb@threerings.net>
[6],
                flz [8], gabor [9], shaun [10], erwin [12], hq [13],
                Gurkan Sengun <gurkan@linuks.mine.nu> [11]

21:49 glewis 

. Add an entry for the linux-sun-jdk15 port.

PR:             108130
Submitted by:   Milon Papezik

20:40 hq 

Convert whitespaces to tabs

PR:             104012
Submitted by:   edwin

19:54 glewis 

. Prefer diablo-jdk15 on 5.x/i386, 6.x/i386 and 6.x/amd64 and jdk15
  everywhere else.

Reviewed by:    hq
Suggested by:   kris

18:27 glewis 

. Remove the entry for the defunct diablo-jdk13 port.

03:32 glewis 

. Add an entry for the new Diablo Caffe (JDK) 1.5.0 binary.
. Make Diablo Caffe 1.5.0 the default JDK for all the versions/architecture
  that its available for.
. Make the standard jdk15 the default on FreeBSD 4.x as this should now be
  stable with the release of patchset 3.

Reviewed by:    hq

09:02 clement 

* Add bsd.database.mk [1]
  - move out from bsd.port.mk USE_MYSQL and USE_PGSQL.
  - add support for Berkley DB and SQLite (via USE_BDB and USE_SQLITE
    knobs).

* Espace '+' in make search [2]

* Add "makepatch" target to simplify creation of patches during porting [3]

* Replace deprecated MACHINE_ARCH with ARCH [4]

* Remove support of OpenLDAP 2.1 [5]

* Add bsd.tcl.mk [6]
  It introduces USE_TCL/USE_TCL_BUILD knobs to support various
  version of tcl (8.0 -> 8.4)

* Fix cosmetic bugs in security-check target [7]

* Add support for INDEX-7 and above (up to INDEX-9 actually) [8]

* Add "package-recursive" to bsd.port.subdir.mk [9]

* Remove check for FreeBSD version < 460101 [10]

* New category: net-im [11]

* Add .desktop file facilities
  It introduces DESKTOPDIR and DESKTOP_ENTRIES knobs [12]

* Add SHA256 support to "*checksum" targets [13]

* Fix USE_PYTHON with OPTIONS [14]

* Force NO_LINT to MAKE_ENV to avoid library breaks [15]

* Fix typo: s/RC_ORDER/USE_RCORDER/g [16]

* Add support for PostgreSQL 8.1 [17]

* Add bsd.apache.mk
  USE_APACHE knob enhancements [18]

PR:             ports/85695 [1], ports/85669 [2], ports/85488 [3],
                ports/84489 [4], ports/83835 [5], ports/83718 [6],
                ports/83716 [7], ports/83710 [8], ports/82753 [9],
                ports/82138 [10], ports/81206 [11], ports/79509 [12],
                ports/79123 [13], ports/74866 [14], ports/85490 [15],
                ports/83514 [16], ports/88466 [17]

Submitted by:   vsevolod [1] [6], Ricardo Alves dos Reis
                <ricardo_bsd@yahoo.com.br> [2], markm [3] [15], obrien [4],
                krion [5] [8] , Petr Rehor <prehor@gmail.com> [7],
                clement [8] [18], jhs@berklix.org [9], edwin [10] [13],
                pav [11], jylefort [12], mnag [14], leeym [16], girgen [17]

17:37 hq 

Disable the use of Jikes when using Java 1.5 because the current stable version
of Jikes not does support all of Java 1.5 extensions.

Porters may still enforce the use of Jikes with Java 1.5 by explicitely
setting:

  USE_JIKES=    yes

This fix is a temporary one and is bound to be removed whenever Java 1.5 gets
fully supported in Jikes.

Reported by:    lawrance
Approved by:    glewis (co-maintainer)

15:55 glewis 

. Prefer jdk15 over jdk14 on amd64 since the latter isn't supported on
  that architecture.

11:32 hq 

Fix typo in header documentation

PR:             83498
Submitted by:   Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>

23:49 hq 

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)

13:29 hq 

Fix a typo in header documentation

Submitted by:   vs

01:44 hq 

Fix a typo

PR:             77330
Submitted by:   Conrad J. Sabatier <conrads@cox.net>

08:43 phantom 

Add minimal support for jdk 1.5

02:26 hq 

Add Java related substitutions to SUB_LIST: JAVASHAREDIR, JAVAJARDIR and
JAVALIBDIR

07:06 glewis 

. Default 4.x to jdk14 as the Diablo JDK has been marked FORBIDDEN.

17:33 hq 

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)

02:11 hq 

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)

00:51 hq 

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)

20:31 glewis 

. Update the location the linux-ibm-jdk14 port installs into based on its
  most recent update.

Forgotten by:   glewis
Approved by:    portmgr (marcus)

16:25 glewis 

. java/javavmwrapper now uses JAVALIBDIR rather than JAVAJARDIR, so modify
  a comment to that effect.

06:11 glewis 

. Rope in hq as a co-maintainer since he wrote most of the current version
  of this file.

Approved by:    hq

13:18 hq 

- 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)

05:02 glewis 

. 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).

05:16 glewis 

. Align some .endif with their corresponding .if.

19:43 glewis 

. Add a comment that the javavmwrapper port will need updating if
  ${JAVAJARDIR} is changed.

22:44 glewis 

. 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>

20:16 glewis 

. 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>

18:17 glewis 

. 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>

16:56 glewis 

. 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>

14:53 glewis 

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>

21:40 glewis 

. Document the variables used/set in the header comment.

PR:             65211
Submitted by:   Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>

21:24 glewis 

. 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>

06:50 glewis 

. Correct spelling of "BSD Java Porting Team".

06:41 glewis 

. 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

03:37 glewis 

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.

(Only the first 15 lines of the commit message are shown above )