Number of commits found: 83

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

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

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

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

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

PR:             116890
Submitted by:   edwin

. Enforce NO_JIKES when 1.6 is required as well.

. Support for the JDK 1.6 ports.

Submitted by:   jkim

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

PR:             113268
Submitted by:   gabor@

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

* 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]

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

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

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

PR:             108130
Submitted by:   Milon Papezik

Convert whitespaces to tabs

PR:             104012
Submitted by:   edwin

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

Reviewed by:    hq
Suggested by:   kris

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

. 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

* 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

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

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)

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

Fix typo in header documentation

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

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)

Fix a typo in header documentation

Submitted by:   vs

Fix a typo

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

Add minimal support for jdk 1.5

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

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

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)

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)

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)

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

Forgotten by:   glewis
Approved by:    portmgr (marcus)

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

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

Approved by:    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)

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

. Align some .endif with their corresponding .if.

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

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

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

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

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

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>

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

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

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

. Correct spelling of "BSD Java Porting Team".

. 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

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 )

Fixed an incorrect comment.

Requested by:   Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
PR:             61741

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]

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

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

. Note some of the JDKs are now 1.4.2 rather than 1.4.1 (the native one
  was updated today in particular).

. 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

Sun JDK 1.4 for Linux is now 1.4.2, not 1.4.1.

. 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

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.

Add support for native JDK 1.4.1 port.

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>

Only using Jikes if NO_BUILD is not set.

Requested by:   Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>

Fixed support for Blackdown JDK 1.3.x.

Submitted by:   Seamus Venasse <Seamus.Venasse@polaris.ca>

Now supports the Sun JDK 1.4.1 for Linux instead of 1.4.0.

Fixed support for Blackdown JDK 1.3 for Linux.

Submitted by:   Seamus Venasse <Seamus.Venasse@gov.yk.ca>

Again changed the order within some lists for estetical reasons.

Added Blackdown JDK 1.4.1 for Linux.

See also:      
http://www.blackdown.org/java-linux/java2-status/jdk1.4-status.html

Changed the order within a list for estetical reasons.

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

Changed the installation directory of the Sun JDK 1.4.x for Linux
to linux-sun-jdk1.4.0.01.

PR:             41424

Changed the installation directory of the Sun JDK 1.3.x for Linux to
linux-sun-jdk1.3.1.

PR:             41424

Now correctly looks for the Blackdown JDK 1.2 for Linux in
${LOCALBASE}/linux-blackdown-jdk1.2.2.

Fixed support for the Sun JDK 1.2.2 for Linux. The installation
directory for that JDK was changed on June 13.

See:   
http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/linux-sun-jdk12/Makefile?rev=1.7&content-type=text/x-cvsweb-markup

Changed the installation directory of the Sun JDK 1.4 for Linux
to ${LOCALBASE}/linux-jdk1.4.0.01.

Noticed by:     phantom

Removed step 2 which used to check that the JDK ports actually
exists. This unbreaks porteasy.

Reported by:    des

Matches new names and locations of JDK ports.
Now also checks that all the JDK ports actually exist.

Fixed typo.

Noticed by:     Alex Dupre <sysadmin@alexdupre.com>
PR:             37933

Blackdown JDK 1.3.1 for Linux added.

Requested by:   Tim Schafer <tim@agship.com>
PR:             37875

Now matches the new installation directory of the
Sun JDK 1.2.x for Linux.

Refactoring applied. One extra stage is introduced in which
it is decided what JDK ports have been installed.

Tested with:    java/jdom net/spread
Reviewed requested from:        java@FreeBSD.org ports@FreeBSD.org
Reviewed by:    John Merryweather Cooper <john_m_cooper@yahoo.com>

Introduction of NEED_JAVAC knob in bsd.java.mk, stage 3.

NEED_JAVAC now actually defaults to NO.

Tested with:    net/spread
                lang/kawa
                java/jdom

Add support for the Sun JDK 1.2.

Also fix one NEED_JAVAC related bug/typo.

Update to IBM JDK 1.3.1 (cxia32131-20020302).

PR:             37397
Submitted by:   Hye-Shik Chang <perky@akaraka.yonsei.ac.kr>

Introduction of NEED_JAVAC knob in bsd.java.mk, stage 2.

All ports that need a Java compiler (either 'javac' or
'jikes') should from now on define NEED_JAVAC.

Some small improvements. Added some comments at the top
summarizing the stages. Identified a sixth stage. Renamed the
JDK_FILE setting to _JDK_FILE, for consistency with other
settings that are only used internally in the mk file.

Tested with:    jakarta-tomcat-3.3.1_7 (www/jakarta-tomcat3),
                jakarta-tomcat-4.0.3_3 (www/jakarta-tomcat),
                orion-1.5.2_17 (www/orion)

Fixed a problem that occurred if it would look for
JDK 1.2 while the FreeBSD JDK 1.3 was not installed,
but the FreeBSD JDK 1.2 was.

Reported by:    lioux

Removed an extraneous .BEGIN. It was not causing any problems,
but it was not necessary either.

Submitted by:   Kimura Fuyuki <fuyuki@mj.0038.net>

Fixed 2 bugs related to dependencies.

Submitted by:   Kimura Fuyuki <fuyuki@mj.0038.net>

Added bsd.java.mk. This adds Java-specific support to ports by
means of a USE_JAVA definition. If a port does not define
USE_JAVA, then this change should not affect that port.

The purpose of this bsd.java.mk file has been extensively
discussed on the freebsd-java mailing list. The current
bsd.java.mk is based on the following specification documents:

http://www.metaverse.nl/~ernst/installing.html
http://www.metaverse.nl/~ernst/writing.html

A proposal that lead to the development of these documents and
finally the current bsd.java.mk file is:

http://www.metaverse.nl/~ernst/freebsd-java-proposal-20011116.html

The bsd.java.mk has been sent to portmgr for review. They had
no objections.

Reviewed by:    portmgr@FreeBSD.org, java@FreeBSD.org
Approved by:    sobomax@FreeBSD.org

Number of commits found: 83

12 vulnerabilities affecting 16 ports have been reported in the past 14 days

^* - modified, not new

All vulnerabilities