From 87b310dbc28f684f7cf40e04a70953e8acaccbed Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Tue, 20 Sep 2005 20:00:08 +0000 Subject: . Update to patchset 2: . Many patches are now unnecessary as they are included in the new patchset. . The browser plugin and Java Web Start is enabled on i386 (there are 64 bit issues with both the plugin and Mozilla/Firefox which prevent enabling it on amd64). . Update the amount of disk space needed. . Update the status of the port. . Disable building the shared class data archive. This broke the build on amd64 and appears to also be problematic on some i386 versions (4.11 is broken at least). It will reappear in future, probably initially on a limited set of FreeBSD versions and architectures (6.0/i386 is reported to work). Reviewed by: freebsd-java@ Approved by: maintainer timeout (1 week) --- java/jdk15/files/patch-deploy::common::Defs-bsd.gmk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 java/jdk15/files/patch-deploy::common::Defs-bsd.gmk (limited to 'java/jdk15/files/patch-deploy::common::Defs-bsd.gmk') diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk new file mode 100644 index 000000000000..6b8e9430f208 --- /dev/null +++ b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk @@ -0,0 +1,20 @@ +$FreeBSD$ + +--- ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Aug 2005 01:06:25 -0000 1.5 ++++ ../../deploy/make/plugin/common/Defs-bsd.gmk 12 Sep 2005 03:26:43 -0000 +@@ -27,3 +27,15 @@ + ifdef ALT_MOZILLA_HEADERS_PATH + MOZILLA_HEADERS_PATH=$(ALT_MOZILLA_HEADERS_PATH) + endif ++ ++# Default NSPR_PATH and allow override. ++NSPR_PATH = ${LOCALBASE} ++ifdef ALT_NSPR_PATH ++ NSPR_PATH = $(subst //,/,$(ALT_NSPR_PATH)) ++endif ++ ++# Default NSPR Headers directory ++NSPR_HEADERS_PATH=$(NSPR_PATH)/include/nspr ++ifdef ALT_NSPR_HEADERS_PATH ++ NSPR_HEADERS_PATH=$(ALT_NSPR_HEADERS_PATH) ++endif -- cgit v1.2.3