Native jdk1.4.1 working

[Greg Lewis]

On Wed, Oct 01, 2003 at 09:18:53AM +0200, Ernst de Haan wrote:
> > Argh, thats what I was missing.  I need to put them in jre!  Ernst, I
> > think I can come up with a patch for this.
> 
> What can I say? This is great. I'm looking forward to your patch.

Look forward no longer... Here 'tis :).

I have a similar patch for the native port which I'll run by Alexey if
you think this one is ok.

It may also be worthwhile adding something similar to both
linux-blackdown-jdk14 and linux-ibm-jdk14.  I'll try and figure out if
they need it (I'm sure Blackdown does, not so sure about IBM).

-- 
Greg Lewis                          Email   : glewis at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/java/linux-sun-jdk14/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	30 Sep 2003 23:42:51 -0000	1.36
+++ Makefile	1 Oct 2003 18:16:39 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${INSTALL_JDK_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-sun-
@@ -71,6 +71,11 @@
 	    ${RM} -f ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack; \
 	  fi \
 	done
+
+post-install:
 	${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Sun-JDK${PORTVERSION}"
+	${SED} -e "s:%%JRE_HOME%%:${APP_HOME}/jre:g" \
+	  < ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /var/fcvs/ports/java/linux-sun-jdk14/pkg-plist,v
retrieving revision 1.15
diff -u -r1.15 pkg-plist
--- pkg-plist	4 Sep 2003 15:09:56 -0000	1.15
+++ pkg-plist	1 Oct 2003 17:15:45 -0000
@@ -883,6 +883,8 @@
 %%T%%/include/jvmpi.h
 %%T%%/include/linux/jawt_md.h
 %%T%%/include/linux/jni_md.h
+%%T%%/jre/.systemPrefs/.system.lock
+%%T%%/jre/.systemPrefs/.systemRootModFile
 %%T%%/jre/CHANGES
 %%T%%/jre/COPYRIGHT
 %%T%%/jre/ControlPanel.html
@@ -1589,6 +1591,7 @@
 @dirrm %%T%%/jre/javaws/resources
 @dirrm %%T%%/jre/javaws
 @dirrm %%T%%/jre/bin
+ at dirrm %%T%%/jre/.systemPrefs
 @dirrm %%T%%/jre
 @dirrm %%T%%/include/linux
 @dirrm %%T%%/include
Index: files/pkg-install.in
===================================================================
RCS file: files/pkg-install.in
diff -N files/pkg-install.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-install.in	1 Oct 2003 17:16:00 -0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# System preference location
+PREFS_LOCATION=%%JRE_HOME%%
+
+# Set up system preferences during post install
+if [ "$2" = "POST-INSTALL" ]; then
+	if [ ! -d "${PREFS_LOCATION}/.systemPrefs" ] ; then
+		mkdir -m 755 "${PREFS_LOCATION}/.systemPrefs"
+	fi
+	if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.system.lock" ] ; then
+		touch "${PREFS_LOCATION}/.systemPrefs/.system.lock"
+		chmod 644 "${PREFS_LOCATION}/.systemPrefs/.system.lock"
+	fi
+	if [ ! -f "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile" ] ; then
+		touch "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile"
+		chmod 644 "${PREFS_LOCATION}/.systemPrefs/.systemRootModFile"
+	fi
+fi