Commit graph

134 commits

Author SHA1 Message Date
Rene Ladan
e11361afb9 Mk/bsd.java.mk: unregister expired java/openjdk7 2022-09-03 13:01:38 +02:00
Tobias C. Berner
2c54d261a6 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
2022-07-20 21:40:02 +02:00
Rene Ladan
c7d1c247d8 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
2022-05-24 22:09:35 +02:00
Greg Lewis
1309940fd0 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.
2022-05-02 18:21:05 -07:00
Ashish SHUKLA
65526ee02d
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
2022-05-01 11:34:08 +00:00
Ashish SHUKLA
90de298b22
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
2022-05-01 06:55:55 +00:00
Tobias C. Berner
aa25396790 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)
2022-04-24 12:00:20 +02:00
Greg Lewis
aad15015e5 Mk/bsd.java.mk: Add support for openjdk18 and 18[+] as a version 2022-04-16 07:52:19 -07:00
Greg Lewis
f10d7de212 Mk/bsd.java.mk: Add support for openjdk17 and 17[+] as a version
PR:		259167
Reported by:	cedric@precidata.com
2021-11-23 22:49:41 -08:00
Rene Ladan
e7863f568d Mk/bsd.java.mk: generalize a comment.
Differential Revision:	https://reviews.freebsd.org/D29451
2021-04-06 12:39:45 +02:00
Greg Lewis
18ff2b64d7 Add support for openjdk16 and 16[+] as a valid version 2021-02-23 04:37:06 +00:00
Greg Lewis
2c0b72e32c Add support for openjdk15 2020-09-07 18:34:28 +00:00
Greg Lewis
c0771b9c8f Allow users to specify a default Java version in the standard way
PR:		244942
Submitted by:	Tommy P <tommyhp2@gmail.com>
2020-04-11 17:10:03 +00:00
Greg Lewis
e24a636951 Add support for openjdk14 2020-03-21 19:05:48 +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
097eb3adec 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.
2019-10-23 19:35:57 +00:00
Greg Lewis
947645f5a7 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
2019-10-03 19:42:37 +00:00
Rene Ladan
721738180f bsd.java.mk: unregister expired java/linux-oracle-jdk9 and java/linux-oracle-jdk10 2019-09-30 11:12:10 +00:00
Greg Lewis
e0d67b113c 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
2019-09-23 18:19:57 +00:00
Greg Lewis
e70d1658ff 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)
2019-07-31 16:06:31 +00:00
Kyle Evans
c465fe25c2 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)
2017-11-04 01:16:31 +00:00
Greg Lewis
e64557483f . Add a port of the Oracle JDK9 for Linux.
. Add support for JDK9 to bsd.java.mk
2017-10-14 18:41:06 +00:00
Kyle Evans
6266a9e3b7 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)
2017-07-14 18:09:11 +00:00
Jung-uk Kim
90dd89a00e Implement test target for USE_ANT=yes. 2017-04-05 23:31:18 +00:00
Rene Ladan
bd55d4b56b Mk/bsd.java.mk: unregister expired java/linux-sun-jdk17
PR:		209011
Approved by:	portmgr (bapt)
Sponsored by:	Essen Linuxhotel Hackathon 2016
2016-04-24 12:16:23 +00:00
Baptiste Daroussin
421767bd88 Remove the now unneeded ${PORTSDIR} from dependency definition in
The infrastructure Makefiles

PR:		206569
Exp run by:	antoine
Differential Revision:	D5047
2016-03-27 01:23:25 +00:00
Steve Wills
dfdb719e6a Make OpenJDK 1.8 the default 2015-10-19 16:14:29 +00:00
Steve Wills
9269a60c90 - Make OpenJDK 1.7 the default 2014-06-27 20:05:36 +00:00
Baptiste Daroussin
4a4ec28d37 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
2014-05-05 09:45:36 +00:00
Jung-uk Kim
aa834f1ffa Document JAVA_EXTRACT. 2014-05-02 21:35:14 +00:00
Jung-uk Kim
d367a33745 - 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.
2014-04-24 18:05:21 +00:00
Jung-uk Kim
6b6b88f5da Update comments. 2014-04-11 17:17:33 +00:00
Sunpoet Po-Chuan Hsieh
841cd91930 - Fix _JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO
- Reorder _JAVA_VENDOR_*
- Update comment

Submitted by:	sunpoet (myself)
Approved by:	bapt (portmgr)
2014-04-11 15:37:52 +00:00
Greg Lewis
713cd98aca . Set maintainer to java@FreeBSD.org. 2014-04-11 02:08:05 +00:00
Baptiste Daroussin
8a3c16d98f 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
2014-04-10 07:20:23 +00:00
Baptiste Daroussin
5d908e6e7d Change DESTDIRNAME into a ant compatible argument when a port is staged
While here remove previous workarounds.

Submitted by:	ale
Discussed with:	jkim, glewis
2013-11-12 10:36:16 +00:00
Martin Wilke
2db3ae64a5 - Remove CVS reference
PR:		178381
		177581
Submitted by:	Eitan Adler <lists@eitanadler.com>
		Alex Kozlov <spam@rm-rf.kiev.ua>

With hat:	portmgr
2013-05-20 00:45:26 +00:00
Greg Lewis
a9d89ba71a . Split a long comment line. 2013-04-26 02:38:41 +00:00
Greg Lewis
19f575740b . 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@
2013-04-26 02:37:19 +00:00
Greg Lewis
e31c370390 . 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.
2012-12-11 05:11:45 +00:00
Baptiste Daroussin
b1ccabf65d 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)
2012-12-10 17:18:32 +00:00
Martin Wilke
61d8acdb49 - 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
2012-05-23 08:17:49 +00:00
Greg Lewis
4d24c791c4 . 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)
2012-04-13 04:03:42 +00:00
Greg Lewis
228707d19d . Add support for the new linux-sun-jdk17 port. 2012-02-09 06:40:49 +00:00
Greg Lewis
1058166026 . Make the openjdk6 port the preferred JDK by default.
Many thanks to erwin@ for a -exp run.
2012-02-07 04:04:12 +00:00
Greg Lewis
bbd1b1b22e . Make commented examples reference 1.6 (the current default) rather than 1.5. 2011-09-04 19:23:26 +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
Rene Ladan
eb407ea16c - Unregister expired java/jdk14
- Update example from java/jdk14 to java/jdk16

PR:		ports/158030
Submitted by:	myself
Approved by:	glewis
2011-06-28 18:46:46 +00:00
Herve Quiroz
79428a47f5 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)
2011-02-12 15:48:48 +00:00
Greg Lewis
9f0cb7ee9f . Add support for the openjdk7 port.
. Add support for a JAVA_VERSION requirement of 1.7.

Reviewed by:	hq@
2010-01-15 06:07:42 +00:00