1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-15 03:14:23 +00:00
Commit Graph

93 Commits

Author SHA1 Message Date
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
Greg Lewis
b4d07ddf3f . Add support for openjdk6 as a possible JDK.
Submitted by:	Jonathan Chen <jonc@chen.org.nz>
Reviewed by:	hq@
2009-05-22 04:11:20 +00:00
Greg Lewis
8edf38e1e7 . Add diablo-jdk16 and make it the default on 6.x and 7.x.
. Make jdk16 the default on all other supported versions.
2008-08-18 15:42:41 +00:00
Kris Kennaway
54e565eedc 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.
2008-07-19 17:59:41 +00:00
Herve Quiroz
e2135b211a 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
2007-10-28 15:09:43 +00:00
Greg Lewis
15bc91d784 . Remove a check for OSVERSION >= 500000 since this is now true for all
supported versions of FreeBSD.

PR:		116890
Submitted by:	edwin
2007-10-07 14:42:03 +00:00
Greg Lewis
0ae458e9c4 . Enforce NO_JIKES when 1.6 is required as well. 2007-08-05 21:19:47 +00:00
Greg Lewis
131eb04d2f . Support for the JDK 1.6 ports.
Submitted by:	jkim
2007-08-05 21:16:39 +00:00
Greg Lewis
8a88cb13c1 . Remove references to deprecated, forbidden and expired port of the
Linux Blackdown 1.3 JDK.

PR:		113268
Submitted by:	gabor@
2007-06-06 15:38:54 +00:00
Mark Linimon
fbcb891de4 * 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]
2007-03-06 06:21:46 +00:00
Pav Lucistnik
0de3ff661a 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]
2007-01-31 14:07:24 +00:00
Greg Lewis
a2821cdbbc . Add an entry for the linux-sun-jdk15 port.
PR:		108130
Submitted by:	Milon Papezik
2007-01-22 21:49:51 +00:00
Herve Quiroz
01aeb9e835 Convert whitespaces to tabs
PR:		104012
Submitted by:	edwin
2006-10-07 20:40:07 +00:00
Greg Lewis
54ac1f4039 . Prefer diablo-jdk15 on 5.x/i386, 6.x/i386 and 6.x/amd64 and jdk15
everywhere else.

Reviewed by:	hq
Suggested by:	kris
2006-09-14 19:54:46 +00:00
Greg Lewis
08cd6727b3 . Remove the entry for the defunct diablo-jdk13 port. 2006-04-24 18:27:45 +00:00
Greg Lewis
6ccf25eab4 . 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
2006-04-07 03:32:48 +00:00
Clement Laforet
a4b366df6a * 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]
2005-11-08 09:02:51 +00:00
Herve Quiroz
7e14c44aca 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)
2005-11-03 17:37:49 +00:00
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