Commit graph

130 commits

Author SHA1 Message Date
Edwin Groothuis
0416031c9b Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by:    krion@
PR:             ports/88711 (related)
2006-01-22 02:20:05 +00:00
Greg Lewis
2f4041691b . Always fix up the pthread library references, even if we're not
building either native threads or HotSpot.  This is due to libcmm
  always wanting to link against a pthread library, which was causing
  problems on 7-CURRENT since it was erroneously hardwired to -lc_r.
  This should really fix the problem.

Pointed out by:	pointyhat via kris
2006-01-13 16:23:47 +00:00
Greg Lewis
fa9ca78083 . Try to bandaid a build problem on 7-CURRENT. This is a legitimate fix,
and will stay in the port, but it masks an underlying problem that still
  remains.

Reported by:	pointyhat (via kris)
2005-12-11 21:59:07 +00:00
Greg Lewis
0159e9ebe4 . Add SHA256. 2005-11-16 06:05:38 +00:00
Greg Lewis
5c0642d3ef . Tell the user all the files they will need up front, instead of telling
porky pies about what they have and prompting them one file at a time.
  This is a rewording and reworking (for jdk13) of the patch in the
  attributed PR by fenner@ (which is for jdk14).
. Update the (commented out) MASTER_SITES while I'm here.

PR:		84644
2005-09-03 06:13:03 +00:00
Greg Lewis
b075f4b0d0 . Set a BUILD_DEPENDS for consistency.
. Set _JAVA_BOOTSTRAP_VERSION in case the jbootstrap default changes.
2005-07-23 07:48:59 +00:00
Greg Lewis
4322717065 . Default to using jbootstrap as the bootstrap, not linux-blackdown-jdk13.
PR:		83758
2005-07-23 07:02:22 +00:00
Greg Lewis
f40ff1cda1 . Add $FreeBSD$. 2005-04-28 20:08:01 +00:00
Greg Lewis
6519b90663 . Bump PORTREVISION for the previous fix for jar(1).
. Don't build the plugin by default as it has security flaws.
2005-04-27 20:32:47 +00:00
Greg Lewis
85d91b0060 . Ensure that when files are extracted that their fully resolved path lies
in or below the current working directory.  Fixes a security problem with
  jar(1).

  This fix may change to be compatible with whatever fix Sun applies when
  they release the next version of 1.5.
2005-04-27 20:31:32 +00:00
Greg Lewis
6253055c55 . Move the invocation of unregistervm to the top of the packing list.
This ensures that this command is run before the files in the package
  are deleted (which is necessary for it to correctly delete the symbolic
  links created by registervm).
2005-02-17 19:41:13 +00:00
Greg Lewis
83a5a82b19 . Backport some fixes from 1.4 for the HotSpot Server VM when compiled
under gcc 3.4.  In particular, this fixes some places where an enumerated
  type is assumed to be the same width as an int (which the standard
  doesn't guarantee and gcc 3.4 now enforces).

  For full details, see the log for the jdk14 equivalent changes.
2004-12-07 20:23:40 +00:00
Greg Lewis
97e8b7483d . Mark FORBIDDEN when building the browser plugin. 2004-11-28 05:38:00 +00:00
Greg Lewis
3ea68048cd . Make sure that all calls to pthread_mutex_trylock handle EDEADLK as well
as EBUSY.

  These are taken from equivalent patches to jdk14 by green and myself.
2004-11-28 05:29:25 +00:00
Greg Lewis
83be817c30 . Use CXX and CXXFLAGS for compiling C++ code, not CPP and CPPFLAGS.
Also, respect the setting of CXX and CXXFLAGS.
2004-11-27 05:48:46 +00:00
Greg Lewis
3883849c28 . Fix the build with gcc 3.4 part 2/2. Don't use the flag
-fmemoize-lookups as gcc 3.4 doesn't understand it. [1]
. Use CXX and CXXFLAGS for compiling C++ code, not CPP and CPPFLAGS.
  Also, respect the setting of CXX and CXXFLAGS.

PR:		71516 [1]
Submitted by:	Damir Kiramov <damirycha@damirycha.net.ru> [1]
2004-11-27 05:48:23 +00:00
Greg Lewis
0614155d8e . Fix the HotSpot build for gcc 3.4 part 1/2. Make some methods public
where previously they defaulted to protected.  gcc 3.4 seems to pick
  this up where earlier versions didn't.

PR:		71516
Submitted by:	Damir Kiramov <damirycha@damirycha.net.ru>
2004-11-27 05:44:12 +00:00
Greg Lewis
c00804a6d7 . Fix the plugin build for gcc 3.4.
Submitted by:	Timo Geusch <freebsd@unixconsult.co.uk>
2004-08-31 19:52:25 +00:00
Greg Lewis
cde658701e . Assume (un)registervm is in LOCALBASE _not_ PREFIX. 2004-08-31 19:43:09 +00:00
Greg Lewis
274f5bb820 . Don't let find(1) descend into directories that may have already been
deleted.

PR:		71019
Submitted by:	Rainer Goellner <rainer@jabbe.de>
2004-08-31 19:41:41 +00:00
Greg Lewis
16df5ea99e . Fix the main build for gcc 3.4. The HotSpot build may need some
additional patches.

  This patch is taken almost verbatim from PR 69853 which was
  submitted by Jake Hamby <jhamby@anobject.com>.  I've applied it to
  jdk13 rather than jdk14 though.
2004-08-10 20:30:30 +00:00
Greg Lewis
453f0beec3 . Set CC, CXX and CPP conditionally so that this port will respect them
if set in the port build.  Note that the HotSpot build will likely
  require additional changes for it to also respect these variables.
2004-08-10 20:28:44 +00:00
Greg Lewis
4d7fe23937 . Call unregistervm with the VM we registered, not the comment associated
with (as comments should be optional).
2004-08-10 20:27:17 +00:00
Greg Lewis
fbdb1126e5 . SIZEify. 2004-03-17 16:42:14 +00:00
Greg Lewis
2f5df15115 . It appears as though diablo is problematic on 5.x still, so default to
bootstrapping with the Linux JDK if there isn't a previously compiled
  native one.
2004-02-06 17:03:09 +00:00
Greg Lewis
73ae1039cb . Set an appropriate LATEST_LINK to avoid conflicts with other jdk ports.
Reminded by:	kris
2004-02-06 16:51:50 +00:00
Joe Marcus Clarke
186b8ba82f Add USE_GETTEXT and bump PORTREVISION.
Submitted by:	trevor
Tested by:	bento
2004-02-04 04:36:30 +00:00
Trevor Johnson
78da40aa98 Now gettext 0.12.1 is gettext-old. 2004-01-23 18:12:26 +00:00
Trevor Johnson
439b8a040c Use the CPIO macro defined in bsd.port.mk. 2004-01-22 12:18:43 +00:00
Trevor Johnson
fbd1108f49 Use the SORT macro from bsd.port.mk. 2004-01-22 11:06:02 +00:00
Greg Lewis
a0c1e8baae . Add ${LOCALBASE}/lib to the default search path for JNI libraries for
HotSpot as well.
2004-01-20 19:53:55 +00:00
Greg Lewis
21c8a9307f . Add ${LOCALBASE}/lib to the default search path for libraries when using
JNI.

XXX: Maybe ${X11BASE}/lib and /lib (5.x dynamic root support) should also
     be added?  /lib is part of the default search path on Linux.

Requested by:	marcus
2004-01-19 19:28:40 +00:00
Greg Lewis
d278524c30 . Convert spaces to tabs. 2004-01-19 19:22:31 +00:00
Greg Lewis
ecf10fa88a . Install the cacerts file from Sun's 1.3.1_10 release to avoid some
problems associated with expired root certificates described in:

  http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsalert%2F57436
2004-01-14 19:44:47 +00:00
Greg Lewis
42137ff178 . Update to 1.3.1 patchset 9. 2003-12-19 19:00:06 +00:00
Greg Lewis
a4ecff6df9 . Fix the plugin build when LOCALBASE is not /usr/local.
PR:		58618
Submitted by:	harti
2003-10-28 18:15:01 +00:00
Greg Lewis
4609603989 . Fix pre-everything target.
PR:		58148
Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com>
2003-10-16 23:06:29 +00:00
Greg Lewis
846f8c04ea . Use ${PTHREAD_LIBS} rather than -pthread.
Suggested by:	mi
2003-10-08 00:45:01 +00:00
Greg Lewis
38e03fb03a . Make HotSpot compile with gcc 3.3.1.
Submitted by:	Munehiro Matsuda <haro@h4.dion.ne.jp>
Reminded by:	mi
2003-10-08 00:42:23 +00:00
Greg Lewis
95a95a767e . Remove native_threads directories when native threads are not specified
during the compile.  The native threads java_vm binaries are compiled
  regardless of the settings and were causing problems with the packing
  list.
. Fix packing list so that native_threads versions of java_vm are
  conditionalised.

PR:		56007
2003-08-31 22:43:08 +00:00
Greg Lewis
6a085cc723 . Check for a setting of "-mcpu=k6" in CFLAGS and error if so. This
setting will cause an internal compiler error in gcc 2.95.x when
  compiling the JDK.

PR:		46269
Submitted by:	Simon Barner <barner@in.tum.de>
2003-08-30 15:33:23 +00:00
Greg Lewis
4030c045ad . Add support for bootstrapping with the Diablo Caffe JDK. The bootstrap
order is now:

  . linux-blackdown-jdk13 iff WITH_LINUX_BOOTSTRAP is set.
  . A previous installation of this port, if it exists.
  . The Diablo Caffe JDK.

  That is, the Diablo Caffe JDK is now the default bootstrapper in the
  absence of a previous installation of this port.
2003-08-29 21:12:18 +00:00
Greg Lewis
506e274eaa . Add a script which checks if ${LINUX_BASE}/${WRKDIRPREFIX} is
(possibly indirectly) a symbolic link to ${WRKDIRPREFIX}.
. Use this script in preference to the direct symbolic link check
  previously used, as it handles indirections which cause the same
  problem.
. /compat/linux -> ${LINUXBASE} in the message output if the check
  detects a link.

PR:		43602
2003-08-22 17:07:08 +00:00
Greg Lewis
e43852d616 1. Autodetect a previous jdk13 install and use that to bootstrap by
default if it exists.  This can be overidden either using JDK13DIR
   or setting WITH_LINUX_BOOTSTRAP.
2. Don't create directories for new files, invoke patch with -p0.

PR:		52195 [1]
Submitted by:	David Yeske <dyeske@yahoo.com> [1 - based on]
2003-08-02 17:28:31 +00:00
Greg Lewis
08d5c4f240 . Switch to using the appropriate Blackdown JDK for bootstrapping since
it doesn't require user intervention to download and install.

PR:		30576
2003-07-21 17:21:49 +00:00
Greg Lewis
6b6e1f94e7 . Try to ensure that we get the correct version of some Netscape header
files.  This will hopefully fix some build problems people have been
  experiencing with bogus versions of these files being installed by Qt.

PR:		54180
2003-07-11 21:01:00 +00:00
Greg Lewis
b0106e2794 . In the cases where we need gtar, its an EXTRACT_DEPENDS, not a
BUILD_DEPENDS.
2003-06-15 05:55:36 +00:00
Greg Lewis
fae59e03a3 . Reorder the check for the source and patchset so that the failure
messages are produced in the order that they were intended.
2003-06-15 05:53:02 +00:00
Greg Lewis
a4c740b47a . Bump PORTREVISION for the recent fixes.
Reminded by:	lioux
2003-05-06 14:55:19 +00:00
Greg Lewis
64c60ee3de . Remove an assert() which asserts that if isatty() is true then
ttyname() must not return NULL.  This isn't entirely true according
  to the manual page (the device must be able to be found as well) and
  certainly appears to not necessarily be true in the package building
  environment on bento (plus at least the PR submitter's environment).

  Note that this assert() was, of course, only ever triggered when
  running in debug mode (which most people don't, but does happen
  during the build in some parts).  Also note that there is a check
  for isatty() preceding the call for ttyname() and a NULL return
  from ttyname() is handled, so removing this assert should not
  create any problems.

PR:		48164
2003-05-06 06:11:02 +00:00